Skip to content

Commit 642d8e1

Browse files
authored
Merge pull request #182 from Depau/fix-move-operators
Fix move operators
2 parents a4584a8 + c5fbd52 commit 642d8e1

File tree

13 files changed

+19
-19
lines changed

13 files changed

+19
-19
lines changed

include/AudioStream.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class AudioStream : public ::AudioStream {
6060

6161
AudioStream& operator=(const AudioStream&) = delete;
6262

63-
AudioStream& operator=(AudioStream&& other) {
63+
AudioStream& operator=(AudioStream&& other) noexcept {
6464
if (this == &other) {
6565
return *this;
6666
}

include/Font.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ class Font : public ::Font {
122122

123123
Font& operator=(const Font&) = delete;
124124

125-
Font& operator=(Font&& other) {
125+
Font& operator=(Font&& other) noexcept {
126126
if (this == &other) {
127127
return *this;
128128
}

include/Image.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ class Image : public ::Image {
203203
return *this;
204204
}
205205

206-
Image& operator=(Image&& other) {
206+
Image& operator=(Image&& other) noexcept {
207207
if (this == &other) {
208208
return *this;
209209
}

include/Material.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ class Material : public ::Material {
5959

6060
Material& operator=(const Material&) = delete;
6161

62-
Material& operator=(Material&& other) {
63-
if (this != &other) {
62+
Material& operator=(Material&& other) noexcept {
63+
if (this == &other) {
6464
return *this;
6565
}
6666

include/Mesh.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ class Mesh : public ::Mesh {
161161

162162
Mesh& operator=(const Mesh&) = delete;
163163

164-
Mesh& operator=(Mesh&& other) {
165-
if (this != &other) {
164+
Mesh& operator=(Mesh&& other) noexcept {
165+
if (this == &other) {
166166
return *this;
167167
}
168168

include/Model.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ class Model : public ::Model {
6565

6666
Model& operator=(const Model&) = delete;
6767

68-
Model& operator=(Model&& other) {
69-
if (this != &other) {
68+
Model& operator=(Model&& other) noexcept {
69+
if (this == &other) {
7070
return *this;
7171
}
7272

include/ModelAnimation.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ class ModelAnimation : public ::ModelAnimation {
5858

5959
ModelAnimation& operator=(const ModelAnimation&) = delete;
6060

61-
ModelAnimation& operator=(ModelAnimation&& other) {
62-
if (this != &other) {
61+
ModelAnimation& operator=(ModelAnimation&& other) noexcept {
62+
if (this == &other) {
6363
return *this;
6464
}
6565

include/Music.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class Music : public ::Music {
8282

8383
Music& operator=(const Music&) = delete;
8484

85-
Music& operator=(Music&& other) {
85+
Music& operator=(Music&& other) noexcept {
8686
if (this == &other) {
8787
return *this;
8888
}

include/RenderTexture.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class RenderTexture : public ::RenderTexture {
5151

5252
RenderTexture& operator=(const RenderTexture&) = delete;
5353

54-
RenderTexture& operator=(RenderTexture&& other) {
54+
RenderTexture& operator=(RenderTexture&& other) noexcept {
5555
if (this == &other) {
5656
return *this;
5757
}

include/Shader.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ class Shader : public ::Shader {
6464

6565
Shader& operator=(const Shader&) = delete;
6666

67-
Shader& operator=(Shader&& other) {
68-
if (this != &other) {
67+
Shader& operator=(Shader&& other) noexcept {
68+
if (this == &other) {
6969
return *this;
7070
}
7171

0 commit comments

Comments
 (0)