sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix mscv compiler errors

Browse source
This commit is contained in:
Mathis Logemann 2020-11-20 20:02:40 +01:00
parent f6b7bc0867
commit fe3160ca99
4 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
include/mapnik/config.hpp
View file

@ -50,6 +50,17 @@
# endif # endif
#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 #define PROJ_ENVELOPE_POINTS 20
#endif // MAPNIK_CONFIG_HPP #endif // MAPNIK_CONFIG_HPP

3
include/mapnik/geometry.hpp
View file

@ -24,6 +24,7 @@
#define MAPNIK_GEOMETRY_HPP #define MAPNIK_GEOMETRY_HPP
// mapnik // mapnik
#include <mapnik/config.hpp>
#include <mapnik/geometry/point.hpp> #include <mapnik/geometry/point.hpp>
#include <mapnik/geometry/line_string.hpp> #include <mapnik/geometry/line_string.hpp>
#include <mapnik/geometry/polygon.hpp> #include <mapnik/geometry/polygon.hpp>
@ -59,7 +60,7 @@ struct geometry : geometry_base<T>
{ {
using coordinate_type = T; using coordinate_type = T;
#if __cpp_inheriting_constructors >= 200802 #if MAPNIK_USE_INHERITING_CONSTRUCTORS
using geometry_base<T>::geometry_base; using geometry_base<T>::geometry_base;

3
include/mapnik/json/geojson_grammar_x3.hpp
View file

@ -23,6 +23,7 @@
#ifndef MAPNIK_JSON_GEOJSON_GRAMMAR_X3_HPP #ifndef MAPNIK_JSON_GEOJSON_GRAMMAR_X3_HPP
#define MAPNIK_JSON_GEOJSON_GRAMMAR_X3_HPP #define MAPNIK_JSON_GEOJSON_GRAMMAR_X3_HPP
#include <mapnik/config.hpp>
#include <mapnik/value/types.hpp> #include <mapnik/value/types.hpp>
#include <mapnik/util/variant.hpp> #include <mapnik/util/variant.hpp>
#include <mapnik/json/json_grammar_config.hpp> #include <mapnik/json/json_grammar_config.hpp>
@ -54,7 +55,7 @@ using geojson_value_base = mapnik::util::variant<value_null,
geojson_object>; geojson_object>;
struct geojson_value : geojson_value_base struct geojson_value : geojson_value_base
{ {
#if __cpp_inheriting_constructors >= 200802 #if MAPNIK_USE_INHERITING_CONSTRUCTORS
using geojson_value_base::geojson_value_base; using geojson_value_base::geojson_value_base;

3
include/mapnik/json/json_value.hpp
View file

@ -24,6 +24,7 @@
#define MAPNIK_JSON_JSON_VALUE_HPP #define MAPNIK_JSON_JSON_VALUE_HPP
// mapnik // mapnik
#include <mapnik/config.hpp>
#include <mapnik/value/types.hpp> #include <mapnik/value/types.hpp>
#include <mapnik/util/variant.hpp> #include <mapnik/util/variant.hpp>
// stl // stl
@ -46,7 +47,7 @@ using json_value_base = mapnik::util::variant<value_null,
json_object>; json_object>;
struct json_value : json_value_base struct json_value : json_value_base
{ {
#if __cpp_inheriting_constructors >= 200802 #if MAPNIK_USE_INHERITING_CONSTRUCTORS
using json_value_base::json_value_base; using json_value_base::json_value_base;