Browse Source

GCC 4.4 compatibility: we can't default these.

Vladimír Vondruš 13 years ago
parent
commit
417ad16470
  1. 2
      src/BufferTexture.h
  2. 2
      src/CubeMapTexture.h
  3. 2
      src/CubeMapTextureArray.h
  4. 6
      src/Query.h
  5. 2
      src/Test/AbstractShaderProgramGLTest.cpp
  6. 2
      src/Texture.h

2
src/BufferTexture.h

@ -219,7 +219,7 @@ class MAGNUM_EXPORT BufferTexture: private AbstractTexture {
#ifdef CORRADE_GCC45_COMPATIBILITY #ifdef CORRADE_GCC45_COMPATIBILITY
BufferTexture(const BufferTexture&) = delete; BufferTexture(const BufferTexture&) = delete;
BufferTexture(BufferTexture&& other) = default; BufferTexture(BufferTexture&& other): AbstractTexture(std::move(other)) {}
BufferTexture& operator=(const BufferTexture&) = delete; BufferTexture& operator=(const BufferTexture&) = delete;
BufferTexture& operator=(BufferTexture&& other) { BufferTexture& operator=(BufferTexture&& other) {
AbstractTexture::operator=(std::move(other)); AbstractTexture::operator=(std::move(other));

2
src/CubeMapTexture.h

@ -98,7 +98,7 @@ class CubeMapTexture: public AbstractTexture {
#ifdef CORRADE_GCC45_COMPATIBILITY #ifdef CORRADE_GCC45_COMPATIBILITY
CubeMapTexture(const CubeMapTexture&) = delete; CubeMapTexture(const CubeMapTexture&) = delete;
CubeMapTexture(CubeMapTexture&&) = default; CubeMapTexture(CubeMapTexture&& other): AbstractTexture(std::move(other)) {}
CubeMapTexture& operator=(CubeMapTexture&) = delete; CubeMapTexture& operator=(CubeMapTexture&) = delete;
CubeMapTexture& operator=(CubeMapTexture&& other) { CubeMapTexture& operator=(CubeMapTexture&& other) {
AbstractTexture::operator=(std::move(other)); AbstractTexture::operator=(std::move(other));

2
src/CubeMapTextureArray.h

@ -89,7 +89,7 @@ class CubeMapTextureArray: public AbstractTexture {
#ifdef CORRADE_GCC45_COMPATIBILITY #ifdef CORRADE_GCC45_COMPATIBILITY
CubeMapTextureArray(const CubeMapTextureArray&) = delete; CubeMapTextureArray(const CubeMapTextureArray&) = delete;
CubeMapTextureArray(CubeMapTextureArray&&) = default; CubeMapTextureArray(CubeMapTextureArray&& other): AbstractTexture(std::move(other)) {}
CubeMapTextureArray& operator=(const CubeMapTextureArray&) = delete; CubeMapTextureArray& operator=(const CubeMapTextureArray&) = delete;
CubeMapTextureArray& operator=(CubeMapTextureArray&& other) { CubeMapTextureArray& operator=(CubeMapTextureArray&& other) {
AbstractTexture::operator=(std::move(other)); AbstractTexture::operator=(std::move(other));

6
src/Query.h

@ -196,7 +196,7 @@ class PrimitiveQuery: public AbstractQuery {
#ifdef CORRADE_GCC45_COMPATIBILITY #ifdef CORRADE_GCC45_COMPATIBILITY
PrimitiveQuery(const PrimitiveQuery&) = delete; PrimitiveQuery(const PrimitiveQuery&) = delete;
PrimitiveQuery(PrimitiveQuery&&) = default; PrimitiveQuery(PrimitiveQuery&& other): AbstractQuery(std::move(other)) {}
PrimitiveQuery& operator=(const PrimitiveQuery&) = delete; PrimitiveQuery& operator=(const PrimitiveQuery&) = delete;
PrimitiveQuery& operator=(PrimitiveQuery&& other) { PrimitiveQuery& operator=(PrimitiveQuery&& other) {
AbstractQuery::operator=(std::move(other)); AbstractQuery::operator=(std::move(other));
@ -334,7 +334,7 @@ class SampleQuery: public AbstractQuery {
#ifdef CORRADE_GCC45_COMPATIBILITY #ifdef CORRADE_GCC45_COMPATIBILITY
SampleQuery(const SampleQuery&) = delete; SampleQuery(const SampleQuery&) = delete;
SampleQuery(SampleQuery&&) = default; SampleQuery(SampleQuery&& other): AbstractQuery(std::move(other)) {}
SampleQuery& operator=(const SampleQuery&) = delete; SampleQuery& operator=(const SampleQuery&) = delete;
SampleQuery& operator=(SampleQuery&& other) { SampleQuery& operator=(SampleQuery&& other) {
AbstractQuery::operator=(std::move(other)); AbstractQuery::operator=(std::move(other));
@ -430,7 +430,7 @@ class TimeQuery: public AbstractQuery {
#ifdef CORRADE_GCC45_COMPATIBILITY #ifdef CORRADE_GCC45_COMPATIBILITY
TimeQuery(const TimeQuery&) = delete; TimeQuery(const TimeQuery&) = delete;
TimeQuery(TimeQuery&&) = default; TimeQuery(TimeQuery&& other): AbstractQuery(std::move(other)) {}
TimeQuery& operator=(const TimeQuery&) = delete; TimeQuery& operator=(const TimeQuery&) = delete;
TimeQuery& operator=(TimeQuery&& other) { TimeQuery& operator=(TimeQuery&& other) {
AbstractQuery::operator=(std::move(other)); AbstractQuery::operator=(std::move(other));

2
src/Test/AbstractShaderProgramGLTest.cpp

@ -56,7 +56,7 @@ class MyShader: public AbstractShaderProgram {
#ifdef CORRADE_GCC45_COMPATIBILITY #ifdef CORRADE_GCC45_COMPATIBILITY
MyShader(const MyShader&) = delete; MyShader(const MyShader&) = delete;
MyShader(MyShader&&) = default; MyShader(MyShader&& other): AbstractShaderProgram(std::move(other)) {}
MyShader& operator=(const MyShader&) = delete; MyShader& operator=(const MyShader&) = delete;
MyShader& operator=(MyShader&& other) { MyShader& operator=(MyShader&& other) {
AbstractShaderProgram::operator=(std::move(other)); AbstractShaderProgram::operator=(std::move(other));

2
src/Texture.h

@ -231,7 +231,7 @@ template<UnsignedInt dimensions> class Texture: public AbstractTexture {
#ifdef CORRADE_GCC45_COMPATIBILITY #ifdef CORRADE_GCC45_COMPATIBILITY
Texture(const Texture<dimensions>&) = delete; Texture(const Texture<dimensions>&) = delete;
Texture(Texture<dimensions>&&) = default; Texture(Texture<dimensions>&& other): AbstractTexture(std::move(other)) {}
Texture<dimensions>& operator=(const Texture<dimensions>&) = delete; Texture<dimensions>& operator=(const Texture<dimensions>&) = delete;
Texture<dimensions>& operator=(Texture<dimensions>&& other) { Texture<dimensions>& operator=(Texture<dimensions>&& other) {
AbstractTexture::operator=(std::move(other)); AbstractTexture::operator=(std::move(other));

Loading…
Cancel
Save