[mapnik] 01/04: Imported Upstream version 3.0.12~rc5+ds

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository mapnik.

commit 8efb14e194576adbd5f348a8d79646b10a439039
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Aug 22 22:19:57 2016 +0200

    Imported Upstream version 3.0.12~rc5+ds
---
 include/mapnik/config.hpp       | 14 --------------
 include/mapnik/util/variant.hpp |  5 ++---
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/include/mapnik/config.hpp b/include/mapnik/config.hpp
index a05caf9..a9168e5 100644
--- a/include/mapnik/config.hpp
+++ b/include/mapnik/config.hpp
@@ -52,18 +52,4 @@
 
 #define PROJ_ENVELOPE_POINTS 20
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-
-#ifndef BOOST_MPL_LIMIT_VECTOR_SIZE
- #define BOOST_MPL_LIMIT_VECTOR_SIZE 30
-#else
- #warning "WARNING: BOOST_MPL_LIMIT_VECTOR_SIZE is already defined. Ensure config.hpp is included before any Boost headers"
-#endif
-
-#ifndef BOOST_MPL_LIMIT_LIST_SIZE
- #define BOOST_MPL_LIMIT_LIST_SIZE 30
-#else
- #warning "WARNING: BOOST_MPL_LIMIT_LIST_SIZE is already defined. Ensure config.hpp is included before any Boost headers"
-#endif
-
 #endif // MAPNIK_CONFIG_HPP
diff --git a/include/mapnik/util/variant.hpp b/include/mapnik/util/variant.hpp
index 87cfb70..6c2d21b 100644
--- a/include/mapnik/util/variant.hpp
+++ b/include/mapnik/util/variant.hpp
@@ -28,7 +28,7 @@
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>
-#include <boost/mpl/vector.hpp> // spirit support
+#include <boost/fusion/adapted/std_tuple.hpp> // spirit support
 #pragma GCC diagnostic pop
 
 namespace mapnik { namespace util {
@@ -36,14 +36,13 @@ namespace mapnik { namespace util {
 template <typename T>
 using recursive_wrapper = typename mapbox::util::recursive_wrapper<T>;
 
-
 template<typename... Types>
 class variant : public mapbox::util::variant<Types...>
 {
 public:
     // tell spirit that this is an adapted variant
     struct adapted_variant_tag;
-    using types = boost::mpl::vector<Types...>;
+    using types = std::tuple<Types...>;
     // inherit ctor's
     using mapbox::util::variant<Types...>::variant;
 };

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapnik.git