summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2020-10-07 17:26:36 +0200
committerGitHub <noreply@github.com>2020-10-07 17:26:36 +0200
commit8a4f402bcb85ccbf713b76581a1960448f917695 (patch)
tree94a012bfc5f4fac1b39bbe0e7b6028e767d35d0c
parentcb77e8d6cfefab19835f2a3053dacf24f6ded910 (diff)
parent0d8bd93e40cca01f9dfbcb0c9c1c2bb7fe7ec6bc (diff)
Merge pull request #42615 from akien-mga/fixup-40097
Fix build after merge of #40097
-rw-r--r--core/ustring.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/ustring.cpp b/core/ustring.cpp
index 18603f37eb..e382ef3746 100644
--- a/core/ustring.cpp
+++ b/core/ustring.cpp
@@ -792,8 +792,8 @@ signed char String::naturalnocasecmp_to(const String &p_str) const {
}
// Keep ptrs to start of numerical sequences
- const CharType *this_substr = this_str;
- const CharType *that_substr = that_str;
+ const char32_t *this_substr = this_str;
+ const char32_t *that_substr = that_str;
// Compare lengths of both numerical sequences, ignoring leading zeros
while (IS_DIGIT(*this_str)) {