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/annotation/annotation_tile.cpp | |
| parent | 48cced9e311d5c1cf2a98937eeaf638c94456c8d (diff) | |
| download | qtlocation-mapboxgl-9b62661b07e86fc1d64e308fde3e15527c1cd8c8.tar.gz | |
[core] Use experimental optional instead of mapbox::util::optional
Diffstat (limited to 'src/mbgl/annotation/annotation_tile.cpp')
| -rw-r--r-- | src/mbgl/annotation/annotation_tile.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/annotation/annotation_tile.cpp b/src/mbgl/annotation/annotation_tile.cpp index f3897ad3ea..39dbee408a 100644 --- a/src/mbgl/annotation/annotation_tile.cpp +++ b/src/mbgl/annotation/annotation_tile.cpp @@ -12,12 +12,12 @@ AnnotationTileFeature::AnnotationTileFeature(FeatureType type_, GeometryCollecti properties(std::move(properties_)), geometries(geometries_) {} -mapbox::util::optional<Value> AnnotationTileFeature::getValue(const std::string& key) const { +optional<Value> AnnotationTileFeature::getValue(const std::string& key) const { auto it = properties.find(key); if (it != properties.end()) { - return mapbox::util::optional<Value>(it->second); + return optional<Value>(it->second); } - return mapbox::util::optional<Value>(); + return optional<Value>(); } util::ptr<GeometryTileLayer> AnnotationTile::getLayer(const std::string& name) const { |