Got rid of the old style std/ includes for several files, mostly in map/ and platform/.

3 files changed, 12 insertions, 9 deletions

diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/mainwindow.cpp b/openlr/openlr_match_quality/openlr_assessment_tool/mainwindow.cpp
index e9c56ffcd0..e2655278c4 100644
--- a/openlr/openlr_match_quality/openlr_assessment_tool/mainwindow.cpp
+++ b/openlr/openlr_match_quality/openlr_assessment_tool/mainwindow.cpp
@@ -34,6 +34,7 @@
 
 #include <cerrno>
 #include <cstring>
+#include <memory>
 #include <vector>
 
 using namespace openlr;
@@ -126,7 +127,7 @@ public:
     : m_framework(framework)
     , m_dataSource(framework.GetDataSource())
     , m_roadGraph(m_dataSource, routing::IRoadGraph::Mode::ObeyOnewayTag,
-                  make_unique<routing::CarModelFactory>(storage::CountryParentGetter{}))
+                  std::make_unique<routing::CarModelFactory>(storage::CountryParentGetter{}))
   {
   }
 
@@ -306,12 +307,12 @@ MainWindow::MainWindow(Framework & framework)
   m_ignorePathAction->setEnabled(false /* enabled */);
 }
 
-void MainWindow::CreateTrafficPanel(string const & dataFilePath)
+void MainWindow::CreateTrafficPanel(std::string const & dataFilePath)
 {
   m_trafficMode = new TrafficMode(dataFilePath,
                                   m_framework.GetDataSource(),
-                                  make_unique<TrafficDrawerDelegate>(m_framework),
-                                  make_unique<PointsControllerDelegate>(m_framework));
+                                  std::make_unique<TrafficDrawerDelegate>(m_framework),
+                                  std::make_unique<PointsControllerDelegate>(m_framework));
 
   connect(m_mapWidget, &MapWidget::TrafficMarkupClick,
           m_trafficMode, &TrafficMode::OnClick);
diff --git a/openlr/router.cpp b/openlr/router.cpp
index 7f4ba37119..39b22a1c91 100644
--- a/openlr/router.cpp
+++ b/openlr/router.cpp
@@ -14,14 +14,16 @@
 #include "base/assert.hpp"
 #include "base/math.hpp"
 
-#include "std/transform_iterator.hpp"
-
 #include <algorithm>
 #include <functional>
 #include <limits>
 #include <queue>
 #include <utility>
 
+#include <boost/iterator/transform_iterator.hpp>
+
+using boost::make_transform_iterator;
+
 namespace openlr
 {
 namespace
@@ -633,7 +635,7 @@ void Router::ForStagePrefix(It b, It e, size_t stage, Fn && fn)
     fn(b);
 }
 
-bool Router::ReconstructPath(std::vector<Edge> & edges, vector<routing::Edge> & path)
+bool Router::ReconstructPath(std::vector<Edge> & edges, std::vector<routing::Edge> & path)
 {
   CHECK_GREATER_OR_EQUAL(m_points.size(), 2, ());
 
diff --git a/openlr/router.hpp b/openlr/router.hpp
index d4eb4cd492..002dcbbcdc 100644
--- a/openlr/router.hpp
+++ b/openlr/router.hpp
@@ -89,7 +89,7 @@ private:
     bool m_bearingChecked = false;
   };
 
-  friend string DebugPrint(Vertex const & u)
+  friend std::string DebugPrint(Vertex const & u)
   {
     std::ostringstream os;
     os << "Vertex [ ";
@@ -122,7 +122,7 @@ private:
     bool m_isSpecial = false;
   };
 
-  friend string DebugPrint(Edge const & edge)
+  friend std::string DebugPrint(Edge const & edge)
   {
     std::ostringstream os;
     os << "Edge [ ";