diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-04-06 18:21:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-06 18:21:18 +0200 |
| commit | 3b697ce8d56ea7e73c202058f6c4d0e202142eae (patch) | |
| tree | 919a15e1b040b629ed8f556fad76ea13cf1df77e /servers | |
| parent | cc3e660d7e13665fd5242502fb677d3e5f30ec18 (diff) | |
| parent | 6be77da7eb817fc1f8469bd0bdd8a0d08167e701 (diff) | |
Merge pull request #26486 from marxin/fix-Wdeprecated-copy
Fix new GCC 9 warnings: -Wdeprecated-copy.
Diffstat (limited to 'servers')
| -rw-r--r-- | servers/physics_2d_server.h | 6 | ||||
| -rw-r--r-- | servers/physics_server.h | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/servers/physics_2d_server.h b/servers/physics_2d_server.h index 1de9c7df93..0ba8a6605d 100644 --- a/servers/physics_2d_server.h +++ b/servers/physics_2d_server.h @@ -653,6 +653,12 @@ class Physics2DServerManager { ClassInfo(const ClassInfo &p_ci) : name(p_ci.name), create_callback(p_ci.create_callback) {} + + ClassInfo operator=(const ClassInfo &p_ci) { + name = p_ci.name; + create_callback = p_ci.create_callback; + return *this; + } }; static Vector<ClassInfo> physics_2d_servers; diff --git a/servers/physics_server.h b/servers/physics_server.h index c71bb01943..9895ef2455 100644 --- a/servers/physics_server.h +++ b/servers/physics_server.h @@ -794,6 +794,12 @@ class PhysicsServerManager { ClassInfo(const ClassInfo &p_ci) : name(p_ci.name), create_callback(p_ci.create_callback) {} + + ClassInfo operator=(const ClassInfo &p_ci) { + name = p_ci.name; + create_callback = p_ci.create_callback; + return *this; + } }; static Vector<ClassInfo> physics_servers; |