Fixed some warnings.

13 files changed, 53 insertions, 41 deletions

diff --git a/coding/compressed_bit_vector.cpp b/coding/compressed_bit_vector.cpp
index 0d6a8e3487..3121e6e2b9 100644
--- a/coding/compressed_bit_vector.cpp
+++ b/coding/compressed_bit_vector.cpp
@@ -20,8 +20,8 @@ struct IntersectOp
   unique_ptr<coding::CompressedBitVector> operator()(coding::DenseCBV const & a,
                                                      coding::DenseCBV const & b) const
   {
-    size_t sizeA = a.NumBitGroups();
-    size_t sizeB = b.NumBitGroups();
+    size_t const sizeA = a.NumBitGroups();
+    size_t const sizeB = b.NumBitGroups();
     vector<uint64_t> resGroups(min(sizeA, sizeB));
     for (size_t i = 0; i < resGroups.size(); ++i)
       resGroups[i] = a.GetBitGroup(i) & b.GetBitGroup(i);
@@ -64,8 +64,8 @@ struct SubtractOp
   unique_ptr<coding::CompressedBitVector> operator()(coding::DenseCBV const & a,
                                                      coding::DenseCBV const & b) const
   {
-    size_t sizeA = a.NumBitGroups();
-    size_t sizeB = b.NumBitGroups();
+    size_t const sizeA = a.NumBitGroups();
+    size_t const sizeB = b.NumBitGroups();
     vector<uint64_t> resGroups(min(sizeA, sizeB));
     for (size_t i = 0; i < resGroups.size(); ++i)
       resGroups[i] = a.GetBitGroup(i) & ~b.GetBitGroup(i);
@@ -127,8 +127,8 @@ struct UnionOp
   unique_ptr<coding::CompressedBitVector> operator()(coding::DenseCBV const & a,
                                                      coding::DenseCBV const & b) const
   {
-    size_t sizeA = a.NumBitGroups();
-    size_t sizeB = b.NumBitGroups();
+    size_t const sizeA = a.NumBitGroups();
+    size_t const sizeB = b.NumBitGroups();
 
     size_t commonSize = min(sizeA, sizeB);
     size_t resultSize = max(sizeA, sizeB);
@@ -151,9 +151,12 @@ struct UnionOp
   unique_ptr<coding::CompressedBitVector> operator()(coding::DenseCBV const & a,
                                                      coding::SparseCBV const & b) const
   {
-    size_t sizeA = a.NumBitGroups();
-    size_t sizeB = b.PopCount() == 0 ? 0 : (b.Select(b.PopCount() - 1) + DenseCBV::kBlockSize - 1) /
-                                               DenseCBV::kBlockSize;
+    size_t const sizeA = a.NumBitGroups();
+    size_t const sizeB =
+        b.PopCount() == 0 ? 0
+                          : static_cast<size_t>((b.Select(static_cast<size_t>(b.PopCount() - 1)) +
+                                                 DenseCBV::kBlockSize - 1) /
+                                                DenseCBV::kBlockSize);
     if (sizeB > sizeA)
     {
       vector<uint64_t> resPos;
@@ -280,11 +283,14 @@ DenseCBV::DenseCBV(vector<uint64_t> const & setBits)
     return;
   }
   uint64_t const maxBit = *max_element(setBits.begin(), setBits.end());
-  size_t const sz = 1 + maxBit / kBlockSize;
+  size_t const sz = 1 + static_cast<size_t>(maxBit / kBlockSize);
   m_bitGroups.resize(sz);
   m_popCount = static_cast<uint64_t>(setBits.size());
   for (uint64_t pos : setBits)
-    m_bitGroups[pos / kBlockSize] |= static_cast<uint64_t>(1) << (pos % kBlockSize);
+  {
+    m_bitGroups[static_cast<size_t>(pos / kBlockSize)] |= static_cast<uint64_t>(1)
+                                                          << (pos % kBlockSize);
+  }
 }
 
 // static
@@ -307,7 +313,7 @@ uint64_t DenseCBV::PopCount() const { return m_popCount; }
 
 bool DenseCBV::GetBit(uint64_t pos) const
 {
-  uint64_t bitGroup = GetBitGroup(pos / kBlockSize);
+  uint64_t bitGroup = GetBitGroup(static_cast<size_t>(pos / kBlockSize));
   return ((bitGroup >> (pos % kBlockSize)) & 1) > 0;
 }
 
@@ -388,7 +394,7 @@ unique_ptr<CompressedBitVector> SparseCBV::LeaveFirstSetNBits(uint64_t n) const
 {
   if (PopCount() <= n)
     return Clone();
-  vector<uint64_t> positions(m_positions.begin(), m_positions.begin() + n);
+  vector<uint64_t> positions(m_positions.begin(), m_positions.begin() + static_cast<size_t>(n));
   return CompressedBitVectorBuilder::FromBitPositions(move(positions));
 }
 
diff --git a/coding/file_container.cpp b/coding/file_container.cpp
index 2e7cd1780f..05135ae18a 100644
--- a/coding/file_container.cpp
+++ b/coding/file_container.cpp
@@ -188,7 +188,7 @@ MappedFile::Handle MappedFile::Map(uint64_t offset, uint64_t size, string const
   if (pMap == NULL)
     MYTHROW(Reader::OpenException, ("Can't map section:", tag, "with [offset, size]:", offset, size, "win last error:", GetLastError()));
 #else
-  void * pMap = mmap(0, length, PROT_READ, MAP_SHARED, m_fd, alignedOffset);
+  void * pMap = mmap(0, static_cast<size_t>(length), PROT_READ, MAP_SHARED, m_fd, alignedOffset);
   if (pMap == MAP_FAILED)
     MYTHROW(Reader::OpenException, ("Can't map section:", tag, "with [offset, size]:", offset, size, "errno:", strerror(errno)));
 #endif
@@ -279,7 +279,7 @@ void FilesMappingContainer::Handle::Unmap()
     #ifdef OMIM_OS_WINDOWS
       VERIFY(UnmapViewOfFile(m_origBase), ());
     #else
-      VERIFY(0 == munmap((void*)m_origBase, m_origSize), ());
+      VERIFY(0 == munmap((void *)m_origBase, static_cast<size_t>(m_origSize)), ());
     #endif
     Reset();
   }
diff --git a/coding/file_writer.cpp b/coding/file_writer.cpp
index e6d2e798a3..18ef4f7c0a 100644
--- a/coding/file_writer.cpp
+++ b/coding/file_writer.cpp
@@ -82,6 +82,6 @@ void FileWriter::WritePadding(uint64_t offset, uint64_t factor)
   uint64_t const padding = ((offset + factor - 1) / factor) * factor - offset;
   if (!padding)
     return;
-  vector<uint8_t> buffer(padding);
+  vector<uint8_t> buffer(static_cast<size_t>(padding));
   Write(buffer.data(), buffer.size());
 }
diff --git a/coding/internal/file_data.cpp b/coding/internal/file_data.cpp
index 880e090e4b..238896c99c 100644
--- a/coding/internal/file_data.cpp
+++ b/coding/internal/file_data.cpp
@@ -333,7 +333,7 @@ bool IsEqualFiles(string const & firstFile, string const & secondFile)
   vector<char> buf1, buf2;
   buf1.resize(bufSize);
   buf2.resize(bufSize);
-  size_t const fileSize = first.Size();
+  size_t const fileSize = static_cast<size_t>(first.Size());
   size_t currSize = 0;
 
   while (currSize < fileSize)
diff --git a/coding/map_uint32_to_val.hpp b/coding/map_uint32_to_val.hpp
index 29a97c009b..df331ad932 100644
--- a/coding/map_uint32_to_val.hpp
+++ b/coding/map_uint32_to_val.hpp
@@ -167,7 +167,7 @@ public:
                            ? m_offsets.select(base + 1)
                            : m_header.m_endOffset - m_header.m_variablesOffset;
 
-      std::vector<uint8_t> data(end - start);
+      std::vector<uint8_t> data(static_cast<size_t>(end - start));
 
       m_reader.Read(m_header.m_variablesOffset + start, data.data(), data.size());
 
diff --git a/coding/mmap_reader.cpp b/coding/mmap_reader.cpp
index 6d4dc0aaef..f5c3b23201 100644
--- a/coding/mmap_reader.cpp
+++ b/coding/mmap_reader.cpp
@@ -39,7 +39,8 @@ public:
       MYTHROW(OpenException, ("fstat failed for file", fileName));
     m_size = s.st_size;
 
-    m_memory = (uint8_t *)mmap(0, m_size, PROT_READ, MAP_SHARED, m_fd, 0);
+    m_memory = static_cast<uint8_t *>(
+        mmap(0, static_cast<size_t>(m_size), PROT_READ, MAP_SHARED, m_fd, 0));
     if (m_memory == MAP_FAILED)
     {
       close(m_fd);
@@ -52,7 +53,7 @@ public:
   {
     // @TODO add windows support
 #ifndef OMIM_OS_WINDOWS
-    munmap(m_memory, m_size);
+    munmap(m_memory, static_cast<size_t>(m_size));
     close(m_fd);
 #endif
   }
diff --git a/coding/reader.cpp b/coding/reader.cpp
index bf3cf668b0..2789335c63 100644
--- a/coding/reader.cpp
+++ b/coding/reader.cpp
@@ -13,7 +13,7 @@ void Reader::ReadAsString(std::string & s) const
 std::vector<uint8_t> Reader::ReadAsBytes() const
 {
   std::vector<uint8_t> contents;
-  contents.resize(Size());
+  contents.resize(static_cast<size_t>(Size()));
   Read(0 /* pos */, contents.data(), contents.size());
   return contents;
 }
diff --git a/coding/reader_writer_ops.cpp b/coding/reader_writer_ops.cpp
index d13543e6df..15a97576eb 100644
--- a/coding/reader_writer_ops.cpp
+++ b/coding/reader_writer_ops.cpp
@@ -17,7 +17,7 @@ void Reverse(Reader const & src, Writer & dest)
   uint64_t pos = src.Size();
   while (pos > 0)
   {
-    size_t const sz = pos > bufSz ? bufSz : pos;
+    size_t const sz = pos > bufSz ? bufSz : static_cast<size_t>(pos);
     ASSERT_GREATER_OR_EQUAL(pos, sz, ());
 
     src.Read(pos - sz, &buffer[0], sz);
diff --git a/coding/serdes_json.hpp b/coding/serdes_json.hpp
index b98394c43e..61ae2af589 100644
--- a/coding/serdes_json.hpp
+++ b/coding/serdes_json.hpp
@@ -214,8 +214,9 @@ public:
                                     Source>::type * = nullptr>
   explicit DeserializerJson(Source & source)
   {
-    std::string src(source.Size(), '\0');
-    source.Read(static_cast<void *>(&src[0]), source.Size());
+    auto const size = static_cast<size_t>(source.Size());
+    std::string src(size, '\0');
+    source.Read(static_cast<void *>(&src[0]), size);
     m_jsonObject.ParseFrom(src);
     m_json = m_jsonObject.get();
   }
diff --git a/coding/simple_dense_coding.cpp b/coding/simple_dense_coding.cpp
index 3dd1ec5aed..265bcef10a 100644
--- a/coding/simple_dense_coding.cpp
+++ b/coding/simple_dense_coding.cpp
@@ -70,6 +70,6 @@ SimpleDenseCoding::SimpleDenseCoding(SimpleDenseCoding && rhs)
 uint8_t SimpleDenseCoding::Get(uint64_t i) const
 {
   ASSERT_LESS(i, Size(), ());
-  return m_symbols[m_ranks[i]];
+  return m_symbols[m_ranks[static_cast<size_t>(i)]];
 }
 }  // namespace coding
diff --git a/coding/text_storage.hpp b/coding/text_storage.hpp
index 321f055a2e..cc0c52f919 100644
--- a/coding/text_storage.hpp
+++ b/coding/text_storage.hpp
@@ -141,7 +141,10 @@ public:
   };
 
   size_t GetNumBlockInfos() const { return m_blocks.size(); }
-  size_t GetNumStrings() const { return m_blocks.empty() ? 0 : m_blocks.back().To(); }
+  size_t GetNumStrings() const
+  {
+    return m_blocks.empty() ? 0 : static_cast<size_t>(m_blocks.back().To());
+  }
 
   BlockInfo const & GetBlockInfo(size_t blockIx) const
   {
@@ -185,7 +188,7 @@ public:
     source.Skip(indexOffset);
 
     auto const numBlocks = ReadVarUint<uint64_t, NonOwningReaderSource>(source);
-    m_blocks.assign(numBlocks, {});
+    m_blocks.assign(static_cast<size_t>(numBlocks), {});
 
     uint64_t prevOffset = 8;  // 8 bytes for the offset of the data section
     for (uint64_t i = 0; i < numBlocks; ++i)
@@ -194,9 +197,9 @@ public:
       CHECK_GREATER_OR_EQUAL(prevOffset + delta, prevOffset, ());
       prevOffset += delta;
 
-      auto & block = m_blocks[i];
+      auto & block = m_blocks[static_cast<size_t>(i)];
       block.m_offset = prevOffset;
-      block.m_from = i == 0 ? 0 : m_blocks[i - 1].To();
+      block.m_from = i == 0 ? 0 : m_blocks[static_cast<size_t>(i - 1)].To();
       block.m_subs = ReadVarUint<uint64_t, NonOwningReaderSource>(source);
       CHECK_GREATER_OR_EQUAL(block.m_from + block.m_subs, block.m_from, ());
     }
@@ -245,7 +248,7 @@ public:
       source.Skip(bi.m_offset);
 
       entry.m_value.clear();
-      entry.m_subs.resize(bi.m_subs);
+      entry.m_subs.resize(static_cast<size_t>(bi.m_subs));
 
       uint64_t offset = 0;
       for (size_t i = 0; i < entry.m_subs.size(); ++i)
@@ -270,7 +273,7 @@ public:
     auto const & si = entry.m_subs[stringIx];
     auto const & value = entry.m_value;
     ASSERT_LESS_OR_EQUAL(si.m_offset + si.m_length, value.size(), ());
-    return value.substr(si.m_offset, si.m_length);
+    return value.substr(static_cast<size_t>(si.m_offset), static_cast<size_t>(si.m_length));
   }
 
   void ClearCache() { m_cache.clear(); }
diff --git a/coding/value_opt_string.hpp b/coding/value_opt_string.hpp
index 9061f454c9..c60f2abc9e 100644
--- a/coding/value_opt_string.hpp
+++ b/coding/value_opt_string.hpp
@@ -12,8 +12,6 @@
 
 class StringNumericOptimal
 {
-  std::string m_s;
-
 public:
   bool operator==(StringNumericOptimal const & rhs) const { return m_s == rhs.m_s; }
 
@@ -43,8 +41,8 @@ public:
   /// First uint64_t value is:
   /// - a number if low control bit is 1;
   /// - a string size-1 if low control bit is 0;
-  template <typename TSink>
-  void Write(TSink & sink) const
+  template <typename Sink>
+  void Write(Sink & sink) const
   {
     // If string is a number and we have space for control bit
     uint64_t n;
@@ -60,8 +58,8 @@ public:
     }
   }
 
-  template <typename TSource>
-  void Read(TSource & src)
+  template <typename Source>
+  void Read(Source & src)
   {
     uint64_t sz = ReadVarUint<uint64_t>(src);
 
@@ -73,9 +71,12 @@ public:
       ASSERT_LESS_OR_EQUAL(sz, std::numeric_limits<size_t>::max(),
                            ("sz is out of platform's range."));
       m_s.resize(static_cast<size_t>(sz));
-      src.Read(&m_s[0], sz);
+      src.Read(&m_s[0], static_cast<size_t>(sz));
     }
   }
+
+private:
+  std::string m_s;
 };
 
 inline std::string DebugPrint(StringNumericOptimal const & s) { return s.Get(); }
diff --git a/coding/writer.hpp b/coding/writer.hpp
index ccf743c813..1300de7baa 100644
--- a/coding/writer.hpp
+++ b/coding/writer.hpp
@@ -43,14 +43,14 @@ public:
 
   void Write(void const * p, size_t size) override
   {
-    intptr_t freeSize = m_Data.size() - m_Pos;
+    auto freeSize = static_cast<intptr_t>(m_Data.size() - m_Pos);
     if (freeSize < 0)
     {
-      m_Data.resize(m_Pos + size);
+      m_Data.resize(static_cast<size_t>(m_Pos + size));
       freeSize = size;
     }
 
-    memcpy(&m_Data[m_Pos], p, std::min(size, static_cast<size_t>(freeSize)));
+    memcpy(&m_Data[static_cast<size_t>(m_Pos)], p, std::min(size, static_cast<size_t>(freeSize)));
 
     if (size > static_cast<size_t>(freeSize))
     {