From b475389cc9272ebd6f69db3537e8d94f3aba476d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 29 May 2014 21:52:30 +0200 Subject: [PATCH] Math: make the constructors in test also constexpr. --- src/Magnum/Math/Test/MatrixTest.cpp | 4 ++-- src/Magnum/Math/Test/RectangularMatrixTest.cpp | 4 ++-- src/Magnum/Math/Test/VectorTest.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Magnum/Math/Test/MatrixTest.cpp b/src/Magnum/Math/Test/MatrixTest.cpp index 2caf3a2fe..e61036340 100644 --- a/src/Magnum/Math/Test/MatrixTest.cpp +++ b/src/Magnum/Math/Test/MatrixTest.cpp @@ -283,12 +283,12 @@ void MatrixTest::invertedOrthogonal() { template class BasicVec2: public Math::Vector<2, T> { public: - template BasicVec2(U&&... args): Math::Vector<2, T>{std::forward(args)...} {} + template constexpr BasicVec2(U&&... args): Math::Vector<2, T>{std::forward(args)...} {} }; template class BasicMat2: public Math::Matrix<2, T> { public: - template BasicMat2(U&&... args): Math::Matrix<2, T>{std::forward(args)...} {} + template constexpr BasicMat2(U&&... args): Math::Matrix<2, T>{std::forward(args)...} {} MAGNUM_MATRIX_SUBCLASS_IMPLEMENTATION(2, BasicMat2, BasicVec2) }; diff --git a/src/Magnum/Math/Test/RectangularMatrixTest.cpp b/src/Magnum/Math/Test/RectangularMatrixTest.cpp index e0f524f23..b9917fff6 100644 --- a/src/Magnum/Math/Test/RectangularMatrixTest.cpp +++ b/src/Magnum/Math/Test/RectangularMatrixTest.cpp @@ -413,7 +413,7 @@ void RectangularMatrixTest::vector() { template class BasicMat: public Math::RectangularMatrix { public: - template BasicMat(U&&... args): Math::RectangularMatrix{std::forward(args)...} {} + template constexpr BasicMat(U&&... args): Math::RectangularMatrix{std::forward(args)...} {} MAGNUM_RECTANGULARMATRIX_SUBCLASS_IMPLEMENTATION(size, size, BasicMat) }; @@ -422,7 +422,7 @@ MAGNUM_MATRIX_OPERATOR_IMPLEMENTATION(BasicMat) template class BasicMat2x2: public BasicMat<2, T> { public: - template BasicMat2x2(U&&... args): BasicMat<2, T>{std::forward(args)...} {} + template constexpr BasicMat2x2(U&&... args): BasicMat<2, T>{std::forward(args)...} {} MAGNUM_RECTANGULARMATRIX_SUBCLASS_IMPLEMENTATION(2, 2, BasicMat2x2) }; diff --git a/src/Magnum/Math/Test/VectorTest.cpp b/src/Magnum/Math/Test/VectorTest.cpp index 60a984106..90c5adfdd 100644 --- a/src/Magnum/Math/Test/VectorTest.cpp +++ b/src/Magnum/Math/Test/VectorTest.cpp @@ -439,7 +439,7 @@ void VectorTest::angle() { template class BasicVec2: public Math::Vector<2, T> { public: - template BasicVec2(U&&... args): Math::Vector<2, T>{std::forward(args)...} {} + template constexpr BasicVec2(U&&... args): Math::Vector<2, T>{std::forward(args)...} {} MAGNUM_VECTOR_SUBCLASS_IMPLEMENTATION(2, BasicVec2) };