From e24acc704d573b9f0f50ff94869c7d73d9c377b0 Mon Sep 17 00:00:00 2001 From: Vladimir Byko-Ianko Date: Wed, 18 Nov 2020 09:30:11 +0300 Subject: [PATCH] Renaming isTwoThreadsReady paramter to twoThreadsReady. --- routing/index_graph_loader.cpp | 10 +++++----- routing/index_router.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/routing/index_graph_loader.cpp b/routing/index_graph_loader.cpp index 063f02fe6e0..4ecfc370742 100644 --- a/routing/index_graph_loader.cpp +++ b/routing/index_graph_loader.cpp @@ -34,7 +34,7 @@ using namespace std; class IndexGraphLoaderImpl final : public IndexGraphLoader { public: - IndexGraphLoaderImpl(VehicleType vehicleType, bool loadAltitudes, bool isTwoThreadsReady, + IndexGraphLoaderImpl(VehicleType vehicleType, bool loadAltitudes, bool twoThreadsReady, shared_ptr numMwmIds, shared_ptr vehicleModelFactory, shared_ptr estimator, DataSource & dataSource, @@ -85,7 +85,7 @@ class IndexGraphLoaderImpl final : public IndexGraphLoader }; IndexGraphLoaderImpl::IndexGraphLoaderImpl( - VehicleType vehicleType, bool loadAltitudes, bool isTwoThreadsReady, shared_ptr numMwmIds, + VehicleType vehicleType, bool loadAltitudes, bool twoThreadsReady, shared_ptr numMwmIds, shared_ptr vehicleModelFactory, shared_ptr estimator, DataSource & dataSource, RoutingOptions routingOptions) @@ -95,7 +95,7 @@ IndexGraphLoaderImpl::IndexGraphLoaderImpl( , m_numMwmIds(move(numMwmIds)) , m_vehicleModelFactory(move(vehicleModelFactory)) , m_estimator(move(estimator)) - , m_graphsMtx(isTwoThreadsReady ? std::make_optional() : std::nullopt) + , m_graphsMtx(twoThreadsReady ? std::make_optional() : std::nullopt) , m_avoidRoutingOptions(routingOptions) { CHECK(m_numMwmIds, ()); @@ -274,12 +274,12 @@ namespace routing { // static unique_ptr IndexGraphLoader::Create( - VehicleType vehicleType, bool loadAltitudes, bool isTwoThreadsReady, shared_ptr numMwmIds, + VehicleType vehicleType, bool loadAltitudes, bool twoThreadsReady, shared_ptr numMwmIds, shared_ptr vehicleModelFactory, shared_ptr estimator, DataSource & dataSource, RoutingOptions routingOptions) { - return make_unique(vehicleType, loadAltitudes, isTwoThreadsReady, numMwmIds, + return make_unique(vehicleType, loadAltitudes, twoThreadsReady, numMwmIds, vehicleModelFactory, estimator, dataSource, routingOptions); } diff --git a/routing/index_router.cpp b/routing/index_router.cpp index 58d7b5615a3..57acb2775ff 100644 --- a/routing/index_router.cpp +++ b/routing/index_router.cpp @@ -905,7 +905,7 @@ RouterResultCode IndexRouter::AdjustRoute(Checkpoints const & checkpoints, { base::Timer timer; TrafficStash::Guard guard(m_trafficStash); - auto graph = MakeWorldGraph(false /* isTwoThreadsReady */); + auto graph = MakeWorldGraph(false /* twoThreadsReady */); graph->SetMode(WorldGraphMode::NoLeaps); vector startSegments;