diff options
author | Justin R. Miller <incanus@codesorcery.net> | 2015-03-17 19:25:32 -0700 |
---|---|---|
committer | Justin R. Miller <incanus@codesorcery.net> | 2015-03-17 19:25:32 -0700 |
commit | 93abf881fb6d94cd8538fe213d5d6e1eba24e2ab (patch) | |
tree | 9c347eaba0a9a1de4dd937981e5af2882b45028c /src | |
parent | 02cccfe7e84a126770836d785e86fd78eace9694 (diff) | |
download | qtlocation-mapboxgl-93abf881fb6d94cd8538fe213d5d6e1eba24e2ab.tar.gz |
feature() -> getFeature() to clear up ambiguity / Linux compiler error
Diffstat (limited to 'src')
-rw-r--r-- | src/mbgl/map/geometry_tile.hpp | 2 | ||||
-rw-r--r-- | src/mbgl/map/live_tile.hpp | 2 | ||||
-rw-r--r-- | src/mbgl/map/tile_parser.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/map/vector_tile.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/map/vector_tile.hpp | 2 | ||||
-rw-r--r-- | src/mbgl/renderer/symbol_bucket.cpp | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/src/mbgl/map/geometry_tile.hpp b/src/mbgl/map/geometry_tile.hpp index 18222b622b..dc1ef10725 100644 --- a/src/mbgl/map/geometry_tile.hpp +++ b/src/mbgl/map/geometry_tile.hpp @@ -33,7 +33,7 @@ public: class GeometryTileLayer : private util::noncopyable { public: virtual std::size_t featureCount() const = 0; - virtual util::ptr<const GeometryTileFeature> feature(std::size_t) const = 0; + virtual util::ptr<const GeometryTileFeature> getFeature(std::size_t) const = 0; }; class GeometryTile : private util::noncopyable { diff --git a/src/mbgl/map/live_tile.hpp b/src/mbgl/map/live_tile.hpp index 019c9da740..6a24518d85 100644 --- a/src/mbgl/map/live_tile.hpp +++ b/src/mbgl/map/live_tile.hpp @@ -29,7 +29,7 @@ public: void addFeature(util::ptr<const LiveTileFeature>); void removeFeature(util::ptr<const LiveTileFeature>); std::size_t featureCount() const override { return features.size(); } - util::ptr<const GeometryTileFeature> feature(std::size_t i) const override { return features[i]; } + util::ptr<const GeometryTileFeature> getFeature(std::size_t i) const override { return features[i]; } private: std::vector<util::ptr<const LiveTileFeature>> features; diff --git a/src/mbgl/map/tile_parser.cpp b/src/mbgl/map/tile_parser.cpp index 5c91c310ec..fa7f4c093f 100644 --- a/src/mbgl/map/tile_parser.cpp +++ b/src/mbgl/map/tile_parser.cpp @@ -215,7 +215,7 @@ std::unique_ptr<Bucket> TileParser::createBucket(const StyleBucket &bucketDesc) template <class Bucket> void TileParser::addBucketGeometries(Bucket& bucket, const GeometryTileLayer& layer, const FilterExpression &filter) { for (std::size_t i = 0; i < layer.featureCount(); i++) { - auto feature = layer.feature(i); + auto feature = layer.getFeature(i); if (obsolete()) return; diff --git a/src/mbgl/map/vector_tile.cpp b/src/mbgl/map/vector_tile.cpp index c0d860b179..dca2168a47 100644 --- a/src/mbgl/map/vector_tile.cpp +++ b/src/mbgl/map/vector_tile.cpp @@ -159,7 +159,7 @@ VectorTileLayer::VectorTileLayer(pbf layer_pbf) { } } -util::ptr<const GeometryTileFeature> VectorTileLayer::feature(std::size_t i) const { +util::ptr<const GeometryTileFeature> VectorTileLayer::getFeature(std::size_t i) const { return std::make_shared<VectorTileFeature>(features.at(i), *this); } diff --git a/src/mbgl/map/vector_tile.hpp b/src/mbgl/map/vector_tile.hpp index f6a2d615bc..9a23c3b189 100644 --- a/src/mbgl/map/vector_tile.hpp +++ b/src/mbgl/map/vector_tile.hpp @@ -31,7 +31,7 @@ public: VectorTileLayer(pbf); std::size_t featureCount() const override { return features.size(); } - util::ptr<const GeometryTileFeature> feature(std::size_t) const override; + util::ptr<const GeometryTileFeature> getFeature(std::size_t) const override; private: friend class VectorTile; diff --git a/src/mbgl/renderer/symbol_bucket.cpp b/src/mbgl/renderer/symbol_bucket.cpp index 2c28d72196..ad54581e10 100644 --- a/src/mbgl/renderer/symbol_bucket.cpp +++ b/src/mbgl/renderer/symbol_bucket.cpp @@ -60,7 +60,7 @@ std::vector<SymbolFeature> SymbolBucket::processFeatures(const GeometryTileLayer std::set<GlyphRange> ranges; for (std::size_t i = 0; i < layer.featureCount(); i++) { - auto feature = layer.feature(i); + auto feature = layer.getFeature(i); GeometryTileFeatureExtractor extractor(*feature); if (!evaluate(filter, extractor)) |