From 3494e7db830589d81156836887b31cab29515661 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 4 Jan 2014 02:01:04 +0100 Subject: [PATCH] GCC 4.4 compatibility: no std::is_constructible. --- src/Test/AbstractQueryGLTest.cpp | 4 ++++ src/Test/AbstractShaderProgramGLTest.cpp | 4 ++++ src/Test/AbstractTextureGLTest.cpp | 4 ++++ src/Test/BufferGLTest.cpp | 4 ++++ src/Test/BufferImageGLTest.cpp | 4 ++++ src/Test/FramebufferGLTest.cpp | 4 ++++ src/Test/ImageTest.cpp | 4 ++++ src/Test/MeshGLTest.cpp | 4 ++++ src/Test/RenderbufferGLTest.cpp | 4 ++++ src/Test/ShaderGLTest.cpp | 4 ++++ src/Trade/Test/ImageDataTest.cpp | 4 ++++ 11 files changed, 44 insertions(+) diff --git a/src/Test/AbstractQueryGLTest.cpp b/src/Test/AbstractQueryGLTest.cpp index ee1919fc3..9a58304cd 100644 --- a/src/Test/AbstractQueryGLTest.cpp +++ b/src/Test/AbstractQueryGLTest.cpp @@ -65,11 +65,15 @@ void AbstractQueryGLTest::construct() { } void AbstractQueryGLTest::constructCopy() { + #ifndef CORRADE_GCC44_COMPATIBILITY CORRADE_VERIFY(!(std::is_constructible::value)); /* GCC 4.6 doesn't have std::is_assignable */ #ifndef CORRADE_GCC46_COMPATIBILITY CORRADE_VERIFY(!(std::is_assignable{})); #endif + #else + CORRADE_SKIP("Type traits needed to test this are not available on GCC 4.4."); + #endif } void AbstractQueryGLTest::constructMove() { diff --git a/src/Test/AbstractShaderProgramGLTest.cpp b/src/Test/AbstractShaderProgramGLTest.cpp index c150d77ac..3f702012b 100644 --- a/src/Test/AbstractShaderProgramGLTest.cpp +++ b/src/Test/AbstractShaderProgramGLTest.cpp @@ -79,11 +79,15 @@ void AbstractShaderProgramGLTest::construct() { } void AbstractShaderProgramGLTest::constructCopy() { + #ifndef CORRADE_GCC44_COMPATIBILITY CORRADE_VERIFY(!(std::is_constructible::value)); /* GCC 4.6 doesn't have std::is_assignable */ #ifndef CORRADE_GCC46_COMPATIBILITY CORRADE_VERIFY(!(std::is_assignable{})); #endif + #else + CORRADE_SKIP("Type traits needed to test this are not available on GCC 4.4."); + #endif } void AbstractShaderProgramGLTest::constructMove() { diff --git a/src/Test/AbstractTextureGLTest.cpp b/src/Test/AbstractTextureGLTest.cpp index 8483fb799..94e72c258 100644 --- a/src/Test/AbstractTextureGLTest.cpp +++ b/src/Test/AbstractTextureGLTest.cpp @@ -60,11 +60,15 @@ void AbstractTextureGLTest::construct() { } void AbstractTextureGLTest::constructCopy() { + #ifndef CORRADE_GCC44_COMPATIBILITY CORRADE_VERIFY(!(std::is_constructible::value)); /* GCC 4.6 doesn't have std::is_assignable */ #ifndef CORRADE_GCC46_COMPATIBILITY CORRADE_VERIFY(!(std::is_assignable{})); #endif + #else + CORRADE_SKIP("Type traits needed to test this are not available on GCC 4.4."); + #endif } void AbstractTextureGLTest::constructMove() { diff --git a/src/Test/BufferGLTest.cpp b/src/Test/BufferGLTest.cpp index 548f55bed..39671226d 100644 --- a/src/Test/BufferGLTest.cpp +++ b/src/Test/BufferGLTest.cpp @@ -90,11 +90,15 @@ void BufferGLTest::construct() { } void BufferGLTest::constructCopy() { + #ifndef CORRADE_GCC44_COMPATIBILITY CORRADE_VERIFY(!(std::is_constructible::value)); /* GCC 4.6 doesn't have std::is_assignable */ #ifndef CORRADE_GCC46_COMPATIBILITY CORRADE_VERIFY(!(std::is_assignable{})); #endif + #else + CORRADE_SKIP("Type traits needed to test this are not available on GCC 4.4."); + #endif } void BufferGLTest::constructMove() { diff --git a/src/Test/BufferImageGLTest.cpp b/src/Test/BufferImageGLTest.cpp index c260ef4c0..abcab4fa4 100644 --- a/src/Test/BufferImageGLTest.cpp +++ b/src/Test/BufferImageGLTest.cpp @@ -72,11 +72,15 @@ void BufferImageTest::construct() { } void BufferImageTest::constructCopy() { + #ifndef CORRADE_GCC44_COMPATIBILITY CORRADE_VERIFY(!(std::is_constructible::value)); /* GCC 4.6 doesn't have std::is_assignable */ #ifndef CORRADE_GCC46_COMPATIBILITY CORRADE_VERIFY(!(std::is_assignable{})); #endif + #else + CORRADE_SKIP("Type traits needed to test this are not available on GCC 4.4."); + #endif } void BufferImageTest::constructMove() { diff --git a/src/Test/FramebufferGLTest.cpp b/src/Test/FramebufferGLTest.cpp index ded66f1c9..ece22b725 100644 --- a/src/Test/FramebufferGLTest.cpp +++ b/src/Test/FramebufferGLTest.cpp @@ -61,11 +61,15 @@ void FramebufferGLTest::construct() { } void FramebufferGLTest::constructCopy() { + #ifndef CORRADE_GCC44_COMPATIBILITY CORRADE_VERIFY(!(std::is_constructible::value)); /* GCC 4.6 doesn't have std::is_assignable */ #ifndef CORRADE_GCC46_COMPATIBILITY CORRADE_VERIFY(!(std::is_assignable{})); #endif + #else + CORRADE_SKIP("Type traits needed to test this are not available on GCC 4.4."); + #endif } void FramebufferGLTest::constructMove() { diff --git a/src/Test/ImageTest.cpp b/src/Test/ImageTest.cpp index 120cdc81b..471900c4b 100644 --- a/src/Test/ImageTest.cpp +++ b/src/Test/ImageTest.cpp @@ -63,11 +63,15 @@ void ImageTest::construct() { } void ImageTest::constructCopy() { + #ifndef CORRADE_GCC44_COMPATIBILITY CORRADE_VERIFY(!(std::is_constructible::value)); /* GCC 4.6 doesn't have std::is_assignable */ #ifndef CORRADE_GCC46_COMPATIBILITY CORRADE_VERIFY(!(std::is_assignable{})); #endif + #else + CORRADE_SKIP("Type traits needed to test this are not available on GCC 4.4."); + #endif } void ImageTest::constructMove() { diff --git a/src/Test/MeshGLTest.cpp b/src/Test/MeshGLTest.cpp index 06587ffaf..297e4dcc6 100644 --- a/src/Test/MeshGLTest.cpp +++ b/src/Test/MeshGLTest.cpp @@ -68,11 +68,15 @@ void MeshGLTest::construct() { } void MeshGLTest::constructCopy() { + #ifndef CORRADE_GCC44_COMPATIBILITY CORRADE_VERIFY(!(std::is_constructible::value)); /* GCC 4.6 doesn't have std::is_assignable */ #ifndef CORRADE_GCC46_COMPATIBILITY CORRADE_VERIFY(!(std::is_assignable{})); #endif + #else + CORRADE_SKIP("Type traits needed to test this are not available on GCC 4.4."); + #endif } void MeshGLTest::constructMove() { diff --git a/src/Test/RenderbufferGLTest.cpp b/src/Test/RenderbufferGLTest.cpp index 0527146f9..c9a72995f 100644 --- a/src/Test/RenderbufferGLTest.cpp +++ b/src/Test/RenderbufferGLTest.cpp @@ -60,11 +60,15 @@ void RenderbufferGLTest::construct() { } void RenderbufferGLTest::constructCopy() { + #ifndef CORRADE_GCC44_COMPATIBILITY CORRADE_VERIFY(!(std::is_constructible::value)); /* GCC 4.6 doesn't have std::is_assignable */ #ifndef CORRADE_GCC46_COMPATIBILITY CORRADE_VERIFY(!(std::is_assignable{})); #endif + #else + CORRADE_SKIP("Type traits needed to test this are not available on GCC 4.4."); + #endif } void RenderbufferGLTest::constructMove() { diff --git a/src/Test/ShaderGLTest.cpp b/src/Test/ShaderGLTest.cpp index 8d41ddfb3..f33d103e0 100644 --- a/src/Test/ShaderGLTest.cpp +++ b/src/Test/ShaderGLTest.cpp @@ -70,11 +70,15 @@ void ShaderGLTest::construct() { } void ShaderGLTest::constructCopy() { + #ifndef CORRADE_GCC44_COMPATIBILITY CORRADE_VERIFY(!(std::is_constructible::value)); /* GCC 4.6 doesn't have std::is_assignable */ #ifndef CORRADE_GCC46_COMPATIBILITY CORRADE_VERIFY(!(std::is_assignable{})); #endif + #else + CORRADE_SKIP("Type traits needed to test this are not available on GCC 4.4."); + #endif } void ShaderGLTest::constructMove() { diff --git a/src/Trade/Test/ImageDataTest.cpp b/src/Trade/Test/ImageDataTest.cpp index 3b1751c0c..23afcde51 100644 --- a/src/Trade/Test/ImageDataTest.cpp +++ b/src/Trade/Test/ImageDataTest.cpp @@ -61,11 +61,15 @@ void ImageDataTest::construct() { } void ImageDataTest::constructCopy() { + #ifndef CORRADE_GCC44_COMPATIBILITY CORRADE_VERIFY(!(std::is_constructible::value)); /* GCC 4.6 doesn't have std::is_assignable */ #ifndef CORRADE_GCC46_COMPATIBILITY CORRADE_VERIFY(!(std::is_assignable{})); #endif + #else + CORRADE_SKIP("Type traits needed to test this are not available on GCC 4.4."); + #endif } void ImageDataTest::constructMove() {