diff options
author | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2016-04-06 14:33:48 +0300 |
---|---|---|
committer | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2016-04-06 17:58:30 +0300 |
commit | d13c4b9212ec64825a8bf46a6ecc771684f6ae8f (patch) | |
tree | 5887597546c336f2f358bfc35699e5b85c9dfe44 /platform | |
parent | 62dc46e750997cf6c3c550e46d9f992de86b84b8 (diff) |
Exchanging size_t to uint64_t for mwm and group mwm size in bytes.
Diffstat (limited to 'platform')
-rw-r--r-- | platform/local_country_file.cpp | 12 | ||||
-rw-r--r-- | platform/local_country_file.hpp | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/platform/local_country_file.cpp b/platform/local_country_file.cpp index a84bd59d62..a69c7439e0 100644 --- a/platform/local_country_file.cpp +++ b/platform/local_country_file.cpp @@ -70,17 +70,15 @@ string LocalCountryFile::GetPath(MapOptions file) const return my::JoinFoldersToPath(m_directory, GetFileName(m_countryFile.GetName(), file, GetVersion())); } -uint32_t LocalCountryFile::GetSize(MapOptions filesMask) const +uint64_t LocalCountryFile::GetSize(MapOptions filesMask) const { - uint64_t size64 = 0; + uint64_t size = 0; if (HasOptions(filesMask, MapOptions::Map)) - size64 += m_mapSize; + size += m_mapSize; if (!version::IsSingleMwm(GetVersion()) && HasOptions(filesMask, MapOptions::CarRouting)) - size64 += m_routingSize; + size += m_routingSize; - uint32_t const size32 = static_cast<uint32_t>(size64); - ASSERT_EQUAL(size32, size64, ()); - return size32; + return size; } bool LocalCountryFile::operator<(LocalCountryFile const & rhs) const diff --git a/platform/local_country_file.hpp b/platform/local_country_file.hpp index fa0fbec278..e506a72f0e 100644 --- a/platform/local_country_file.hpp +++ b/platform/local_country_file.hpp @@ -51,7 +51,7 @@ public: // Returns size of a file. Return value may be zero until // SyncWithDisk() is called. - uint32_t GetSize(MapOptions filesMask) const; + uint64_t GetSize(MapOptions filesMask) const; // Returns a mask of all known country files. Return value may be // empty until SyncWithDisk() is called. |