From e6ed16e94e0edf50af29b58e110b78a1e1347402 Mon Sep 17 00:00:00 2001 From: Mickey Rose 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 +#include #include @@ -34,7 +35,6 @@ #pragma GCC diagnostic pop // stl -#include #include #include @@ -160,13 +160,13 @@ namespace detail { // value_double if T is a floating-point type // T && otherwise -template > +template > using mapnik_value_type_t = - std::conditional_t< + conditional_t< std::is_same::value, value_bool, - std::conditional_t< + conditional_t< std::is_integral
::value, value_integer, - std::conditional_t< + conditional_t< std::is_floating_point
::value, value_double, T && >>>;