From 621ab999614a9c4c8f02294053542b09ae530e10 Mon Sep 17 00:00:00 2001
From: Mathis Logemann <mathisloge@gmail.com>
Date: Fri, 20 Nov 2020 20:11:42 +0100
Subject: [PATCH] Revert "fix mscv compiler errors"

This reverts commit fe3160ca996922e122f2aa629280f51ad9445ae3.
---
 include/mapnik/config.hpp                  | 11 -----------
 include/mapnik/geometry.hpp                |  3 +--
 include/mapnik/json/geojson_grammar_x3.hpp |  3 +--
 include/mapnik/json/json_value.hpp         |  3 +--
 4 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/include/mapnik/config.hpp b/include/mapnik/config.hpp
index 65b370784..ac48546f2 100644
--- a/include/mapnik/config.hpp
+++ b/include/mapnik/config.hpp
@@ -50,17 +50,6 @@
 #  endif
 #endif
 
-#if defined(__clang__)
-#if __has_feature(cxx_inheriting_constructors)
-#define MAPNIK_USE_INHERITING_CONSTRUCTORS 1
-#endif
-#elif (defined(__GNUC__) &&                                       \
-       (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 8)) || \
-    (__cpp_inheriting_constructors >= 200802) ||                  \
-    (defined(_MSC_VER) && _MSC_VER >= 1910)
-#define MAPNIK_USE_INHERITING_CONSTRUCTORS 1
-#endif
-
 #define PROJ_ENVELOPE_POINTS 20
 
 #endif // MAPNIK_CONFIG_HPP
diff --git a/include/mapnik/geometry.hpp b/include/mapnik/geometry.hpp
index dccd25371..f6e795de9 100644
--- a/include/mapnik/geometry.hpp
+++ b/include/mapnik/geometry.hpp
@@ -24,7 +24,6 @@
 #define MAPNIK_GEOMETRY_HPP
 
 // mapnik
-#include <mapnik/config.hpp>
 #include <mapnik/geometry/point.hpp>
 #include <mapnik/geometry/line_string.hpp>
 #include <mapnik/geometry/polygon.hpp>
@@ -60,7 +59,7 @@ struct geometry : geometry_base<T>
 {
     using coordinate_type = T;
 
-#if MAPNIK_USE_INHERITING_CONSTRUCTORS
+#if __cpp_inheriting_constructors >= 200802
 
     using geometry_base<T>::geometry_base;
 
diff --git a/include/mapnik/json/geojson_grammar_x3.hpp b/include/mapnik/json/geojson_grammar_x3.hpp
index e840c3436..3f44d1066 100644
--- a/include/mapnik/json/geojson_grammar_x3.hpp
+++ b/include/mapnik/json/geojson_grammar_x3.hpp
@@ -23,7 +23,6 @@
 #ifndef MAPNIK_JSON_GEOJSON_GRAMMAR_X3_HPP
 #define MAPNIK_JSON_GEOJSON_GRAMMAR_X3_HPP
 
-#include <mapnik/config.hpp>
 #include <mapnik/value/types.hpp>
 #include <mapnik/util/variant.hpp>
 #include <mapnik/json/json_grammar_config.hpp>
@@ -55,7 +54,7 @@ using geojson_value_base = mapnik::util::variant<value_null,
                                               geojson_object>;
 struct geojson_value : geojson_value_base
 {
-#if MAPNIK_USE_INHERITING_CONSTRUCTORS
+#if __cpp_inheriting_constructors >= 200802
 
     using geojson_value_base::geojson_value_base;
 
diff --git a/include/mapnik/json/json_value.hpp b/include/mapnik/json/json_value.hpp
index 2157ce595..c5ed03604 100644
--- a/include/mapnik/json/json_value.hpp
+++ b/include/mapnik/json/json_value.hpp
@@ -24,7 +24,6 @@
 #define MAPNIK_JSON_JSON_VALUE_HPP
 
 // mapnik
-#include <mapnik/config.hpp>
 #include <mapnik/value/types.hpp>
 #include <mapnik/util/variant.hpp>
 // stl
@@ -47,7 +46,7 @@ using json_value_base = mapnik::util::variant<value_null,
                                               json_object>;
 struct json_value : json_value_base
 {
-#if MAPNIK_USE_INHERITING_CONSTRUCTORS
+#if __cpp_inheriting_constructors >= 200802
 
     using json_value_base::json_value_base;