From 64585ca4fdb2adeaaf17e0ede4a45b8ad5678684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 31 Mar 2013 19:41:10 +0200 Subject: [PATCH] GCC 4.6 compatibility: vector conversion is not constexpr. --- src/Math/Geometry/Test/RectangleTest.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Math/Geometry/Test/RectangleTest.cpp b/src/Math/Geometry/Test/RectangleTest.cpp index c53f35bc4..051f97670 100644 --- a/src/Math/Geometry/Test/RectangleTest.cpp +++ b/src/Math/Geometry/Test/RectangleTest.cpp @@ -80,7 +80,10 @@ void RectangleTest::constructFromSize() { void RectangleTest::constructConversion() { constexpr Rectangle a({1.3f, 2.7f}, {-15.0f, 7.0f}); - constexpr Rectanglei b(a); + #ifndef CORRADE_GCC46_COMPATIBILITY + constexpr /* Not constexpr under GCC < 4.7 */ + #endif + Rectanglei b(a); CORRADE_COMPARE(b, Rectanglei({1, 2}, {-15, 7})); /* Implicit conversion is not allowed */