From 9737b5fa34a45f8f2a4460afd9fe6a8c3792408b Mon Sep 17 00:00:00 2001 From: Maxim Pimenov Date: Tue, 28 Mar 2017 13:26:32 +0300 Subject: [PATCH] Review fixes. --- base/base_tests/bits_test.cpp | 2 +- coding/coding_tests/dd_vector_test.cpp | 4 ++-- routing/routing_tests/nearest_edge_finder_tests.cpp | 2 +- routing/routing_tests/osrm_router_test.cpp | 2 +- routing/routing_tests/road_graph_builder.cpp | 7 ++++--- search/geocoder.cpp | 8 ++++---- search/hotels_filter.cpp | 2 +- search/locality_scorer.cpp | 2 +- 8 files changed, 15 insertions(+), 14 deletions(-) diff --git a/base/base_tests/bits_test.cpp b/base/base_tests/bits_test.cpp index 14c9cada97..68e9d18048 100644 --- a/base/base_tests/bits_test.cpp +++ b/base/base_tests/bits_test.cpp @@ -38,7 +38,7 @@ UNIT_TEST(PopcountArray32) uint32_t expectedPopCount = 0; for (size_t i = 0; i < v.size(); ++i) expectedPopCount += PopCountSimple(v[i]); - TEST_EQUAL(bits::PopCount(v.empty() ? NULL : &v[0], base::asserted_cast(v.size())), + TEST_EQUAL(bits::PopCount(v.empty() ? NULL : &v[0], base::checked_cast(v.size())), expectedPopCount, (j, v.size(), expectedPopCount)); } } diff --git a/coding/coding_tests/dd_vector_test.cpp b/coding/coding_tests/dd_vector_test.cpp index c6993997e3..56a96aab6e 100644 --- a/coding/coding_tests/dd_vector_test.cpp +++ b/coding/coding_tests/dd_vector_test.cpp @@ -19,8 +19,8 @@ UNIT_TEST(DDVector_Smoke) TEST_EQUAL(2, v[1], ()); TEST_EQUAL(3, v[2], ()); Vector::const_iterator it = v.begin(); - for (Vector::size_type i = 0; i < v.size(); ++i, ++it) - TEST_EQUAL(v[i], *it, ()); + for (auto const value : v) + TEST_EQUAL(value, *it++, ()); } UNIT_TEST(DDVector_IncorrectSize) diff --git a/routing/routing_tests/nearest_edge_finder_tests.cpp b/routing/routing_tests/nearest_edge_finder_tests.cpp index e99ff1a0d8..549c5cdeb7 100644 --- a/routing/routing_tests/nearest_edge_finder_tests.cpp +++ b/routing/routing_tests/nearest_edge_finder_tests.cpp @@ -18,7 +18,7 @@ void TestNearestOnMock1(m2::PointD const & point, size_t const candidatesCount, NearestEdgeFinder finder(point); for (size_t i = 0; i < graph->GetRoadCount(); ++i) { - FeatureID const featureId = MakeTestFeatureID(base::asserted_cast(i)); + FeatureID const featureId = MakeTestFeatureID(base::checked_cast(i)); finder.AddInformationSource(featureId, graph->GetRoadInfo(featureId)); } diff --git a/routing/routing_tests/osrm_router_test.cpp b/routing/routing_tests/osrm_router_test.cpp index 52961d5f6d..5718548755 100644 --- a/routing/routing_tests/osrm_router_test.cpp +++ b/routing/routing_tests/osrm_router_test.cpp @@ -118,7 +118,7 @@ void TestMapping(InputDataT const & data, for (size_t i = 0; i < mapping.GetSegmentsCount(); ++i) { - TOsrmNodeId const node = mapping.GetNodeId(base::asserted_cast(i)); + TOsrmNodeId const node = mapping.GetNodeId(base::checked_cast(i)); size_t count = 0; mapping.ForEachFtSeg(node, [&] (OsrmMappingTypes::FtSeg const & s) { diff --git a/routing/routing_tests/road_graph_builder.cpp b/routing/routing_tests/road_graph_builder.cpp index 0d75c52ba8..37e6ce9fd0 100644 --- a/routing/routing_tests/road_graph_builder.cpp +++ b/routing/routing_tests/road_graph_builder.cpp @@ -4,8 +4,9 @@ #include "indexer/mwm_set.hpp" -#include "base/macros.hpp" +#include "base/checked_cast.hpp" #include "base/logging.hpp" +#include "base/macros.hpp" #include "std/algorithm.hpp" #include "std/shared_ptr.hpp" @@ -88,8 +89,8 @@ double RoadGraphMockSource::GetMaxSpeedKMPH() const void RoadGraphMockSource::ForEachFeatureClosestToCross(m2::PointD const & /* cross */, ICrossEdgesLoader & edgesLoader) const { - for (uint32_t roadId = 0; roadId < m_roads.size(); ++roadId) - edgesLoader(MakeTestFeatureID(roadId), m_roads[roadId]); + for (size_t roadId = 0; roadId < m_roads.size(); ++roadId) + edgesLoader(MakeTestFeatureID(base::checked_cast(roadId)), m_roads[roadId]); } void RoadGraphMockSource::FindClosestEdges(m2::PointD const & point, uint32_t count, diff --git a/search/geocoder.cpp b/search/geocoder.cpp index 8e9ef25a3c..5caa2c28c6 100644 --- a/search/geocoder.cpp +++ b/search/geocoder.cpp @@ -966,7 +966,7 @@ void Geocoder::MatchPOIsAndBuildings(BaseContext & ctx, size_t curToken) if (m_filter->NeedToFilter(m_postcodes.m_features)) filtered = m_filter->Filter(m_postcodes.m_features); filtered.ForEach([&](uint64_t bit) { - uint32_t const featureId = base::asserted_cast(bit); + auto const featureId = base::asserted_cast(bit); SearchModel::SearchType searchType; if (GetSearchTypeInGeocoding(ctx, featureId, searchType)) { @@ -1025,7 +1025,7 @@ void Geocoder::MatchPOIsAndBuildings(BaseContext & ctx, size_t curToken) // any. auto clusterize = [&](uint64_t bit) { - uint32_t const featureId = base::asserted_cast(bit); + auto const featureId = base::asserted_cast(bit); SearchModel::SearchType searchType; if (!GetSearchTypeInGeocoding(ctx, featureId, searchType)) return; @@ -1088,7 +1088,7 @@ void Geocoder::MatchPOIsAndBuildings(BaseContext & ctx, size_t curToken) ends[i] = clusters[i].size(); filtered.ForEach([&](uint64_t bit) { - uint32_t const featureId = base::asserted_cast(bit); + auto const featureId = base::asserted_cast(bit); bool found = false; for (size_t i = 0; i < kNumClusters && !found; ++i) { @@ -1278,7 +1278,7 @@ void Geocoder::MatchUnclassified(BaseContext & ctx, size_t curToken) auto emitUnclassified = [&](uint64_t bit) { - uint32_t const featureId = base::asserted_cast(bit); + auto const featureId = base::asserted_cast(bit); SearchModel::SearchType searchType; if (!GetSearchTypeInGeocoding(ctx, featureId, searchType)) return; diff --git a/search/hotels_filter.cpp b/search/hotels_filter.cpp index 0499eb7e3d..84cb6bf7e7 100644 --- a/search/hotels_filter.cpp +++ b/search/hotels_filter.cpp @@ -113,7 +113,7 @@ HotelsFilter::Descriptions const & HotelsFilter::GetDescriptions(MwmContext cons auto const hotels = m_hotels.Get(context); auto & descriptions = m_descriptions[mwmId]; hotels.ForEach([&descriptions, &context](uint64_t bit) { - uint32_t const id = base::asserted_cast(bit); + auto const id = base::asserted_cast(bit); FeatureType ft; Description description; diff --git a/search/locality_scorer.cpp b/search/locality_scorer.cpp index 58f4442d51..3fecd7ec4b 100644 --- a/search/locality_scorer.cpp +++ b/search/locality_scorer.cpp @@ -65,7 +65,7 @@ void LocalityScorer::GetTopLocalities(MwmSet::MwmId const & countryId, BaseConte if (!m_params.IsNumberTokens(tokenRange)) { intersection.ForEach([&](uint64_t bit) { - uint32_t const featureId = base::asserted_cast(bit); + auto const featureId = base::asserted_cast(bit); double const prob = static_cast(intersection.PopCount()) / static_cast(unfilteredIntersection.PopCount()); localities.emplace_back(countryId, featureId, tokenRange, prob);