diff --git a/base/std_serialization.hpp b/base/std_serialization.hpp index 2cb0a13d3b..6507531b93 100644 --- a/base/std_serialization.hpp +++ b/base/std_serialization.hpp @@ -28,7 +28,7 @@ TArchive & operator >> (TArchive & ar, pair & t) template void save_like_map(TArchive & ar, TCont const & rMap) { - uint32_t const count = rMap.size(); + uint32_t const count = static_cast(rMap.size()); ar << count; for (typename TCont::const_iterator i = rMap.begin(); i != rMap.end(); ++i) @@ -56,7 +56,7 @@ template void load_like_map(TArchive & ar, TCont & template void save_like_vector(TArchive & ar, TCont const & rCont) { - uint32_t const count = rCont.size(); + uint32_t const count = static_cast(rCont.size()); ar << count; for (uint32_t i = 0; i < count; ++i) diff --git a/coding/byte_stream.hpp b/coding/byte_stream.hpp index 1e9a494d14..45ad0eef5d 100644 --- a/coding/byte_stream.hpp +++ b/coding/byte_stream.hpp @@ -21,14 +21,15 @@ public: m_p += size; } - const void * Ptr() const { - return m_p; - } + inline const void * Ptr() const { return m_p; } + inline const unsigned char * PtrUC() const { return m_p; } + inline const char * PtrC() const { return static_cast(Ptr()); } void Advance(size_t size) { m_p += size; } + private: const unsigned char * m_p; }; diff --git a/coding/coding_tests/varint_test.cpp b/coding/coding_tests/varint_test.cpp index 8c15073049..0f5bded6af 100644 --- a/coding/coding_tests/varint_test.cpp +++ b/coding/coding_tests/varint_test.cpp @@ -14,7 +14,7 @@ namespace WriteVarUint(dst, x); ArrayByteSource src(&data[0]); TEST_EQUAL(ReadVarUint(src), x, ()); - size_t const bytesRead = static_cast(src.Ptr()) - &data[0]; + size_t const bytesRead = src.PtrUC() - &data[0]; TEST_EQUAL(bytesRead, data.size(), (x)); } @@ -25,7 +25,7 @@ namespace WriteVarInt(dst, x); ArrayByteSource src(&data[0]); TEST_EQUAL(ReadVarInt(src), x, ()); - size_t const bytesRead = static_cast(src.Ptr()) - &data[0]; + size_t const bytesRead = src.PtrUC() - &data[0]; TEST_EQUAL(bytesRead, data.size(), (x)); } } diff --git a/coding/streams_common.hpp b/coding/streams_common.hpp index 652d335601..acc17df587 100644 --- a/coding/streams_common.hpp +++ b/coding/streams_common.hpp @@ -28,7 +28,7 @@ namespace stream template void WriteString(TStream & s, TWriter & w, string const & t) { - uint32_t const count = t.size(); + uint32_t const count = static_cast(t.size()); s << count; if (count > 0) w.Write(t.c_str(), count); diff --git a/coding/var_record_reader.hpp b/coding/var_record_reader.hpp index 592afb6869..45b2a7072f 100644 --- a/coding/var_record_reader.hpp +++ b/coding/var_record_reader.hpp @@ -40,7 +40,7 @@ public: m_Reader.Read(pos, &buffer[0], initialSize); ArrayByteSource source(&buffer[0]); uint32_t const recordSize = VarRecordSizeReaderFn(source); - uint32_t const recordSizeSize = static_cast(source.Ptr()) - &buffer[0]; + uint32_t const recordSizeSize = static_cast(source.PtrC() - &buffer[0]); uint32_t const fullSize = recordSize + recordSizeSize; ASSERT_LESS_OR_EQUAL(pos + fullSize, m_ReaderSize, ()); buffer.resize(fullSize); diff --git a/indexer/cell_coverer.hpp b/indexer/cell_coverer.hpp index 225222a325..3763fac592 100644 --- a/indexer/cell_coverer.hpp +++ b/indexer/cell_coverer.hpp @@ -13,7 +13,7 @@ inline void SplitRectCell(CellIdT id, CoordT maxX, CoordT maxY, vector & result) { - for (size_t i = 0; i < 4; ++i) + for (int8_t i = 0; i < 4; ++i) { CellIdT child = id.Child(i); CoordT minCellX, minCellY, maxCellX, maxCellY; diff --git a/indexer/feature_loader.cpp b/indexer/feature_loader.cpp index db85154e7d..d842566fdd 100644 --- a/indexer/feature_loader.cpp +++ b/indexer/feature_loader.cpp @@ -142,11 +142,11 @@ void LoaderCurrent::ParseHeader2() m_ptsSimpMask += (mask << (i << 3)); } - char const * start = static_cast(src.Ptr()); + char const * start = src.PtrC(); - src = ArrayByteSource(serial::LoadInnerPath(src.Ptr(), ptsCount, cp, m_pF->m_Points)); + src = ArrayByteSource(serial::LoadInnerPath(start, ptsCount, cp, m_pF->m_Points)); - m_pF->m_InnerStats.m_Points = static_cast(src.Ptr()) - start; + m_pF->m_InnerStats.m_Points = src.PtrC() - start; } else { @@ -162,12 +162,12 @@ void LoaderCurrent::ParseHeader2() { trgCount += 2; - char const * start = static_cast(src.Ptr()); + char const * start = static_cast(src.PtrC()); FeatureType::points_t points; - src = ArrayByteSource(serial::LoadInnerTriangles(src.Ptr(), trgCount, cp, points)); + src = ArrayByteSource(serial::LoadInnerTriangles(start, trgCount, cp, points)); - m_pF->m_InnerStats.m_Strips = static_cast(src.Ptr()) - start; + m_pF->m_InnerStats.m_Strips = src.PtrC() - start; for (uint8_t i = 2; i < trgCount; ++i) { @@ -180,7 +180,7 @@ void LoaderCurrent::ParseHeader2() ReadOffsets(src, trgMask, m_trgOffsets); } - m_pF->m_InnerStats.m_Size = static_cast(src.Ptr()) - DataPtr(); + m_pF->m_InnerStats.m_Size = src.PtrC() - DataPtr(); } uint32_t LoaderCurrent::ParseGeometry(int scale) diff --git a/indexer/feature_loader_base.cpp b/indexer/feature_loader_base.cpp index 63e66522d6..85e24eb46d 100644 --- a/indexer/feature_loader_base.cpp +++ b/indexer/feature_loader_base.cpp @@ -77,7 +77,7 @@ void LoaderBase::Deserialize(BufferT data) uint32_t LoaderBase::CalcOffset(ArrayByteSource const & source) const { - return static_cast(static_cast(source.Ptr()) - DataPtr()); + return static_cast(source.PtrC() - DataPtr()); } } diff --git a/indexer/geometry_serialization.hpp b/indexer/geometry_serialization.hpp index 3d3bc3500d..0e4b030879 100644 --- a/indexer/geometry_serialization.hpp +++ b/indexer/geometry_serialization.hpp @@ -77,7 +77,7 @@ namespace serial template void WriteBufferToSink(vector const & buffer, TSink & sink) { - uint32_t const count = buffer.size(); + uint32_t const count = static_cast(buffer.size()); WriteVarUint(sink, count); sink.Write(&buffer[0], count); } diff --git a/indexer/old/feature_loader_101.cpp b/indexer/old/feature_loader_101.cpp index cae2f8ca43..79a1503329 100644 --- a/indexer/old/feature_loader_101.cpp +++ b/indexer/old/feature_loader_101.cpp @@ -247,12 +247,12 @@ void LoaderImpl::ParseHeader2() m_ptsSimpMask += (mask << (i << 3)); } - char const * start = static_cast(src.Ptr()); + char const * start = src.PtrC(); src = ArrayByteSource(serial::LoadInnerPath( - src.Ptr(), ptsCount, GetDefCodingParams(), m_pF->m_Points)); + start, ptsCount, GetDefCodingParams(), m_pF->m_Points)); - m_pF->m_InnerStats.m_Points = static_cast(src.Ptr()) - start; + m_pF->m_InnerStats.m_Points = src.PtrC() - start; } else ReadOffsets(src, ptsMask, m_ptsOffsets); @@ -264,13 +264,13 @@ void LoaderImpl::ParseHeader2() { trgCount += 2; - char const * start = static_cast(src.Ptr()); + char const * start = src.PtrC(); FeatureType::points_t points; src = ArrayByteSource(serial::LoadInnerTriangles( - src.Ptr(), trgCount, GetDefCodingParams(), points)); + start, trgCount, GetDefCodingParams(), points)); - m_pF->m_InnerStats.m_Strips = static_cast(src.Ptr()) - start; + m_pF->m_InnerStats.m_Strips = src.PtrC() - start; for (uint8_t i = 2; i < trgCount; ++i) { @@ -283,7 +283,7 @@ void LoaderImpl::ParseHeader2() ReadOffsets(src, trgMask, m_trgOffsets); } - m_pF->m_InnerStats.m_Size = static_cast(src.Ptr()) - DataPtr(); + m_pF->m_InnerStats.m_Size = src.PtrC() - DataPtr(); } uint32_t LoaderImpl::ParseGeometry(int scale) diff --git a/words/slof_dictionary.cpp b/words/slof_dictionary.cpp index d0212c099e..16798ae5c2 100644 --- a/words/slof_dictionary.cpp +++ b/words/slof_dictionary.cpp @@ -86,7 +86,7 @@ void sl::SlofDictionary::ArticleById(sl::Dictionary::Id id, string & article) co m_pReader->Read(m_Header.m_ArticleOffset + articleChunkPos + 4, &chunk[0], chunkSize); ArrayByteSource chunkSource(&chunk[0]); uint32_t chunkHeaderSize = ReadVarUint(chunkSource); - chunkHeaderSize += static_cast(chunkSource.Ptr()) - &chunk[0]; + chunkHeaderSize += (chunkSource.PtrC() - &chunk[0]); uint32_t const decompressedChunkSize = ReadVarUint(chunkSource); uint32_t articleBegInChunk = 0; for (uint32_t i = 0; i < articleNumInChunk; ++i)