From d934630bc50c20fa161c5d2ae5207c171ad2caab Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 23 Sep 2016 16:01:07 +0200
Subject: [PATCH] Fix clang >= 3.9.0 compilation by using
 `mapbox::util::variant` as alias (via deps/mapbox/variant => "types" branch)

---
 deps/mapbox/variant             |  2 +-
 include/mapnik/util/variant.hpp | 10 +---------
 src/save_map.cpp                |  2 +-
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/deps/mapbox/variant b/deps/mapbox/variant
index aaddee927..e5818212a 160000
--- a/deps/mapbox/variant
+++ b/deps/mapbox/variant
@@ -1 +1 @@
-Subproject commit aaddee9270e3956cee98cdd7d04aea848d69f5f0
+Subproject commit e5818212a8f7ef89df0aa76d5244eca78b8dbb8d
diff --git a/include/mapnik/util/variant.hpp b/include/mapnik/util/variant.hpp
index 27993ce3f..b73533d71 100644
--- a/include/mapnik/util/variant.hpp
+++ b/include/mapnik/util/variant.hpp
@@ -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
diff --git a/src/save_map.cpp b/src/save_map.cpp
index f3d89153c..882d795f9 100644
--- a/src/save_map.cpp
+++ b/src/save_map.cpp
@@ -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>