From 5420ccd6af19a2df999197d4d8043467fd79c5de Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Fri, 20 Nov 2020 20:16:27 +0100 Subject: [PATCH] now fix msvc compiler error. Why does msvc complain? --- include/mapnik/geometry.hpp | 2 +- include/mapnik/json/geojson_grammar_x3.hpp | 2 +- include/mapnik/json/json_value.hpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/mapnik/geometry.hpp b/include/mapnik/geometry.hpp index f6e795de9..44b9931b4 100644 --- a/include/mapnik/geometry.hpp +++ b/include/mapnik/geometry.hpp @@ -59,7 +59,7 @@ struct geometry : geometry_base { using coordinate_type = T; -#if __cpp_inheriting_constructors >= 200802 +#if __cpp_inheriting_constructors >= 200802 && !defined (_MSC_VER) using geometry_base::geometry_base; diff --git a/include/mapnik/json/geojson_grammar_x3.hpp b/include/mapnik/json/geojson_grammar_x3.hpp index 3f44d1066..a4f713637 100644 --- a/include/mapnik/json/geojson_grammar_x3.hpp +++ b/include/mapnik/json/geojson_grammar_x3.hpp @@ -54,7 +54,7 @@ using geojson_value_base = mapnik::util::variant; struct geojson_value : geojson_value_base { -#if __cpp_inheriting_constructors >= 200802 +#if __cpp_inheriting_constructors >= 200802 && !defined (_MSC_VER) using geojson_value_base::geojson_value_base; diff --git a/include/mapnik/json/json_value.hpp b/include/mapnik/json/json_value.hpp index c5ed03604..150a80f21 100644 --- a/include/mapnik/json/json_value.hpp +++ b/include/mapnik/json/json_value.hpp @@ -46,7 +46,7 @@ using json_value_base = mapnik::util::variant; struct json_value : json_value_base { -#if __cpp_inheriting_constructors >= 200802 +#if __cpp_inheriting_constructors >= 200802 && !defined (_MSC_VER) using json_value_base::json_value_base;