diff --git a/src/Magnum/Math/Angle.h b/src/Magnum/Math/Angle.h index 43a3270ef..c407f1680 100644 --- a/src/Magnum/Math/Angle.h +++ b/src/Magnum/Math/Angle.h @@ -106,20 +106,10 @@ template class Deg: public Unit { constexpr /*implicit*/ Deg() noexcept: Unit{ZeroInit} {} /** @brief Construct a zero angle */ - constexpr explicit Deg(ZeroInitT) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : Unit{ZeroInit} - #endif - {} + constexpr explicit Deg(ZeroInitT) noexcept: Unit{ZeroInit} {} /** @brief Construct without initializing the contents */ - explicit Deg(NoInitT) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : Unit{NoInit} - #endif - {} + explicit Deg(NoInitT) noexcept: Unit{NoInit} {} /** @brief Explicit constructor from unitless type */ constexpr explicit Deg(T value) noexcept: Unit(value) {} @@ -185,20 +175,10 @@ template class Rad: public Unit { constexpr /*implicit*/ Rad() noexcept: Unit{ZeroInit} {} /** @brief Constructor a zero angle */ - constexpr explicit Rad(ZeroInitT) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : Unit{ZeroInit} - #endif - {} + constexpr explicit Rad(ZeroInitT) noexcept: Unit{ZeroInit} {} /** @brief Construct without initializing the contents */ - explicit Rad(NoInitT) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : Unit{NoInit} - #endif - {} + explicit Rad(NoInitT) noexcept: Unit{NoInit} {} /** @brief Construct from unitless type */ constexpr explicit Rad(T value) noexcept: Unit(value) {} diff --git a/src/Magnum/Math/Bezier.h b/src/Magnum/Math/Bezier.h index 0706b0019..7aa88df3c 100644 --- a/src/Magnum/Math/Bezier.h +++ b/src/Magnum/Math/Bezier.h @@ -109,20 +109,10 @@ template class Bezier { * * All control points are zero vectors. */ - constexpr explicit Bezier(ZeroInitT) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : Bezier{typename Implementation::GenerateSequence::Type{}, ZeroInit} - #endif - {} + constexpr explicit Bezier(ZeroInitT) noexcept: Bezier{typename Implementation::GenerateSequence::Type{}, ZeroInit} {} /** @brief Construct Bézier without initializing the contents */ - explicit Bezier(NoInitT) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : Bezier{typename Implementation::GenerateSequence::Type{}, NoInit} - #endif - {} + explicit Bezier(NoInitT) noexcept: Bezier{typename Implementation::GenerateSequence::Type{}, NoInit} {} /** @brief Construct Bézier curve with given array of control points */ template constexpr /*implicit*/ Bezier(const Vector& first, U... next) noexcept: _data{first, next...} { diff --git a/src/Magnum/Math/Color.h b/src/Magnum/Math/Color.h index 1b4e4c0ab..5895118b2 100644 --- a/src/Magnum/Math/Color.h +++ b/src/Magnum/Math/Color.h @@ -437,20 +437,10 @@ template class Color3: public Vector3 { * * All components are set to zero. */ - constexpr explicit Color3(ZeroInitT) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : Vector3{ZeroInit} - #endif - {} + constexpr explicit Color3(ZeroInitT) noexcept: Vector3{ZeroInit} {} /** @copydoc Vector::Vector(NoInitT) */ - explicit Color3(NoInitT) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : Vector3{NoInit} - #endif - {} + explicit Color3(NoInitT) noexcept: Vector3{NoInit} {} /** * @brief Gray constructor @@ -849,20 +839,10 @@ class Color4: public Vector4 { * * All components are set to zero. */ - constexpr explicit Color4(ZeroInitT) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : Vector4{ZeroInit} - #endif - {} + constexpr explicit Color4(ZeroInitT) noexcept: Vector4{ZeroInit} {} /** @copydoc Vector::Vector(NoInitT) */ - explicit Color4(NoInitT) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : Vector4{NoInit} - #endif - {} + explicit Color4(NoInitT) noexcept: Vector4{NoInit} {} /** * @copydoc Color3::Color3(T) diff --git a/src/Magnum/Math/DualComplex.h b/src/Magnum/Math/DualComplex.h index 0f01d1022..545cea56b 100644 --- a/src/Magnum/Math/DualComplex.h +++ b/src/Magnum/Math/DualComplex.h @@ -116,27 +116,13 @@ template class DualComplex: public Dual> { * \hat c = (0 + i1) + \epsilon (0 + i0) * @f] */ - #ifdef DOXYGEN_GENERATING_OUTPUT - constexpr explicit DualComplex(IdentityInitT) noexcept; - #else constexpr explicit DualComplex(IdentityInitT) noexcept: Dual>({}, {T(0), T(0)}) {} - #endif /** @brief Construct zero-initialized dual complex number */ - constexpr explicit DualComplex(ZeroInitT) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : Dual>{Complex{ZeroInit}, Complex{ZeroInit}} - #endif - {} + constexpr explicit DualComplex(ZeroInitT) noexcept: Dual>{Complex{ZeroInit}, Complex{ZeroInit}} {} /** @brief Construct without initializing the contents */ - explicit DualComplex(NoInitT) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : Dual>{NoInit} - #endif - {} + explicit DualComplex(NoInitT) noexcept: Dual>{NoInit} {} /** * @brief Construct dual complex number from real and dual part @@ -157,11 +143,7 @@ template class DualComplex: public Dual> { * \hat c = (0 + i1) + \epsilon(v_x + iv_y) * @f] */ - #ifdef DOXYGEN_GENERATING_OUTPUT - constexpr explicit DualComplex(const Vector2& vector) noexcept; - #else constexpr explicit DualComplex(const Vector2& vector) noexcept: Dual>({}, Complex(vector)) {} - #endif /** * @brief Construct dual complex number from another of different type @@ -169,12 +151,7 @@ template class DualComplex: public Dual> { * Performs only default casting on the values, no rounding or anything * else. */ - template constexpr explicit DualComplex(const DualComplex& other) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : Dual>{other} - #endif - {} + template constexpr explicit DualComplex(const DualComplex& other) noexcept: Dual>{other} {} /** @brief Construct dual complex number from external representation */ template::from(std::declval()))> constexpr explicit DualComplex(const U& other): DualComplex{Implementation::DualComplexConverter::from(other)} {} diff --git a/src/Magnum/Math/DualQuaternion.h b/src/Magnum/Math/DualQuaternion.h index ca3d7f806..fa0f765d2 100644 --- a/src/Magnum/Math/DualQuaternion.h +++ b/src/Magnum/Math/DualQuaternion.h @@ -256,28 +256,13 @@ template class DualQuaternion: public Dual> { * \hat q = [\boldsymbol 0, 1] + \epsilon [\boldsymbol 0, 0] * @f] */ - constexpr explicit DualQuaternion(IdentityInitT) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : Dual>{{}, {{}, T(0)}} - #endif - {} + constexpr explicit DualQuaternion(IdentityInitT) noexcept: Dual>{{}, {{}, T(0)}} {} /** @brief Construct zero-initialized dual quaternion */ - constexpr explicit DualQuaternion(ZeroInitT) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : Dual>{Quaternion{ZeroInit}, Quaternion{ZeroInit}} - #endif - {} + constexpr explicit DualQuaternion(ZeroInitT) noexcept: Dual>{Quaternion{ZeroInit}, Quaternion{ZeroInit}} {} /** @brief Construct without initializing the contents */ - explicit DualQuaternion(NoInitT) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : Dual>{NoInit} - #endif - {} + explicit DualQuaternion(NoInitT) noexcept: Dual>{NoInit} {} /** * @brief Construct dual quaternion from real and dual part @@ -295,11 +280,7 @@ template class DualQuaternion: public Dual> { * \hat q = [\hat{\boldsymbol v}, \hat s] = [\boldsymbol v_0, s_0] + \epsilon [\boldsymbol v_\epsilon, s_\epsilon] * @f] */ - constexpr /*implicit*/ DualQuaternion(const Dual>& vector, const Dual& scalar) noexcept - #ifndef DOXYGEN_GENERATING_OUTPUT - : Dual>{{vector.real(), scalar.real()}, {vector.dual(), scalar.dual()}} - #endif - {} + constexpr /*implicit*/ DualQuaternion(const Dual>& vector, const Dual& scalar) noexcept: Dual>{{vector.real(), scalar.real()}, {vector.dual(), scalar.dual()}} {} /** * @brief Construct dual quaternion from vector @@ -309,11 +290,7 @@ template class DualQuaternion: public Dual> { * @f] * @see @ref transformPointNormalized() */ - #ifdef DOXYGEN_GENERATING_OUTPUT - constexpr explicit DualQuaternion(const Vector3& vector) noexcept; - #else constexpr explicit DualQuaternion(const Vector3& vector) noexcept: Dual>({}, {vector, T(0)}) {} - #endif /** * @brief Construct dual quaternion from another of different type diff --git a/src/Magnum/Math/Matrix.h b/src/Magnum/Math/Matrix.h index 2e018b5bc..2e523f1af 100644 --- a/src/Magnum/Math/Matrix.h +++ b/src/Magnum/Math/Matrix.h @@ -75,39 +75,19 @@ template class Matrix: public RectangularMatrix{typename Implementation::GenerateSequence::Type(), Vector(value)} - #endif - {} + constexpr explicit Matrix(IdentityInitT, T value = T(1)) noexcept: RectangularMatrix{typename Implementation::GenerateSequence::Type(), Vector(value)} {} /** @copydoc RectangularMatrix::RectangularMatrix(ZeroInitT) */ - constexpr explicit Matrix(ZeroInitT) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : RectangularMatrix{ZeroInit} - #endif - {} + constexpr explicit Matrix(ZeroInitT) noexcept: RectangularMatrix{ZeroInit} {} /** @copydoc RectangularMatrix::RectangularMatrix(NoInitT) */ - constexpr explicit Matrix(NoInitT) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : RectangularMatrix{NoInit} - #endif - {} + constexpr explicit Matrix(NoInitT) noexcept: RectangularMatrix{NoInit} {} /** @brief Construct matrix from column vectors */ template constexpr /*implicit*/ Matrix(const Vector& first, const U&... next) noexcept: RectangularMatrix(first, next...) {} /** @brief Construct matrix with one value for all elements */ - constexpr explicit Matrix(T value) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : RectangularMatrix{typename Implementation::GenerateSequence::Type(), value} - #endif - {} + constexpr explicit Matrix(T value) noexcept: RectangularMatrix{typename Implementation::GenerateSequence::Type(), value} {} /** * @brief Construct matrix from another of different type @@ -129,12 +109,7 @@ template class Matrix: public RectangularMatrix constexpr explicit Matrix(const RectangularMatrix& other) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : Matrix{typename Implementation::GenerateSequence::Type(), other} - #endif - {} + template constexpr explicit Matrix(const RectangularMatrix& other) noexcept: Matrix{typename Implementation::GenerateSequence::Type(), other} {} /** @brief Copy constructor */ constexpr /*implicit*/ Matrix(const RectangularMatrix& other) noexcept: RectangularMatrix(other) {} diff --git a/src/Magnum/Math/Matrix3.h b/src/Magnum/Math/Matrix3.h index cc45f31dc..dad682e7c 100644 --- a/src/Magnum/Math/Matrix3.h +++ b/src/Magnum/Math/Matrix3.h @@ -208,39 +208,19 @@ template class Matrix3: public Matrix3x3 { * Creates an identity matrix. @p value allows you to specify value on * diagonal. */ - constexpr explicit Matrix3(IdentityInitT, T value = T{1}) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : Matrix3x3{IdentityInit, value} - #endif - {} + constexpr explicit Matrix3(IdentityInitT, T value = T{1}) noexcept: Matrix3x3{IdentityInit, value} {} /** @copydoc Matrix::Matrix(ZeroInitT) */ - constexpr explicit Matrix3(ZeroInitT) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : Matrix3x3{ZeroInit} - #endif - {} + constexpr explicit Matrix3(ZeroInitT) noexcept: Matrix3x3{ZeroInit} {} /** @copydoc Matrix::Matrix(NoInitT) */ - constexpr explicit Matrix3(NoInitT) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : Matrix3x3{NoInit} - #endif - {} + constexpr explicit Matrix3(NoInitT) noexcept: Matrix3x3{NoInit} {} /** @brief Construct matrix from column vectors */ constexpr /*implicit*/ Matrix3(const Vector3& first, const Vector3& second, const Vector3& third) noexcept: Matrix3x3(first, second, third) {} /** @brief Construct matrix with one value for all elements */ - constexpr explicit Matrix3(T value) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : Matrix3x3{value} - #endif - {} + constexpr explicit Matrix3(T value) noexcept: Matrix3x3{value} {} /** @copydoc Matrix::Matrix(const RectangularMatrix&) */ template constexpr explicit Matrix3(const RectangularMatrix<3, 3, U>& other) noexcept: Matrix3x3(other) {} diff --git a/src/Magnum/Math/Matrix4.h b/src/Magnum/Math/Matrix4.h index 878418477..894ef977c 100644 --- a/src/Magnum/Math/Matrix4.h +++ b/src/Magnum/Math/Matrix4.h @@ -393,39 +393,19 @@ template class Matrix4: public Matrix4x4 { * Creates an identity matrix. @p value allows you to specify value on * diagonal. */ - constexpr explicit Matrix4(IdentityInitT, T value = T{1}) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : Matrix4x4{IdentityInit, value} - #endif - {} + constexpr explicit Matrix4(IdentityInitT, T value = T{1}) noexcept: Matrix4x4{IdentityInit, value} {} /** @copydoc Matrix::Matrix(ZeroInitT) */ - constexpr explicit Matrix4(ZeroInitT) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : Matrix4x4{ZeroInit} - #endif - {} + constexpr explicit Matrix4(ZeroInitT) noexcept: Matrix4x4{ZeroInit} {} /** @copydoc Matrix::Matrix(NoInitT) */ - constexpr explicit Matrix4(NoInitT) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : Matrix4x4{NoInit} - #endif - {} + constexpr explicit Matrix4(NoInitT) noexcept: Matrix4x4{NoInit} {} /** @brief Construct matrix from column vectors */ constexpr /*implicit*/ Matrix4(const Vector4& first, const Vector4& second, const Vector4& third, const Vector4& fourth) noexcept: Matrix4x4(first, second, third, fourth) {} /** @brief Construct matrix with one value for all elements */ - constexpr explicit Matrix4(T value) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : Matrix4x4{value} - #endif - {} + constexpr explicit Matrix4(T value) noexcept: Matrix4x4{value} {} /** @copydoc Matrix::Matrix(const RectangularMatrix&) */ template constexpr explicit Matrix4(const RectangularMatrix<4, 4, U>& other) noexcept: Matrix4x4(other) {} diff --git a/src/Magnum/Math/Range.h b/src/Magnum/Math/Range.h index ad39fdae5..763b68538 100644 --- a/src/Magnum/Math/Range.h +++ b/src/Magnum/Math/Range.h @@ -366,20 +366,10 @@ template class Range2D: public Range<2, T> { constexpr /*implicit*/ Range2D() noexcept: Range<2, T>{ZeroInit} {} /** @copydoc Range(ZeroInitT) */ - constexpr explicit Range2D(ZeroInitT) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : Range<2, T>{ZeroInit} - #endif - {} + constexpr explicit Range2D(ZeroInitT) noexcept: Range<2, T>{ZeroInit} {} /** @copydoc Range(NoInitT) */ - explicit Range2D(NoInitT) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : Range<2, T>{NoInit} - #endif - {} + explicit Range2D(NoInitT) noexcept: Range<2, T>{NoInit} {} /** @copydoc Range(const VectorType&, const VectorType&) */ constexpr /*implicit*/ Range2D(const Vector2& min, const Vector2& max) noexcept: Range<2, T>(min, max) {} @@ -398,12 +388,7 @@ template class Range2D: public Range<2, T> { decltype(Implementation::RangeConverter<2, T, U>()) #endif > - constexpr explicit Range2D(const U& other) - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : Range<2, T>{Implementation::RangeConverter<2, T, U>::from(other)} - #endif - {} + constexpr explicit Range2D(const U& other): Range<2, T>{Implementation::RangeConverter<2, T, U>::from(other)} {} /** @copydoc Range(const Range&) */ constexpr /*implicit*/ Range2D(const Range<2, T>& other) noexcept: Range<2, T>(other) {} @@ -516,20 +501,10 @@ template class Range3D: public Range<3, T> { constexpr /*implicit*/ Range3D() noexcept: Range<3, T>{ZeroInit} {} /** @copydoc Range(ZeroInitT) */ - constexpr explicit Range3D(ZeroInitT) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : Range<3, T>{ZeroInit} - #endif - {} + constexpr explicit Range3D(ZeroInitT) noexcept: Range<3, T>{ZeroInit} {} /** @brief @copybrief Range(NoInitT) */ - explicit Range3D(NoInitT) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : Range<3, T>{NoInit} - #endif - {} + explicit Range3D(NoInitT) noexcept: Range<3, T>{NoInit} {} /** @copydoc Range(const VectorType&, const VectorType&) */ constexpr /*implicit*/ Range3D(const Vector3& min, const Vector3& max) noexcept: Range<3, T>(min, max) {} @@ -541,12 +516,7 @@ template class Range3D: public Range<3, T> { * @brief Construct range from external representation * @todoc Remove workaround when Doxygen no longer chokes on that line */ - template::from(std::declval()))> constexpr explicit Range3D(const U& other) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : Range<3, T>{Implementation::RangeConverter<3, T, U>::from(other)} - #endif - {} + template::from(std::declval()))> constexpr explicit Range3D(const U& other) noexcept: Range<3, T>{Implementation::RangeConverter<3, T, U>::from(other)} {} /** @copydoc Range(const Range&) */ constexpr /*implicit*/ Range3D(const Range<3, T>& other) noexcept: Range<3, T>(other) {} diff --git a/src/Magnum/Math/RectangularMatrix.h b/src/Magnum/Math/RectangularMatrix.h index 24c2b794f..de100151b 100644 --- a/src/Magnum/Math/RectangularMatrix.h +++ b/src/Magnum/Math/RectangularMatrix.h @@ -115,20 +115,10 @@ template class RectangularMatrix { constexpr /*implicit*/ RectangularMatrix() noexcept: RectangularMatrix{typename Implementation::GenerateSequence::Type{}, ZeroInit} {} /** @brief Construct zero-filled matrix */ - constexpr explicit RectangularMatrix(ZeroInitT) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : RectangularMatrix{typename Implementation::GenerateSequence::Type{}, ZeroInit} - #endif - {} + constexpr explicit RectangularMatrix(ZeroInitT) noexcept: RectangularMatrix{typename Implementation::GenerateSequence::Type{}, ZeroInit} {} /** @brief Construct matrix without initializing the contents */ - explicit RectangularMatrix(NoInitT) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : RectangularMatrix{typename Implementation::GenerateSequence::Type{}, NoInit} - #endif - {} + explicit RectangularMatrix(NoInitT) noexcept: RectangularMatrix{typename Implementation::GenerateSequence::Type{}, NoInit} {} /** @brief Construct matrix from column vectors */ template constexpr /*implicit*/ RectangularMatrix(const Vector& first, const U&... next) noexcept: _data{first, next...} { @@ -136,12 +126,7 @@ template class RectangularMatrix { } /** @brief Construct matrix with one value for all components */ - constexpr explicit RectangularMatrix(T value) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : RectangularMatrix{typename Implementation::GenerateSequence::Type(), value} - #endif - {} + constexpr explicit RectangularMatrix(T value) noexcept: RectangularMatrix{typename Implementation::GenerateSequence::Type(), value} {} /** * @brief Construct matrix from another of different type diff --git a/src/Magnum/Math/Vector2.h b/src/Magnum/Math/Vector2.h index 05a0def50..7dc970c23 100644 --- a/src/Magnum/Math/Vector2.h +++ b/src/Magnum/Math/Vector2.h @@ -108,20 +108,10 @@ template class Vector2: public Vector<2, T> { constexpr /*implicit*/ Vector2() noexcept: Vector<2, T>{ZeroInit} {} /** @copydoc Vector::Vector(ZeroInitT) */ - constexpr explicit Vector2(ZeroInitT) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : Vector<2, T>{ZeroInit} - #endif - {} + constexpr explicit Vector2(ZeroInitT) noexcept: Vector<2, T>{ZeroInit} {} /** @copydoc Vector::Vector(NoInitT) */ - explicit Vector2(NoInitT) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : Vector<2, T>{NoInit} - #endif - {} + explicit Vector2(NoInitT) noexcept: Vector<2, T>{NoInit} {} /** @copydoc Vector::Vector(T) */ constexpr explicit Vector2(T value) noexcept: Vector<2, T>(value) {} diff --git a/src/Magnum/Math/Vector3.h b/src/Magnum/Math/Vector3.h index d1d720850..f14734fdb 100644 --- a/src/Magnum/Math/Vector3.h +++ b/src/Magnum/Math/Vector3.h @@ -129,20 +129,10 @@ template class Vector3: public Vector<3, T> { constexpr /*implicit*/ Vector3() noexcept: Vector<3, T>{ZeroInit} {} /** @copydoc Vector::Vector(ZeroInitT) */ - constexpr explicit Vector3(ZeroInitT) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : Vector<3, T>{ZeroInit} - #endif - {} + constexpr explicit Vector3(ZeroInitT) noexcept: Vector<3, T>{ZeroInit} {} /** @copydoc Vector::Vector(NoInitT) */ - explicit Vector3(NoInitT) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : Vector<3, T>{NoInit} - #endif - {} + explicit Vector3(NoInitT) noexcept: Vector<3, T>{NoInit} {} /** @copydoc Vector::Vector(T) */ constexpr explicit Vector3(T value) noexcept: Vector<3, T>(value) {} diff --git a/src/Magnum/Math/Vector4.h b/src/Magnum/Math/Vector4.h index 7e7f113d7..73ba55954 100644 --- a/src/Magnum/Math/Vector4.h +++ b/src/Magnum/Math/Vector4.h @@ -67,20 +67,10 @@ template class Vector4: public Vector<4, T> { constexpr /*implicit*/ Vector4() noexcept: Vector<4, T>{ZeroInit} {} /** @copydoc Vector::Vector(ZeroInitT) */ - constexpr explicit Vector4(ZeroInitT) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : Vector<4, T>{ZeroInit} - #endif - {} + constexpr explicit Vector4(ZeroInitT) noexcept: Vector<4, T>{ZeroInit} {} /** @copydoc Vector::Vector(NoInitT) */ - explicit Vector4(NoInitT) noexcept - /** @todoc remove workaround when doxygen is sane */ - #ifndef DOXYGEN_GENERATING_OUTPUT - : Vector<4, T>{NoInit} - #endif - {} + explicit Vector4(NoInitT) noexcept: Vector<4, T>{NoInit} {} /** @copydoc Vector::Vector(T) */ constexpr explicit Vector4(T value) noexcept: Vector<4, T>(value) {}