[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:
John Firebaugh
2016-04-25 13:58:10 -07:00
parent c1f40b9e71
commit 76d6aba8f2
8 changed files with 24 additions and 15 deletions

View File

@@ -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