diff options
-rw-r--r-- | include/mbgl/map/camera.hpp | 2 | ||||
-rw-r--r-- | include/mbgl/style/filter.hpp | 2 | ||||
-rw-r--r-- | platform/node/src/node_map.hpp | 2 | ||||
-rw-r--r-- | platform/node/src/util/async_queue.hpp | 2 | ||||
-rw-r--r-- | src/mbgl/layout/symbol_projection.hpp | 3 | ||||
-rw-r--r-- | src/mbgl/text/collision_feature.hpp | 3 |
6 files changed, 7 insertions, 7 deletions
diff --git a/include/mbgl/map/camera.hpp b/include/mbgl/map/camera.hpp index c8b665fc16..726c009231 100644 --- a/include/mbgl/map/camera.hpp +++ b/include/mbgl/map/camera.hpp @@ -89,7 +89,7 @@ struct AnimationOptions { std::function<void()> transitionFinishFn; /** Creates an animation with no options specified. */ - AnimationOptions() {} + AnimationOptions() = default; /** Creates an animation with the specified duration. */ AnimationOptions(Duration d) diff --git a/include/mbgl/style/filter.hpp b/include/mbgl/style/filter.hpp index 5e14bccacc..c3ce6833fb 100644 --- a/include/mbgl/style/filter.hpp +++ b/include/mbgl/style/filter.hpp @@ -18,7 +18,7 @@ public: private: optional<mbgl::Value> legacyFilter; public: - Filter() {} + Filter() = default; Filter(expression::ParseResult _expression, optional<mbgl::Value> _filter = {}) : expression(std::move(*_expression)), diff --git a/platform/node/src/node_map.hpp b/platform/node/src/node_map.hpp index 4349cbabe2..29c4547b24 100644 --- a/platform/node/src/node_map.hpp +++ b/platform/node/src/node_map.hpp @@ -97,7 +97,7 @@ public: struct NodeFileSource : public mbgl::FileSource { NodeFileSource(NodeMap* nodeMap_) : nodeMap(nodeMap_) {} - ~NodeFileSource() {} + ~NodeFileSource() = default; std::unique_ptr<mbgl::AsyncRequest> request(const mbgl::Resource&, mbgl::FileSource::Callback) final; bool canRequest(const mbgl::Resource&) const override; NodeMap* nodeMap; diff --git a/platform/node/src/util/async_queue.hpp b/platform/node/src/util/async_queue.hpp index a084b866ae..e9d9e23626 100644 --- a/platform/node/src/util/async_queue.hpp +++ b/platform/node/src/util/async_queue.hpp @@ -22,7 +22,7 @@ public: q->process(); }); } - ~AsyncQueue() {} + ~AsyncQueue() = default; void send(T &&data) { { diff --git a/src/mbgl/layout/symbol_projection.hpp b/src/mbgl/layout/symbol_projection.hpp index e04f8908b6..598073bf55 100644 --- a/src/mbgl/layout/symbol_projection.hpp +++ b/src/mbgl/layout/symbol_projection.hpp @@ -30,8 +30,7 @@ namespace mbgl { {} PlacedGlyph(PlacedGlyph&& other) noexcept : point(other.point), angle(other.angle), tileDistance(std::move(other.tileDistance)) {} - PlacedGlyph(const PlacedGlyph& other) - : point(other.point), angle(other.angle), tileDistance(other.tileDistance) {} + PlacedGlyph(const PlacedGlyph& other) = default; Point<float> point; float angle; optional<TileDistance> tileDistance; diff --git a/src/mbgl/text/collision_feature.hpp b/src/mbgl/text/collision_feature.hpp index f9ad659570..2486600832 100644 --- a/src/mbgl/text/collision_feature.hpp +++ b/src/mbgl/text/collision_feature.hpp @@ -36,9 +36,10 @@ public: private: union Geometry { + // NOLINTNEXTLINE(modernize-use-equals-default) + Geometry() {} Geometry(float x1, float y1, float x2, float y2) : box({x1, y1}, {x2, y2}) {} Geometry(float x, float y, float r) : circle({x, y}, r) {} - Geometry() {} mapbox::geometry::box<float> box; geometry::circle<float> circle; } geometry; |