From 28a19f5add90357f746448cb8013d4fe544a4d73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 13 Sep 2018 21:41:33 +0200 Subject: [PATCH] Math: adapt to m.css Doxygen theme updates. In particular, there's now warning about ignored documented friend declarations. I don't have them documented, that's just Doxygen being shitty. --- src/Magnum/Math/Complex.h | 7 +++++-- src/Magnum/Math/Quaternion.h | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/Magnum/Math/Complex.h b/src/Magnum/Math/Complex.h index 0fd31f984..7af206749 100644 --- a/src/Magnum/Math/Complex.h +++ b/src/Magnum/Math/Complex.h @@ -89,8 +89,6 @@ See @ref transformations for brief introduction. @see @ref Magnum::Complex, @ref Magnum::Complexd, @ref Matrix3 */ template class Complex { - template friend class Complex; - public: typedef T Type; /**< @brief Underlying data type */ @@ -440,6 +438,11 @@ template class Complex { } private: + #ifndef DOXYGEN_GENERATING_OUTPUT + /* Doxygen copies the description from Magnum::Complex here. Ugh. */ + template friend class Complex; + #endif + T _real, _imaginary; }; diff --git a/src/Magnum/Math/Quaternion.h b/src/Magnum/Math/Quaternion.h index 6112fed47..8a29f65f0 100644 --- a/src/Magnum/Math/Quaternion.h +++ b/src/Magnum/Math/Quaternion.h @@ -238,8 +238,6 @@ See @ref transformations for a brief introduction. @ref Matrix4 */ template class Quaternion { - template friend class Quaternion; - public: typedef T Type; /**< @brief Underlying data type */ @@ -588,6 +586,11 @@ template class Quaternion { Vector3 transformVectorNormalized(const Vector3& vector) const; private: + #ifndef DOXYGEN_GENERATING_OUTPUT + /* Doxygen copies the description from Magnum::Quaternion here. Ugh. */ + template friend class Quaternion; + #endif + /* Used to avoid including Functions.h */ constexpr static T pow2(T value) { return value*value;