diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-25 13:58:10 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-25 13:58:10 -0700 |
| commit | 76d6aba8f29645cb4cb97315d6a584fc8c6ed8cb (patch) | |
| tree | bc7a6231cbbf5af5c9ed01d51f98ca1579643938 /include/mbgl/annotation | |
| parent | c1f40b9e711115c24d4a4e8464eb8d75f4004ddc (diff) | |
| download | qtlocation-mapboxgl-76d6aba8f29645cb4cb97315d6a584fc8c6ed8cb.tar.gz | |
[core] Define mbgl::variant (#4833)
For parallelism with mbgl::optional, and to avoid exposing namespaces other than `mbgl` in the public API.
Diffstat (limited to 'include/mbgl/annotation')
| -rw-r--r-- | include/mbgl/annotation/shape_annotation.hpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/mbgl/annotation/shape_annotation.hpp b/include/mbgl/annotation/shape_annotation.hpp index 121cb7f1d7..4d8d35d9ca 100644 --- a/include/mbgl/annotation/shape_annotation.hpp +++ b/include/mbgl/annotation/shape_annotation.hpp @@ -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 |