From 1ad65c7c7ac95da9d1e71cf3c806eec0f9fab835 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 22 Mar 2020 21:28:06 +0100 Subject: [PATCH] Remove some more uint16_t --- ext/native/util/text/utf8.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/native/util/text/utf8.cpp b/ext/native/util/text/utf8.cpp index 7817ac7545..ab734231db 100644 --- a/ext/native/util/text/utf8.cpp +++ b/ext/native/util/text/utf8.cpp @@ -540,16 +540,16 @@ static size_t ConvertUTF8ToWStringInternal(wchar_t *dest, size_t destSize, const UTF8 utf(source.c_str()); if (sizeof(wchar_t) == 2) { - uint16_t *destw = (uint16_t *)dest; - const uint16_t *const destwEnd = destw + destSize; - while (uint32_t c = utf.next()) { + char16_t *destw = (char16_t *)dest; + const char16_t *const destwEnd = destw + destSize; + while (char32_t c = utf.next()) { if (destw + UTF16LE::encodeUnits(c) >= destwEnd) { break; } destw += UTF16LE::encode(destw, c); } } else { - while (uint32_t c = utf.next()) { + while (char32_t c = utf.next()) { if (dest + 1 >= destEnd) { break; }