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 Mickey Rose
parent ab86171c2b
commit d934630bc5
3 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
deps/mapbox/variant vendored

@ -1 +1 @@
Subproject commit aaddee9270e3956cee98cdd7d04aea848d69f5f0
Subproject commit e5818212a8f7ef89df0aa76d5244eca78b8dbb8d

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

@ -32,15 +32,7 @@ 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 = std::tuple<Types...>;
// inherit ctor's
using mapbox::util::variant<Types...>::variant;
};
using variant = typename mapbox::util::variant<Types...>;
// unary visitor interface
// const

2
src/save_map.cpp
View file

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