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 /src/mbgl/style/value.hpp | |
| 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 'src/mbgl/style/value.hpp')
| -rw-r--r-- | src/mbgl/style/value.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/style/value.hpp b/src/mbgl/style/value.hpp index c5be450916..869ddd6668 100644 --- a/src/mbgl/style/value.hpp +++ b/src/mbgl/style/value.hpp @@ -1,7 +1,7 @@ #ifndef MBGL_STYLE_VALUE #define MBGL_STYLE_VALUE -#include <mapbox/variant.hpp> +#include <mbgl/util/variant.hpp> #include <mbgl/util/rapidjson.hpp> #include <cstdlib> @@ -9,7 +9,7 @@ namespace mbgl { -typedef mapbox::util::variant<bool, int64_t, uint64_t, double, std::string> Value; +typedef variant<bool, int64_t, uint64_t, double, std::string> Value; std::string toString(const Value &value); |