Fix building with GCC 14

Co-authored-by: Tom Hughes <tom@compton.nu>
mapnik · May 21, 2024 · cd82cd2 · cd82cd2
1 parent 34bb44e
commit cd82cd2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 19 deletions.
diff --git a/include/mapnik/geometry/fusion_adapted.hpp b/include/mapnik/geometry/fusion_adapted.hpp
@@ -26,6 +26,8 @@
 #include <mapnik/geometry/polygon.hpp>
 #include <boost/fusion/include/adapt_struct.hpp>
 
+#include <cstdint>
+
 BOOST_FUSION_ADAPT_STRUCT(mapnik::geometry::point<double>, (double, x)(double, y))
 
 BOOST_FUSION_ADAPT_STRUCT(mapnik::geometry::point<std::int64_t>, (std::int64_t, x)(std::int64_t, y))

diff --git a/include/mapnik/grid/grid_view.hpp b/include/mapnik/grid/grid_view.hpp
@@ -97,23 +97,6 @@ class hit_grid_view
         , features_(rhs.features_)
     {}
 
-    hit_grid_view<T>& operator=(hit_grid_view<T> const& rhs)
-    {
-        if (&rhs == this)
-            return *this;
-        x_ = rhs.x_;
-        y_ = rhs.y_;
-        width_ = rhs.width_;
-        height_ = rhs.height_;
-        data_ = rhs.data_;
-        key_ = rhs.key_;
-        id_name_ = rhs.id_name_;
-        names_ = rhs.names_;
-        f_keys_ = rhs.f_keys_;
-        features_ = rhs.features_;
-        return *this;
-    }
-
     inline unsigned x() const { return x_; }
 
     inline unsigned y() const { return y_; }

diff --git a/include/mapnik/util/singleton.hpp b/include/mapnik/util/singleton.hpp
@@ -39,15 +39,15 @@
 namespace mapnik {
 
 template<typename T>
-class CreateUsingNew
+class MAPNIK_DECL CreateUsingNew
 {
   public:
     static T* create() { return new T; }
     static void destroy(T* obj) { delete obj; }
 };
 
 template<typename T>
-class CreateStatic
+class MAPNIK_DECL CreateStatic
 {
   private:
     using storage_type = typename std::aligned_storage<sizeof(T), alignof(T)>::type;