diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2021-11-30 15:19:26 +0100 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2021-11-30 16:26:29 +0100 |
commit | 7da392bcc52366740394322728464e724cf20cdf (patch) | |
tree | 5c3579dc3743a244b4a5e25ae02220b8790742c6 /servers | |
parent | 2d118bd8b881fe9658e70eb8dc4fa7a6efac41a3 (diff) |
Don't return reference on copy assignment operators
We prefer to prevent using chained assignment (`T a = b = c = T();`) as this
can lead to confusing code and subtle bugs.
According to https://en.wikipedia.org/wiki/Assignment_operator_(C%2B%2B), C++
allows any arbitrary return type, so this is standard compliant.
This could be re-assessed if/when we have an actual need for a behavior more
akin to that of the C++ STL, for now this PR simply changes a handful of
cases which were inconsistent with the rest of the codebase (`void` return
type was already the most common case prior to this commit).
Diffstat (limited to 'servers')
-rw-r--r-- | servers/physics_server_2d.h | 3 | ||||
-rw-r--r-- | servers/physics_server_3d.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/servers/physics_server_2d.h b/servers/physics_server_2d.h index 2bff8f5dcb..c76ec5a5b1 100644 --- a/servers/physics_server_2d.h +++ b/servers/physics_server_2d.h @@ -758,10 +758,9 @@ class PhysicsServer2DManager { name(p_ci.name), create_callback(p_ci.create_callback) {} - ClassInfo &operator=(const ClassInfo &p_ci) { + void operator=(const ClassInfo &p_ci) { name = p_ci.name; create_callback = p_ci.create_callback; - return *this; } }; diff --git a/servers/physics_server_3d.h b/servers/physics_server_3d.h index 89a7eeee96..bd5a3eb4b7 100644 --- a/servers/physics_server_3d.h +++ b/servers/physics_server_3d.h @@ -965,10 +965,9 @@ class PhysicsServer3DManager { name(p_ci.name), create_callback(p_ci.create_callback) {} - ClassInfo &operator=(const ClassInfo &p_ci) { + void operator=(const ClassInfo &p_ci) { name = p_ci.name; create_callback = p_ci.create_callback; - return *this; } }; |