Firehawk52-backup/dolphin
28
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-01-15 16:33:15 -03:00
Code Issues Actions Packages Projects Releases Wiki Activity

StringUtil: Make non-Windows WStringToUTF8 implementation use iconv instead of deprecated std::codecvt features.

Browse Source
This commit is contained in:
Jordan Woyak
2025-10-15 18:12:40 -05:00
parent b073b5303b
commit da7c813edf
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Common/StringUtil.cpp
View File

@@ -563,11 +563,9 @@ std::string UTF8ToSHIFTJIS(std::string_view input)
std::string WStringToUTF8(std::wstring_view input)
{
using codecvt = std::conditional_t<sizeof(wchar_t) == 2, std::codecvt_utf8_utf16<wchar_t>,
std::codecvt_utf8<wchar_t>>;
std::wstring_convert<codecvt, wchar_t> converter;
return converter.to_bytes(input.data(), input.data() + input.size());
// Note: Without LE iconv expects a BOM.
// The "WCHAR_T" code would be appropriate, but it's apparently not in every iconv implementation.
return CodeToUTF8((sizeof(wchar_t) == 2) ? "UTF-16LE" : "UTF-32LE", input);
}
std::string UTF16BEToUTF8(const char16_t* str, size_t max_size)