From 1ad6d97558b1ea012fef9516598ab490490fcdf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Thu, 16 Jan 2014 19:36:27 +0100
Subject: [PATCH] GCC 4.5 compatibility: fix the merge.

This was already fixed earlier but I forgot to copy it over in
9ea4f8596898f29cf63d61f71441126d007acf9e merge commit.
---
 src/Magnum/Test/AbstractShaderProgramGLTest.cpp | 2 +-
 src/Magnum/Test/FramebufferGLTest.cpp           | 2 +-
 src/Magnum/Test/MeshGLTest.cpp                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Magnum/Test/AbstractShaderProgramGLTest.cpp b/src/Magnum/Test/AbstractShaderProgramGLTest.cpp
index 4ebda946d..8e5840a8a 100644
--- a/src/Magnum/Test/AbstractShaderProgramGLTest.cpp
+++ b/src/Magnum/Test/AbstractShaderProgramGLTest.cpp
@@ -105,7 +105,7 @@ void AbstractShaderProgramGLTest::construct() {
 
 void AbstractShaderProgramGLTest::constructCopy() {
     #ifndef CORRADE_GCC44_COMPATIBILITY
-    CORRADE_VERIFY(!(std::is_constructible<DummyShader, const DummyShader&>{}));
+    CORRADE_VERIFY(!(std::is_constructible<DummyShader, const DummyShader&>::value));
     /* GCC 4.6 doesn't have std::is_assignable */
     #ifndef CORRADE_GCC46_COMPATIBILITY
     CORRADE_VERIFY(!(std::is_assignable<DummyShader, const DummyShader&>{}));
diff --git a/src/Magnum/Test/FramebufferGLTest.cpp b/src/Magnum/Test/FramebufferGLTest.cpp
index 3ba5e7c90..b4081a3a3 100644
--- a/src/Magnum/Test/FramebufferGLTest.cpp
+++ b/src/Magnum/Test/FramebufferGLTest.cpp
@@ -147,7 +147,7 @@ void FramebufferGLTest::construct() {
 
 void FramebufferGLTest::constructCopy() {
     #ifndef CORRADE_GCC44_COMPATIBILITY
-    CORRADE_VERIFY(!(std::is_constructible<Framebuffer, const Framebuffer&>{}));
+    CORRADE_VERIFY(!(std::is_constructible<Framebuffer, const Framebuffer&>::value));
     /* GCC 4.6 doesn't have std::is_assignable */
     #ifndef CORRADE_GCC46_COMPATIBILITY
     CORRADE_VERIFY(!(std::is_assignable<Framebuffer, const Framebuffer&>{}));
diff --git a/src/Magnum/Test/MeshGLTest.cpp b/src/Magnum/Test/MeshGLTest.cpp
index 9ab3849c7..13b788829 100644
--- a/src/Magnum/Test/MeshGLTest.cpp
+++ b/src/Magnum/Test/MeshGLTest.cpp
@@ -190,7 +190,7 @@ void MeshGLTest::construct() {
 
 void MeshGLTest::constructCopy() {
     #ifndef CORRADE_GCC44_COMPATIBILITY
-    CORRADE_VERIFY(!(std::is_constructible<Mesh, const Mesh&>{}));
+    CORRADE_VERIFY(!(std::is_constructible<Mesh, const Mesh&>::value));
     /* GCC 4.6 doesn't have std::is_assignable */
     #ifndef CORRADE_GCC46_COMPATIBILITY
     CORRADE_VERIFY(!(std::is_assignable<Mesh, const Mesh&>{}));