From 417ad16470c6855c40635be13c338d9f5aeedfd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Sat, 4 Jan 2014 01:59:51 +0100
Subject: [PATCH] GCC 4.4 compatibility: we can't default these.

---
 src/BufferTexture.h                      | 2 +-
 src/CubeMapTexture.h                     | 2 +-
 src/CubeMapTextureArray.h                | 2 +-
 src/Query.h                              | 6 +++---
 src/Test/AbstractShaderProgramGLTest.cpp | 2 +-
 src/Texture.h                            | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/BufferTexture.h b/src/BufferTexture.h
index c432a970c..faad9557f 100644
--- a/src/BufferTexture.h
+++ b/src/BufferTexture.h
@@ -219,7 +219,7 @@ class MAGNUM_EXPORT BufferTexture: private AbstractTexture {
 
         #ifdef CORRADE_GCC45_COMPATIBILITY
         BufferTexture(const BufferTexture&) = delete;
-        BufferTexture(BufferTexture&& other) = default;
+        BufferTexture(BufferTexture&& other): AbstractTexture(std::move(other)) {}
         BufferTexture& operator=(const BufferTexture&) = delete;
         BufferTexture& operator=(BufferTexture&& other) {
             AbstractTexture::operator=(std::move(other));
diff --git a/src/CubeMapTexture.h b/src/CubeMapTexture.h
index 05caec7aa..b4c4a30b9 100644
--- a/src/CubeMapTexture.h
+++ b/src/CubeMapTexture.h
@@ -98,7 +98,7 @@ class CubeMapTexture: public AbstractTexture {
 
         #ifdef CORRADE_GCC45_COMPATIBILITY
         CubeMapTexture(const CubeMapTexture&) = delete;
-        CubeMapTexture(CubeMapTexture&&) = default;
+        CubeMapTexture(CubeMapTexture&& other): AbstractTexture(std::move(other)) {}
         CubeMapTexture& operator=(CubeMapTexture&) = delete;
         CubeMapTexture& operator=(CubeMapTexture&& other) {
             AbstractTexture::operator=(std::move(other));
diff --git a/src/CubeMapTextureArray.h b/src/CubeMapTextureArray.h
index 35a6da895..558a8b89b 100644
--- a/src/CubeMapTextureArray.h
+++ b/src/CubeMapTextureArray.h
@@ -89,7 +89,7 @@ class CubeMapTextureArray: public AbstractTexture {
 
         #ifdef CORRADE_GCC45_COMPATIBILITY
         CubeMapTextureArray(const CubeMapTextureArray&) = delete;
-        CubeMapTextureArray(CubeMapTextureArray&&) = default;
+        CubeMapTextureArray(CubeMapTextureArray&& other): AbstractTexture(std::move(other)) {}
         CubeMapTextureArray& operator=(const CubeMapTextureArray&) = delete;
         CubeMapTextureArray& operator=(CubeMapTextureArray&& other) {
             AbstractTexture::operator=(std::move(other));
diff --git a/src/Query.h b/src/Query.h
index f98abea50..2935cd942 100644
--- a/src/Query.h
+++ b/src/Query.h
@@ -196,7 +196,7 @@ class PrimitiveQuery: public AbstractQuery {
 
         #ifdef CORRADE_GCC45_COMPATIBILITY
         PrimitiveQuery(const PrimitiveQuery&) = delete;
-        PrimitiveQuery(PrimitiveQuery&&) = default;
+        PrimitiveQuery(PrimitiveQuery&& other): AbstractQuery(std::move(other)) {}
         PrimitiveQuery& operator=(const PrimitiveQuery&) = delete;
         PrimitiveQuery& operator=(PrimitiveQuery&& other) {
             AbstractQuery::operator=(std::move(other));
@@ -334,7 +334,7 @@ class SampleQuery: public AbstractQuery {
 
         #ifdef CORRADE_GCC45_COMPATIBILITY
         SampleQuery(const SampleQuery&) = delete;
-        SampleQuery(SampleQuery&&) = default;
+        SampleQuery(SampleQuery&& other): AbstractQuery(std::move(other)) {}
         SampleQuery& operator=(const SampleQuery&) = delete;
         SampleQuery& operator=(SampleQuery&& other) {
             AbstractQuery::operator=(std::move(other));
@@ -430,7 +430,7 @@ class TimeQuery: public AbstractQuery {
 
         #ifdef CORRADE_GCC45_COMPATIBILITY
         TimeQuery(const TimeQuery&) = delete;
-        TimeQuery(TimeQuery&&) = default;
+        TimeQuery(TimeQuery&& other): AbstractQuery(std::move(other)) {}
         TimeQuery& operator=(const TimeQuery&) = delete;
         TimeQuery& operator=(TimeQuery&& other) {
             AbstractQuery::operator=(std::move(other));
diff --git a/src/Test/AbstractShaderProgramGLTest.cpp b/src/Test/AbstractShaderProgramGLTest.cpp
index cf637171a..c150d77ac 100644
--- a/src/Test/AbstractShaderProgramGLTest.cpp
+++ b/src/Test/AbstractShaderProgramGLTest.cpp
@@ -56,7 +56,7 @@ class MyShader: public AbstractShaderProgram {
 
         #ifdef CORRADE_GCC45_COMPATIBILITY
         MyShader(const MyShader&) = delete;
-        MyShader(MyShader&&) = default;
+        MyShader(MyShader&& other): AbstractShaderProgram(std::move(other)) {}
         MyShader& operator=(const MyShader&) = delete;
         MyShader& operator=(MyShader&& other) {
             AbstractShaderProgram::operator=(std::move(other));
diff --git a/src/Texture.h b/src/Texture.h
index 8bd063a01..265df7738 100644
--- a/src/Texture.h
+++ b/src/Texture.h
@@ -231,7 +231,7 @@ template<UnsignedInt dimensions> class Texture: public AbstractTexture {
 
         #ifdef CORRADE_GCC45_COMPATIBILITY
         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=(Texture<dimensions>&& other) {
             AbstractTexture::operator=(std::move(other));