From fdd542a3c4e852827bbdf2743d15f7fab5e65554 Mon Sep 17 00:00:00 2001
From: Mickey Rose <mickey.rose@seznam.cz>
Date: Thu, 15 Dec 2016 11:58:50 +0100
Subject: [PATCH] make mapnik_value_type_t C++11-friendly

---
 include/mapnik/value_types.hpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/mapnik/value_types.hpp b/include/mapnik/value_types.hpp
index d1c0c59bd..7682d52b2 100644
--- a/include/mapnik/value_types.hpp
+++ b/include/mapnik/value_types.hpp
@@ -25,6 +25,7 @@
 
 // mapnik
 #include <mapnik/config.hpp>
+#include <mapnik/cxx11_support.hpp>
 #include <mapnik/pixel_types.hpp>
 
 
@@ -34,7 +35,6 @@
 #pragma GCC diagnostic pop
 
 // stl
-#include <type_traits>
 #include <iosfwd>
 #include <cstddef>
 
@@ -160,13 +160,13 @@ namespace detail {
 //  value_double    if T is a floating-point type
 //  T &&            otherwise
 
-template <typename T, typename dT = std::decay_t<T>>
+template <typename T, typename dT = decay_t<T>>
 using mapnik_value_type_t =
-    std::conditional_t<
+    conditional_t<
         std::is_same<dT, bool>::value, value_bool,
-        std::conditional_t<
+        conditional_t<
             std::is_integral<dT>::value, value_integer,
-            std::conditional_t<
+            conditional_t<
                 std::is_floating_point<dT>::value, value_double,
                 T && >>>;