From ce7102df46ebe335bb97f815812e1282f8fefc4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Sun, 29 Dec 2013 11:00:23 +0100
Subject: [PATCH] GCC 4.6 compatibility: no std::is_assignable.

Just disabling it, as it appears only in tests.
---
 src/Test/AbstractQueryGLTest.cpp         | 7 +++++--
 src/Test/AbstractShaderProgramGLTest.cpp | 7 +++++--
 src/Test/AbstractTextureGLTest.cpp       | 7 +++++--
 src/Test/BufferGLTest.cpp                | 7 +++++--
 src/Test/BufferImageGLTest.cpp           | 7 +++++--
 src/Test/FramebufferGLTest.cpp           | 7 +++++--
 src/Test/ImageTest.cpp                   | 7 +++++--
 src/Test/MeshGLTest.cpp                  | 7 +++++--
 src/Test/RenderbufferGLTest.cpp          | 7 +++++--
 src/Test/ShaderGLTest.cpp                | 7 +++++--
 src/Trade/Test/ImageDataTest.cpp         | 7 +++++--
 11 files changed, 55 insertions(+), 22 deletions(-)

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<SampleQuery, const SampleQuery&>{}));
-     CORRADE_VERIFY(!(std::is_assignable<SampleQuery, const SampleQuery&>{}));
+    CORRADE_VERIFY(!(std::is_constructible<SampleQuery, const SampleQuery&>{}));
+    /* GCC 4.6 doesn't have std::is_assignable */
+    #ifndef CORRADE_GCC46_COMPATIBILITY
+    CORRADE_VERIFY(!(std::is_assignable<SampleQuery, const SampleQuery&>{}));
+    #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<MyShader, const MyShader&>{}));
-     CORRADE_VERIFY(!(std::is_assignable<MyShader, const MyShader&>{}));
+    CORRADE_VERIFY(!(std::is_constructible<MyShader, const MyShader&>{}));
+    /* GCC 4.6 doesn't have std::is_assignable */
+    #ifndef CORRADE_GCC46_COMPATIBILITY
+    CORRADE_VERIFY(!(std::is_assignable<MyShader, const MyShader&>{}));
+    #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<Texture2D, const Texture2D&>{}));
-     CORRADE_VERIFY(!(std::is_assignable<Texture2D, const Texture2D&>{}));
+    CORRADE_VERIFY(!(std::is_constructible<Texture2D, const Texture2D&>{}));
+    /* GCC 4.6 doesn't have std::is_assignable */
+    #ifndef CORRADE_GCC46_COMPATIBILITY
+    CORRADE_VERIFY(!(std::is_assignable<Texture2D, const Texture2D&>{}));
+    #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<Buffer, const Buffer&>{}));
-     CORRADE_VERIFY(!(std::is_assignable<Buffer, const Buffer&>{}));
+    CORRADE_VERIFY(!(std::is_constructible<Buffer, const Buffer&>{}));
+    /* GCC 4.6 doesn't have std::is_assignable */
+    #ifndef CORRADE_GCC46_COMPATIBILITY
+    CORRADE_VERIFY(!(std::is_assignable<Buffer, const Buffer&>{}));
+    #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<BufferImage2D, const BufferImage2D&>{}));
-     CORRADE_VERIFY(!(std::is_assignable<BufferImage2D, const BufferImage2D&>{}));
+    CORRADE_VERIFY(!(std::is_constructible<BufferImage2D, const BufferImage2D&>{}));
+    /* GCC 4.6 doesn't have std::is_assignable */
+    #ifndef CORRADE_GCC46_COMPATIBILITY
+    CORRADE_VERIFY(!(std::is_assignable<BufferImage2D, const BufferImage2D&>{}));
+    #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<Framebuffer, const Framebuffer&>{}));
-     CORRADE_VERIFY(!(std::is_assignable<Framebuffer, const Framebuffer&>{}));
+    CORRADE_VERIFY(!(std::is_constructible<Framebuffer, const Framebuffer&>{}));
+    /* GCC 4.6 doesn't have std::is_assignable */
+    #ifndef CORRADE_GCC46_COMPATIBILITY
+    CORRADE_VERIFY(!(std::is_assignable<Framebuffer, const Framebuffer&>{}));
+    #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<Image2D, const Image2D&>{}));
-     CORRADE_VERIFY(!(std::is_assignable<Image2D, const Image2D&>{}));
+    CORRADE_VERIFY(!(std::is_constructible<Image2D, const Image2D&>{}));
+    /* GCC 4.6 doesn't have std::is_assignable */
+    #ifndef CORRADE_GCC46_COMPATIBILITY
+    CORRADE_VERIFY(!(std::is_assignable<Image2D, const Image2D&>{}));
+    #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<Mesh, const Mesh&>{}));
-     CORRADE_VERIFY(!(std::is_assignable<Mesh, const Mesh&>{}));
+    CORRADE_VERIFY(!(std::is_constructible<Mesh, const Mesh&>{}));
+    /* GCC 4.6 doesn't have std::is_assignable */
+    #ifndef CORRADE_GCC46_COMPATIBILITY
+    CORRADE_VERIFY(!(std::is_assignable<Mesh, const Mesh&>{}));
+    #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<Renderbuffer, const Renderbuffer&>{}));
-     CORRADE_VERIFY(!(std::is_assignable<Renderbuffer, const Renderbuffer&>{}));
+    CORRADE_VERIFY(!(std::is_constructible<Renderbuffer, const Renderbuffer&>{}));
+    /* GCC 4.6 doesn't have std::is_assignable */
+    #ifndef CORRADE_GCC46_COMPATIBILITY
+    CORRADE_VERIFY(!(std::is_assignable<Renderbuffer, const Renderbuffer&>{}));
+    #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<Shader, const Shader&>{}));
-     CORRADE_VERIFY(!(std::is_assignable<Shader, const Shader&>{}));
+    CORRADE_VERIFY(!(std::is_constructible<Shader, const Shader&>{}));
+    /* GCC 4.6 doesn't have std::is_assignable */
+    #ifndef CORRADE_GCC46_COMPATIBILITY
+    CORRADE_VERIFY(!(std::is_assignable<Shader, const Shader&>{}));
+    #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<Trade::ImageData2D, const Trade::ImageData2D&>{}));
-     CORRADE_VERIFY(!(std::is_assignable<Trade::ImageData2D, const Trade::ImageData2D&>{}));
+    CORRADE_VERIFY(!(std::is_constructible<Trade::ImageData2D, const Trade::ImageData2D&>{}));
+    /* GCC 4.6 doesn't have std::is_assignable */
+    #ifndef CORRADE_GCC46_COMPATIBILITY
+    CORRADE_VERIFY(!(std::is_assignable<Trade::ImageData2D, const Trade::ImageData2D&>{}));
+    #endif
 }
 
 void ImageDataTest::constructMove() {