summaryrefslogtreecommitdiffstats
path: root/core/string_builder.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2020-09-03 21:35:27 +0200
committerGitHub <noreply@github.com>2020-09-03 21:35:27 +0200
commit27763b67bb63139319bf611590c40e48663e72d6 (patch)
treead9a1589128f569fc6be2a99893b916491f87af1 /core/string_builder.cpp
parent4dd915028a9c8819075d7ac5683f6da7ddf58087 (diff)
parent80b8eff6aa41ba79175a5152ba5b2b9b16f6de3f (diff)
downloadredot-engine-27763b67bb63139319bf611590c40e48663e72d6.tar.gz
Merge pull request #40999 from bruvzg/ctl_string_to_utf32
[Complex Test Layouts] Refactor `String` to use UTF-32 encoding.
Diffstat (limited to 'core/string_builder.cpp')
-rw-r--r--core/string_builder.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/string_builder.cpp b/core/string_builder.cpp
index c8d6498f27..dec299ffa3 100644
--- a/core/string_builder.cpp
+++ b/core/string_builder.cpp
@@ -61,7 +61,7 @@ String StringBuilder::as_string() const {
return "";
}
- CharType *buffer = memnew_arr(CharType, string_length);
+ char32_t *buffer = memnew_arr(char32_t, string_length);
int current_position = 0;
@@ -73,7 +73,7 @@ String StringBuilder::as_string() const {
// Godot string
const String &s = strings[godot_string_elem];
- memcpy(buffer + current_position, s.ptr(), s.length() * sizeof(CharType));
+ memcpy(buffer + current_position, s.ptr(), s.length() * sizeof(char32_t));
current_position += s.length();