From 02a26a6e14a04200ab86ecb258d3118c2c51a4cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 8 Jan 2025 12:56:37 +0100 Subject: [PATCH] Math: remove Frustum::planes() deprecated in 2019.10. --- doc/changelog.dox | 3 +++ src/Magnum/Math/Frustum.h | 16 ---------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/doc/changelog.dox b/doc/changelog.dox index 2e0cde1df..3edf67796 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -1761,6 +1761,9 @@ See also: @ref std::tuple typedefs and @ref Math::Color3::fromHsv() / @ref Math::Color4::fromHsv() overloads taking separate hue, saturation and value arguments. Use the @ref Math::ColorHsv struct instead. + - @cpp Math::Frustum::planes() @ce, use @ref Math::Frustum::data() or + @relativeref{Math::Frustum,begin()} / @relativeref{Math::Frustum,end()} + instead - @cpp Math::swizzle() @ce, use @ref Math::gather() instead - @cpp Text::FontFeature::MultiFile @ce, @cpp Text::AbstractFont::openData() @ce taking a vector of pairs, and diff --git a/src/Magnum/Math/Frustum.h b/src/Magnum/Math/Frustum.h index 7464a7fb7..186face38 100644 --- a/src/Magnum/Math/Frustum.h +++ b/src/Magnum/Math/Frustum.h @@ -42,10 +42,6 @@ #include "Magnum/Math/Matrix4.h" #include "Magnum/Math/Vector4.h" -#ifdef MAGNUM_BUILD_DEPRECATED -#include /** @todo remove when planes() is gone */ -#endif - #ifdef CORRADE_TARGET_WINDOWS /* I so HATE windef.h */ #undef near #undef far @@ -165,18 +161,6 @@ template class Frustum { } #endif - #ifdef MAGNUM_BUILD_DEPRECATED - /** - * @brief Frustum planes - * @m_deprecated_since{2019,10} Use @ref operator[](std::size_t) const, - * @ref data() or @ref begin() / @ref end() instead. - */ - constexpr CORRADE_DEPRECATED("use operator[](), data() or begin() / end() instead") Containers::StaticArrayView<6, const Vector4> planes() const { - /* GCC 4.8 needs explicit construction */ - return Containers::StaticArrayView<6, const Vector4>{_data}; - } - #endif - /** * @brief Plane at given index * @m_since{2020,06}