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

Fixes various compiler diagnostics

Browse Source 
Found with LLVM 3.9.1 and then fixed the most severe categories.
This commit is contained in:
Daniel J. Hofmann
2017-01-06 13:21:54 +01:00
committed by Daniel J. H
parent b5d5f309a3
commit 1153b78c06
12 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/contractor/contractor.cpp
+5 -5
View File
@@ -906,7 +906,7 @@ EdgeID Contractor::LoadEdgeExpandedGraph(
auto speed_iter =
find(segment_speed_lookup,
SegmentSpeedSource{
previous_osm_node_id, segmentblocks[i].this_osm_node_id, {0, 0}});
{previous_osm_node_id, segmentblocks[i].this_osm_node_id}, {0, 0}});
if (speed_iter != segment_speed_lookup.end())
{
if (speed_iter->speed_source.speed > 0)
@@ -947,10 +947,10 @@ EdgeID Contractor::LoadEdgeExpandedGraph(
continue;
}
auto turn_iter =
find(turn_penalty_lookup,
TurnPenaltySource{
penaltyblock->from_id, penaltyblock->via_id, penaltyblock->to_id, {0, 0}});
auto turn_iter = find(
turn_penalty_lookup,
TurnPenaltySource{
{penaltyblock->from_id, penaltyblock->via_id, penaltyblock->to_id}, {0, 0}});
if (turn_iter != turn_penalty_lookup.end())
{
int new_turn_weight = static_cast<int>(turn_iter->penalty_source.penalty * 10);