sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mapnik::variant - use std::tuple<Typess...> instead of mpl::vector<Types...> and remove Boost.MPL dependency

Browse source
This commit is contained in:
artemp 2016-08-22 12:14:41 +01:00
parent ccd95c88ec
commit b3a347c678
2 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/mapnik/config.hpp
View file

@ -52,18 +52,4 @@
#define PROJ_ENVELOPE_POINTS 20 #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 #endif // MAPNIK_CONFIG_HPP

5
include/mapnik/util/variant.hpp
View file

@ -28,7 +28,7 @@
#pragma GCC diagnostic push #pragma GCC diagnostic push
#include <mapnik/warning_ignore.hpp> #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 #pragma GCC diagnostic pop
namespace mapnik { namespace util { namespace mapnik { namespace util {
@ -36,14 +36,13 @@ namespace mapnik { namespace util {
template <typename T> template <typename T>
using recursive_wrapper = typename mapbox::util::recursive_wrapper<T>; using recursive_wrapper = typename mapbox::util::recursive_wrapper<T>;
template<typename... Types> template<typename... Types>
class variant : public mapbox::util::variant<Types...> class variant : public mapbox::util::variant<Types...>
{ {
public: public:
// tell spirit that this is an adapted variant // tell spirit that this is an adapted variant
struct adapted_variant_tag; struct adapted_variant_tag;
using types = boost::mpl::vector<Types...>; using types = std::tuple<Types...>;
// inherit ctor's // inherit ctor's
using mapbox::util::variant<Types...>::variant; using mapbox::util::variant<Types...>::variant;
}; };