From cceda1195748f4d12d7d9e260af630f74f6ff2b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 1 Apr 2012 14:50:32 +0200 Subject: [PATCH] Fixed all Doxygen C++11 incompatibilities. --- src/Math/Matrix3.h | 11 ++--------- src/Math/Matrix4.h | 11 ++--------- src/MeshTools/Interleave.h | 4 ++++ 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/src/Math/Matrix3.h b/src/Math/Matrix3.h index 2be5ab7c4..2145e72c7 100644 --- a/src/Math/Matrix3.h +++ b/src/Math/Matrix3.h @@ -45,18 +45,11 @@ template class Matrix3: public Matrix { 0.0f, 0.0f, identity ? 1.0f : 0.0f } {} - /** - * @brief Initializer-list constructor - * @param first First value - * @param next Next values - * - * Note that the values are in column-major order. - */ - /* doxygen: @copydoc Matrix::Matrix(T, U&&...) doesn't work */ + /** @copydoc Matrix::Matrix(T, U&&...) */ #ifndef DOXYGEN_GENERATING_OUTPUT template inline constexpr Matrix3(T first, U&&... next): Matrix(first, std::forward(next)...) {} #else - template inline constexpr Matrix3(T first, U&&... next); + template inline constexpr Matrix3(T first, U&&... next) {} #endif /** @copydoc Matrix::Matrix(const Matrix&) */ diff --git a/src/Math/Matrix4.h b/src/Math/Matrix4.h index fafdfb6cc..633a7803b 100644 --- a/src/Math/Matrix4.h +++ b/src/Math/Matrix4.h @@ -114,18 +114,11 @@ template class Matrix4: public Matrix { 0.0f, 0.0f, 0.0f, identity ? 1.0f : 0.0f } {} - /** - * @brief Initializer-list constructor - * @param first First value - * @param next Next values - * - * Note that the values are in column-major order. - */ - /* doxygen: @copydoc Matrix::Matrix(T, U&&...) doesn't work */ + /** @copydoc Matrix::Matrix(T, U&&...) */ #ifndef DOXYGEN_GENERATING_OUTPUT template inline constexpr Matrix4(T first, U&&... next): Matrix(first, std::forward(next)...) {} #else - template inline constexpr Matrix4(T first, U&&... next); + template inline constexpr Matrix4(T first, U&&... next) {} #endif /** @copydoc Matrix::Matrix(const Matrix&) */ diff --git a/src/MeshTools/Interleave.h b/src/MeshTools/Interleave.h index 12b9ea897..36f610a73 100644 --- a/src/MeshTools/Interleave.h +++ b/src/MeshTools/Interleave.h @@ -52,7 +52,11 @@ class Interleave { }; /** @brief Constructor */ + #ifndef DOXYGEN_GENERATING_OUTPUT inline Interleave(): result{0, 0, 0} {} + #else + inline Interleave() {} + #endif /** * @brief Functor