From 2d5278240726163a4a64f2a61e2718d34d8ff851 Mon Sep 17 00:00:00 2001
From: Mateusz Pusz <mateusz.pusz@gmail.com>
Date: Tue, 7 May 2019 08:28:02 -0600
Subject: [PATCH] type_list moved from mp to units namespace

---
 src/include/units/bits/type_list.h | 4 ++--
 src/include/units/dimension.h      | 6 +++---
 test/test_type_list.cpp            | 1 -
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/include/units/bits/type_list.h b/src/include/units/bits/type_list.h
index d14969e2..f922ee4f 100644
--- a/src/include/units/bits/type_list.h
+++ b/src/include/units/bits/type_list.h
@@ -24,7 +24,7 @@
 
 #include <type_traits>
 
-namespace mp {
+namespace units {
 
   namespace detail {
 
@@ -163,4 +163,4 @@ namespace mp {
   template<TypeList List, template<typename, typename> typename Pred>
   using type_list_sort_t = typename type_list_sort<List, Pred>::type;
 
-}  // namespace mp
\ No newline at end of file
+}  // namespace units
\ No newline at end of file
diff --git a/src/include/units/dimension.h b/src/include/units/dimension.h
index de432a2c..72721135 100644
--- a/src/include/units/dimension.h
+++ b/src/include/units/dimension.h
@@ -140,7 +140,7 @@ namespace units {
     struct dim_consolidate<dimension<E1, ERest...>> {
       using rest = dim_consolidate_t<dimension<ERest...>>;
       using type =
-          std::conditional_t<std::is_same_v<rest, dimension<>>, dimension<E1>, mp::type_list_push_front_t<rest, E1>>;
+          std::conditional_t<std::is_same_v<rest, dimension<>>, dimension<E1>, type_list_push_front_t<rest, E1>>;
     };
 
     template<typename D, int V1, int V2, Exponent... ERest>
@@ -153,7 +153,7 @@ namespace units {
 
   template<Exponent... Es>
   struct make_dimension {
-    using type = mp::type_list_sort_t<detail::dim_consolidate_t<mp::type_list_sort_t<dimension<Es...>, exp_dim_id_less>>, exp_greater_equal>;
+    using type = type_list_sort_t<detail::dim_consolidate_t<type_list_sort_t<dimension<Es...>, exp_dim_id_less>>, exp_greater_equal>;
   };
 
   template<Exponent... Es>
@@ -161,7 +161,7 @@ namespace units {
 
   template<Dimension D1, Dimension D2>
   struct merge_dimension {
-    using type = mp::type_list_sort_t<detail::dim_consolidate_t<mp::type_list_merge_sorted_t<D1, D2, exp_dim_id_less>>, exp_greater_equal>;
+    using type = type_list_sort_t<detail::dim_consolidate_t<type_list_merge_sorted_t<D1, D2, exp_dim_id_less>>, exp_greater_equal>;
   };
 
   template<Dimension D1, Dimension D2>
diff --git a/test/test_type_list.cpp b/test/test_type_list.cpp
index cec30a93..bfc00d62 100644
--- a/test/test_type_list.cpp
+++ b/test/test_type_list.cpp
@@ -25,7 +25,6 @@
 
 namespace {
 
-  using namespace mp;
   using namespace units;
 
   template<typename... Types>