From bdfa0b4abe0450613937bf5d3ca33639d685aa15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 4 Jan 2014 01:47:48 +0100 Subject: [PATCH 1/2] Proper syntax for deleted copy constructors. Another bug caused by copypasting, but caused issue only on GCC 4.5. Also removed unused parameter name. --- src/Image.h | 4 ++-- src/Trade/ImageData.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Image.h b/src/Image.h index 1bdc52633..9c9881e86 100644 --- a/src/Image.h +++ b/src/Image.h @@ -66,13 +66,13 @@ template class Image: public AbstractImage { explicit Image(ColorFormat format, ColorType type): AbstractImage(format, type), _data(nullptr) {} /** @brief Copying is not allowed */ - Image(const Image&& other) = delete; + Image(const Image&) = delete; /** @brief Move constructor */ Image(Image&& other) noexcept; /** @brief Copying is not allowed */ - Image& operator=(const Image&& other) = delete; + Image& operator=(const Image&) = delete; /** @brief Move assignment */ Image& operator=(Image&& other) noexcept; diff --git a/src/Trade/ImageData.h b/src/Trade/ImageData.h index a5e8691ba..181b768bb 100644 --- a/src/Trade/ImageData.h +++ b/src/Trade/ImageData.h @@ -56,13 +56,13 @@ template class ImageData: public AbstractImage { explicit ImageData(ColorFormat format, ColorType type, const typename DimensionTraits::VectorType& size, void* data): AbstractImage(format, type), _size(size), _data(reinterpret_cast(data)) {} /** @brief Copying is not allowed */ - ImageData(const ImageData&& other) = delete; + ImageData(const ImageData&) = delete; /** @brief Move constructor */ ImageData(ImageData&& other) noexcept; /** @brief Copying is not allowed */ - ImageData& operator=(const ImageData&& other) = delete; + ImageData& operator=(const ImageData&) = delete; /** @brief Move assignment */ ImageData& operator=(ImageData&& other) noexcept; From a9ca7d7544018825e637268481a24f4b22791967 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 4 Jan 2014 01:48:40 +0100 Subject: [PATCH 2/2] Platform: include cleanup. --- src/Platform/Sdl2Application.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Platform/Sdl2Application.h b/src/Platform/Sdl2Application.h index 837966012..bb03214f0 100644 --- a/src/Platform/Sdl2Application.h +++ b/src/Platform/Sdl2Application.h @@ -29,6 +29,7 @@ */ #include +#include #include "Platform/Platform.h" #include "Math/Vector2.h" @@ -39,8 +40,6 @@ #endif #include #include -#include -#include namespace Magnum {