mnalis/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Unused variable warning fixes in Release builds.

Browse source
This commit is contained in:
Alex Zolotarev 2015-06-26 19:21:36 +03:00
parent 7e865a6e58
commit 63ae574a99
3 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
generator/feature_builder.cpp
View file

@ -467,8 +467,7 @@ void FeatureBuilder1::SetCoastCell(int64_t iCell, string const & strCell)
string FeatureBuilder1::GetName(int8_t lang) const
{
string s;
bool const res = m_params.name.GetString(lang, s);
ASSERT(res != s.empty(), ());
VERIFY(m_params.name.GetString(lang, s) != s.empty(), ());
return s;
}

5
platform/local_country_file.cpp
View file

@ -47,10 +47,7 @@ void LocalCountryFile::DeleteFromDisk()
for (TMapOptions file : {TMapOptions::EMap, TMapOptions::ECarRouting})
{
if (OnDisk(file))
{
bool const deleted = my::DeleteFileX(GetPath(file));
ASSERT(deleted, (file, "from", *this, "wasn't deleted from disk."));
}
VERIFY(my::DeleteFileX(GetPath(file)), (file, "from", *this, "wasn't deleted from disk."));
}
}

7
platform/local_country_file_utils.cpp
View file

@ -58,11 +58,8 @@ void CleanupMapsDirectory()
platform.GetFilesByType(subdirPath,
Platform::FILE_TYPE_REGULAR | Platform::FILE_TYPE_DIRECTORY, files);
if (all_of(files.begin(), files.end(), &IsSpecialFile))
{
Platform::EError ret = Platform::RmDir(subdirPath);
ASSERT_EQUAL(Platform::ERR_OK, ret,
("Can't remove empty directory:", subdirPath, "error:", ret));
}
VERIFY(Platform::ERR_OK == Platform::RmDir(subdirPath),
("Can't remove empty directory:", subdirPath, "error:", ret));
}
}
}