From 0526c603d4a1b79ebc321182c892f09f86a57000 Mon Sep 17 00:00:00 2001 From: David Hummel <6109326+hummeltech@users.noreply.github.com> Date: Tue, 21 May 2024 20:24:35 -0700 Subject: [PATCH] Workaround for Windows builds with GCC 14 patches --- include/mapnik/util/singleton.hpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/mapnik/util/singleton.hpp b/include/mapnik/util/singleton.hpp index 3397ae99a..ba99b2327 100644 --- a/include/mapnik/util/singleton.hpp +++ b/include/mapnik/util/singleton.hpp @@ -39,7 +39,11 @@ namespace mapnik { template +#ifdef _WIN32 +class CreateUsingNew +#else class MAPNIK_DECL CreateUsingNew +#endif { public: static T* create() { return new T; } @@ -47,7 +51,11 @@ class MAPNIK_DECL CreateUsingNew }; template +#ifdef _WIN32 +class CreateStatic +#else class MAPNIK_DECL CreateStatic +#endif { private: using storage_type = typename std::aligned_storage::type;