Skip to content

Commit

Permalink
Fix the fix.
Browse files Browse the repository at this point in the history
  • Loading branch information
Relintai committed Nov 14, 2024
1 parent d75d359 commit 48935e9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
6 changes: 5 additions & 1 deletion core/string/ustring.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,10 @@ void String::copy_from(const wchar_t *p_cstr, const int p_clip_to) {
#endif
}

void String::copy_from(const Char16String &p_str) {
parse_utf16(p_str.ptr());
}

void String::copy_from(const CharType &p_char) {
if (p_char == 0) {
#if PRINT_UNICODE_ERRORS
Expand Down Expand Up @@ -5162,7 +5166,7 @@ String::String(const CharType *p_str) {
}

String::String(const Char16String &p_str) {
copy_from(p_str.ptr());
copy_from(p_str);
}

String::String(const char *p_str, int p_clip_to_len) {
Expand Down
1 change: 1 addition & 0 deletions core/string/ustring.h
Original file line number Diff line number Diff line change
Expand Up @@ -583,6 +583,7 @@ class String {
void copy_from(const char *p_cstr, const int p_clip_to);
void copy_from(const wchar_t *p_cstr);
void copy_from(const wchar_t *p_cstr, const int p_clip_to);
void copy_from(const Char16String &p_str);
void copy_from(const CharType *p_cstr);
void copy_from(const CharType *p_cstr, const int p_clip_to);

Expand Down

0 comments on commit 48935e9

Please sign in to comment.