From 790b57411484aef20fcd00bf316cf6e10b28fc0b Mon Sep 17 00:00:00 2001 From: Michael Krasnyk Date: Thu, 28 Sep 2017 15:49:44 +0200 Subject: [PATCH] unordered_multimap compilation fixes --- .../routing_algorithms/many_to_many.cpp | 36 ++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/src/engine/routing_algorithms/many_to_many.cpp b/src/engine/routing_algorithms/many_to_many.cpp index 943a9cfbb..5dfb9a262 100644 --- a/src/engine/routing_algorithms/many_to_many.cpp +++ b/src/engine/routing_algorithms/many_to_many.cpp @@ -494,28 +494,32 @@ std::vector oneToManySearch(SearchEngineData &engine_wo if (DIRECTION == FORWARD_DIRECTION) { if (phantom_node.IsValidForwardTarget()) - target_nodes_index.insert({phantom_node.forward_segment_id.id, - {index, - phantom_node.GetForwardWeightPlusOffset(), - phantom_node.GetForwardDuration()}}); + target_nodes_index.insert( + {phantom_node.forward_segment_id.id, + std::make_tuple(index, + phantom_node.GetForwardWeightPlusOffset(), + phantom_node.GetForwardDuration())}); if (phantom_node.IsValidReverseTarget()) - target_nodes_index.insert({phantom_node.reverse_segment_id.id, - {index, - phantom_node.GetReverseWeightPlusOffset(), - phantom_node.GetReverseDuration()}}); + target_nodes_index.insert( + {phantom_node.reverse_segment_id.id, + std::make_tuple(index, + phantom_node.GetReverseWeightPlusOffset(), + phantom_node.GetReverseDuration())}); } else if (DIRECTION == REVERSE_DIRECTION) { if (phantom_node.IsValidForwardSource()) - target_nodes_index.insert({phantom_node.forward_segment_id.id, - {index, - -phantom_node.GetForwardWeightPlusOffset(), - -phantom_node.GetForwardDuration()}}); + target_nodes_index.insert( + {phantom_node.forward_segment_id.id, + std::make_tuple(index, + -phantom_node.GetForwardWeightPlusOffset(), + -phantom_node.GetForwardDuration())}); if (phantom_node.IsValidReverseSource()) - target_nodes_index.insert({phantom_node.reverse_segment_id.id, - {index, - -phantom_node.GetReverseWeightPlusOffset(), - -phantom_node.GetReverseDuration()}}); + target_nodes_index.insert( + {phantom_node.reverse_segment_id.id, + std::make_tuple(index, + -phantom_node.GetReverseWeightPlusOffset(), + -phantom_node.GetReverseDuration())}); } }