summaryrefslogtreecommitdiff
path: root/src/mbgl/text/shaping.hpp
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-01-19 14:47:58 -0800
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-01-19 17:56:48 -0800
commit9b62661b07e86fc1d64e308fde3e15527c1cd8c8 (patch)
treec27b37e3f94b53d4fdd5855d1eb68868ce803bae /src/mbgl/text/shaping.hpp
parent48cced9e311d5c1cf2a98937eeaf638c94456c8d (diff)
downloadqtlocation-mapboxgl-9b62661b07e86fc1d64e308fde3e15527c1cd8c8.tar.gz
[core] Use experimental optional instead of mapbox::util::optional
Diffstat (limited to 'src/mbgl/text/shaping.hpp')
-rw-r--r--src/mbgl/text/shaping.hpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/text/shaping.hpp b/src/mbgl/text/shaping.hpp
index decf7b946e..5fbb433035 100644
--- a/src/mbgl/text/shaping.hpp
+++ b/src/mbgl/text/shaping.hpp
@@ -4,9 +4,9 @@
#include <mbgl/text/glyph.hpp>
#include <mbgl/sprite/sprite_atlas.hpp>
#include <mbgl/sprite/sprite_image.hpp>
-#include <mapbox/optional.hpp>
#include <mbgl/util/vec.hpp>
+#include <mbgl/util/optional.hpp>
namespace mbgl {
@@ -19,7 +19,7 @@ namespace mbgl {
float _top, float _bottom, float _left, float _right) :
image(_image), top(_top), bottom(_bottom), left(_left), right(_right) {}
- mapbox::util::optional<SpriteAtlasElement> image;
+ optional<SpriteAtlasElement> image;
float top = 0;
float bottom = 0;
float left = 0;