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/sprite | |
| 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/sprite')
| -rw-r--r-- | src/mbgl/sprite/sprite_parser.hpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mbgl/sprite/sprite_parser.hpp b/src/mbgl/sprite/sprite_parser.hpp index 36e8947992..3244b6e4c8 100644 --- a/src/mbgl/sprite/sprite_parser.hpp +++ b/src/mbgl/sprite/sprite_parser.hpp @@ -1,10 +1,9 @@ #ifndef MBGL_SPRITE_PARSER #define MBGL_SPRITE_PARSER -#include <mapbox/variant.hpp> - #include <mbgl/util/image.hpp> #include <mbgl/util/noncopyable.hpp> +#include <mbgl/util/variant.hpp> #include <mbgl/util/geo.hpp> #include <string> @@ -29,7 +28,7 @@ SpriteImagePtr createSpriteImage(const PremultipliedImage&, using Sprites = std::map<std::string, SpriteImagePtr>; -using SpriteParseResult = mapbox::util::variant< +using SpriteParseResult = variant< Sprites, // success std::exception_ptr>; // error |