From 4624cef3422840ad9c87138d50ebb4b9737f95d9 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Thu, 12 May 2022 22:59:24 +0200 Subject: [PATCH 1/2] Move operator should not unload this if == other --- include/Material.hpp | 2 +- include/Mesh.hpp | 2 +- include/Model.hpp | 2 +- include/ModelAnimation.hpp | 2 +- include/Shader.hpp | 2 +- include/Wave.hpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/Material.hpp b/include/Material.hpp index fbb5dfed..af436f7d 100644 --- a/include/Material.hpp +++ b/include/Material.hpp @@ -60,7 +60,7 @@ class Material : public ::Material { Material& operator=(const Material&) = delete; Material& operator=(Material&& other) { - if (this != &other) { + if (this == &other) { return *this; } diff --git a/include/Mesh.hpp b/include/Mesh.hpp index 9e7ae93c..6f47daa7 100644 --- a/include/Mesh.hpp +++ b/include/Mesh.hpp @@ -162,7 +162,7 @@ class Mesh : public ::Mesh { Mesh& operator=(const Mesh&) = delete; Mesh& operator=(Mesh&& other) { - if (this != &other) { + if (this == &other) { return *this; } diff --git a/include/Model.hpp b/include/Model.hpp index 894aa334..3b0c39f6 100644 --- a/include/Model.hpp +++ b/include/Model.hpp @@ -66,7 +66,7 @@ class Model : public ::Model { Model& operator=(const Model&) = delete; Model& operator=(Model&& other) { - if (this != &other) { + if (this == &other) { return *this; } diff --git a/include/ModelAnimation.hpp b/include/ModelAnimation.hpp index 91f46c8c..4a069ffe 100644 --- a/include/ModelAnimation.hpp +++ b/include/ModelAnimation.hpp @@ -59,7 +59,7 @@ class ModelAnimation : public ::ModelAnimation { ModelAnimation& operator=(const ModelAnimation&) = delete; ModelAnimation& operator=(ModelAnimation&& other) { - if (this != &other) { + if (this == &other) { return *this; } diff --git a/include/Shader.hpp b/include/Shader.hpp index 68687e75..6fac4f43 100644 --- a/include/Shader.hpp +++ b/include/Shader.hpp @@ -65,7 +65,7 @@ class Shader : public ::Shader { Shader& operator=(const Shader&) = delete; Shader& operator=(Shader&& other) { - if (this != &other) { + if (this == &other) { return *this; } diff --git a/include/Wave.hpp b/include/Wave.hpp index 3e3efb2a..9ec6b6fa 100644 --- a/include/Wave.hpp +++ b/include/Wave.hpp @@ -77,7 +77,7 @@ class Wave : public ::Wave { } Wave& operator=(const Wave& other) { - if (&other != this) { + if (this == &other) { return *this; } From c5fbd521848c03b0a54cb2ac1d82e545ba907f81 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Thu, 12 May 2022 23:08:49 +0200 Subject: [PATCH 2/2] Move operators should be marked noexcept https://clang.llvm.org/extra/clang-tidy/checks/performance-noexcept-move-constructor.html --- include/AudioStream.hpp | 2 +- include/Font.hpp | 2 +- include/Image.hpp | 2 +- include/Material.hpp | 2 +- include/Mesh.hpp | 2 +- include/Model.hpp | 2 +- include/ModelAnimation.hpp | 2 +- include/Music.hpp | 2 +- include/RenderTexture.hpp | 2 +- include/Shader.hpp | 2 +- include/Sound.hpp | 2 +- include/Texture.hpp | 2 +- include/Wave.hpp | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/AudioStream.hpp b/include/AudioStream.hpp index f70c6a72..c280c830 100644 --- a/include/AudioStream.hpp +++ b/include/AudioStream.hpp @@ -60,7 +60,7 @@ class AudioStream : public ::AudioStream { AudioStream& operator=(const AudioStream&) = delete; - AudioStream& operator=(AudioStream&& other) { + AudioStream& operator=(AudioStream&& other) noexcept { if (this == &other) { return *this; } diff --git a/include/Font.hpp b/include/Font.hpp index 6df7e517..e755a3c8 100644 --- a/include/Font.hpp +++ b/include/Font.hpp @@ -122,7 +122,7 @@ class Font : public ::Font { Font& operator=(const Font&) = delete; - Font& operator=(Font&& other) { + Font& operator=(Font&& other) noexcept { if (this == &other) { return *this; } diff --git a/include/Image.hpp b/include/Image.hpp index f6967c12..65fdf4de 100644 --- a/include/Image.hpp +++ b/include/Image.hpp @@ -203,7 +203,7 @@ class Image : public ::Image { return *this; } - Image& operator=(Image&& other) { + Image& operator=(Image&& other) noexcept { if (this == &other) { return *this; } diff --git a/include/Material.hpp b/include/Material.hpp index af436f7d..02c87eef 100644 --- a/include/Material.hpp +++ b/include/Material.hpp @@ -59,7 +59,7 @@ class Material : public ::Material { Material& operator=(const Material&) = delete; - Material& operator=(Material&& other) { + Material& operator=(Material&& other) noexcept { if (this == &other) { return *this; } diff --git a/include/Mesh.hpp b/include/Mesh.hpp index 6f47daa7..01040721 100644 --- a/include/Mesh.hpp +++ b/include/Mesh.hpp @@ -161,7 +161,7 @@ class Mesh : public ::Mesh { Mesh& operator=(const Mesh&) = delete; - Mesh& operator=(Mesh&& other) { + Mesh& operator=(Mesh&& other) noexcept { if (this == &other) { return *this; } diff --git a/include/Model.hpp b/include/Model.hpp index 3b0c39f6..9b26fba0 100644 --- a/include/Model.hpp +++ b/include/Model.hpp @@ -65,7 +65,7 @@ class Model : public ::Model { Model& operator=(const Model&) = delete; - Model& operator=(Model&& other) { + Model& operator=(Model&& other) noexcept { if (this == &other) { return *this; } diff --git a/include/ModelAnimation.hpp b/include/ModelAnimation.hpp index 4a069ffe..3ad91bec 100644 --- a/include/ModelAnimation.hpp +++ b/include/ModelAnimation.hpp @@ -58,7 +58,7 @@ class ModelAnimation : public ::ModelAnimation { ModelAnimation& operator=(const ModelAnimation&) = delete; - ModelAnimation& operator=(ModelAnimation&& other) { + ModelAnimation& operator=(ModelAnimation&& other) noexcept { if (this == &other) { return *this; } diff --git a/include/Music.hpp b/include/Music.hpp index 37c22d53..094848bd 100644 --- a/include/Music.hpp +++ b/include/Music.hpp @@ -82,7 +82,7 @@ class Music : public ::Music { Music& operator=(const Music&) = delete; - Music& operator=(Music&& other) { + Music& operator=(Music&& other) noexcept { if (this == &other) { return *this; } diff --git a/include/RenderTexture.hpp b/include/RenderTexture.hpp index dd437293..fbbb41e6 100644 --- a/include/RenderTexture.hpp +++ b/include/RenderTexture.hpp @@ -51,7 +51,7 @@ class RenderTexture : public ::RenderTexture { RenderTexture& operator=(const RenderTexture&) = delete; - RenderTexture& operator=(RenderTexture&& other) { + RenderTexture& operator=(RenderTexture&& other) noexcept { if (this == &other) { return *this; } diff --git a/include/Shader.hpp b/include/Shader.hpp index 6fac4f43..146248fa 100644 --- a/include/Shader.hpp +++ b/include/Shader.hpp @@ -64,7 +64,7 @@ class Shader : public ::Shader { Shader& operator=(const Shader&) = delete; - Shader& operator=(Shader&& other) { + Shader& operator=(Shader&& other) noexcept { if (this == &other) { return *this; } diff --git a/include/Sound.hpp b/include/Sound.hpp index 283a76dd..7049f43a 100644 --- a/include/Sound.hpp +++ b/include/Sound.hpp @@ -66,7 +66,7 @@ class Sound : public ::Sound { GETTERSETTER(unsigned int, FrameCount, frameCount) GETTERSETTER(::AudioStream, Stream, stream) - Sound& operator=(Sound&& other) { + Sound& operator=(Sound&& other) noexcept { if (this == &other) { return *this; } diff --git a/include/Texture.hpp b/include/Texture.hpp index 5d39b918..cb2e6aa7 100644 --- a/include/Texture.hpp +++ b/include/Texture.hpp @@ -97,7 +97,7 @@ class Texture : public ::Texture { Texture& operator=(const Texture&) = delete; - Texture& operator=(Texture&& other) { + Texture& operator=(Texture&& other) noexcept { if (this == &other) { return *this; } diff --git a/include/Wave.hpp b/include/Wave.hpp index 9ec6b6fa..fe1f50b3 100644 --- a/include/Wave.hpp +++ b/include/Wave.hpp @@ -87,7 +87,7 @@ class Wave : public ::Wave { return *this; } - Wave& operator=(Wave&& other) { + Wave& operator=(Wave&& other) noexcept { if (this != &other) { return *this; }