From 76d6aba8f29645cb4cb97315d6a584fc8c6ed8cb Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Mon, 25 Apr 2016 13:58:10 -0700
Subject: [core] Define mbgl::variant (#4833)

For parallelism with mbgl::optional, and to avoid exposing namespaces other than `mbgl` in the public API.
---
 include/mbgl/annotation/shape_annotation.hpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'include/mbgl/annotation')

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
-- 
cgit v1.2.1