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 /core/string/ustring.cpp | |
parent | 11d5b91462285d9fc541c20331aedcd4511908cd (diff) | |
parent | 7da392bcc52366740394322728464e724cf20cdf (diff) | |
download | redot-engine-892a5a72cd9b25dc660671b9f4244fd842884b9f.tar.gz |
Merge pull request #55474 from akien-mga/copy-operators-no-reference
Diffstat (limited to 'core/string/ustring.cpp')
-rw-r--r-- | core/string/ustring.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/core/string/ustring.cpp b/core/string/ustring.cpp index 320aae2ba4..8d1f610578 100644 --- a/core/string/ustring.cpp +++ b/core/string/ustring.cpp @@ -130,9 +130,8 @@ Char16String &Char16String::operator+=(char16_t p_char) { return *this; } -Char16String &Char16String::operator=(const char16_t *p_cstr) { +void Char16String::operator=(const char16_t *p_cstr) { copy_from(p_cstr); - return *this; } const char16_t *Char16String::get_data() const { @@ -186,9 +185,8 @@ CharString &CharString::operator+=(char p_char) { return *this; } -CharString &CharString::operator=(const char *p_cstr) { +void CharString::operator=(const char *p_cstr) { copy_from(p_cstr); - return *this; } const char *CharString::get_data() const { |