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

Fix clang >= 3.9.0 compilation by using mapbox::util::variant as alias (via deps/mapbox/variant => "types" branch)

Browse source
This commit is contained in:
artemp 2016-09-23 16:01:07 +02:00 • committed by Dane Springmeyer
parent 765922e42f
commit 4d4ea3a576
2 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -32,15 +32,7 @@ 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...> using variant = typename mapbox::util::variant<Types...>;
{
public:
// tell spirit that this is an adapted variant
struct adapted_variant_tag;
using types = std::tuple<Types...>;
// inherit ctor's
using mapbox::util::variant<Types...>::variant;
};
// unary visitor interface // unary visitor interface
// const // const

2
src/save_map.cpp
View file

@ -46,7 +46,7 @@
#include <mapnik/group/group_layout.hpp> #include <mapnik/group/group_layout.hpp>
#include <mapnik/group/group_symbolizer_properties.hpp> #include <mapnik/group/group_symbolizer_properties.hpp>
#include <mapnik/util/variant.hpp> #include <mapnik/util/variant.hpp>
#include <mapnik/util/variant_io.hpp> #include <mapbox/variant_io.hpp>
#pragma GCC diagnostic push #pragma GCC diagnostic push
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>