From 627c74c60380c9e890d5c51297598893b80d18cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Tue, 4 Jun 2013 20:47:17 +0200
Subject: [PATCH] GCC 4.4 compatibility: no explicit conversion operators.

---
 src/Math/Test/Matrix3Test.cpp           | 7 ++++++-
 src/Math/Test/Matrix4Test.cpp           | 7 ++++++-
 src/Math/Test/MatrixTest.cpp            | 7 ++++++-
 src/Math/Test/RectangularMatrixTest.cpp | 7 ++++++-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/Math/Test/Matrix3Test.cpp b/src/Math/Test/Matrix3Test.cpp
index 7546434ca..c00f44ec7 100644
--- a/src/Math/Test/Matrix3Test.cpp
+++ b/src/Math/Test/Matrix3Test.cpp
@@ -200,7 +200,12 @@ void Matrix3Test::convert() {
 
     /* Implicit conversion is not allowed */
     CORRADE_VERIFY(!(std::is_convertible<Mat3, Matrix3>::value));
-    CORRADE_VERIFY(!(std::is_convertible<Matrix3, Mat3>::value));
+    {
+        #ifdef CORRADE_GCC44_COMPATIBILITY
+        CORRADE_EXPECT_FAIL("GCC 4.4 doesn't have explicit conversion operators");
+        #endif
+        CORRADE_VERIFY(!(std::is_convertible<Matrix3, Mat3>::value));
+    }
 }
 
 void Matrix3Test::isRigidTransformation() {
diff --git a/src/Math/Test/Matrix4Test.cpp b/src/Math/Test/Matrix4Test.cpp
index d5bbfa70b..0b09f05c5 100644
--- a/src/Math/Test/Matrix4Test.cpp
+++ b/src/Math/Test/Matrix4Test.cpp
@@ -224,7 +224,12 @@ void Matrix4Test::convert() {
 
     /* Implicit conversion is not allowed */
     CORRADE_VERIFY(!(std::is_convertible<Mat4, Matrix4>::value));
-    CORRADE_VERIFY(!(std::is_convertible<Matrix4, Mat4>::value));
+    {
+        #ifdef CORRADE_GCC44_COMPATIBILITY
+        CORRADE_EXPECT_FAIL("GCC 4.4 doesn't have explicit conversion operators");
+        #endif
+        CORRADE_VERIFY(!(std::is_convertible<Matrix4, Mat4>::value));
+    }
 }
 
 void Matrix4Test::isRigidTransformation() {
diff --git a/src/Math/Test/MatrixTest.cpp b/src/Math/Test/MatrixTest.cpp
index 9dfa54457..91f19195a 100644
--- a/src/Math/Test/MatrixTest.cpp
+++ b/src/Math/Test/MatrixTest.cpp
@@ -198,7 +198,12 @@ void MatrixTest::convert() {
 
     /* Implicit conversion is not allowed */
     CORRADE_VERIFY(!(std::is_convertible<Mat3, Matrix3>::value));
-    CORRADE_VERIFY(!(std::is_convertible<Matrix3, Mat3>::value));
+    {
+        #ifdef CORRADE_GCC44_COMPATIBILITY
+        CORRADE_EXPECT_FAIL("GCC 4.4 doesn't have explicit conversion operators");
+        #endif
+        CORRADE_VERIFY(!(std::is_convertible<Matrix3, Mat3>::value));
+    }
 }
 
 void MatrixTest::isOrthogonal() {
diff --git a/src/Math/Test/RectangularMatrixTest.cpp b/src/Math/Test/RectangularMatrixTest.cpp
index 1062015b9..62fd58395 100644
--- a/src/Math/Test/RectangularMatrixTest.cpp
+++ b/src/Math/Test/RectangularMatrixTest.cpp
@@ -215,7 +215,12 @@ void RectangularMatrixTest::convert() {
 
     /* Implicit conversion is not allowed */
     CORRADE_VERIFY(!(std::is_convertible<Mat2x3, Matrix2x3>::value));
-    CORRADE_VERIFY(!(std::is_convertible<Matrix2x3, Mat2x3>::value));
+    {
+        #ifdef CORRADE_GCC44_COMPATIBILITY
+        CORRADE_EXPECT_FAIL("GCC 4.4 doesn't have explicit conversion operators");
+        #endif
+        CORRADE_VERIFY(!(std::is_convertible<Matrix2x3, Mat2x3>::value));
+    }
 }
 
 void RectangularMatrixTest::data() {