ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12467 from AdmiralCurtiss/codepage-convert-linkage 

Common/StringUtil: Use internal linkage for codepage conversion functions.
This commit is contained in:
JosJuice 2023-12-30 12:13:53 +01:00 committed by GitHub
parent 2beaaf608d 4f04ac5858
commit 26760cf8a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -426,7 +426,7 @@ size_t StringUTF8CodePointCount(std::string_view str)
#ifdef _WIN32 #ifdef _WIN32
std::wstring CPToUTF16(u32 code_page, std::string_view input) static std::wstring CPToUTF16(u32 code_page, std::string_view input)
{ {
auto const size = auto const size =
MultiByteToWideChar(code_page, 0, input.data(), static_cast<int>(input.size()), nullptr, 0); MultiByteToWideChar(code_page, 0, input.data(), static_cast<int>(input.size()), nullptr, 0);
@ -444,7 +444,7 @@ std::wstring CPToUTF16(u32 code_page, std::string_view input)
return output; return output;
} }
std::string UTF16ToCP(u32 code_page, std::wstring_view input) static std::string UTF16ToCP(u32 code_page, std::wstring_view input)
{ {
if (input.empty()) if (input.empty())
return {}; return {};