mason variant@1.0

9 files changed, 14 insertions, 8 deletions

diff --git a/src/mbgl/annotation/sprite_parser.hpp b/src/mbgl/annotation/sprite_parser.hpp
index d7e9953359..c5856ebbc7 100644
--- a/src/mbgl/annotation/sprite_parser.hpp
+++ b/src/mbgl/annotation/sprite_parser.hpp
@@ -1,9 +1,10 @@
 #ifndef MBGL_ANNOTATIONS_SPRITE_PARSER
 #define MBGL_ANNOTATIONS_SPRITE_PARSER
 
+#include <mapbox/variant.hpp>
+
 #include <mbgl/util/noncopyable.hpp>
 #include <mbgl/util/geo.hpp>
-#include <mbgl/util/variant.hpp>
 
 #include <string>
 #include <memory>
diff --git a/src/mbgl/map/geometry_tile.hpp b/src/mbgl/map/geometry_tile.hpp
index dc1ef10725..37d7bf1427 100644
--- a/src/mbgl/map/geometry_tile.hpp
+++ b/src/mbgl/map/geometry_tile.hpp
@@ -1,10 +1,11 @@
 #ifndef MBGL_MAP_GEOMETRY_TILE
 #define MBGL_MAP_GEOMETRY_TILE
 
+#include <mapbox/variant.hpp>
+#include <mapbox/optional.hpp>
+
 #include <mbgl/style/value.hpp>
-#include <mbgl/util/optional.hpp>
 #include <mbgl/util/ptr.hpp>
-#include <mbgl/util/variant.hpp>
 #include <mbgl/util/vec.hpp>
 #include <mbgl/util/noncopyable.hpp>
 
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp
index 4ba8d6cd8f..50819f66a7 100644
--- a/src/mbgl/map/map.cpp
+++ b/src/mbgl/map/map.cpp
@@ -1,5 +1,6 @@
 #include <mbgl/map/map.hpp>
 #include <mbgl/map/map_context.hpp>
+#include <mbgl/map/camera.hpp>
 #include <mbgl/map/view.hpp>
 #include <mbgl/map/transform.hpp>
 #include <mbgl/map/transform_state.hpp>
diff --git a/src/mbgl/map/tile_worker.hpp b/src/mbgl/map/tile_worker.hpp
index 62527b9fd9..b045ae0f6e 100644
--- a/src/mbgl/map/tile_worker.hpp
+++ b/src/mbgl/map/tile_worker.hpp
@@ -1,7 +1,8 @@
 #ifndef MBGL_MAP_TILE_WORKER
 #define MBGL_MAP_TILE_WORKER
 
-#include <mbgl/util/variant.hpp>
+#include <mapbox/variant.hpp>
+
 #include <mbgl/map/tile_data.hpp>
 #include <mbgl/geometry/elements_buffer.hpp>
 #include <mbgl/geometry/fill_buffer.hpp>
diff --git a/src/mbgl/style/filter_expression_private.hpp b/src/mbgl/style/filter_expression_private.hpp
index 381f8f617c..ff6301b7c6 100644
--- a/src/mbgl/style/filter_expression_private.hpp
+++ b/src/mbgl/style/filter_expression_private.hpp
@@ -1,4 +1,5 @@
-#include <mbgl/util/optional.hpp>
+#include <mapbox/optional.hpp>
+
 #include <mbgl/style/value_comparison.hpp>
 
 namespace mbgl {
diff --git a/src/mbgl/style/function_properties.hpp b/src/mbgl/style/function_properties.hpp
index 924f192330..c41918a0fb 100644
--- a/src/mbgl/style/function_properties.hpp
+++ b/src/mbgl/style/function_properties.hpp
@@ -1,7 +1,7 @@
 #ifndef MBGL_STYLE_FUNCTION_PROPERTIES
 #define MBGL_STYLE_FUNCTION_PROPERTIES
 
-#include <mbgl/util/variant.hpp>
+#include <mapbox/variant.hpp>
 
 #include <vector>
 
diff --git a/src/mbgl/style/property_value.hpp b/src/mbgl/style/property_value.hpp
index fbc3f3bd6a..f225899c66 100644
--- a/src/mbgl/style/property_value.hpp
+++ b/src/mbgl/style/property_value.hpp
@@ -1,7 +1,8 @@
 #ifndef MBGL_STYLE_PROPERTY_VALUE
 #define MBGL_STYLE_PROPERTY_VALUE
 
-#include <mbgl/util/variant.hpp>
+#include <mapbox/variant.hpp>
+
 #include <mbgl/style/function_properties.hpp>
 #include <mbgl/style/piecewisefunction_properties.hpp>
 #include <mbgl/style/types.hpp>
diff --git a/src/mbgl/style/value.hpp b/src/mbgl/style/value.hpp
index 8b0b21c20c..4649134b20 100644
--- a/src/mbgl/style/value.hpp
+++ b/src/mbgl/style/value.hpp
@@ -1,7 +1,7 @@
 #ifndef MBGL_STYLE_VALUE
 #define MBGL_STYLE_VALUE
 
-#include <mbgl/util/variant.hpp>
+#include <mapbox/variant.hpp>
 #include <rapidjson/document.h>
 
 #include <cstdlib>
diff --git a/src/mbgl/util/geojsonvt b/src/mbgl/util/geojsonvt
-Subproject 995ffc72c556da4b4880a6036fbcf7159fc5ecc
+Subproject 83bffbcc6ad75ff59c7640036567820c8932161