From 5c4a845b552e0065c5a84af9d89863da08bd23bd Mon Sep 17 00:00:00 2001
From: "Daniel J. Hofmann" <daniel@trvx.org>
Date: Thu, 3 Sep 2015 11:38:35 +0200
Subject: [PATCH] Remove template-heavy Boost.MPL headers where not needed.

This removed mpl headers from the code base, where not needed.

This mostly affects unit tests, where mpl's type list is actually only
used once to automatically generate tests for multiple types (see ref).

In addition, this commit also fixes the includes in the touched headers.

Resulting in 1/ reduces build times and 2/ proper includes.

Reference:

- http://www.boost.org/doc/libs/1_59_0/libs/test/doc/html/boost_test/tests_organization/test_cases/test_organization_templates.html#ref_BOOST_AUTO_TEST_CASE_TEMPLATE
---
 unit_tests/algorithms/douglas_peucker.cpp    | 3 +--
 unit_tests/data_structures/binary_heap.cpp   | 3 +++
 unit_tests/data_structures/dynamic_graph.cpp | 5 +----
 unit_tests/data_structures/static_graph.cpp  | 4 ++--
 unit_tests/data_structures/static_rtree.cpp  | 9 ++++++++-
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/unit_tests/algorithms/douglas_peucker.cpp b/unit_tests/algorithms/douglas_peucker.cpp
index 9654e4da3..8a3920976 100644
--- a/unit_tests/algorithms/douglas_peucker.cpp
+++ b/unit_tests/algorithms/douglas_peucker.cpp
@@ -30,11 +30,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <boost/test/unit_test.hpp>
 #include <boost/test/test_case_template.hpp>
-#include <boost/mpl/list.hpp>
 
 #include <osrm/coordinate.hpp>
 
-#include <iostream>
+#include <vector>
 
 BOOST_AUTO_TEST_SUITE(douglas_peucker)
 
diff --git a/unit_tests/data_structures/binary_heap.cpp b/unit_tests/data_structures/binary_heap.cpp
index 300d8984e..ee22a1fbb 100644
--- a/unit_tests/data_structures/binary_heap.cpp
+++ b/unit_tests/data_structures/binary_heap.cpp
@@ -32,7 +32,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <boost/test/test_case_template.hpp>
 #include <boost/mpl/list.hpp>
 
+#include <algorithm>
+#include <limits>
 #include <random>
+#include <vector>
 
 BOOST_AUTO_TEST_SUITE(binary_heap)
 
diff --git a/unit_tests/data_structures/dynamic_graph.cpp b/unit_tests/data_structures/dynamic_graph.cpp
index 5082278f0..df8eb21b1 100644
--- a/unit_tests/data_structures/dynamic_graph.cpp
+++ b/unit_tests/data_structures/dynamic_graph.cpp
@@ -26,15 +26,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include "../../data_structures/dynamic_graph.hpp"
-#include "../../util/make_unique.hpp"
 #include "../../typedefs.h"
 
 #include <boost/test/unit_test.hpp>
 #include <boost/test/test_case_template.hpp>
-#include <boost/mpl/list.hpp>
 
-#include <random>
-#include <unordered_map>
+#include <vector>
 
 BOOST_AUTO_TEST_SUITE(dynamic_graph)
 
diff --git a/unit_tests/data_structures/static_graph.cpp b/unit_tests/data_structures/static_graph.cpp
index 65704c652..ddadd7fdb 100644
--- a/unit_tests/data_structures/static_graph.cpp
+++ b/unit_tests/data_structures/static_graph.cpp
@@ -30,10 +30,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <boost/test/unit_test.hpp>
 #include <boost/test/test_case_template.hpp>
-#include <boost/mpl/list.hpp>
 
+#include <algorithm>
 #include <random>
-#include <unordered_map>
+#include <vector>
 
 BOOST_AUTO_TEST_SUITE(static_graph)
 
diff --git a/unit_tests/data_structures/static_rtree.cpp b/unit_tests/data_structures/static_rtree.cpp
index 73fbc88a5..5a3815e62 100644
--- a/unit_tests/data_structures/static_rtree.cpp
+++ b/unit_tests/data_structures/static_rtree.cpp
@@ -35,12 +35,19 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <boost/functional/hash.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/test/test_case_template.hpp>
-#include <boost/mpl/list.hpp>
 
 #include <osrm/coordinate.hpp>
 
+#include <cstdint>
+#include <cmath>
+
+#include <algorithm>
+#include <memory>
 #include <random>
+#include <string>
+#include <utility>
 #include <unordered_set>
+#include <vector>
 
 BOOST_AUTO_TEST_SUITE(static_rtree)