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 /modules/mono/utils/path_utils.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 'modules/mono/utils/path_utils.cpp')
| -rw-r--r-- | modules/mono/utils/path_utils.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/mono/utils/path_utils.cpp b/modules/mono/utils/path_utils.cpp index ccfaf5aba7..d91dcb5981 100644 --- a/modules/mono/utils/path_utils.cpp +++ b/modules/mono/utils/path_utils.cpp @@ -86,7 +86,7 @@ String abspath(const String &p_path) { String realpath(const String &p_path) { #ifdef WINDOWS_ENABLED // Open file without read/write access - HANDLE hFile = ::CreateFileW(p_path.c_str(), 0, + HANDLE hFile = ::CreateFileW((LPCWSTR)(p_path.utf16().get_data()), 0, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr); @@ -130,7 +130,7 @@ String join(const String &p_a, const String &p_b) { return p_b; } - const CharType a_last = p_a[p_a.length() - 1]; + const char32_t a_last = p_a[p_a.length() - 1]; if ((a_last == '/' || a_last == '\\') || (p_b.size() > 0 && (p_b[0] == '/' || p_b[0] == '\\'))) { return p_a + p_b; |