1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
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 <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
index 4cfa28736..9391181ff 100644
--- 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
index 897fcee69..4a379f737 100644
--- a/include/mapnik/util/singleton.hpp
+++ b/include/mapnik/util/singleton.hpp
@@ -39,7 +39,7 @@
namespace mapnik {
template<typename T>
-class CreateUsingNew
+class MAPNIK_DECL CreateUsingNew
{
public:
static T* create() { return new T; }
@@ -47,7 +47,7 @@ class CreateUsingNew
};
template<typename T>
-class CreateStatic
+class MAPNIK_DECL CreateStatic
{
private:
using storage_type = typename std::aligned_storage<sizeof(T), alignof(T)>::type;
|