Browse Source

GCC 4.6 compatibility: no std::is_assignable.

Just disabling it, as it appears only in tests.
pull/51/head
Vladimír Vondruš 13 years ago
parent
commit
ce7102df46
  1. 7
      src/Test/AbstractQueryGLTest.cpp
  2. 7
      src/Test/AbstractShaderProgramGLTest.cpp
  3. 7
      src/Test/AbstractTextureGLTest.cpp
  4. 7
      src/Test/BufferGLTest.cpp
  5. 7
      src/Test/BufferImageGLTest.cpp
  6. 7
      src/Test/FramebufferGLTest.cpp
  7. 7
      src/Test/ImageTest.cpp
  8. 7
      src/Test/MeshGLTest.cpp
  9. 7
      src/Test/RenderbufferGLTest.cpp
  10. 7
      src/Test/ShaderGLTest.cpp
  11. 7
      src/Trade/Test/ImageDataTest.cpp

7
src/Test/AbstractQueryGLTest.cpp

@ -65,8 +65,11 @@ void AbstractQueryGLTest::construct() {
} }
void AbstractQueryGLTest::constructCopy() { void AbstractQueryGLTest::constructCopy() {
CORRADE_VERIFY(!(std::is_constructible<SampleQuery, const SampleQuery&>{})); CORRADE_VERIFY(!(std::is_constructible<SampleQuery, const SampleQuery&>{}));
CORRADE_VERIFY(!(std::is_assignable<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() { void AbstractQueryGLTest::constructMove() {

7
src/Test/AbstractShaderProgramGLTest.cpp

@ -69,8 +69,11 @@ void AbstractShaderProgramGLTest::construct() {
} }
void AbstractShaderProgramGLTest::constructCopy() { void AbstractShaderProgramGLTest::constructCopy() {
CORRADE_VERIFY(!(std::is_constructible<MyShader, const MyShader&>{})); CORRADE_VERIFY(!(std::is_constructible<MyShader, const MyShader&>{}));
CORRADE_VERIFY(!(std::is_assignable<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() { void AbstractShaderProgramGLTest::constructMove() {

7
src/Test/AbstractTextureGLTest.cpp

@ -60,8 +60,11 @@ void AbstractTextureGLTest::construct() {
} }
void AbstractTextureGLTest::constructCopy() { void AbstractTextureGLTest::constructCopy() {
CORRADE_VERIFY(!(std::is_constructible<Texture2D, const Texture2D&>{})); CORRADE_VERIFY(!(std::is_constructible<Texture2D, const Texture2D&>{}));
CORRADE_VERIFY(!(std::is_assignable<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() { void AbstractTextureGLTest::constructMove() {

7
src/Test/BufferGLTest.cpp

@ -90,8 +90,11 @@ void BufferGLTest::construct() {
} }
void BufferGLTest::constructCopy() { void BufferGLTest::constructCopy() {
CORRADE_VERIFY(!(std::is_constructible<Buffer, const Buffer&>{})); CORRADE_VERIFY(!(std::is_constructible<Buffer, const Buffer&>{}));
CORRADE_VERIFY(!(std::is_assignable<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() { void BufferGLTest::constructMove() {

7
src/Test/BufferImageGLTest.cpp

@ -65,8 +65,11 @@ void BufferImageTest::construct() {
} }
void BufferImageTest::constructCopy() { void BufferImageTest::constructCopy() {
CORRADE_VERIFY(!(std::is_constructible<BufferImage2D, const BufferImage2D&>{})); CORRADE_VERIFY(!(std::is_constructible<BufferImage2D, const BufferImage2D&>{}));
CORRADE_VERIFY(!(std::is_assignable<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() { void BufferImageTest::constructMove() {

7
src/Test/FramebufferGLTest.cpp

@ -61,8 +61,11 @@ void FramebufferGLTest::construct() {
} }
void FramebufferGLTest::constructCopy() { void FramebufferGLTest::constructCopy() {
CORRADE_VERIFY(!(std::is_constructible<Framebuffer, const Framebuffer&>{})); CORRADE_VERIFY(!(std::is_constructible<Framebuffer, const Framebuffer&>{}));
CORRADE_VERIFY(!(std::is_assignable<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() { void FramebufferGLTest::constructMove() {

7
src/Test/ImageTest.cpp

@ -63,8 +63,11 @@ void ImageTest::construct() {
} }
void ImageTest::constructCopy() { void ImageTest::constructCopy() {
CORRADE_VERIFY(!(std::is_constructible<Image2D, const Image2D&>{})); CORRADE_VERIFY(!(std::is_constructible<Image2D, const Image2D&>{}));
CORRADE_VERIFY(!(std::is_assignable<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() { void ImageTest::constructMove() {

7
src/Test/MeshGLTest.cpp

@ -60,8 +60,11 @@ void MeshGLTest::construct() {
} }
void MeshGLTest::constructCopy() { void MeshGLTest::constructCopy() {
CORRADE_VERIFY(!(std::is_constructible<Mesh, const Mesh&>{})); CORRADE_VERIFY(!(std::is_constructible<Mesh, const Mesh&>{}));
CORRADE_VERIFY(!(std::is_assignable<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() { void MeshGLTest::constructMove() {

7
src/Test/RenderbufferGLTest.cpp

@ -60,8 +60,11 @@ void RenderbufferGLTest::construct() {
} }
void RenderbufferGLTest::constructCopy() { void RenderbufferGLTest::constructCopy() {
CORRADE_VERIFY(!(std::is_constructible<Renderbuffer, const Renderbuffer&>{})); CORRADE_VERIFY(!(std::is_constructible<Renderbuffer, const Renderbuffer&>{}));
CORRADE_VERIFY(!(std::is_assignable<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() { void RenderbufferGLTest::constructMove() {

7
src/Test/ShaderGLTest.cpp

@ -70,8 +70,11 @@ void ShaderGLTest::construct() {
} }
void ShaderGLTest::constructCopy() { void ShaderGLTest::constructCopy() {
CORRADE_VERIFY(!(std::is_constructible<Shader, const Shader&>{})); CORRADE_VERIFY(!(std::is_constructible<Shader, const Shader&>{}));
CORRADE_VERIFY(!(std::is_assignable<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() { void ShaderGLTest::constructMove() {

7
src/Trade/Test/ImageDataTest.cpp

@ -61,8 +61,11 @@ void ImageDataTest::construct() {
} }
void ImageDataTest::constructCopy() { void ImageDataTest::constructCopy() {
CORRADE_VERIFY(!(std::is_constructible<Trade::ImageData2D, const Trade::ImageData2D&>{})); CORRADE_VERIFY(!(std::is_constructible<Trade::ImageData2D, const Trade::ImageData2D&>{}));
CORRADE_VERIFY(!(std::is_assignable<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() { void ImageDataTest::constructMove() {

Loading…
Cancel
Save