Browse Source

Fixed all Doxygen C++11 incompatibilities.

pull/279/head
Vladimír Vondruš 14 years ago
parent
commit
cceda11957
  1. 11
      src/Math/Matrix3.h
  2. 11
      src/Math/Matrix4.h
  3. 4
      src/MeshTools/Interleave.h

11
src/Math/Matrix3.h

@ -45,18 +45,11 @@ template<class T> class Matrix3: public Matrix<T, 3> {
0.0f, 0.0f, identity ? 1.0f : 0.0f 0.0f, 0.0f, identity ? 1.0f : 0.0f
} {} } {}
/** /** @copydoc Matrix::Matrix(T, U&&...) */
* @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 */
#ifndef DOXYGEN_GENERATING_OUTPUT #ifndef DOXYGEN_GENERATING_OUTPUT
template<class ...U> inline constexpr Matrix3(T first, U&&... next): Matrix<T, 3>(first, std::forward<U>(next)...) {} template<class ...U> inline constexpr Matrix3(T first, U&&... next): Matrix<T, 3>(first, std::forward<U>(next)...) {}
#else #else
template<class ...U> inline constexpr Matrix3(T first, U&&... next); template<class ...U> inline constexpr Matrix3(T first, U&&... next) {}
#endif #endif
/** @copydoc Matrix::Matrix(const Matrix<T, size>&) */ /** @copydoc Matrix::Matrix(const Matrix<T, size>&) */

11
src/Math/Matrix4.h

@ -114,18 +114,11 @@ template<class T> class Matrix4: public Matrix<T, 4> {
0.0f, 0.0f, 0.0f, identity ? 1.0f : 0.0f 0.0f, 0.0f, 0.0f, identity ? 1.0f : 0.0f
} {} } {}
/** /** @copydoc Matrix::Matrix(T, U&&...) */
* @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 */
#ifndef DOXYGEN_GENERATING_OUTPUT #ifndef DOXYGEN_GENERATING_OUTPUT
template<class ...U> inline constexpr Matrix4(T first, U&&... next): Matrix<T, 4>(first, std::forward<U>(next)...) {} template<class ...U> inline constexpr Matrix4(T first, U&&... next): Matrix<T, 4>(first, std::forward<U>(next)...) {}
#else #else
template<class ...U> inline constexpr Matrix4(T first, U&&... next); template<class ...U> inline constexpr Matrix4(T first, U&&... next) {}
#endif #endif
/** @copydoc Matrix::Matrix(const Matrix<T, size>&) */ /** @copydoc Matrix::Matrix(const Matrix<T, size>&) */

4
src/MeshTools/Interleave.h

@ -52,7 +52,11 @@ class Interleave {
}; };
/** @brief Constructor */ /** @brief Constructor */
#ifndef DOXYGEN_GENERATING_OUTPUT
inline Interleave(): result{0, 0, 0} {} inline Interleave(): result{0, 0, 0} {}
#else
inline Interleave() {}
#endif
/** /**
* @brief Functor * @brief Functor

Loading…
Cancel
Save