mason variant@1.0

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>

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>
 

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>

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>

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 {

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>
 

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>

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>