diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-12-02 17:34:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-02 17:34:45 +0100 |
| commit | 892a5a72cd9b25dc660671b9f4244fd842884b9f (patch) | |
| tree | fb410b4b5daa1e8a79dc9f7983c43bcd9b196e8f /modules/gdscript | |
| parent | 11d5b91462285d9fc541c20331aedcd4511908cd (diff) | |
| parent | 7da392bcc52366740394322728464e724cf20cdf (diff) | |
Merge pull request #55474 from akien-mga/copy-operators-no-reference
Diffstat (limited to 'modules/gdscript')
| -rw-r--r-- | modules/gdscript/gdscript_function.h | 3 | ||||
| -rw-r--r-- | modules/gdscript/gdscript_parser.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/modules/gdscript/gdscript_function.h b/modules/gdscript/gdscript_function.h index 9d076a8e4c..e1ed71a268 100644 --- a/modules/gdscript/gdscript_function.h +++ b/modules/gdscript/gdscript_function.h @@ -192,7 +192,7 @@ public: GDScriptDataType() = default; - GDScriptDataType &operator=(const GDScriptDataType &p_other) { + void operator=(const GDScriptDataType &p_other) { kind = p_other.kind; has_type = p_other.has_type; builtin_type = p_other.builtin_type; @@ -203,7 +203,6 @@ public: if (p_other.has_container_element_type()) { set_container_element_type(p_other.get_container_element_type()); } - return *this; } GDScriptDataType(const GDScriptDataType &p_other) { diff --git a/modules/gdscript/gdscript_parser.h b/modules/gdscript/gdscript_parser.h index af9b973ada..2f05b4b948 100644 --- a/modules/gdscript/gdscript_parser.h +++ b/modules/gdscript/gdscript_parser.h @@ -203,7 +203,7 @@ public: return !(this->operator==(p_other)); } - DataType &operator=(const DataType &p_other) { + void operator=(const DataType &p_other) { kind = p_other.kind; type_source = p_other.type_source; is_constant = p_other.is_constant; @@ -221,7 +221,6 @@ public: if (p_other.has_container_element_type()) { set_container_element_type(p_other.get_container_element_type()); } - return *this; } DataType() = default; |