Merge pull request #4276 from mathisloge/remove_cxx11_support

remove cxx11_support.hpp

include/mapnik/cxx11_support.hpp

@@ -1,43 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2021 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-#ifndef MAPNIK_CXX11_SUPPORT_HPP
-#define MAPNIK_CXX11_SUPPORT_HPP
-
-#include <type_traits>
-
-namespace mapnik {
-namespace detail {
-
-template <bool B, typename T, typename F>
-using conditional_t = typename std::conditional<B, T, F>::type;
-
-template <typename T>
-using decay_t = typename std::decay<T>::type;
-
-template <bool B, typename T = void>
-using enable_if_t = typename std::enable_if<B, T>::type;
-
-} // namespace detail
-} // namespace mapnik
-
-#endif // MAPNIK_CXX11_SUPPORT_HPP

include/mapnik/value/types.hpp

@@ -25,9 +25,8 @@
 
 // mapnik
 #include <mapnik/config.hpp>
-#include <mapnik/cxx11_support.hpp>
 #include <mapnik/pixel_types.hpp>
-
+#include <type_traits>
 
 #include <mapnik/warning.hpp>
 MAPNIK_DISABLE_WARNING_PUSH
@@ -161,13 +160,13 @@ namespace detail {
 //  value_double    if T is a floating-point type
 //  T &&            otherwise
 
-template <typename T, typename dT = decay_t<T>>
+template <typename T, typename dT = std::decay_t<T>>
 using mapnik_value_type_t =
-    conditional_t<
+    std::conditional_t<
         std::is_same<dT, bool>::value, value_bool,
-        conditional_t<
+        std::conditional_t<
             std::is_integral<dT>::value, value_integer,
-            conditional_t<
+            std::conditional_t<
                 std::is_floating_point<dT>::value, value_double,
                 T && >>>;