diff options
| author | Lev Dragunov <l.dragunov@corp.mail.ru> | 2015-08-10 11:05:06 +0300 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 03:00:22 +0300 |
| commit | cd65decf6c664d7ef0c374d9e675dd60fbd46d0c (patch) | |
| tree | 711f9c62cf4fa78b0656ba3fd724f79110f07451 /routing | |
| parent | 30b30063a6ca50d918e6a44e5435ed3243a7cf82 (diff) | |
PR fixes
Diffstat (limited to 'routing')
| -rw-r--r-- | routing/road_graph_router.cpp | 4 | ||||
| -rw-r--r-- | routing/road_graph_router.hpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/routing/road_graph_router.cpp b/routing/road_graph_router.cpp index 485de31756..b1b1552346 100644 --- a/routing/road_graph_router.cpp +++ b/routing/road_graph_router.cpp @@ -88,7 +88,7 @@ RoadGraphRouter::RoadGraphRouter(string const & name, Index & index, unique_ptr<IDirectionsEngine> && directionsEngine) : m_name(name) , m_countryFileFn(countryFileFn) - , m_index(&index) + , m_index(index) , m_algorithm(move(algorithm)) , m_roadGraph(make_unique<FeaturesRoadGraph>(index, move(vehicleModelFactory))) , m_directionsEngine(move(directionsEngine)) @@ -103,7 +103,7 @@ void RoadGraphRouter::ClearState() bool RoadGraphRouter::CheckMapExistence(m2::PointD const & point, Route & route) const { string fileName = m_countryFileFn(point); - LocalCountryFile localCountryFile = m_index->GetMwmHandleByCountryFile(CountryFile(fileName)).GetInfo()->GetLocalFile(); + LocalCountryFile localCountryFile = m_index.GetMwmHandleByCountryFile(CountryFile(fileName)).GetInfo()->GetLocalFile(); if (!HasOptions(localCountryFile.GetFiles(), MapOptions::Map)) { route.AddAbsentCountry(fileName); diff --git a/routing/road_graph_router.hpp b/routing/road_graph_router.hpp index 12c1d722e2..0e8dda7159 100644 --- a/routing/road_graph_router.hpp +++ b/routing/road_graph_router.hpp @@ -47,7 +47,7 @@ private: string const m_name; TCountryFileFn const m_countryFileFn; - Index * m_index; + Index & m_index; unique_ptr<IRoutingAlgorithm> const m_algorithm; unique_ptr<IRoadGraph> const m_roadGraph; unique_ptr<IDirectionsEngine> const m_directionsEngine; |