From 181cf2cf111b03deb42e1048240aa5c79f933601 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 28 Feb 2013 17:53:27 +0100 Subject: [PATCH] GCC 4.6 compatibility: std::array can't be constexpr. Don't know why. --- src/MeshTools/Test/TransformTest.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/MeshTools/Test/TransformTest.cpp b/src/MeshTools/Test/TransformTest.cpp index 1cfe3b934..9f5ede231 100644 --- a/src/MeshTools/Test/TransformTest.cpp +++ b/src/MeshTools/Test/TransformTest.cpp @@ -41,6 +41,11 @@ TransformTest::TransformTest() { &TransformTest::transformPoints3D); } +/* GCC < 4.7 doesn't like constexpr here, don't know why */ +#ifdef CORRADE_GCC46_COMPATIBILITY +#define constexpr const +#endif + constexpr static std::array points2D{{ {-3.0f, 4.0f}, { 2.5f, -15.0f} @@ -71,6 +76,10 @@ constexpr static std::array points3DRotatedTranslated{{ {15.0f, 1.5f, 1.5f} }}; +#ifdef CORRADE_GCC46_COMPATIBILITY +#undef constexpr +#endif + void TransformTest::transformVectors2D() { auto matrix = MeshTools::transformVectors(Matrix3::rotation(Deg(90.0f)), points2D); auto complex = MeshTools::transformVectors(Complex::rotation(Deg(90.0f)), points2D);