Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

replace C limits with STL-defined and typedef'ed limits

Browse Source
This commit is contained in:
Dennis Luxen 2014-08-05 17:19:51 +02:00
parent d4bf02c882
commit d00f4afb84
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
RoutingAlgorithms/BasicRoutingInterface.h
View File

@ -180,7 +180,7 @@ template <class DataFacadeT> class BasicRoutingInterface
// facade->FindEdge does not suffice here in case of shortcuts. // facade->FindEdge does not suffice here in case of shortcuts.
// The above explanation unclear? Think! // The above explanation unclear? Think!
EdgeID smaller_edge_id = SPECIAL_EDGEID; EdgeID smaller_edge_id = SPECIAL_EDGEID;
int edge_weight = INT_MAX; int edge_weight = std::numeric_limits<EdgeWeight>::max();
for (const auto edge_id : facade->GetAdjacentEdgeRange(edge.first)) for (const auto edge_id : facade->GetAdjacentEdgeRange(edge.first))
{ {
const int weight = facade->GetEdgeData(edge_id).distance; const int weight = facade->GetEdgeData(edge_id).distance;
@ -339,7 +339,7 @@ template <class DataFacadeT> class BasicRoutingInterface
recursion_stack.pop(); recursion_stack.pop();
EdgeID smaller_edge_id = SPECIAL_EDGEID; EdgeID smaller_edge_id = SPECIAL_EDGEID;
int edge_weight = INT_MAX; int edge_weight = std::numeric_limits<EdgeWeight>::max();
for (const auto edge_id : facade->GetAdjacentEdgeRange(edge.first)) for (const auto edge_id : facade->GetAdjacentEdgeRange(edge.first))
{ {
const int weight = facade->GetEdgeData(edge_id).distance; const int weight = facade->GetEdgeData(edge_id).distance;
@ -364,7 +364,7 @@ template <class DataFacadeT> class BasicRoutingInterface
} }
} }
} }
BOOST_ASSERT_MSG(edge_weight != INT_MAX, "edge weight invalid"); BOOST_ASSERT_MSG(edge_weight != std::numeric_limits<EdgeWeight>::max(), "edge weight invalid");
const EdgeData &ed = facade->GetEdgeData(smaller_edge_id); const EdgeData &ed = facade->GetEdgeData(smaller_edge_id);
if (ed.shortcut) if (ed.shortcut)