diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-08-26 17:47:24 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-09-06 12:52:13 -0700 |
commit | 0afd14ae29e03f2781981180ddc42208e3da67c0 (patch) | |
tree | 8e585306bab3a02e2941490e8380e563c1ecd53a /src/mbgl/annotation/annotation_tile.hpp | |
parent | 1c51b43dafdcf74000290cbb09d7307253e683ab (diff) | |
download | qtlocation-mapboxgl-0afd14ae29e03f2781981180ddc42208e3da67c0.tar.gz |
[core] Eliminate use of util::ptr in GeometryTile* interfaces
Diffstat (limited to 'src/mbgl/annotation/annotation_tile.hpp')
-rw-r--r-- | src/mbgl/annotation/annotation_tile.hpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/annotation/annotation_tile.hpp b/src/mbgl/annotation/annotation_tile.hpp index 78ed9e4080..19a731ee7b 100644 --- a/src/mbgl/annotation/annotation_tile.hpp +++ b/src/mbgl/annotation/annotation_tile.hpp @@ -45,10 +45,10 @@ public: AnnotationTileLayer(std::string); std::size_t featureCount() const override { return features.size(); } - util::ptr<const GeometryTileFeature> getFeature(std::size_t i) const override { return features[i]; } + std::unique_ptr<GeometryTileFeature> getFeature(std::size_t i) const override { return std::make_unique<AnnotationTileFeature>(features[i]); } std::string getName() const override { return name; }; - std::vector<util::ptr<const AnnotationTileFeature>> features; + std::vector<AnnotationTileFeature> features; private: std::string name; @@ -56,9 +56,9 @@ private: class AnnotationTileData : public GeometryTileData { public: - util::ptr<const GeometryTileLayer> getLayer(const std::string&) const override; + const GeometryTileLayer* getLayer(const std::string&) const override; - std::unordered_map<std::string, util::ptr<AnnotationTileLayer>> layers; + std::unordered_map<std::string, AnnotationTileLayer> layers; }; } // namespace mbgl |