Merge branch 'master' into compatibility

src/Image.h

@@ -66,13 +66,13 @@ template<UnsignedInt dimensions> class Image: public AbstractImage {
         explicit Image(ColorFormat format, ColorType type): AbstractImage(format, type), _data(nullptr) {}
 
         /** @brief Copying is not allowed */
-        Image(const Image<dimensions>&& other) = delete;
+        Image(const Image<dimensions>&) = delete;
 
         /** @brief Move constructor */
         Image(Image<dimensions>&& other) noexcept;
 
         /** @brief Copying is not allowed */
-        Image<dimensions>& operator=(const Image<dimensions>&& other) = delete;
+        Image<dimensions>& operator=(const Image<dimensions>&) = delete;
 
         /** @brief Move assignment */
         Image<dimensions>& operator=(Image<dimensions>&& other) noexcept;

src/Platform/Sdl2Application.h

@@ -29,6 +29,7 @@
  */
 
 #include <Containers/EnumSet.h>
+#include <Corrade.h>
 
 #include "Platform/Platform.h"
 #include "Math/Vector2.h"
@@ -39,8 +40,6 @@
 #endif
 #include <SDL.h>
 #include <SDL_scancode.h>
-#include <Containers/EnumSet.h>
-#include <Corrade.h>
 
 #ifdef CORRADE_GCC45_COMPATIBILITY
 #include "Version.h"

src/Trade/ImageData.h

@@ -56,13 +56,13 @@ template<UnsignedInt dimensions> class ImageData: public AbstractImage {
         explicit ImageData(ColorFormat format, ColorType type, const typename DimensionTraits<Dimensions, Int>::VectorType& size, void* data): AbstractImage(format, type), _size(size), _data(reinterpret_cast<unsigned char*>(data)) {}
 
         /** @brief Copying is not allowed */
-        ImageData(const ImageData<dimensions>&& other) = delete;
+        ImageData(const ImageData<dimensions>&) = delete;
 
         /** @brief Move constructor */
         ImageData(ImageData<dimensions>&& other) noexcept;
 
         /** @brief Copying is not allowed */
-        ImageData<dimensions>& operator=(const ImageData<dimensions>&& other) = delete;
+        ImageData<dimensions>& operator=(const ImageData<dimensions>&) = delete;
 
         /** @brief Move assignment */
         ImageData<dimensions>& operator=(ImageData<dimensions>&& other) noexcept;