From 2ef5003283ef6cc56a170fb1e3bbb180c6b90b3e Mon Sep 17 00:00:00 2001 From: David Hummel <6109326+hummeltech@users.noreply.github.com> Date: Tue, 21 May 2024 07:46:18 -0700 Subject: [PATCH] Fix building with GCC 14 Co-authored-by: Tom Hughes --- include/mapnik/geometry/fusion_adapted.hpp | 2 ++ include/mapnik/util/singleton.hpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/mapnik/geometry/fusion_adapted.hpp b/include/mapnik/geometry/fusion_adapted.hpp index fcf574567..69cbde29f 100644 --- a/include/mapnik/geometry/fusion_adapted.hpp +++ b/include/mapnik/geometry/fusion_adapted.hpp @@ -26,6 +26,8 @@ #include #include +#include + BOOST_FUSION_ADAPT_STRUCT(mapnik::geometry::point, (double, x)(double, y)) BOOST_FUSION_ADAPT_STRUCT(mapnik::geometry::point, (std::int64_t, x)(std::int64_t, y)) diff --git a/include/mapnik/util/singleton.hpp b/include/mapnik/util/singleton.hpp index bfc86913f..3397ae99a 100644 --- a/include/mapnik/util/singleton.hpp +++ b/include/mapnik/util/singleton.hpp @@ -39,7 +39,7 @@ namespace mapnik { template -class CreateUsingNew +class MAPNIK_DECL CreateUsingNew { public: static T* create() { return new T; } @@ -47,7 +47,7 @@ class CreateUsingNew }; template -class CreateStatic +class MAPNIK_DECL CreateStatic { private: using storage_type = typename std::aligned_storage::type;