From d3430f7599e6815182dd628e94addcc80b6182a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 31 Jan 2022 13:19:36 +0100 Subject: [PATCH] Math: fix a copypaste error with Frustumd debug output extern template. --- doc/changelog.dox | 3 +++ doc/credits.dox | 2 ++ src/Magnum/Math/Frustum.h | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/doc/changelog.dox b/doc/changelog.dox index e4eafdd63..db29fea1d 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -559,6 +559,9 @@ See also: - Fixed an assertion when using @ref MeshTools::removeDuplicates() on an interleaved @ref Trade::MeshData that included padding at the beginning or end of each vertex +- Fixed a silly mistake where there was no @cpp extern template @ce for a + @ref Frustumd debug printer but two declarations for the float version + instead (see [mosra/magnum#545](https://github.com/mosra/magnum/issues/545)) - Fixed @ref MeshTools::compile() to properly take into account index buffer offsets - Fixed @ref MeshTools::removeDuplicates() to not take into account random diff --git a/doc/credits.dox b/doc/credits.dox index 0e80954c0..9d6995b6c 100644 --- a/doc/credits.dox +++ b/doc/credits.dox @@ -120,6 +120,8 @@ Are the below lists missing your name or something's wrong? @ref ResourceManager, warning fixes - **Denis Igorevich Lobanov** ([\@denislobanov](https://github.com/denislobanov)) --- math fixes +- **[\@DJQuardaboff](https://github.com/DJQuardaboff)** --- discovery of a + silly mistake with @ref Frustumd debug output printer - **[\@dlardi](https://github.com/dlardi)** --- WGL-related bugfixes - **Eliot Saba** ([\@staticfloat](https://github.com/staticfloat)) --- macOS-related updates to @ref Platform::GlfwApplication diff --git a/src/Magnum/Math/Frustum.h b/src/Magnum/Math/Frustum.h index a31d463bc..8c49a22aa 100644 --- a/src/Magnum/Math/Frustum.h +++ b/src/Magnum/Math/Frustum.h @@ -267,7 +267,7 @@ template Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug& d /* Explicit instantiation for commonly used types */ #ifndef DOXYGEN_GENERATING_OUTPUT extern template MAGNUM_EXPORT Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug&, const Frustum&); -extern template MAGNUM_EXPORT Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug&, const Frustum&); +extern template MAGNUM_EXPORT Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug&, const Frustum&); #endif #endif