Browse Source

GCC 4.5 compatibility: no bool conversion of std::integral_constant.

Vladimír Vondruš 13 years ago
parent
commit
53bdfd059f
  1. 2
      src/Test/AbstractQueryGLTest.cpp
  2. 2
      src/Test/AbstractShaderProgramGLTest.cpp
  3. 2
      src/Test/AbstractTextureGLTest.cpp
  4. 2
      src/Test/BufferGLTest.cpp
  5. 2
      src/Test/BufferImageGLTest.cpp
  6. 2
      src/Test/FramebufferGLTest.cpp
  7. 2
      src/Test/ImageTest.cpp
  8. 2
      src/Test/MeshGLTest.cpp
  9. 2
      src/Test/RenderbufferGLTest.cpp
  10. 2
      src/Test/ShaderGLTest.cpp
  11. 2
      src/Trade/Test/ImageDataTest.cpp

2
src/Test/AbstractQueryGLTest.cpp

@ -65,7 +65,7 @@ void AbstractQueryGLTest::construct() {
}
void AbstractQueryGLTest::constructCopy() {
CORRADE_VERIFY(!(std::is_constructible<SampleQuery, const SampleQuery&>{}));
CORRADE_VERIFY(!(std::is_constructible<SampleQuery, const SampleQuery&>::value));
/* GCC 4.6 doesn't have std::is_assignable */
#ifndef CORRADE_GCC46_COMPATIBILITY
CORRADE_VERIFY(!(std::is_assignable<SampleQuery, const SampleQuery&>{}));

2
src/Test/AbstractShaderProgramGLTest.cpp

@ -69,7 +69,7 @@ void AbstractShaderProgramGLTest::construct() {
}
void AbstractShaderProgramGLTest::constructCopy() {
CORRADE_VERIFY(!(std::is_constructible<MyShader, const MyShader&>{}));
CORRADE_VERIFY(!(std::is_constructible<MyShader, const MyShader&>::value));
/* GCC 4.6 doesn't have std::is_assignable */
#ifndef CORRADE_GCC46_COMPATIBILITY
CORRADE_VERIFY(!(std::is_assignable<MyShader, const MyShader&>{}));

2
src/Test/AbstractTextureGLTest.cpp

@ -60,7 +60,7 @@ void AbstractTextureGLTest::construct() {
}
void AbstractTextureGLTest::constructCopy() {
CORRADE_VERIFY(!(std::is_constructible<Texture2D, const Texture2D&>{}));
CORRADE_VERIFY(!(std::is_constructible<Texture2D, const Texture2D&>::value));
/* GCC 4.6 doesn't have std::is_assignable */
#ifndef CORRADE_GCC46_COMPATIBILITY
CORRADE_VERIFY(!(std::is_assignable<Texture2D, const Texture2D&>{}));

2
src/Test/BufferGLTest.cpp

@ -90,7 +90,7 @@ void BufferGLTest::construct() {
}
void BufferGLTest::constructCopy() {
CORRADE_VERIFY(!(std::is_constructible<Buffer, const Buffer&>{}));
CORRADE_VERIFY(!(std::is_constructible<Buffer, const Buffer&>::value));
/* GCC 4.6 doesn't have std::is_assignable */
#ifndef CORRADE_GCC46_COMPATIBILITY
CORRADE_VERIFY(!(std::is_assignable<Buffer, const Buffer&>{}));

2
src/Test/BufferImageGLTest.cpp

@ -72,7 +72,7 @@ void BufferImageTest::construct() {
}
void BufferImageTest::constructCopy() {
CORRADE_VERIFY(!(std::is_constructible<BufferImage2D, const BufferImage2D&>{}));
CORRADE_VERIFY(!(std::is_constructible<BufferImage2D, const BufferImage2D&>::value));
/* GCC 4.6 doesn't have std::is_assignable */
#ifndef CORRADE_GCC46_COMPATIBILITY
CORRADE_VERIFY(!(std::is_assignable<BufferImage2D, const BufferImage2D&>{}));

2
src/Test/FramebufferGLTest.cpp

@ -61,7 +61,7 @@ void FramebufferGLTest::construct() {
}
void FramebufferGLTest::constructCopy() {
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/Test/ImageTest.cpp

@ -63,7 +63,7 @@ void ImageTest::construct() {
}
void ImageTest::constructCopy() {
CORRADE_VERIFY(!(std::is_constructible<Image2D, const Image2D&>{}));
CORRADE_VERIFY(!(std::is_constructible<Image2D, const Image2D&>::value));
/* GCC 4.6 doesn't have std::is_assignable */
#ifndef CORRADE_GCC46_COMPATIBILITY
CORRADE_VERIFY(!(std::is_assignable<Image2D, const Image2D&>{}));

2
src/Test/MeshGLTest.cpp

@ -68,7 +68,7 @@ void MeshGLTest::construct() {
}
void MeshGLTest::constructCopy() {
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&>{}));

2
src/Test/RenderbufferGLTest.cpp

@ -60,7 +60,7 @@ void RenderbufferGLTest::construct() {
}
void RenderbufferGLTest::constructCopy() {
CORRADE_VERIFY(!(std::is_constructible<Renderbuffer, const Renderbuffer&>{}));
CORRADE_VERIFY(!(std::is_constructible<Renderbuffer, const Renderbuffer&>::value));
/* GCC 4.6 doesn't have std::is_assignable */
#ifndef CORRADE_GCC46_COMPATIBILITY
CORRADE_VERIFY(!(std::is_assignable<Renderbuffer, const Renderbuffer&>{}));

2
src/Test/ShaderGLTest.cpp

@ -70,7 +70,7 @@ void ShaderGLTest::construct() {
}
void ShaderGLTest::constructCopy() {
CORRADE_VERIFY(!(std::is_constructible<Shader, const Shader&>{}));
CORRADE_VERIFY(!(std::is_constructible<Shader, const Shader&>::value));
/* GCC 4.6 doesn't have std::is_assignable */
#ifndef CORRADE_GCC46_COMPATIBILITY
CORRADE_VERIFY(!(std::is_assignable<Shader, const Shader&>{}));

2
src/Trade/Test/ImageDataTest.cpp

@ -61,7 +61,7 @@ void ImageDataTest::construct() {
}
void ImageDataTest::constructCopy() {
CORRADE_VERIFY(!(std::is_constructible<Trade::ImageData2D, const Trade::ImageData2D&>{}));
CORRADE_VERIFY(!(std::is_constructible<Trade::ImageData2D, const Trade::ImageData2D&>::value));
/* GCC 4.6 doesn't have std::is_assignable */
#ifndef CORRADE_GCC46_COMPATIBILITY
CORRADE_VERIFY(!(std::is_assignable<Trade::ImageData2D, const Trade::ImageData2D&>{}));

Loading…
Cancel
Save