From 80cc7de91d2a35f5347a363eb1a713c65f3bc4a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 29 Oct 2013 22:50:04 +0100 Subject: [PATCH] GCC 4.6 compatibility: proper constexpr workaround in test. --- src/Math/Test/MatrixTest.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Math/Test/MatrixTest.cpp b/src/Math/Test/MatrixTest.cpp index 875c4ff98..5e8c905b9 100644 --- a/src/Math/Test/MatrixTest.cpp +++ b/src/Math/Test/MatrixTest.cpp @@ -159,10 +159,9 @@ void MatrixTest::constructConversion() { Vector4(1.0f, 2.0f, 3.0f, -1.0f), Vector4(7.9f, -1.0f, 8.0f, -1.5f)); #ifndef CORRADE_GCC46_COMPATIBILITY - constexpr Matrix4x4i b(a); - #else - Matrix4i b(a); /* Not constexpr under GCC < 4.7 */ + constexpr /* Not constexpr under GCC < 4.7 */ #endif + Matrix4x4i b(a); CORRADE_COMPARE(b, Matrix4x4i(Vector4i(3, 5, 8, -3), Vector4i(4, 4, 7, 2), Vector4i(1, 2, 3, -1),