summaryrefslogtreecommitdiff
path: root/src/mbgl/tile
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/tile
parent48cced9e311d5c1cf2a98937eeaf638c94456c8d (diff)
downloadqtlocation-mapboxgl-9b62661b07e86fc1d64e308fde3e15527c1cd8c8.tar.gz
[core] Use experimental optional instead of mapbox::util::optional
Diffstat (limited to 'src/mbgl/tile')
-rw-r--r--src/mbgl/tile/geojson_tile.cpp6
-rw-r--r--src/mbgl/tile/geojson_tile.hpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/tile/geojson_tile.cpp b/src/mbgl/tile/geojson_tile.cpp
index 9f14780ca4..e7ce5385fe 100644
--- a/src/mbgl/tile/geojson_tile.cpp
+++ b/src/mbgl/tile/geojson_tile.cpp
@@ -14,12 +14,12 @@ FeatureType GeoJSONTileFeature::getType() const {
return type;
}
-mapbox::util::optional<Value> GeoJSONTileFeature::getValue(const std::string& key) const {
+optional<Value> GeoJSONTileFeature::getValue(const std::string& key) const {
auto it = tags.find(key);
if (it != tags.end()) {
- return mapbox::util::optional<Value>(it->second);
+ return optional<Value>(it->second);
}
- return mapbox::util::optional<Value>();
+ return optional<Value>();
}
GeometryCollection GeoJSONTileFeature::getGeometries() const {
diff --git a/src/mbgl/tile/geojson_tile.hpp b/src/mbgl/tile/geojson_tile.hpp
index e5e9766a17..bbb3eef401 100644
--- a/src/mbgl/tile/geojson_tile.hpp
+++ b/src/mbgl/tile/geojson_tile.hpp
@@ -23,7 +23,7 @@ public:
GeoJSONTileFeature(FeatureType, GeometryCollection&&, Tags&& = Tags{});
FeatureType getType() const override;
- mapbox::util::optional<Value> getValue(const std::string&) const override;
+ optional<Value> getValue(const std::string&) const override;
GeometryCollection getGeometries() const override;
private: