diff --git a/third_party/mini_chromium/utf_string_conversion_utils.mingw.cc b/third_party/mini_chromium/utf_string_conversion_utils.mingw.cc index 6baf7b452d..4184adf649 100644 --- a/third_party/mini_chromium/utf_string_conversion_utils.mingw.cc +++ b/third_party/mini_chromium/utf_string_conversion_utils.mingw.cc @@ -21,7 +21,7 @@ bool ReadUnicodeCharacter(const char* src, return IsValidCodepoint(code_point); } -bool ReadUnicodeCharacter(const char16* src, +bool ReadUnicodeCharacter(const char16_t* src, int32_t src_len, int32_t* char_index, uint32_t* code_point) { @@ -58,9 +58,9 @@ size_t WriteUnicodeCharacter(uint32_t code_point, std::string* output) { return char_offset - original_char_offset; } -size_t WriteUnicodeCharacter(uint32_t code_point, string16* output) { +size_t WriteUnicodeCharacter(uint32_t code_point, std::u16string* output) { if (CBU16_LENGTH(code_point) == 1) { - output->push_back(static_cast(code_point)); + output->push_back(static_cast(code_point)); return 1; } size_t char_offset = output->length(); @@ -84,7 +84,7 @@ void PrepareForUTF8Output(const CHAR* src, } template void PrepareForUTF8Output(const wchar_t*, size_t, std::string*); -// template void PrepareForUTF8Output(const char16*, size_t, std::string*); +template void PrepareForUTF8Output(const char16_t*, size_t, std::string*); template void PrepareForUTF16Or32Output(const char* src, @@ -100,6 +100,6 @@ void PrepareForUTF16Or32Output(const char* src, } } -template void PrepareForUTF16Or32Output(const char*, size_t, string16*); +template void PrepareForUTF16Or32Output(const char*, size_t, std::u16string*); } // namespace base