refactor ContainerUtil into container.hpp

RoutingAlgorithms/AlternativePathRouting.h

@@ -31,6 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "BasicRoutingInterface.h"
 #include "../DataStructures/Range.h"
 #include "../DataStructures/SearchEngineData.h"
+#include "../Util/container.hpp"
 
 #include <boost/assert.hpp>
 
@@ -172,7 +173,7 @@ template <class DataFacadeT> class AlternativeRouting final : private BasicRouti
             return;
         }
 
-        sort_unique_resize(via_node_candidate_list);
+        osrm::sort_unique_resize(via_node_candidate_list);
 
         std::vector<NodeID> packed_forward_path;
         std::vector<NodeID> packed_reverse_path;

RoutingAlgorithms/BasicRoutingInterface.h

@@ -31,7 +31,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../DataStructures/RawRouteData.h"
 #include "../DataStructures/SearchEngineData.h"
 #include "../DataStructures/TurnInstructions.h"
-#include "../Util/ContainerUtils.h"
 #include "../Util/SimpleLogger.h"
 
 #include <boost/assert.hpp>

Util/container.hpp

@@ -25,12 +25,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#ifndef CONTAINERUTILS_H_
-#define CONTAINERUTILS_H_
+#ifndef CONTAINER_HPP_
+#define CONTAINER_HPP_
 
 #include <algorithm>
+#include <iterator>
 #include <vector>
 
+namespace osrm
+{
 template <typename T> void sort_unique_resize(std::vector<T> &vector)
 {
     std::sort(vector.begin(), vector.end());
@@ -58,15 +61,15 @@ Function for_each_pair(ForwardIterator begin, ForwardIterator end, Function func
         return function;
     }
 
-    ForwardIterator next = begin;
-    ++next;
+    auto next = begin;
+    next = std::next(next);
 
     while (next != end)
     {
         function(*begin, *next);
-        ++begin; ++next;
+        std::next(begin); std::next(next);
     }
     return function;
 }
-
-#endif /* CONTAINERUTILS_H_ */
+}
+#endif /* CONTAINER_HPP_ */