diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2020-09-03 21:35:27 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-03 21:35:27 +0200 |
commit | 27763b67bb63139319bf611590c40e48663e72d6 (patch) | |
tree | ad9a1589128f569fc6be2a99893b916491f87af1 /core/variant.cpp | |
parent | 4dd915028a9c8819075d7ac5683f6da7ddf58087 (diff) | |
parent | 80b8eff6aa41ba79175a5152ba5b2b9b16f6de3f (diff) |
Merge pull request #40999 from bruvzg/ctl_string_to_utf32
[Complex Test Layouts] Refactor `String` to use UTF-32 encoding.
Diffstat (limited to 'core/variant.cpp')
-rw-r--r-- | core/variant.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/variant.cpp b/core/variant.cpp index c19ce79e64..181ced0f32 100644 --- a/core/variant.cpp +++ b/core/variant.cpp @@ -1558,7 +1558,7 @@ Variant::operator unsigned char() const { } } -Variant::operator CharType() const { +Variant::operator char32_t() const { return operator unsigned int(); } @@ -2445,7 +2445,7 @@ Variant::Variant(const char *const p_cstring) { memnew_placement(_data._mem, String((const char *)p_cstring)); } -Variant::Variant(const CharType *p_wstring) { +Variant::Variant(const char32_t *p_wstring) { type = STRING; memnew_placement(_data._mem, String(p_wstring)); } |