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

Fix gcc5 internal compilation error

Browse Source
This commit is contained in:
Michael Krasnyk 2017-08-01 22:57:28 +02:00
parent fd0d79e17b
commit df2d4daad3
1 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/extractor/edge_based_graph_factory.cpp
View File

@ -749,40 +749,36 @@ void EdgeBasedGraphFactory::GenerateEdgeExpandedEdges(
// next to the normal restrictions tracked in `entry_allowed`, via // next to the normal restrictions tracked in `entry_allowed`, via
// ways might introduce additional restrictions. These are handled // ways might introduce additional restrictions. These are handled
// here when turning off a via-way // here when turning off a via-way
const auto add_unrestricted_turns = for (auto duplicated_node_id : duplicated_nodes)
[&](const auto duplicated_node_id) { {
const auto from_id = const auto from_id =
m_number_of_edge_based_nodes - m_number_of_edge_based_nodes -
way_restriction_map.NumberOfDuplicatedNodes() + way_restriction_map.NumberOfDuplicatedNodes() +
duplicated_node_id; duplicated_node_id;
auto const node_at_end_of_turn = auto const node_at_end_of_turn =
m_node_based_graph->GetTarget(turn.eid); m_node_based_graph->GetTarget(turn.eid);
const auto is_restricted = way_restriction_map.IsRestricted( const auto is_restricted = way_restriction_map.IsRestricted(
duplicated_node_id, node_at_end_of_turn); duplicated_node_id, node_at_end_of_turn);
if (is_restricted) if (is_restricted)
return; continue;
// add into delayed data // add into delayed data
auto edge_with_data = generate_edge( auto edge_with_data = generate_edge(
NodeID(from_id), NodeID(from_id),
m_node_based_graph->GetEdgeData(turn.eid).edge_id, m_node_based_graph->GetEdgeData(turn.eid).edge_id,
node_along_road_entering, node_along_road_entering,
incoming_edge, incoming_edge,
node_at_center_of_intersection, node_at_center_of_intersection,
turn.eid, turn.eid,
intersection, intersection,
turn, turn,
entry_class_id); entry_class_id);
buffer->delayed_data.push_back(std::move(edge_with_data)); buffer->delayed_data.push_back(std::move(edge_with_data));
}; }
std::for_each(duplicated_nodes.begin(),
duplicated_nodes.end(),
add_unrestricted_turns);
} }
} }
} }