diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-01-19 14:47:58 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-01-19 17:56:48 -0800 |
| commit | 9b62661b07e86fc1d64e308fde3e15527c1cd8c8 (patch) | |
| tree | c27b37e3f94b53d4fdd5855d1eb68868ce803bae /src/mbgl/style/style.hpp | |
| parent | 48cced9e311d5c1cf2a98937eeaf638c94456c8d (diff) | |
| download | qtlocation-mapboxgl-9b62661b07e86fc1d64e308fde3e15527c1cd8c8.tar.gz | |
[core] Use experimental optional instead of mapbox::util::optional
Diffstat (limited to 'src/mbgl/style/style.hpp')
| -rw-r--r-- | src/mbgl/style/style.hpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mbgl/style/style.hpp b/src/mbgl/style/style.hpp index ba5da7435a..29510a3887 100644 --- a/src/mbgl/style/style.hpp +++ b/src/mbgl/style/style.hpp @@ -10,8 +10,7 @@ #include <mbgl/util/noncopyable.hpp> #include <mbgl/util/chrono.hpp> #include <mbgl/util/worker.hpp> - -#include <mapbox/optional.hpp> +#include <mbgl/util/optional.hpp> #include <cstdint> #include <string> @@ -97,7 +96,7 @@ public: std::vector<std::unique_ptr<StyleLayer>> getLayers() const; StyleLayer* getLayer(const std::string& id) const; void addLayer(std::unique_ptr<StyleLayer>, - mapbox::util::optional<std::string> beforeLayerID = {}); + optional<std::string> beforeLayerID = {}); void removeLayer(const std::string& layerID); RenderData getRenderData() const; |