Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Zolotarev <deathbaba@gmail.com>2011-10-05 13:16:29 +0400
committerAlex Zolotarev <alex@maps.me>2015-09-23 01:25:16 +0300
commit16568a93c18c619c1a11e60b550079cf114347f6 (patch)
treedbefa52fcb2e3a1a3a1e5c1bf9231cce7306dec0 /indexer/interval_index_builder.hpp
parentb91122858b8836565077ec183d290dd7cc6e5679 (diff)
Fixed some warnings
Diffstat (limited to 'indexer/interval_index_builder.hpp')
-rw-r--r--indexer/interval_index_builder.hpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/indexer/interval_index_builder.hpp b/indexer/interval_index_builder.hpp
index 9727c97c6a..65d4431569 100644
--- a/indexer/interval_index_builder.hpp
+++ b/indexer/interval_index_builder.hpp
@@ -90,9 +90,12 @@ public:
{
IntervalIndexBase::Header header;
header.m_Version = IntervalIndexBase::kVersion;
- header.m_BitsPerLevel = m_BitsPerLevel;
- header.m_Levels = m_Levels;
- header.m_LeafBytes = m_LeafBytes;
+ header.m_BitsPerLevel = static_cast<uint8_t>(m_BitsPerLevel);
+ ASSERT_EQUAL(header.m_BitsPerLevel, m_BitsPerLevel, ());
+ header.m_Levels = static_cast<uint8_t>(m_Levels);
+ ASSERT_EQUAL(header.m_Levels, m_Levels, ());
+ header.m_LeafBytes = static_cast<uint8_t>(m_LeafBytes);
+ ASSERT_EQUAL(header.m_LeafBytes, m_LeafBytes, ());
writer.Write(&header, sizeof(header));
}
@@ -157,12 +160,14 @@ public:
if (bitmapSerial.size() <= listSerial.size())
{
sink.Write(&bitmapSerial[0], bitmapSerial.size());
- return bitmapSerial.size();
+ ASSERT_EQUAL(bitmapSerial.size(), static_cast<uint32_t>(bitmapSerial.size()), ());
+ return static_cast<uint32_t>(bitmapSerial.size());
}
else
{
sink.Write(&listSerial[0], listSerial.size());
- return listSerial.size();
+ ASSERT_EQUAL(listSerial.size(), static_cast<uint32_t>(listSerial.size()), ());
+ return static_cast<uint32_t>(listSerial.size());
}
}