diff --git a/src/Test/AbstractQueryGLTest.cpp b/src/Test/AbstractQueryGLTest.cpp index 5060f9df9..39c00c777 100644 --- a/src/Test/AbstractQueryGLTest.cpp +++ b/src/Test/AbstractQueryGLTest.cpp @@ -65,8 +65,11 @@ void AbstractQueryGLTest::construct() { } void AbstractQueryGLTest::constructCopy() { - CORRADE_VERIFY(!(std::is_constructible{})); - CORRADE_VERIFY(!(std::is_assignable{})); + CORRADE_VERIFY(!(std::is_constructible{})); + /* GCC 4.6 doesn't have std::is_assignable */ + #ifndef CORRADE_GCC46_COMPATIBILITY + CORRADE_VERIFY(!(std::is_assignable{})); + #endif } void AbstractQueryGLTest::constructMove() { diff --git a/src/Test/AbstractShaderProgramGLTest.cpp b/src/Test/AbstractShaderProgramGLTest.cpp index 0881927c5..2f0ac36fe 100644 --- a/src/Test/AbstractShaderProgramGLTest.cpp +++ b/src/Test/AbstractShaderProgramGLTest.cpp @@ -69,8 +69,11 @@ void AbstractShaderProgramGLTest::construct() { } void AbstractShaderProgramGLTest::constructCopy() { - CORRADE_VERIFY(!(std::is_constructible{})); - CORRADE_VERIFY(!(std::is_assignable{})); + CORRADE_VERIFY(!(std::is_constructible{})); + /* GCC 4.6 doesn't have std::is_assignable */ + #ifndef CORRADE_GCC46_COMPATIBILITY + CORRADE_VERIFY(!(std::is_assignable{})); + #endif } void AbstractShaderProgramGLTest::constructMove() { diff --git a/src/Test/AbstractTextureGLTest.cpp b/src/Test/AbstractTextureGLTest.cpp index 42865ae14..753d90337 100644 --- a/src/Test/AbstractTextureGLTest.cpp +++ b/src/Test/AbstractTextureGLTest.cpp @@ -60,8 +60,11 @@ void AbstractTextureGLTest::construct() { } void AbstractTextureGLTest::constructCopy() { - CORRADE_VERIFY(!(std::is_constructible{})); - CORRADE_VERIFY(!(std::is_assignable{})); + CORRADE_VERIFY(!(std::is_constructible{})); + /* GCC 4.6 doesn't have std::is_assignable */ + #ifndef CORRADE_GCC46_COMPATIBILITY + CORRADE_VERIFY(!(std::is_assignable{})); + #endif } void AbstractTextureGLTest::constructMove() { diff --git a/src/Test/BufferGLTest.cpp b/src/Test/BufferGLTest.cpp index 3e050266d..a5718eab2 100644 --- a/src/Test/BufferGLTest.cpp +++ b/src/Test/BufferGLTest.cpp @@ -90,8 +90,11 @@ void BufferGLTest::construct() { } void BufferGLTest::constructCopy() { - CORRADE_VERIFY(!(std::is_constructible{})); - CORRADE_VERIFY(!(std::is_assignable{})); + CORRADE_VERIFY(!(std::is_constructible{})); + /* GCC 4.6 doesn't have std::is_assignable */ + #ifndef CORRADE_GCC46_COMPATIBILITY + CORRADE_VERIFY(!(std::is_assignable{})); + #endif } void BufferGLTest::constructMove() { diff --git a/src/Test/BufferImageGLTest.cpp b/src/Test/BufferImageGLTest.cpp index 38db4ef88..ff01edf04 100644 --- a/src/Test/BufferImageGLTest.cpp +++ b/src/Test/BufferImageGLTest.cpp @@ -65,8 +65,11 @@ void BufferImageTest::construct() { } void BufferImageTest::constructCopy() { - CORRADE_VERIFY(!(std::is_constructible{})); - CORRADE_VERIFY(!(std::is_assignable{})); + CORRADE_VERIFY(!(std::is_constructible{})); + /* GCC 4.6 doesn't have std::is_assignable */ + #ifndef CORRADE_GCC46_COMPATIBILITY + CORRADE_VERIFY(!(std::is_assignable{})); + #endif } void BufferImageTest::constructMove() { diff --git a/src/Test/FramebufferGLTest.cpp b/src/Test/FramebufferGLTest.cpp index 298d1d684..f02fcd538 100644 --- a/src/Test/FramebufferGLTest.cpp +++ b/src/Test/FramebufferGLTest.cpp @@ -61,8 +61,11 @@ void FramebufferGLTest::construct() { } void FramebufferGLTest::constructCopy() { - CORRADE_VERIFY(!(std::is_constructible{})); - CORRADE_VERIFY(!(std::is_assignable{})); + CORRADE_VERIFY(!(std::is_constructible{})); + /* GCC 4.6 doesn't have std::is_assignable */ + #ifndef CORRADE_GCC46_COMPATIBILITY + CORRADE_VERIFY(!(std::is_assignable{})); + #endif } void FramebufferGLTest::constructMove() { diff --git a/src/Test/ImageTest.cpp b/src/Test/ImageTest.cpp index 7ea196199..2a464cf55 100644 --- a/src/Test/ImageTest.cpp +++ b/src/Test/ImageTest.cpp @@ -63,8 +63,11 @@ void ImageTest::construct() { } void ImageTest::constructCopy() { - CORRADE_VERIFY(!(std::is_constructible{})); - CORRADE_VERIFY(!(std::is_assignable{})); + CORRADE_VERIFY(!(std::is_constructible{})); + /* GCC 4.6 doesn't have std::is_assignable */ + #ifndef CORRADE_GCC46_COMPATIBILITY + CORRADE_VERIFY(!(std::is_assignable{})); + #endif } void ImageTest::constructMove() { diff --git a/src/Test/MeshGLTest.cpp b/src/Test/MeshGLTest.cpp index 62215d181..a20a98081 100644 --- a/src/Test/MeshGLTest.cpp +++ b/src/Test/MeshGLTest.cpp @@ -60,8 +60,11 @@ void MeshGLTest::construct() { } void MeshGLTest::constructCopy() { - CORRADE_VERIFY(!(std::is_constructible{})); - CORRADE_VERIFY(!(std::is_assignable{})); + CORRADE_VERIFY(!(std::is_constructible{})); + /* GCC 4.6 doesn't have std::is_assignable */ + #ifndef CORRADE_GCC46_COMPATIBILITY + CORRADE_VERIFY(!(std::is_assignable{})); + #endif } void MeshGLTest::constructMove() { diff --git a/src/Test/RenderbufferGLTest.cpp b/src/Test/RenderbufferGLTest.cpp index 4f44ac41f..58572a93b 100644 --- a/src/Test/RenderbufferGLTest.cpp +++ b/src/Test/RenderbufferGLTest.cpp @@ -60,8 +60,11 @@ void RenderbufferGLTest::construct() { } void RenderbufferGLTest::constructCopy() { - CORRADE_VERIFY(!(std::is_constructible{})); - CORRADE_VERIFY(!(std::is_assignable{})); + CORRADE_VERIFY(!(std::is_constructible{})); + /* GCC 4.6 doesn't have std::is_assignable */ + #ifndef CORRADE_GCC46_COMPATIBILITY + CORRADE_VERIFY(!(std::is_assignable{})); + #endif } void RenderbufferGLTest::constructMove() { diff --git a/src/Test/ShaderGLTest.cpp b/src/Test/ShaderGLTest.cpp index 8e5846b8a..86d7fbeb0 100644 --- a/src/Test/ShaderGLTest.cpp +++ b/src/Test/ShaderGLTest.cpp @@ -70,8 +70,11 @@ void ShaderGLTest::construct() { } void ShaderGLTest::constructCopy() { - CORRADE_VERIFY(!(std::is_constructible{})); - CORRADE_VERIFY(!(std::is_assignable{})); + CORRADE_VERIFY(!(std::is_constructible{})); + /* GCC 4.6 doesn't have std::is_assignable */ + #ifndef CORRADE_GCC46_COMPATIBILITY + CORRADE_VERIFY(!(std::is_assignable{})); + #endif } void ShaderGLTest::constructMove() { diff --git a/src/Trade/Test/ImageDataTest.cpp b/src/Trade/Test/ImageDataTest.cpp index 040cccc94..a2310158b 100644 --- a/src/Trade/Test/ImageDataTest.cpp +++ b/src/Trade/Test/ImageDataTest.cpp @@ -61,8 +61,11 @@ void ImageDataTest::construct() { } void ImageDataTest::constructCopy() { - CORRADE_VERIFY(!(std::is_constructible{})); - CORRADE_VERIFY(!(std::is_assignable{})); + CORRADE_VERIFY(!(std::is_constructible{})); + /* GCC 4.6 doesn't have std::is_assignable */ + #ifndef CORRADE_GCC46_COMPATIBILITY + CORRADE_VERIFY(!(std::is_assignable{})); + #endif } void ImageDataTest::constructMove() {