asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #41761 from madmiraal/fix-assignment-operators

Browse source 
Ensure assignment operators return by reference to avoid unnecessary copies.
This commit is contained in:
Rémi Verschelde 2020-09-04 13:00:17 +02:00 committed by GitHub
commit 696849f73a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/math/audio_frame.h
View file

@ -121,7 +121,7 @@ struct AudioFrame {
r = p_frame.r;
}
_ALWAYS_INLINE_ AudioFrame operator=(const AudioFrame &p_frame) {
_ALWAYS_INLINE_ AudioFrame &operator=(const AudioFrame &p_frame) {
l = p_frame.l;
r = p_frame.r;
return *this;

2
core/math/quat.h
View file

@ -130,7 +130,7 @@ public:
w(q.w) {
}
Quat operator=(const Quat &q) {
Quat &operator=(const Quat &q) {
x = q.x;
y = q.y;
z = q.z;

6
core/ustring.h
View file

@ -103,7 +103,7 @@ public:
_FORCE_INLINE_ Char16String() {}
_FORCE_INLINE_ Char16String(const Char16String &p_str) { _cowdata._ref(p_str._cowdata); }
_FORCE_INLINE_ Char16String operator=(const Char16String &p_str) {
_FORCE_INLINE_ Char16String &operator=(const Char16String &p_str) {
_cowdata._ref(p_str._cowdata);
return *this;
}
@ -147,7 +147,7 @@ public:
_FORCE_INLINE_ CharString() {}
_FORCE_INLINE_ CharString(const CharString &p_str) { _cowdata._ref(p_str._cowdata); }
_FORCE_INLINE_ CharString operator=(const CharString &p_str) {
_FORCE_INLINE_ CharString &operator=(const CharString &p_str) {
_cowdata._ref(p_str._cowdata);
return *this;
}
@ -435,7 +435,7 @@ public:
_FORCE_INLINE_ String() {}
_FORCE_INLINE_ String(const String &p_str) { _cowdata._ref(p_str._cowdata); }
String operator=(const String &p_str) {
String &operator=(const String &p_str) {
_cowdata._ref(p_str._cowdata);
return *this;
}

2
editor/editor_audio_buses.h
View file

@ -230,7 +230,7 @@ private:
render_db_value = n.render_db_value;
}
_FORCE_INLINE_ AudioNotch operator=(const EditorAudioMeterNotches::AudioNotch &n) {
_FORCE_INLINE_ AudioNotch &operator=(const EditorAudioMeterNotches::AudioNotch &n) {
relative_position = n.relative_position;
db_value = n.db_value;
render_db_value = n.render_db_value;

2
scene/3d/soft_body_3d.cpp
View file

@ -106,7 +106,7 @@ SoftBody3D::PinnedPoint::PinnedPoint(const PinnedPoint &obj_tocopy) {
offset = obj_tocopy.offset;
}
SoftBody3D::PinnedPoint SoftBody3D::PinnedPoint::operator=(const PinnedPoint &obj) {
SoftBody3D::PinnedPoint &SoftBody3D::PinnedPoint::operator=(const PinnedPoint &obj) {
point_index = obj.point_index;
spatial_attachment_path = obj.spatial_attachment_path;
spatial_attachment = obj.spatial_attachment;

2
scene/3d/soft_body_3d.h
View file

@ -74,7 +74,7 @@ public:
PinnedPoint();
PinnedPoint(const PinnedPoint &obj_tocopy);
PinnedPoint operator=(const PinnedPoint &obj);
PinnedPoint &operator=(const PinnedPoint &obj);
};
private:

2
servers/physics_server_2d.h
View file

@ -644,7 +644,7 @@ class PhysicsServer2DManager {
name(p_ci.name),
create_callback(p_ci.create_callback) {}
ClassInfo operator=(const ClassInfo &p_ci) {
ClassInfo &operator=(const ClassInfo &p_ci) {
name = p_ci.name;
create_callback = p_ci.create_callback;
return *this;

2
servers/physics_server_3d.h
View file

@ -785,7 +785,7 @@ class PhysicsServer3DManager {
name(p_ci.name),
create_callback(p_ci.create_callback) {}
ClassInfo operator=(const ClassInfo &p_ci) {
ClassInfo &operator=(const ClassInfo &p_ci) {
name = p_ci.name;
create_callback = p_ci.create_callback;
return *this;