diff options
| author | Justin R. Miller <incanus@codesorcery.net> | 2015-03-08 16:21:22 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-03-09 11:57:34 -0700 |
| commit | 2d8bf823fca8daede324b6b345d2fecd224715ee (patch) | |
| tree | 5429bf405101644133c955e081ac213231a0f804 /src | |
| parent | 0652174465d7231b514d9d5afd718af66dd62097 (diff) | |
| download | qtlocation-mapboxgl-2d8bf823fca8daede324b6b345d2fecd224715ee.tar.gz | |
unique -> shared ptr
Diffstat (limited to 'src')
| -rw-r--r-- | src/mbgl/map/geometry_tile.hpp | 2 | ||||
| -rw-r--r-- | src/mbgl/map/tile_parser.cpp | 2 | ||||
| -rw-r--r-- | src/mbgl/map/vector_tile.cpp | 5 | ||||
| -rw-r--r-- | src/mbgl/map/vector_tile.hpp | 2 | ||||
| -rw-r--r-- | src/mbgl/renderer/symbol_bucket.cpp | 2 |
5 files changed, 6 insertions, 7 deletions
diff --git a/src/mbgl/map/geometry_tile.hpp b/src/mbgl/map/geometry_tile.hpp index 3d5b677b87..045c298428 100644 --- a/src/mbgl/map/geometry_tile.hpp +++ b/src/mbgl/map/geometry_tile.hpp @@ -91,7 +91,7 @@ public: virtual const std::unordered_map<std::string, uint32_t>& getKeyIndex() const = 0; virtual const std::vector<Value>& getValues() const = 0; virtual const std::map<std::string, std::map<Value, Shaping>>& getShaping() const = 0; - virtual std::unique_ptr<GeometryFilteredTileLayer> createFilteredTileLayer(const FilterExpression&) const = 0; + virtual util::ptr<GeometryFilteredTileLayer> createFilteredTileLayer(const FilterExpression&) const = 0; }; class GeometryTile { diff --git a/src/mbgl/map/tile_parser.cpp b/src/mbgl/map/tile_parser.cpp index 73426a2d1e..be5b901369 100644 --- a/src/mbgl/map/tile_parser.cpp +++ b/src/mbgl/map/tile_parser.cpp @@ -214,7 +214,7 @@ std::unique_ptr<Bucket> TileParser::createBucket(const StyleBucket &bucketDesc) template <class Bucket> void TileParser::addBucketGeometries(Bucket& bucket, const util::ptr<const GeometryTileLayer> layer, const FilterExpression &filter) { - std::unique_ptr<GeometryFilteredTileLayer> filtered_layer = layer->createFilteredTileLayer(filter); + util::ptr<GeometryFilteredTileLayer> filtered_layer = layer->createFilteredTileLayer(filter); for (auto feature_it = filtered_layer->begin(); feature_it != filtered_layer->end(); ++feature_it) { diff --git a/src/mbgl/map/vector_tile.cpp b/src/mbgl/map/vector_tile.cpp index 0728608321..6eb0704a64 100644 --- a/src/mbgl/map/vector_tile.cpp +++ b/src/mbgl/map/vector_tile.cpp @@ -1,7 +1,6 @@ #include <mbgl/map/vector_tile.hpp> #include <mbgl/geometry/pbf_geometry.hpp> #include <mbgl/style/filter_expression_private.hpp> -#include <mbgl/util/std.hpp> #include <mbgl/util/pbf.hpp> #include <type_traits> @@ -145,8 +144,8 @@ VectorTileLayer::VectorTileLayer(pbf layer_pbf) } } -std::unique_ptr<GeometryFilteredTileLayer> VectorTileLayer::createFilteredTileLayer(const FilterExpression& filterExpression) const { - return util::make_unique<FilteredVectorTileLayer>(*this, filterExpression); +util::ptr<GeometryFilteredTileLayer> VectorTileLayer::createFilteredTileLayer(const FilterExpression& filterExpression) const { + return std::make_shared<FilteredVectorTileLayer>(*this, filterExpression); } FilteredVectorTileLayer::FilteredVectorTileLayer(const VectorTileLayer& layer_, const FilterExpression& filterExpression_) diff --git a/src/mbgl/map/vector_tile.hpp b/src/mbgl/map/vector_tile.hpp index e2704a4114..c99a4a3fb7 100644 --- a/src/mbgl/map/vector_tile.hpp +++ b/src/mbgl/map/vector_tile.hpp @@ -66,7 +66,7 @@ public: virtual inline const std::vector<Value>& getValues() const { return values; } virtual inline const std::map<std::string, std::map<Value, Shaping>>& getShaping() const { return shaping; } - virtual std::unique_ptr<GeometryFilteredTileLayer> createFilteredTileLayer(const FilterExpression&) const; + virtual util::ptr<GeometryFilteredTileLayer> createFilteredTileLayer(const FilterExpression&) const; private: std::string name; diff --git a/src/mbgl/renderer/symbol_bucket.cpp b/src/mbgl/renderer/symbol_bucket.cpp index 53833a7599..631fcaf5d5 100644 --- a/src/mbgl/renderer/symbol_bucket.cpp +++ b/src/mbgl/renderer/symbol_bucket.cpp @@ -66,7 +66,7 @@ std::vector<SymbolFeature> SymbolBucket::processFeatures(const util::ptr<const G // Determine and load glyph ranges std::set<GlyphRange> ranges; - std::unique_ptr<GeometryFilteredTileLayer> filtered_layer = layer->createFilteredTileLayer(filter); + util::ptr<GeometryFilteredTileLayer> filtered_layer = layer->createFilteredTileLayer(filter); for (auto feature_it = filtered_layer->begin(); feature_it != filtered_layer->end(); ++feature_it) { |