diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/mbgl/layout/symbol_projection.hpp | 3 | ||||
-rw-r--r-- | src/mbgl/text/collision_feature.hpp | 3 |
2 files changed, 3 insertions, 3 deletions
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; |