diff --git a/coding/internal/expat_impl.h b/coding/internal/expat_impl.h index b9262d6b44..04af168d4f 100644 --- a/coding/internal/expat_impl.h +++ b/coding/internal/expat_impl.h @@ -392,7 +392,7 @@ public: // @cmember Get the current line number - int GetCurrentLineNumber () + unsigned long GetCurrentLineNumber () { assert (m_p != NULL); return XML_GetCurrentLineNumber (m_p); diff --git a/coding/parse_xml.hpp b/coding/parse_xml.hpp index 54f17aa537..2fc3cf81c6 100644 --- a/coding/parse_xml.hpp +++ b/coding/parse_xml.hpp @@ -13,7 +13,7 @@ uint64_t ParseXMLSequence(SequenceT & source, XMLDispatcherT & dispatcher, bool if (!parser.Create()) return 0; - int const BUFFER_SIZE = 16 * 1024; + uint32_t const BUFFER_SIZE = 16 * 1024; uint64_t res = 0; uint64_t readed; @@ -26,7 +26,7 @@ uint64_t ParseXMLSequence(SequenceT & source, XMLDispatcherT & dispatcher, bool if (readed == 0) return res; - if (!parser.ParseBuffer(readed, false)) + if (!parser.ParseBuffer(static_cast(readed), false)) { parser.PrintError(); return res; diff --git a/generator/feature_builder.cpp b/generator/feature_builder.cpp index 93eabdb8de..8aba7ab405 100644 --- a/generator/feature_builder.cpp +++ b/generator/feature_builder.cpp @@ -326,9 +326,9 @@ bool FeatureBuilder1::CheckValid() const return true; } -void FeatureBuilder1::SerializeBase(buffer_t & data, serial::CodingParams const & params, bool needSerializeAdditionalInfo) const +void FeatureBuilder1::SerializeBase(TBuffer & data, serial::CodingParams const & params, bool needSerializeAdditionalInfo) const { - PushBackByteSink sink(data); + PushBackByteSink sink(data); m_params.Write(sink, needSerializeAdditionalInfo); @@ -336,7 +336,7 @@ void FeatureBuilder1::SerializeBase(buffer_t & data, serial::CodingParams const serial::SavePoint(sink, m_center, params); } -void FeatureBuilder1::Serialize(buffer_t & data) const +void FeatureBuilder1::Serialize(TBuffer & data) const { CHECK ( CheckValid(), (*this) ); @@ -346,7 +346,7 @@ void FeatureBuilder1::Serialize(buffer_t & data) const SerializeBase(data, cp); - PushBackByteSink sink(data); + PushBackByteSink sink(data); if (m_params.GetGeomType() != GEOM_POINT) { @@ -363,14 +363,14 @@ void FeatureBuilder1::Serialize(buffer_t & data) const // check for correct serialization #ifdef DEBUG - buffer_t tmp(data); + TBuffer tmp(data); FeatureBuilder1 fb; fb.Deserialize(tmp); ASSERT ( fb == *this, ("Source feature: ", *this, "Deserialized feature: ", fb) ); #endif } -void FeatureBuilder1::Deserialize(buffer_t & data) +void FeatureBuilder1::Deserialize(TBuffer & data) { serial::CodingParams cp; @@ -507,7 +507,7 @@ uint64_t FeatureBuilder1::GetWayIDForRouting() const } -bool FeatureBuilder2::PreSerialize(buffers_holder_t const & data) +bool FeatureBuilder2::PreSerialize(SupportingData const & data) { // make flags actual before header serialization EGeomType const geoType = m_params.GetGeomType(); @@ -523,7 +523,7 @@ bool FeatureBuilder2::PreSerialize(buffers_holder_t const & data) } // we don't need empty features without geometry - return base_type::PreSerialize(); + return TBase::PreSerialize(); } namespace @@ -561,14 +561,14 @@ namespace }; } -void FeatureBuilder2::Serialize(buffers_holder_t & data, serial::CodingParams const & params) +void FeatureBuilder2::Serialize(SupportingData & data, serial::CodingParams const & params) { data.m_buffer.clear(); // header data serialization SerializeBase(data.m_buffer, params, false /* don't store additional info from FeatureParams*/); - PushBackByteSink sink(data.m_buffer); + PushBackByteSink sink(data.m_buffer); uint8_t const ptsCount = static_cast(data.m_innerPts.size()); uint8_t trgCount = static_cast(data.m_innerTrg.size()); @@ -578,7 +578,7 @@ void FeatureBuilder2::Serialize(buffers_holder_t & data, serial::CodingParams co trgCount -= 2; } - BitSink< PushBackByteSink > bitSink(sink); + BitSink< PushBackByteSink > bitSink(sink); EGeomType const type = m_params.GetGeomType(); diff --git a/generator/feature_builder.hpp b/generator/feature_builder.hpp index ab45bd0cfb..ca608bd1d8 100644 --- a/generator/feature_builder.hpp +++ b/generator/feature_builder.hpp @@ -19,8 +19,10 @@ class FeatureBuilder1 friend string DebugPrint(FeatureBuilder1 const & f); public: - typedef vector TPointSeq; - typedef list TGeometry; + using TPointSeq = vector; + using TGeometry = list; + + using TBuffer = vector; FeatureBuilder1(); @@ -73,14 +75,12 @@ public: return m_params.m_Types.empty(); } - typedef vector buffer_t; - /// @name Serialization. //@{ - void Serialize(buffer_t & data) const; - void SerializeBase(buffer_t & data, serial::CodingParams const & params, bool needSearializeAdditionalInfo = true) const; + void Serialize(TBuffer & data) const; + void SerializeBase(TBuffer & data, serial::CodingParams const & params, bool needSearializeAdditionalInfo = true) const; - void Deserialize(buffer_t & data); + void Deserialize(TBuffer & data); //@} /// @name Selectors. @@ -213,36 +213,38 @@ protected: /// Used for serialization of features during final pass. class FeatureBuilder2 : public FeatureBuilder1 { - typedef FeatureBuilder1 base_type; + using TBase = FeatureBuilder1; + using TOffsets = vector; - typedef vector offsets_t; - - static void SerializeOffsets(uint32_t mask, offsets_t const & offsets, buffer_t & buffer); + static void SerializeOffsets(uint32_t mask, TOffsets const & offsets, TBuffer & buffer); public: - struct buffers_holder_t + struct SupportingData { /// @name input //@{ - offsets_t m_ptsOffset, m_trgOffset; - uint8_t m_ptsMask, m_trgMask; + TOffsets m_ptsOffset; + TOffsets m_trgOffset; + uint8_t m_ptsMask; + uint8_t m_trgMask; uint32_t m_ptsSimpMask; - TPointSeq m_innerPts, m_innerTrg; + TPointSeq m_innerPts; + TPointSeq m_innerTrg; //@} /// @name output - base_type::buffer_t m_buffer; + TBase::TBuffer m_buffer; - buffers_holder_t() : m_ptsMask(0), m_trgMask(0), m_ptsSimpMask(0) {} + SupportingData() : m_ptsMask(0), m_trgMask(0), m_ptsSimpMask(0) {} }; /// @name Overwrite from base_type. //@{ - bool PreSerialize(buffers_holder_t const & data); - void Serialize(buffers_holder_t & data, serial::CodingParams const & params); + bool PreSerialize(SupportingData const & data); + void Serialize(SupportingData & data, serial::CodingParams const & params); //@} }; @@ -253,7 +255,7 @@ namespace feature void ReadFromSourceRowFormat(TSource & src, FeatureBuilder1 & fb) { uint32_t const sz = ReadVarUint(src); - typename FeatureBuilder1::buffer_t buffer(sz); + typename FeatureBuilder1::TBuffer buffer(sz); src.Read(&buffer[0], sz); fb.Deserialize(buffer); } diff --git a/generator/feature_generator.cpp b/generator/feature_generator.cpp index 8e6b3c8172..5dda06a183 100644 --- a/generator/feature_generator.cpp +++ b/generator/feature_generator.cpp @@ -105,7 +105,7 @@ uint32_t FeaturesCollector::WriteFeatureBase(vector const & bytes, Feature void FeaturesCollector::operator()(FeatureBuilder1 const & fb) { - FeatureBuilder1::buffer_t bytes; + FeatureBuilder1::TBuffer bytes; fb.Serialize(bytes); (void)WriteFeatureBase(bytes, fb); } diff --git a/generator/feature_sorter.cpp b/generator/feature_sorter.cpp index ba97d6a995..f906c21255 100644 --- a/generator/feature_sorter.cpp +++ b/generator/feature_sorter.cpp @@ -185,7 +185,7 @@ namespace feature class GeometryHolder { public: - FeatureBuilder2::buffers_holder_t m_buffer; + FeatureBuilder2::SupportingData m_buffer; private: FeaturesCollector2 & m_rMain; diff --git a/generator/generator_tests/check_mwms.cpp b/generator/generator_tests/check_mwms.cpp index 711a75ff37..927e308aeb 100644 --- a/generator/generator_tests/check_mwms.cpp +++ b/generator/generator_tests/check_mwms.cpp @@ -51,7 +51,7 @@ UNIT_TEST(CheckMWM_GeomIndex) // Make interval index objects for each scale bucket. vector>> scale2Index; for (size_t i = 0; i < treesReader.Size(); ++i) - scale2Index.emplace_back(new IntervalIndex(treesReader.SubReader(i))); + scale2Index.emplace_back(new IntervalIndex(treesReader.SubReader(static_cast(i)))); // Pass full coverage as input for test. uint64_t beg = 0; diff --git a/generator/generator_tests/feature_builder_test.cpp b/generator/generator_tests/feature_builder_test.cpp index 2d19331cbc..880b027d96 100644 --- a/generator/generator_tests/feature_builder_test.cpp +++ b/generator/generator_tests/feature_builder_test.cpp @@ -53,7 +53,7 @@ UNIT_TEST(FBuilder_ManyTypes) TEST(fb1.RemoveInvalidTypes(), ()); TEST(fb1.CheckValid(), ()); - FeatureBuilder1::buffer_t buffer; + FeatureBuilder1::TBuffer buffer; TEST(fb1.PreSerialize(), ()); fb1.Serialize(buffer); @@ -88,7 +88,7 @@ UNIT_TEST(FBuilder_LineTypes) TEST(fb1.RemoveInvalidTypes(), ()); TEST(fb1.CheckValid(), ()); - FeatureBuilder1::buffer_t buffer; + FeatureBuilder1::TBuffer buffer; TEST(fb1.PreSerialize(), ()); fb1.Serialize(buffer); diff --git a/generator/generator_tests/triangles_tree_coding_test.cpp b/generator/generator_tests/triangles_tree_coding_test.cpp index c21c933477..1ab03f0fde 100644 --- a/generator/generator_tests/triangles_tree_coding_test.cpp +++ b/generator/generator_tests/triangles_tree_coding_test.cpp @@ -37,7 +37,7 @@ namespace } void CompareTriangles(serial::OutPointsT const & test, - P arrP[], uintptr_t arrT[][3], size_t count) + P arrP[], int arrT[][3], size_t count) { TEST_EQUAL(test.size(), 3*count, (test)); @@ -48,7 +48,7 @@ namespace } } - void TestTrianglesCoding(P arrP[], size_t countP, uintptr_t arrT[][3], size_t countT) + void TestTrianglesCoding(P arrP[], size_t countP, int arrT[][3], size_t countT) { tesselator::TrianglesInfo info; info.AssignPoints(arrP, arrP + countP); @@ -88,7 +88,7 @@ UNIT_TEST(TrianglesCoding_Smoke) { { P arrP[] = { P(0, 0), P(0, 1), P(1, 0), P(1, 1), P(0, -1), P(-1, 0) }; - uintptr_t arrT[][3] = { {0, 1, 2}, {1, 3, 2}, {4, 0, 2}, {1, 0, 5}, {4, 5, 0} }; + int arrT[][3] = { {0, 1, 2}, {1, 3, 2}, {4, 0, 2}, {1, 0, 5}, {4, 5, 0} }; TestTrianglesCoding(arrP, ARRAY_SIZE(arrP), arrT, ARRAY_SIZE(arrT)); } @@ -103,7 +103,7 @@ UNIT_TEST(TrianglesCoding_Rect) P(-11.249999842839316, -44.999999874271452) }; - uintptr_t arrT[][3] = { {2, 0, 1}, {0, 2, 3} }; + int arrT[][3] = { {2, 0, 1}, {0, 2, 3} }; TestTrianglesCoding(arrP, ARRAY_SIZE(arrP), arrT, ARRAY_SIZE(arrT)); } diff --git a/generator/update_generator.cpp b/generator/update_generator.cpp index bbbac39d59..1e19c8bfed 100644 --- a/generator/update_generator.cpp +++ b/generator/update_generator.cpp @@ -78,8 +78,14 @@ namespace update ++m_processedFiles; - cnt.SetRemoteSizes(GetFileSize(cnt, MapOptions::Map), - GetFileSize(cnt, MapOptions::CarRouting)); + uint64_t szMap = GetFileSize(cnt, MapOptions::Map); + uint64_t szRouting = GetFileSize(cnt, MapOptions::CarRouting); + + ASSERT_EQUAL(static_cast(szMap), szMap, ()); + ASSERT_EQUAL(static_cast(szRouting), szRouting, ()); + + cnt.SetRemoteSizes(static_cast(szMap), + static_cast(szRouting)); string const fName = cnt.GetNameWithExt(MapOptions::Map); auto found = find(m_files.begin(), m_files.end(), fName); diff --git a/map/mwm_url.cpp b/map/mwm_url.cpp index 420f5900b2..5156e35842 100644 --- a/map/mwm_url.cpp +++ b/map/mwm_url.cpp @@ -97,7 +97,8 @@ void ParsedMapApi::AddKeyValue(string key, string const & value, vector