Merge remote-tracking branch 'origin/master' into replace_boost_stringref

include/extractor/node_restriction_map.hpp

@@ -6,8 +6,8 @@
 #include "util/typedefs.hpp"
 
 #include <boost/range/adaptor/filtered.hpp>
-#include <boost/unordered_map.hpp>
 
+#include <unordered_map>
 #include <utility>
 #include <vector>
 

include/extractor/restriction_graph.hpp

@@ -2,11 +2,13 @@
 #define OSRM_EXTRACTOR_RESTRICTION_GRAPH_HPP_
 
 #include <boost/assert.hpp>
-#include <boost/unordered_map.hpp>
 
 #include "util/node_based_graph.hpp"
+#include "util/std_hash.hpp"
 #include "util/typedefs.hpp"
 
+#include <unordered_map>
+
 namespace osrm
 {
 namespace extractor
@@ -112,10 +114,10 @@ struct RestrictionGraph
     RestrictionRange GetRestrictions(RestrictionID id) const;
 
     // A compressed node-based edge can only have one start node in the restriction graph.
-    boost::unordered_map<EdgeKey, RestrictionID> start_edge_to_node{};
+    std::unordered_map<EdgeKey, RestrictionID> start_edge_to_node{};
     // A compressed node-based edge can have multiple via nodes in the restriction graph
     // (as the compressed edge can appear in paths with different prefixes).
-    boost::unordered_multimap<EdgeKey, RestrictionID> via_edge_to_node{};
+    std::unordered_multimap<EdgeKey, RestrictionID> via_edge_to_node{};
     std::vector<RestrictionNode> nodes;
     // TODO: Investigate reusing DynamicGraph. Currently it requires specific attributes
     // (e.g. reversed, weight) that would not make sense for restrictions.

include/extractor/traffic_signals.hpp

@@ -2,9 +2,9 @@
 #define OSRM_EXTRACTOR_TRAFFIC_SIGNALS_HPP
 
 #include "util/typedefs.hpp"
-#include <unordered_set>
 
-#include <boost/unordered_set.hpp>
+#include <boost/functional/hash.hpp>
+#include <unordered_set>
 
 namespace osrm
 {

include/extractor/turn_path_compressor.hpp

@@ -3,7 +3,7 @@
 
 #include "util/typedefs.hpp"
 
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
 #include <vector>
 
 namespace osrm
@@ -43,9 +43,9 @@ class TurnPathCompressor
     // via nodes are the same.
     // Similarly, we do not compress the instruction via node in a maneuver override, as we need
     // this to identify the location of the maneuver during routing path-processing.
-    boost::unordered_multimap<NodeID, TurnPath *> starts;
-    boost::unordered_multimap<NodeID, TurnPath *> vias;
-    boost::unordered_multimap<NodeID, TurnPath *> ends;
+    std::unordered_multimap<NodeID, TurnPath *> starts;
+    std::unordered_multimap<NodeID, TurnPath *> vias;
+    std::unordered_multimap<NodeID, TurnPath *> ends;
 };
 
 } // namespace extractor

include/extractor/way_restriction_map.hpp

@@ -1,17 +1,16 @@
 #ifndef OSRM_EXTRACTOR_WAY_RESTRICTION_MAP_HPP_
 #define OSRM_EXTRACTOR_WAY_RESTRICTION_MAP_HPP_
 
-#include <utility>
-#include <vector>
-
-// to access the turn restrictions
-#include <boost/unordered_map.hpp>
-
 #include "extractor/restriction.hpp"
 #include "extractor/restriction_graph.hpp"
 #include "util/integer_range.hpp"
 #include "util/typedefs.hpp"
 
+// to access the turn restrictions
+#include <unordered_map>
+#include <utility>
+#include <vector>
+
 namespace osrm
 {
 namespace extractor