Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Byko-Ianko <v.bykoianko@corp.mail.ru>2018-04-19 13:50:08 +0300
committerTatiana Yan <tatiana.kondakova@gmail.com>2018-04-19 15:16:12 +0300
commit0762359c1dcade9ff4abe02acfaa3b033028dfd4 (patch)
treef5d5b04755a9b7124d9e889ff8737c1f24296d74 /routing
parent63df578e6eace6068e8d3524bcea26ea4abb2fa3 (diff)
Review fixes.
Diffstat (limited to 'routing')
-rw-r--r--routing/index_graph.cpp4
-rw-r--r--routing/index_graph_loader.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/routing/index_graph.cpp b/routing/index_graph.cpp
index c8820bc01e..9c4264b9f0 100644
--- a/routing/index_graph.cpp
+++ b/routing/index_graph.cpp
@@ -60,8 +60,8 @@ namespace routing
IndexGraph::IndexGraph(shared_ptr<Geometry> geometry, shared_ptr<EdgeEstimator> estimator)
: m_geometry(geometry), m_estimator(move(estimator))
{
- ASSERT(m_geometry, ());
- ASSERT(m_estimator, ());
+ CHECK(m_geometry, ());
+ CHECK(m_estimator, ());
}
void IndexGraph::GetEdgeList(Segment const & segment, bool isOutgoing, vector<SegmentEdge> & edges)
diff --git a/routing/index_graph_loader.cpp b/routing/index_graph_loader.cpp
index c568ea3343..307dd3f132 100644
--- a/routing/index_graph_loader.cpp
+++ b/routing/index_graph_loader.cpp
@@ -31,7 +31,7 @@ private:
struct GeometryIndexGraph
{
shared_ptr<Geometry> m_geometry;
- shared_ptr<IndexGraph> m_indexGraph;
+ unique_ptr<IndexGraph> m_indexGraph;
};
GeometryIndexGraph & CreateGeometry(NumMwmId numMwmId);
@@ -108,7 +108,7 @@ IndexGraphLoaderImpl::GeometryIndexGraph & IndexGraphLoaderImpl::CreateIndexGrap
if (!handle.IsAlive())
MYTHROW(RoutingException, ("Can't get mwm handle for", file));
- graph.m_indexGraph = make_shared<IndexGraph>(graph.m_geometry, m_estimator);
+ graph.m_indexGraph = make_unique<IndexGraph>(graph.m_geometry, m_estimator);
my::Timer timer;
MwmValue const & mwmValue = *handle.GetValue<MwmValue>();
DeserializeIndexGraph(mwmValue, m_vehicleType, *graph.m_indexGraph);