From 75189905d6108dc62fd85c1f7018410a24c2b12e Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 9 May 2016 11:42:46 +0200
Subject: [PATCH] upgrade to latest variant.hpp

---
 SConstruct                      | 1 +
 deps/mapbox/variant             | 2 +-
 include/mapnik/util/variant.hpp | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/SConstruct b/SConstruct
index a4c4fda74..f61309fa9 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1610,6 +1610,7 @@ if not preconfigured:
     # prepend to make sure we link locally
     env.Prepend(CPPPATH = '#deps/agg/include')
     env.Prepend(LIBPATH = '#deps/agg')
+    env.Prepend(CPPPATH = '#deps/mapbox/variant/include')
     # prepend deps dir for auxillary headers
     env.Prepend(CPPPATH = '#deps')
 
diff --git a/deps/mapbox/variant b/deps/mapbox/variant
index 35ca16c74..1bc46e525 160000
--- a/deps/mapbox/variant
+++ b/deps/mapbox/variant
@@ -1 +1 @@
-Subproject commit 35ca16c74f5712afb4f042f45ea64078fa0b630e
+Subproject commit 1bc46e525a9dec71af28f822e5fc031c1352ad2e
diff --git a/include/mapnik/util/variant.hpp b/include/mapnik/util/variant.hpp
index 05dddecf8..3fb00b388 100644
--- a/include/mapnik/util/variant.hpp
+++ b/include/mapnik/util/variant.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_UTIL_VARIANT_HPP
 
 #include <mapnik/config.hpp>
-#include <mapbox/variant/variant.hpp>
+#include <mapbox/variant.hpp>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>