[core] Define mbgl::variant (#4833)
For parallelism with mbgl::optional, and to avoid exposing namespaces other than `mbgl` in the public API.
This commit is contained in:
@@ -5,8 +5,7 @@
|
||||
#include <mbgl/style/types.hpp>
|
||||
|
||||
#include <mbgl/util/geo.hpp>
|
||||
|
||||
#include <mapbox/variant.hpp>
|
||||
#include <mbgl/util/variant.hpp>
|
||||
|
||||
namespace mbgl {
|
||||
|
||||
@@ -27,7 +26,7 @@ struct LineAnnotationProperties {
|
||||
|
||||
class ShapeAnnotation {
|
||||
public:
|
||||
using Properties = mapbox::util::variant<
|
||||
using Properties = variant<
|
||||
FillAnnotationProperties, // creates a fill annotation
|
||||
LineAnnotationProperties, // creates a line annotation
|
||||
std::string>; // creates an annotation whose type and properties are sourced from a style layer
|
||||
|
||||
Reference in New Issue
Block a user