Use WChar instead of char (dotnet/coreclr#18294)
authorLuqun Lou <luqunl@users.noreply.github.com>
Tue, 5 Jun 2018 13:40:34 +0000 (06:40 -0700)
committerJan Vorlicek <janvorli@microsoft.com>
Tue, 5 Jun 2018 13:40:34 +0000 (15:40 +0200)
Commit migrated from https://github.com/dotnet/coreclr/commit/a81eea23a750425fad3c9593fcf6ec23aa0542fd

src/coreclr/src/pal/src/locale/utf8.cpp

index d797f45..4688cf0 100644 (file)
@@ -1863,7 +1863,7 @@ public:
                     if (ch > 0x7F)
                         goto ProcessChar;
 
-                    *pTarget = (char)ch;
+                    *pTarget = (WCHAR)ch;
                     pTarget++;
                 }
                 // we are done
@@ -1899,7 +1899,7 @@ public:
                     if (ch > 0x7F) {
                         goto LongCode;
                     }
-                    *pTarget = (char)ch;
+                    *pTarget = (WCHAR)ch;
                     pTarget++;
                 }
 
@@ -2022,7 +2022,7 @@ public:
 
                         ch = (chc << 6) | (ch & 0x3F);
 
-                        *pTarget = (char)(((ch >> 10) & 0x7FF) +
+                        *pTarget = (WCHAR)(((ch >> 10) & 0x7FF) +
                             (SHORT)(CharUnicodeInfo::HIGH_SURROGATE_START - (0x10000 >> 10)));
                         pTarget++;