From 6c415471d22e5dd71ea3a6f4ba7fdaa7e400ef10 Mon Sep 17 00:00:00 2001 From: ZXShady Date: Thu, 18 Jul 2024 20:35:37 +0000 Subject: [PATCH] Apply changes Putting the `= default` in the header file like other files do and not in the `.inl` implementation files for consistency --- include/SFML/Graphics/Color.hpp | 2 +- include/SFML/Graphics/Color.inl | 4 ---- include/SFML/Graphics/Rect.hpp | 2 +- include/SFML/Graphics/Rect.inl | 5 ----- include/SFML/Graphics/Transform.hpp | 2 +- include/SFML/Graphics/Transform.inl | 4 ---- include/SFML/System/Angle.hpp | 2 +- include/SFML/System/Angle.inl | 5 ----- include/SFML/System/Time.hpp | 2 +- include/SFML/System/Time.inl | 4 ---- include/SFML/System/Vector2.hpp | 2 +- include/SFML/System/Vector2.inl | 5 ----- include/SFML/System/Vector3.hpp | 2 +- include/SFML/System/Vector3.inl | 5 ----- 14 files changed, 7 insertions(+), 39 deletions(-) diff --git a/include/SFML/Graphics/Color.hpp b/include/SFML/Graphics/Color.hpp index f847fb159..cf5192ff5 100644 --- a/include/SFML/Graphics/Color.hpp +++ b/include/SFML/Graphics/Color.hpp @@ -48,7 +48,7 @@ public: /// sf::Color(0, 0, 0, 255). /// //////////////////////////////////////////////////////////// - constexpr Color(); + constexpr Color() = default; //////////////////////////////////////////////////////////// /// \brief Construct the color from its 4 RGBA components diff --git a/include/SFML/Graphics/Color.inl b/include/SFML/Graphics/Color.inl index c47dc5e88..6573090cd 100644 --- a/include/SFML/Graphics/Color.inl +++ b/include/SFML/Graphics/Color.inl @@ -30,10 +30,6 @@ namespace sf { -//////////////////////////////////////////////////////////// -constexpr Color::Color() = default; - - //////////////////////////////////////////////////////////// constexpr Color::Color(std::uint8_t red, std::uint8_t green, std::uint8_t blue, std::uint8_t alpha) : r(red), diff --git a/include/SFML/Graphics/Rect.hpp b/include/SFML/Graphics/Rect.hpp index 62fb98c19..96c8aac52 100644 --- a/include/SFML/Graphics/Rect.hpp +++ b/include/SFML/Graphics/Rect.hpp @@ -49,7 +49,7 @@ public: /// Rect({0, 0}, {0, 0})). /// //////////////////////////////////////////////////////////// - constexpr Rect(); + constexpr Rect() = default; //////////////////////////////////////////////////////////// /// \brief Construct the rectangle from position and size diff --git a/include/SFML/Graphics/Rect.inl b/include/SFML/Graphics/Rect.inl index 898ef71de..858de5e89 100644 --- a/include/SFML/Graphics/Rect.inl +++ b/include/SFML/Graphics/Rect.inl @@ -30,11 +30,6 @@ namespace sf { -//////////////////////////////////////////////////////////// -template -constexpr Rect::Rect() = default; - - //////////////////////////////////////////////////////////// template constexpr Rect::Rect(const Vector2& thePosition, const Vector2& theSize) : position(thePosition), size(theSize) diff --git a/include/SFML/Graphics/Transform.hpp b/include/SFML/Graphics/Transform.hpp index fcae7ac01..b5633690f 100644 --- a/include/SFML/Graphics/Transform.hpp +++ b/include/SFML/Graphics/Transform.hpp @@ -53,7 +53,7 @@ public: /// Creates an identity transform (a transform that does nothing). /// //////////////////////////////////////////////////////////// - constexpr Transform(); + constexpr Transform() = default; //////////////////////////////////////////////////////////// /// \brief Construct a transform from a 3x3 matrix diff --git a/include/SFML/Graphics/Transform.inl b/include/SFML/Graphics/Transform.inl index 6250ebabf..015068cda 100644 --- a/include/SFML/Graphics/Transform.inl +++ b/include/SFML/Graphics/Transform.inl @@ -34,10 +34,6 @@ namespace sf { -//////////////////////////////////////////////////////////// -constexpr Transform::Transform() = default; - - //////////////////////////////////////////////////////////// // clang-format off constexpr Transform::Transform(float a00, float a01, float a02, diff --git a/include/SFML/System/Angle.hpp b/include/SFML/System/Angle.hpp index 12aa32ed2..3d394d548 100644 --- a/include/SFML/System/Angle.hpp +++ b/include/SFML/System/Angle.hpp @@ -45,7 +45,7 @@ public: /// Sets the angle value to zero. /// //////////////////////////////////////////////////////////// - constexpr Angle(); + constexpr Angle() = default; //////////////////////////////////////////////////////////// /// \brief Return the angle's value in degrees diff --git a/include/SFML/System/Angle.inl b/include/SFML/System/Angle.inl index 0a6abbc64..867cf2203 100644 --- a/include/SFML/System/Angle.inl +++ b/include/SFML/System/Angle.inl @@ -45,11 +45,6 @@ constexpr float positiveRemainder(float a, float b) } } // namespace priv - -//////////////////////////////////////////////////////////// -constexpr Angle::Angle() = default; - - //////////////////////////////////////////////////////////// constexpr float Angle::asDegrees() const { diff --git a/include/SFML/System/Time.hpp b/include/SFML/System/Time.hpp index 4b3ffe029..248a16e0c 100644 --- a/include/SFML/System/Time.hpp +++ b/include/SFML/System/Time.hpp @@ -49,7 +49,7 @@ public: /// Sets the time value to zero. /// //////////////////////////////////////////////////////////// - constexpr Time(); + constexpr Time() = default; //////////////////////////////////////////////////////////// /// \brief Construct from std::chrono::duration diff --git a/include/SFML/System/Time.inl b/include/SFML/System/Time.inl index ac838f3ec..f4c4b1a62 100644 --- a/include/SFML/System/Time.inl +++ b/include/SFML/System/Time.inl @@ -34,10 +34,6 @@ namespace sf { -//////////////////////////////////////////////////////////// -constexpr Time::Time() = default; - - //////////////////////////////////////////////////////////// template constexpr Time::Time(const std::chrono::duration& duration) : m_microseconds(duration) diff --git a/include/SFML/System/Vector2.hpp b/include/SFML/System/Vector2.hpp index 45a6c8e84..87e531c5e 100644 --- a/include/SFML/System/Vector2.hpp +++ b/include/SFML/System/Vector2.hpp @@ -46,7 +46,7 @@ public: /// Creates a Vector2(0, 0). /// //////////////////////////////////////////////////////////// - constexpr Vector2(); + constexpr Vector2() = default; //////////////////////////////////////////////////////////// /// \brief Construct the vector from cartesian coordinates diff --git a/include/SFML/System/Vector2.inl b/include/SFML/System/Vector2.inl index dae219807..1cbd9b391 100644 --- a/include/SFML/System/Vector2.inl +++ b/include/SFML/System/Vector2.inl @@ -32,11 +32,6 @@ namespace sf { -//////////////////////////////////////////////////////////// -template -constexpr Vector2::Vector2() = default; - - //////////////////////////////////////////////////////////// #if defined(__GNUC__) #pragma GCC diagnostic push diff --git a/include/SFML/System/Vector3.hpp b/include/SFML/System/Vector3.hpp index d3d8fc9fb..fd840ed9d 100644 --- a/include/SFML/System/Vector3.hpp +++ b/include/SFML/System/Vector3.hpp @@ -44,7 +44,7 @@ public: /// Creates a Vector3(0, 0, 0). /// //////////////////////////////////////////////////////////// - constexpr Vector3(); + constexpr Vector3() = default; //////////////////////////////////////////////////////////// /// \brief Construct the vector from its coordinates diff --git a/include/SFML/System/Vector3.inl b/include/SFML/System/Vector3.inl index 5a5ad2e2d..923c3c36e 100644 --- a/include/SFML/System/Vector3.inl +++ b/include/SFML/System/Vector3.inl @@ -32,11 +32,6 @@ namespace sf { -//////////////////////////////////////////////////////////// -template -constexpr Vector3::Vector3() = default; - - //////////////////////////////////////////////////////////// #if defined(__GNUC__) #pragma GCC diagnostic push