Browse Source

GCC 4.5 compatibility: fix the merge.

This was already fixed earlier but I forgot to copy it over in
9ea4f85968 merge commit.
Vladimír Vondruš 12 years ago
parent
commit
1ad6d97558
  1. 2
      src/Magnum/Test/AbstractShaderProgramGLTest.cpp
  2. 2
      src/Magnum/Test/FramebufferGLTest.cpp
  3. 2
      src/Magnum/Test/MeshGLTest.cpp

2
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&>{}));

2
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&>{}));

2
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&>{}));

Loading…
Cancel
Save