diff options
19 files changed, 103 insertions, 27 deletions
diff --git a/coding/fixed_bits_ddvector.hpp b/coding/fixed_bits_ddvector.hpp index a1b619fb61..6a33acc0e5 100644 --- a/coding/fixed_bits_ddvector.hpp +++ b/coding/fixed_bits_ddvector.hpp @@ -130,6 +130,8 @@ public: TWriter & m_finalWriter; public: + using ValueType = TValue; + explicit Builder(TWriter & writer) : m_writer(m_data), m_bits(new TBits(m_writer)), m_finalWriter(writer) { diff --git a/generator/altitude_generator.cpp b/generator/altitude_generator.cpp index d90a6d008f..1308ebc108 100644 --- a/generator/altitude_generator.cpp +++ b/generator/altitude_generator.cpp @@ -20,6 +20,7 @@ #include "geometry/latlon.hpp" #include "base/assert.hpp" +#include "base/checked_cast.hpp" #include "base/logging.hpp" #include "base/scope_guard.hpp" #include "base/stl_helpers.hpp" @@ -184,7 +185,7 @@ void BuildRoadAltitudes(string const & mwmPath, AltitudeGetter & altitudeGetter) succinct::bit_vector_builder & builder = processor.GetAltitudeAvailabilityBuilder(); succinct::rs_bit_vector(&builder).map(visitor); } - header.m_featureTableOffset = w.Pos() - startOffset; + header.m_featureTableOffset = base::checked_cast<uint32_t>(w.Pos() - startOffset); vector<uint32_t> offsets; vector<uint8_t> deltas; @@ -194,7 +195,7 @@ void BuildRoadAltitudes(string const & mwmPath, AltitudeGetter & altitudeGetter) Processor::TFeatureAltitudes const & featureAltitudes = processor.GetFeatureAltitudes(); for (auto const & a : featureAltitudes) { - offsets.push_back(writer.Pos()); + offsets.push_back(base::checked_cast<uint32_t>(writer.Pos())); a.m_altitudes.Serialize(header.m_minAltitude, writer); } } @@ -211,10 +212,10 @@ void BuildRoadAltitudes(string const & mwmPath, AltitudeGetter & altitudeGetter) succinct::elias_fano(&builder).map(visitor); } // Writing altitude info. - header.m_altitudesOffset = w.Pos() - startOffset; + header.m_altitudesOffset = base::checked_cast<uint32_t>(w.Pos() - startOffset); w.Write(deltas.data(), deltas.size()); w.WritePaddingByEnd(8); - header.m_endOffset = w.Pos() - startOffset; + header.m_endOffset = base::checked_cast<uint32_t>(w.Pos() - startOffset); // Rewriting header info. int64_t const endOffset = w.Pos(); diff --git a/generator/booking_quality_check/booking_quality_check.cpp b/generator/booking_quality_check/booking_quality_check.cpp index 1d189e1b77..28f3237bfb 100644 --- a/generator/booking_quality_check/booking_quality_check.cpp +++ b/generator/booking_quality_check/booking_quality_check.cpp @@ -278,7 +278,7 @@ void GenerateSample(Dataset const & dataset, boost::copy(features | boost::adaptors::map_keys, begin(elementIndexes)); // TODO(mgsergio): Try RandomSample (from search:: at the moment of writing). - shuffle(elementIndexes.begin(), elementIndexes.end(), minstd_rand(FLAGS_seed)); + shuffle(elementIndexes.begin(), elementIndexes.end(), minstd_rand(static_cast<uint32_t>(FLAGS_seed))); if (FLAGS_selection_size < elementIndexes.size()) elementIndexes.resize(FLAGS_selection_size); diff --git a/generator/feature_segments_checker/feature_segments_checker.cpp b/generator/feature_segments_checker/feature_segments_checker.cpp index aa7e2c534e..b37a45809b 100644 --- a/generator/feature_segments_checker/feature_segments_checker.cpp +++ b/generator/feature_segments_checker/feature_segments_checker.cpp @@ -15,6 +15,7 @@ #include "platform/platform.hpp" +#include "base/checked_cast.hpp" #include "base/logging.hpp" #include "base/math.hpp" @@ -166,7 +167,7 @@ public: } f.ParseGeometry(FeatureType::BEST_GEOMETRY); - uint32_t const numPoints = f.GetPointsCount(); + uint32_t const numPoints = base::asserted_cast<uint32_t>(f.GetPointsCount()); if (numPoints == 0) { ++m_emptyRoadCount; diff --git a/generator/restriction_generator.cpp b/generator/restriction_generator.cpp index bf672dd81e..6613e12cd3 100644 --- a/generator/restriction_generator.cpp +++ b/generator/restriction_generator.cpp @@ -5,6 +5,7 @@ #include "coding/file_container.hpp" #include "coding/file_writer.hpp" +#include "base/checked_cast.hpp" #include "base/logging.hpp" #include "base/stl_helpers.hpp" @@ -33,8 +34,8 @@ bool BuildRoadRestrictions(string const & mwmPath, string const & restrictionPat lower_bound(restrictions.cbegin(), restrictions.cend(), Restriction(Restriction::Type::Only, {} /* links */), my::LessBy(&Restriction::m_type)); RoutingHeader header; - header.m_noRestrictionCount = distance(restrictions.cbegin(), firstOnlyIt); - header.m_onlyRestrictionCount = restrictions.size() - header.m_noRestrictionCount; + header.m_noRestrictionCount = base::checked_cast<uint32_t>(distance(restrictions.cbegin(), firstOnlyIt)); + header.m_onlyRestrictionCount = base::checked_cast<uint32_t>(restrictions.size() - header.m_noRestrictionCount); LOG(LINFO, ("Header info. There are", header.m_noRestrictionCount, "of type No restrictions and", header.m_onlyRestrictionCount, "of type Only restrictions")); diff --git a/generator/routing_index_generator.cpp b/generator/routing_index_generator.cpp index 8b6016fe9d..bbd1d8caad 100644 --- a/generator/routing_index_generator.cpp +++ b/generator/routing_index_generator.cpp @@ -13,6 +13,7 @@ #include "coding/file_container.hpp" +#include "base/checked_cast.hpp" #include "base/logging.hpp" #include "std/bind.hpp" @@ -72,7 +73,7 @@ private: for (size_t i = 0; i < f.GetPointsCount(); ++i) { uint64_t const locationKey = PointToInt64(f.GetPoint(i), POINT_COORD_BITS); - m_posToJoint[locationKey].AddPoint(RoadPoint(id, i)); + m_posToJoint[locationKey].AddPoint(RoadPoint(id, base::checked_cast<uint32_t>(i))); } } diff --git a/generator/search_index_builder.cpp b/generator/search_index_builder.cpp index 016b2a9e2e..78e08059a2 100644 --- a/generator/search_index_builder.cpp +++ b/generator/search_index_builder.cpp @@ -363,7 +363,7 @@ void BuildAddressTable(FilesContainerR & container, Writer & writer) ++address; } if (streetMatched) - building2Street.PushBack(streetIndex); + building2Street.PushBack(base::checked_cast<decltype(building2Street)::ValueType>(streetIndex)); else building2Street.PushBackUndefined(); } diff --git a/generator/sponsored_dataset_inl.hpp b/generator/sponsored_dataset_inl.hpp index 355192885a..12364346a3 100644 --- a/generator/sponsored_dataset_inl.hpp +++ b/generator/sponsored_dataset_inl.hpp @@ -111,7 +111,7 @@ SponsoredDataset<SponsoredObject>::GetNearestObjects(ms::LatLon const & latLon, namespace bgi = boost::geometry::index; vector<ObjectId> indexes; - for_each(bgi::qbegin(m_rtree, bgi::nearest(Point(latLon.lat, latLon.lon), limit)), + for_each(bgi::qbegin(m_rtree, bgi::nearest(Point(latLon.lat, latLon.lon), static_cast<unsigned>(limit))), bgi::qend(m_rtree), [this, &latLon, &indexes, maxDistanceMeters](Value const & v) { auto const & object = GetObjectById(v.second); diff --git a/generator/srtm_coverage_checker/srtm_coverage_checker.cpp b/generator/srtm_coverage_checker/srtm_coverage_checker.cpp index dfd033522b..28b366ea05 100644 --- a/generator/srtm_coverage_checker/srtm_coverage_checker.cpp +++ b/generator/srtm_coverage_checker/srtm_coverage_checker.cpp @@ -71,7 +71,7 @@ int main(int argc, char * argv[]) size_t all = 0; size_t good = 0; - for (size_t i = 0; i < dataFacade.GetNumberOfNodes(); ++i) + for (TOsrmNodeId i = 0; i < dataFacade.GetNumberOfNodes(); ++i) { buffer_vector<OsrmMappingTypes::FtSeg, 8> buffer; segMapping.ForEachFtSeg(i, MakeBackInsertFunctor(buffer)); diff --git a/indexer/indexer_tests/trie_test.cpp b/indexer/indexer_tests/trie_test.cpp index ca3555648f..38265302bd 100644 --- a/indexer/indexer_tests/trie_test.cpp +++ b/indexer/indexer_tests/trie_test.cpp @@ -36,7 +36,7 @@ struct ChildNodeInfo uint32_t Size() const { return m_size; } bool IsLeaf() const { return m_isLeaf; } uint32_t const * GetEdge() const { return &m_edge[0]; } - uint32_t GetEdgeSize() const { return m_edge.size(); } + size_t GetEdgeSize() const { return m_edge.size(); } }; // The SingleValueSerializer and ValueList classes are similar to diff --git a/indexer/trie_builder.hpp b/indexer/trie_builder.hpp index bf728c50da..02dfcf3737 100644 --- a/indexer/trie_builder.hpp +++ b/indexer/trie_builder.hpp @@ -5,6 +5,7 @@ #include "coding/varint.hpp" #include "base/buffer_vector.hpp" +#include "base/checked_cast.hpp" #include "base/logging.hpp" #include "std/algorithm.hpp" @@ -48,7 +49,7 @@ void WriteNode(TSink & sink, TSerializer const & serializer, TrieChar baseChar, TValueList const & valueList, TChildIter const begChild, TChildIter const endChild, bool isRoot = false) { - uint32_t const valueCount = valueList.Size(); + uint32_t const valueCount = base::asserted_cast<uint32_t>(valueList.Size()); if (begChild == endChild && !isRoot) { // Leaf node. @@ -65,7 +66,7 @@ void WriteNode(TSink & sink, TSerializer const & serializer, TrieChar baseChar, return; } - uint32_t const childCount = endChild - begChild; + uint32_t const childCount = base::asserted_cast<uint32_t>(endChild - begChild); uint8_t const header = static_cast<uint32_t>((min(valueCount, 3U) << 6) + min(childCount, 63U)); sink.Write(&header, 1); if (valueCount >= 3) @@ -77,7 +78,7 @@ void WriteNode(TSink & sink, TSerializer const & serializer, TrieChar baseChar, { uint8_t header = (it->IsLeaf() ? 128 : 0); TrieChar const * const edge = it->GetEdge(); - uint32_t const edgeSize = it->GetEdgeSize(); + uint32_t const edgeSize = base::asserted_cast<uint32_t>(it->GetEdgeSize()); CHECK_NOT_EQUAL(edgeSize, 0, ()); CHECK_LESS(edgeSize, 100000, ()); uint32_t const diff0 = bits::ZigZagEncode(int32_t(edge[0] - baseChar)); @@ -127,7 +128,7 @@ struct ChildInfo uint32_t Size() const { return m_size; } bool IsLeaf() const { return m_isLeaf; } TrieChar const * GetEdge() const { return m_edge.data(); } - uint32_t GetEdgeSize() const { return m_edge.size(); } + size_t GetEdgeSize() const { return m_edge.size(); } }; template <typename TValueList> @@ -184,7 +185,7 @@ void WriteNodeReverse(TSink & sink, TSerializer const & serializer, TrieChar bas } template <typename TSink, typename TNodes, typename TSerializer> -void PopNodes(TSink & sink, TSerializer const & serializer, TNodes & nodes, int nodesToPop) +void PopNodes(TSink & sink, TSerializer const & serializer, TNodes & nodes, size_t nodesToPop) { using TNodeInfo = typename TNodes::value_type; ASSERT_GREATER(nodes.size(), nodesToPop, ()); diff --git a/routing/index_graph_serialization.hpp b/routing/index_graph_serialization.hpp index 796f2fd97d..a11b358b25 100644 --- a/routing/index_graph_serialization.hpp +++ b/routing/index_graph_serialization.hpp @@ -10,6 +10,8 @@ #include "coding/reader.hpp" #include "coding/write_to_sink.hpp" +#include "base/checked_cast.hpp" + #include "std/algorithm.hpp" #include "std/cstdint.hpp" #include "std/limits.hpp" @@ -218,7 +220,7 @@ private: uint32_t GetNumRoads() const { return m_numRoads; } Joint::Id GetNumJoints() const { return m_numJoints; } - uint32_t GetNumSections() const { return m_sections.size(); } + uint32_t GetNumSections() const { return base::asserted_cast<uint32_t>(m_sections.size()); } Section const & GetSection(size_t index) const { diff --git a/routing/road_index.hpp b/routing/road_index.hpp index 779183172a..ada8b054ce 100644 --- a/routing/road_index.hpp +++ b/routing/road_index.hpp @@ -2,6 +2,8 @@ #include "routing/joint.hpp" +#include "base/checked_cast.hpp" + #include "std/algorithm.hpp" #include "std/cstdint.hpp" #include "std/unordered_map.hpp" @@ -130,7 +132,7 @@ public: // If there is no nearest point, return {Joint::kInvalidId, 0} pair<Joint::Id, uint32_t> FindNeighbor(RoadPoint const & rp, bool forward) const; - uint32_t GetSize() const { return m_roads.size(); } + uint32_t GetSize() const { return base::asserted_cast<uint32_t>(m_roads.size()); } Joint::Id GetJointId(RoadPoint const & rp) const { diff --git a/routing/routing_serialization.hpp b/routing/routing_serialization.hpp index 87a7782a7b..8e1b747a7c 100644 --- a/routing/routing_serialization.hpp +++ b/routing/routing_serialization.hpp @@ -9,6 +9,7 @@ #include "base/assert.hpp" #include "base/bits.hpp" +#include "base/checked_cast.hpp" #include "std/algorithm.hpp" #include "std/string.hpp" @@ -163,7 +164,7 @@ private: BitReader<Source> bits(src); for (size_t i = 0; i < count; ++i) { - uint32_t const biasedLinkNumber = coding::DeltaCoder::Decode(bits); + auto const biasedLinkNumber = coding::DeltaCoder::Decode(bits); if (biasedLinkNumber == 0) { LOG(LERROR, ("Decoded link restriction number is zero.")); @@ -173,22 +174,22 @@ private: routing::Restriction restriction(type, {} /* links */); restriction.m_featureIds.resize(numLinks); - uint32_t const biasedFirstFeatureId = coding::DeltaCoder::Decode(bits); + auto const biasedFirstFeatureId = coding::DeltaCoder::Decode(bits); if (biasedFirstFeatureId == 0) { LOG(LERROR, ("Decoded first link restriction feature id delta is zero.")); return false; } - restriction.m_featureIds[0] = prevFirstLinkFeatureId + biasedFirstFeatureId - 1; + restriction.m_featureIds[0] = prevFirstLinkFeatureId + base::checked_cast<uint32_t>(biasedFirstFeatureId) - 1; for (size_t i = 1; i < numLinks; ++i) { - uint32_t const biasedDelta = coding::DeltaCoder::Decode(bits); + auto const biasedDelta = coding::DeltaCoder::Decode(bits); if (biasedDelta == 0) { LOG(LERROR, ("Decoded link restriction feature id delta is zero.")); return false; } - uint32_t const delta = biasedDelta - 1; + auto const delta = biasedDelta - 1; restriction.m_featureIds[i] = static_cast<uint32_t>( bits::ZigZagDecode(delta) + restriction.m_featureIds[i - 1]); } diff --git a/xcode/generator/generator.xcodeproj/project.pbxproj b/xcode/generator/generator.xcodeproj/project.pbxproj index 698e748f5b..5683681950 100644 --- a/xcode/generator/generator.xcodeproj/project.pbxproj +++ b/xcode/generator/generator.xcodeproj/project.pbxproj @@ -84,6 +84,14 @@ 67BC92E31D1A9ED800A4A378 /* test_feature.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67BC92D91D1A9E9800A4A378 /* test_feature.hpp */; }; 67BC92E41D1A9ED800A4A378 /* test_mwm_builder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67BC92DA1D1A9E9800A4A378 /* test_mwm_builder.cpp */; }; 67BC92E51D1A9ED800A4A378 /* test_mwm_builder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67BC92DB1D1A9E9800A4A378 /* test_mwm_builder.hpp */; }; + 67C79BAF1E2CEEAB00C40034 /* restriction_collector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67C79BA71E2CEEAB00C40034 /* restriction_collector.cpp */; }; + 67C79BB01E2CEEAB00C40034 /* restriction_collector.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67C79BA81E2CEEAB00C40034 /* restriction_collector.hpp */; }; + 67C79BB11E2CEEAB00C40034 /* restriction_generator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67C79BA91E2CEEAB00C40034 /* restriction_generator.cpp */; }; + 67C79BB21E2CEEAB00C40034 /* restriction_generator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67C79BAA1E2CEEAB00C40034 /* restriction_generator.hpp */; }; + 67C79BB31E2CEEAB00C40034 /* restriction_writer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67C79BAB1E2CEEAB00C40034 /* restriction_writer.cpp */; }; + 67C79BB41E2CEEAB00C40034 /* restriction_writer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67C79BAC1E2CEEAB00C40034 /* restriction_writer.hpp */; }; + 67C79BB51E2CEEAB00C40034 /* traffic_generator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67C79BAD1E2CEEAB00C40034 /* traffic_generator.cpp */; }; + 67C79BB61E2CEEAB00C40034 /* traffic_generator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67C79BAE1E2CEEAB00C40034 /* traffic_generator.hpp */; }; E9502E331D34012200CAB86B /* booking_scoring.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9502E311D34012200CAB86B /* booking_scoring.cpp */; }; /* End PBXBuildFile section */ @@ -170,6 +178,14 @@ 67BC92D91D1A9E9800A4A378 /* test_feature.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = test_feature.hpp; sourceTree = "<group>"; }; 67BC92DA1D1A9E9800A4A378 /* test_mwm_builder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_mwm_builder.cpp; sourceTree = "<group>"; }; 67BC92DB1D1A9E9800A4A378 /* test_mwm_builder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = test_mwm_builder.hpp; sourceTree = "<group>"; }; + 67C79BA71E2CEEAB00C40034 /* restriction_collector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = restriction_collector.cpp; sourceTree = "<group>"; }; + 67C79BA81E2CEEAB00C40034 /* restriction_collector.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = restriction_collector.hpp; sourceTree = "<group>"; }; + 67C79BA91E2CEEAB00C40034 /* restriction_generator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = restriction_generator.cpp; sourceTree = "<group>"; }; + 67C79BAA1E2CEEAB00C40034 /* restriction_generator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = restriction_generator.hpp; sourceTree = "<group>"; }; + 67C79BAB1E2CEEAB00C40034 /* restriction_writer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = restriction_writer.cpp; sourceTree = "<group>"; }; + 67C79BAC1E2CEEAB00C40034 /* restriction_writer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = restriction_writer.hpp; sourceTree = "<group>"; }; + 67C79BAD1E2CEEAB00C40034 /* traffic_generator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = traffic_generator.cpp; sourceTree = "<group>"; }; + 67C79BAE1E2CEEAB00C40034 /* traffic_generator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = traffic_generator.hpp; sourceTree = "<group>"; }; 67F0F6761B8C9DCE003F52FF /* osm_xml_source.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = osm_xml_source.hpp; sourceTree = "<group>"; }; E9502E311D34012200CAB86B /* booking_scoring.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = booking_scoring.cpp; sourceTree = "<group>"; }; /* End PBXFileReference section */ @@ -215,6 +231,14 @@ 6753401D1A3F2A1B00A0A8C3 /* generator */ = { isa = PBXGroup; children = ( + 67C79BA71E2CEEAB00C40034 /* restriction_collector.cpp */, + 67C79BA81E2CEEAB00C40034 /* restriction_collector.hpp */, + 67C79BA91E2CEEAB00C40034 /* restriction_generator.cpp */, + 67C79BAA1E2CEEAB00C40034 /* restriction_generator.hpp */, + 67C79BAB1E2CEEAB00C40034 /* restriction_writer.cpp */, + 67C79BAC1E2CEEAB00C40034 /* restriction_writer.hpp */, + 67C79BAD1E2CEEAB00C40034 /* traffic_generator.cpp */, + 67C79BAE1E2CEEAB00C40034 /* traffic_generator.hpp */, 3D51BC4A1D5E512500F1FA8D /* altitude_generator.cpp */, 3D51BC4B1D5E512500F1FA8D /* altitude_generator.hpp */, 67A0FEBC1CEB467F008F2A61 /* booking_dataset.cpp */, @@ -320,12 +344,14 @@ 6753405D1A3F2A7400A0A8C3 /* borders_generator.hpp in Headers */, 6753408B1A3F2A7400A0A8C3 /* ways_merger.hpp in Headers */, 6753407F1A3F2A7400A0A8C3 /* osm2type.hpp in Headers */, + 67C79BB21E2CEEAB00C40034 /* restriction_generator.hpp in Headers */, 670B84BD1A8CDB0000CE4492 /* osm_source.hpp in Headers */, 675340631A3F2A7400A0A8C3 /* coastlines_generator.hpp in Headers */, 675340641A3F2A7400A0A8C3 /* intermediate_data.hpp in Headers */, 675340781A3F2A7400A0A8C3 /* intermediate_elements.hpp in Headers */, 6753406B1A3F2A7400A0A8C3 /* feature_emitter_iface.hpp in Headers */, 6753408C1A3F2A7400A0A8C3 /* world_map_generator.hpp in Headers */, + 67C79BB41E2CEEAB00C40034 /* restriction_writer.hpp in Headers */, 6753408E1A3F2A7400A0A8C3 /* osm_element.hpp in Headers */, 6753406F1A3F2A7400A0A8C3 /* feature_merger.hpp in Headers */, 6753406A1A3F2A7400A0A8C3 /* feature_builder.hpp in Headers */, @@ -338,6 +364,7 @@ 6753405F1A3F2A7400A0A8C3 /* borders_loader.hpp in Headers */, 675340801A3F2A7400A0A8C3 /* polygonizer.hpp in Headers */, 0C5FEC711DDE19E50017688C /* routing_index_generator.hpp in Headers */, + 67C79BB01E2CEEAB00C40034 /* restriction_collector.hpp in Headers */, 675340941C5231BA002CF0D9 /* search_index_builder.hpp in Headers */, 3D51BC591D5E512500F1FA8D /* srtm_parser.hpp in Headers */, 677E2A181CAACC5F001DC42A /* towns_dumper.hpp in Headers */, @@ -348,6 +375,7 @@ 675340791A3F2A7400A0A8C3 /* osm_translator.hpp in Headers */, 675340711A3F2A7400A0A8C3 /* feature_sorter.hpp in Headers */, 34F5588A1DBF4C9600A4FC11 /* sponsored_dataset_inl.hpp in Headers */, + 67C79BB61E2CEEAB00C40034 /* traffic_generator.hpp in Headers */, 675340611A3F2A7400A0A8C3 /* check_model.hpp in Headers */, 6726C1D61A4AFEF4005EEA39 /* osm2meta.hpp in Headers */, 34F5588D1DBF4C9600A4FC11 /* sponsored_scoring.hpp in Headers */, @@ -445,7 +473,9 @@ buildActionMask = 2147483647; files = ( 6753406C1A3F2A7400A0A8C3 /* feature_generator.cpp in Sources */, + 67C79BB51E2CEEAB00C40034 /* traffic_generator.cpp in Sources */, 0C5FEC701DDE19E50017688C /* routing_index_generator.cpp in Sources */, + 67C79BB11E2CEEAB00C40034 /* restriction_generator.cpp in Sources */, 3D51BC561D5E512500F1FA8D /* region_meta.cpp in Sources */, 3D51BC521D5E512500F1FA8D /* altitude_generator.cpp in Sources */, 3D51BC581D5E512500F1FA8D /* srtm_parser.cpp in Sources */, @@ -458,6 +488,7 @@ 675340931C5231BA002CF0D9 /* search_index_builder.cpp in Sources */, 6753406E1A3F2A7400A0A8C3 /* feature_merger.cpp in Sources */, 34F5587B1DBF4C8300A4FC11 /* feature_segments_checker.cpp in Sources */, + 67C79BB31E2CEEAB00C40034 /* restriction_writer.cpp in Sources */, 67A0FEBE1CEB467F008F2A61 /* booking_dataset.cpp in Sources */, 6753408D1A3F2A7400A0A8C3 /* osm_element.cpp in Sources */, 6726C1D51A4AFEF4005EEA39 /* osm2meta.cpp in Sources */, @@ -469,6 +500,7 @@ 34F558891DBF4C9600A4FC11 /* opentable_scoring.cpp in Sources */, 34F5588F1DBF4C9F00A4FC11 /* restaurants_info.cpp in Sources */, 6753405C1A3F2A7400A0A8C3 /* borders_generator.cpp in Sources */, + 67C79BAF1E2CEEAB00C40034 /* restriction_collector.cpp in Sources */, 3D51BC481D5E50F700F1FA8D /* centers_table_builder.cpp in Sources */, 675340671A3F2A7400A0A8C3 /* dumper.cpp in Sources */, E9502E331D34012200CAB86B /* booking_scoring.cpp in Sources */, diff --git a/xcode/generator_tool/generator_tool.xcodeproj/project.pbxproj b/xcode/generator_tool/generator_tool.xcodeproj/project.pbxproj index e26ad93ab3..886d5d76ea 100644 --- a/xcode/generator_tool/generator_tool.xcodeproj/project.pbxproj +++ b/xcode/generator_tool/generator_tool.xcodeproj/project.pbxproj @@ -712,6 +712,8 @@ 6726C2331A4C2BBD005EEA39 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; + GCC_SYMBOLS_PRIVATE_EXTERN = NO; PRODUCT_NAME = generator_tests; WARNING_CFLAGS = "-Wnull-conversion"; }; @@ -720,6 +722,8 @@ 6726C2341A4C2BBD005EEA39 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; + GCC_SYMBOLS_PRIVATE_EXTERN = NO; PRODUCT_NAME = generator_tests; WARNING_CFLAGS = "-Wnull-conversion"; }; @@ -766,6 +770,8 @@ 675341601A3F54D800A0A8C3 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; + GCC_SYMBOLS_PRIVATE_EXTERN = NO; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -773,6 +779,8 @@ 675341611A3F54D800A0A8C3 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; + GCC_SYMBOLS_PRIVATE_EXTERN = NO; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/xcode/indexer/indexer.xcodeproj/project.pbxproj b/xcode/indexer/indexer.xcodeproj/project.pbxproj index e690be6ba6..826828f6ea 100644 --- a/xcode/indexer/indexer.xcodeproj/project.pbxproj +++ b/xcode/indexer/indexer.xcodeproj/project.pbxproj @@ -1109,8 +1109,10 @@ 670C612A1AB0661100C38A8C /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; + GCC_SYMBOLS_PRIVATE_EXTERN = NO; INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; - PRODUCT_BUNDLE_IDENTIFIER = maps.me.indexer_tests; + PRODUCT_BUNDLE_IDENTIFIER = "maps.me.indexer-tests"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -1118,8 +1120,10 @@ 670C612B1AB0661100C38A8C /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; + GCC_SYMBOLS_PRIVATE_EXTERN = NO; INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist"; - PRODUCT_BUNDLE_IDENTIFIER = maps.me.indexer_tests; + PRODUCT_BUNDLE_IDENTIFIER = "maps.me.indexer-tests"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/xcode/qtMapsMe/qtMapsMe.xcodeproj/project.pbxproj b/xcode/qtMapsMe/qtMapsMe.xcodeproj/project.pbxproj index c64ab45d2e..f9f267d5ff 100644 --- a/xcode/qtMapsMe/qtMapsMe.xcodeproj/project.pbxproj +++ b/xcode/qtMapsMe/qtMapsMe.xcodeproj/project.pbxproj @@ -703,6 +703,8 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; + GCC_SYMBOLS_PRIVATE_EXTERN = NO; INFOPLIST_FILE = Info.plist; PRODUCT_BUNDLE_IDENTIFIER = "mail.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -713,12 +715,14 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", "NDEBUG=1", "_NDEBUG=1", "QT_NO_DEBUG=1", ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; INFOPLIST_FILE = Info.plist; PRODUCT_BUNDLE_IDENTIFIER = "mail.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/xcode/routing/routing.xcodeproj/project.pbxproj b/xcode/routing/routing.xcodeproj/project.pbxproj index 9e6cba62ae..d36a41eda4 100644 --- a/xcode/routing/routing.xcodeproj/project.pbxproj +++ b/xcode/routing/routing.xcodeproj/project.pbxproj @@ -221,6 +221,10 @@ 67BD35FF1C69F4BC003AA26F /* countries.txt in Resources */ = {isa = PBXBuildFile; fileRef = 67BD35FD1C69F4AC003AA26F /* countries.txt */; }; 67BD36031C69F51C003AA26F /* World.mwm in Resources */ = {isa = PBXBuildFile; fileRef = 67BD36001C69F513003AA26F /* World.mwm */; }; 67BD36051C69F51C003AA26F /* WorldCoasts.mwm in Resources */ = {isa = PBXBuildFile; fileRef = 67BD36021C69F513003AA26F /* WorldCoasts.mwm */; }; + 67C79BA11E2CEE1400C40034 /* restriction_loader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67C79B9F1E2CEE1400C40034 /* restriction_loader.cpp */; }; + 67C79BA21E2CEE1400C40034 /* restriction_loader.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67C79BA01E2CEE1400C40034 /* restriction_loader.hpp */; }; + 67C79BA51E2CEE3100C40034 /* routing_serialization.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67C79BA31E2CEE3100C40034 /* routing_serialization.cpp */; }; + 67C79BA61E2CEE3100C40034 /* routing_serialization.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67C79BA41E2CEE3100C40034 /* routing_serialization.hpp */; }; 67C7D4291B4EB48F00FE41AA /* car_model.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67C7D4211B4EB48F00FE41AA /* car_model.cpp */; }; 67C7D42A1B4EB48F00FE41AA /* car_model.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67C7D4221B4EB48F00FE41AA /* car_model.hpp */; }; 67C7D42B1B4EB48F00FE41AA /* pedestrian_model.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67C7D4231B4EB48F00FE41AA /* pedestrian_model.cpp */; }; @@ -409,6 +413,10 @@ 67BD35FD1C69F4AC003AA26F /* countries.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = countries.txt; sourceTree = "<group>"; }; 67BD36001C69F513003AA26F /* World.mwm */ = {isa = PBXFileReference; lastKnownFileType = file; path = World.mwm; sourceTree = "<group>"; }; 67BD36021C69F513003AA26F /* WorldCoasts.mwm */ = {isa = PBXFileReference; lastKnownFileType = file; path = WorldCoasts.mwm; sourceTree = "<group>"; }; + 67C79B9F1E2CEE1400C40034 /* restriction_loader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = restriction_loader.cpp; sourceTree = "<group>"; }; + 67C79BA01E2CEE1400C40034 /* restriction_loader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = restriction_loader.hpp; sourceTree = "<group>"; }; + 67C79BA31E2CEE3100C40034 /* routing_serialization.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = routing_serialization.cpp; sourceTree = "<group>"; }; + 67C79BA41E2CEE3100C40034 /* routing_serialization.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = routing_serialization.hpp; sourceTree = "<group>"; }; 67C7D4211B4EB48F00FE41AA /* car_model.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = car_model.cpp; sourceTree = "<group>"; }; 67C7D4221B4EB48F00FE41AA /* car_model.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = car_model.hpp; sourceTree = "<group>"; }; 67C7D4231B4EB48F00FE41AA /* pedestrian_model.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pedestrian_model.cpp; sourceTree = "<group>"; }; @@ -677,6 +685,10 @@ 675343FA1A3F640D00A0A8C3 /* routing */ = { isa = PBXGroup; children = ( + 67C79BA31E2CEE3100C40034 /* routing_serialization.cpp */, + 67C79BA41E2CEE3100C40034 /* routing_serialization.hpp */, + 67C79B9F1E2CEE1400C40034 /* restriction_loader.cpp */, + 67C79BA01E2CEE1400C40034 /* restriction_loader.hpp */, 0C470E6F1E0D4EB1005B824D /* segment.hpp */, 0C5FEC521DDE191E0017688C /* edge_estimator.cpp */, 0C5FEC531DDE191E0017688C /* edge_estimator.hpp */, @@ -807,6 +819,7 @@ files = ( 0C5FEC631DDE192A0017688C /* joint_index.hpp in Headers */, 67AB92E51B7B3E6E00AB5194 /* routing_mapping.hpp in Headers */, + 67C79BA21E2CEE1400C40034 /* restriction_loader.hpp in Headers */, 674F9BCB1B0A580E00704FFA /* async_router.hpp in Headers */, 0C08AA391DF8329B004195DD /* routing_exceptions.hpp in Headers */, 0C5BC9D21E28FD4E0071BFDD /* index_road_graph.hpp in Headers */, @@ -831,6 +844,7 @@ A1616E2C1B6B60AB003F078E /* router_delegate.hpp in Headers */, A17B42991BCFBD0E00A1EAE4 /* osrm_helpers.hpp in Headers */, 67C7D42E1B4EB48F00FE41AA /* turns_sound_settings.hpp in Headers */, + 67C79BA61E2CEE3100C40034 /* routing_serialization.hpp in Headers */, 56099E341CC9247E00A7772A /* bicycle_directions.hpp in Headers */, 670EE55E1B6001E7001E8064 /* routing_session.hpp in Headers */, 56099E291CC7C97D00A7772A /* loaded_path_segment.hpp in Headers */, @@ -1111,6 +1125,7 @@ 0C08AA341DF83223004195DD /* index_graph_serialization.cpp in Sources */, 674F9BD41B0A580E00704FFA /* road_graph.cpp in Sources */, 0C0DF92A1DE898FF0055A22F /* routing_helpers.cpp in Sources */, + 67C79BA51E2CEE3100C40034 /* routing_serialization.cpp in Sources */, 67AB92E61B7B3E6E00AB5194 /* turns_tts_text.cpp in Sources */, 0C5FEC601DDE192A0017688C /* index_graph.cpp in Sources */, 0C5FEC6D1DDE19A40017688C /* index_graph_test.cpp in Sources */, @@ -1123,6 +1138,7 @@ 670EE5751B664796001E8064 /* router.cpp in Sources */, 0C5FEC621DDE192A0017688C /* joint_index.cpp in Sources */, 670C62131AC5A15700C38A8C /* routing_mapping.cpp in Sources */, + 67C79BA11E2CEE1400C40034 /* restriction_loader.cpp in Sources */, 67C7D42D1B4EB48F00FE41AA /* turns_sound_settings.cpp in Sources */, 0C5FEC541DDE191E0017688C /* edge_estimator.cpp in Sources */, A120B34E1B4A7C0A002F3808 /* online_absent_fetcher.cpp in Sources */, |