Browse Source

GCC 4.4 compatibility: no explicit conversion operators.

Vladimír Vondruš 13 years ago
parent
commit
627c74c603
  1. 5
      src/Math/Test/Matrix3Test.cpp
  2. 5
      src/Math/Test/Matrix4Test.cpp
  3. 5
      src/Math/Test/MatrixTest.cpp
  4. 5
      src/Math/Test/RectangularMatrixTest.cpp

5
src/Math/Test/Matrix3Test.cpp

@ -200,8 +200,13 @@ void Matrix3Test::convert() {
/* Implicit conversion is not allowed */ /* Implicit conversion is not allowed */
CORRADE_VERIFY(!(std::is_convertible<Mat3, Matrix3>::value)); CORRADE_VERIFY(!(std::is_convertible<Mat3, Matrix3>::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)); CORRADE_VERIFY(!(std::is_convertible<Matrix3, Mat3>::value));
} }
}
void Matrix3Test::isRigidTransformation() { void Matrix3Test::isRigidTransformation() {
CORRADE_VERIFY(!Matrix3({1.0f, 0.0f, 0.0f}, CORRADE_VERIFY(!Matrix3({1.0f, 0.0f, 0.0f},

5
src/Math/Test/Matrix4Test.cpp

@ -224,8 +224,13 @@ void Matrix4Test::convert() {
/* Implicit conversion is not allowed */ /* Implicit conversion is not allowed */
CORRADE_VERIFY(!(std::is_convertible<Mat4, Matrix4>::value)); CORRADE_VERIFY(!(std::is_convertible<Mat4, Matrix4>::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)); CORRADE_VERIFY(!(std::is_convertible<Matrix4, Mat4>::value));
} }
}
void Matrix4Test::isRigidTransformation() { void Matrix4Test::isRigidTransformation() {
CORRADE_VERIFY(!Matrix4({1.0f, 0.0f, 0.0f, 0.0f}, CORRADE_VERIFY(!Matrix4({1.0f, 0.0f, 0.0f, 0.0f},

5
src/Math/Test/MatrixTest.cpp

@ -198,8 +198,13 @@ void MatrixTest::convert() {
/* Implicit conversion is not allowed */ /* Implicit conversion is not allowed */
CORRADE_VERIFY(!(std::is_convertible<Mat3, Matrix3>::value)); CORRADE_VERIFY(!(std::is_convertible<Mat3, Matrix3>::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)); CORRADE_VERIFY(!(std::is_convertible<Matrix3, Mat3>::value));
} }
}
void MatrixTest::isOrthogonal() { void MatrixTest::isOrthogonal() {
CORRADE_VERIFY(!Matrix3(Vector3(1.0f, 0.0f, 0.0f), CORRADE_VERIFY(!Matrix3(Vector3(1.0f, 0.0f, 0.0f),

5
src/Math/Test/RectangularMatrixTest.cpp

@ -215,8 +215,13 @@ void RectangularMatrixTest::convert() {
/* Implicit conversion is not allowed */ /* Implicit conversion is not allowed */
CORRADE_VERIFY(!(std::is_convertible<Mat2x3, Matrix2x3>::value)); CORRADE_VERIFY(!(std::is_convertible<Mat2x3, Matrix2x3>::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)); CORRADE_VERIFY(!(std::is_convertible<Matrix2x3, Mat2x3>::value));
} }
}
void RectangularMatrixTest::data() { void RectangularMatrixTest::data() {
Matrix3x4 m; Matrix3x4 m;

Loading…
Cancel
Save