diff --git a/src/mbgl/annotation/annotation_tile.cpp b/src/mbgl/annotation/annotation_tile.cpp index 06ae82adb..2c676420d 100644 --- a/src/mbgl/annotation/annotation_tile.cpp +++ b/src/mbgl/annotation/annotation_tile.cpp @@ -40,7 +40,7 @@ optional AnnotationTileFeature::getValue(const std::string& key) const { AnnotationTileLayer::AnnotationTileLayer(std::string name_) : name(std::move(name_)) {} -util::ptr AnnotationTileData::getLayer(const std::string& name) const { +util::ptr AnnotationTileData::getLayer(const std::string& name) const { auto it = layers.find(name); if (it != layers.end()) { return it->second; diff --git a/src/mbgl/annotation/annotation_tile.hpp b/src/mbgl/annotation/annotation_tile.hpp index 4e0b1551d..78ed9e408 100644 --- a/src/mbgl/annotation/annotation_tile.hpp +++ b/src/mbgl/annotation/annotation_tile.hpp @@ -56,7 +56,7 @@ private: class AnnotationTileData : public GeometryTileData { public: - util::ptr getLayer(const std::string&) const override; + util::ptr getLayer(const std::string&) const override; std::unordered_map> layers; }; diff --git a/src/mbgl/tile/geojson_tile.cpp b/src/mbgl/tile/geojson_tile.cpp index ab596bd9b..09c12dff8 100644 --- a/src/mbgl/tile/geojson_tile.cpp +++ b/src/mbgl/tile/geojson_tile.cpp @@ -40,7 +40,7 @@ private: class GeoJSONTileData : public GeometryTileData { public: GeoJSONTileData(std::shared_ptr); - util::ptr getLayer(const std::string&) const override; + util::ptr getLayer(const std::string&) const override; private: const std::shared_ptr layer; @@ -136,7 +136,7 @@ util::ptr GeoJSONTileLayer::getFeature(std::size_t i) GeoJSONTileData::GeoJSONTileData(std::shared_ptr layer_) : layer(std::move(layer_)) { } -util::ptr GeoJSONTileData::getLayer(const std::string&) const { +util::ptr GeoJSONTileData::getLayer(const std::string&) const { // We're ignoring the layer name because GeoJSON tiles only have one layer. return layer; } diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp index daa358420..e4e2085d0 100644 --- a/src/mbgl/tile/geometry_tile.cpp +++ b/src/mbgl/tile/geometry_tile.cpp @@ -60,7 +60,7 @@ std::vector> GeometryTile::cloneStyleLayers() const { return result; } -void GeometryTile::setData(std::unique_ptr data_) { +void GeometryTile::setData(std::unique_ptr data_) { if (!data_) { // This is a 404 response. We're treating these as empty tiles. workRequest.reset(); diff --git a/src/mbgl/tile/geometry_tile.hpp b/src/mbgl/tile/geometry_tile.hpp index 891aba043..adbe81e29 100644 --- a/src/mbgl/tile/geometry_tile.hpp +++ b/src/mbgl/tile/geometry_tile.hpp @@ -31,7 +31,7 @@ public: ~GeometryTile() override; void setError(std::exception_ptr err); - void setData(std::unique_ptr); + void setData(std::unique_ptr); Bucket* getBucket(const style::Layer&) override; diff --git a/src/mbgl/tile/geometry_tile_data.hpp b/src/mbgl/tile/geometry_tile_data.hpp index 4055a80ec..dcc8e66fc 100644 --- a/src/mbgl/tile/geometry_tile_data.hpp +++ b/src/mbgl/tile/geometry_tile_data.hpp @@ -58,7 +58,7 @@ public: class GeometryTileData : private util::noncopyable { public: virtual ~GeometryTileData() = default; - virtual util::ptr getLayer(const std::string&) const = 0; + virtual util::ptr getLayer(const std::string&) const = 0; }; // classifies an array of rings into polygons with outer rings and holes diff --git a/src/mbgl/tile/vector_tile.cpp b/src/mbgl/tile/vector_tile.cpp index 1ba30d869..e96080ce8 100644 --- a/src/mbgl/tile/vector_tile.cpp +++ b/src/mbgl/tile/vector_tile.cpp @@ -59,7 +59,7 @@ class VectorTileData : public GeometryTileData { public: VectorTileData(std::shared_ptr data); - util::ptr getLayer(const std::string&) const override; + util::ptr getLayer(const std::string&) const override; private: std::shared_ptr data; @@ -242,7 +242,7 @@ VectorTileData::VectorTileData(std::shared_ptr data_) : data(std::move(data_)) { } -util::ptr VectorTileData::getLayer(const std::string& name) const { +util::ptr VectorTileData::getLayer(const std::string& name) const { if (!parsed) { parsed = true; protozero::pbf_reader tile_pbf(*data); diff --git a/src/mbgl/util/worker.cpp b/src/mbgl/util/worker.cpp index 50ecb93c0..39e3b1cea 100644 --- a/src/mbgl/util/worker.cpp +++ b/src/mbgl/util/worker.cpp @@ -31,7 +31,7 @@ public: void parseGeometryTile(TileWorker* worker, std::vector> layers, - std::unique_ptr tileData, + std::unique_ptr tileData, PlacementConfig config, std::function callback) { try { @@ -80,7 +80,7 @@ Worker::parseRasterTile(std::unique_ptr bucket, std::unique_ptr Worker::parseGeometryTile(TileWorker& worker, std::vector> layers, - std::unique_ptr tileData, + std::unique_ptr tileData, PlacementConfig config, std::function callback) { current = (current + 1) % threads.size(); diff --git a/src/mbgl/util/worker.hpp b/src/mbgl/util/worker.hpp index 5ab86d1b9..3c6d3f64b 100644 --- a/src/mbgl/util/worker.hpp +++ b/src/mbgl/util/worker.hpp @@ -41,7 +41,7 @@ public: Request parseGeometryTile(TileWorker&, std::vector>, - std::unique_ptr, + std::unique_ptr, PlacementConfig, std::function callback);