OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-25 11:50:14 +00:00
Code Issues Projects Releases Wiki Activity

Update string_util.cpp

Browse Source 
Careless
This commit is contained in:
yami-hack 2016-06-13 16:07:37 +08:00 committed by GitHub
parent 4cd902da5e
commit 1645eee8f4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/string_util.cpp
View File

@ -296,7 +296,7 @@ std::string ReplaceAll(std::string result, const std::string& src, const std::st
std::string UTF16ToUTF8(const std::u16string& input)
{
#if _MSC_VER >= 1900 && defined(__MINGW64__)
#if _MSC_VER >= 1900 || defined(__MINGW64__)
// Workaround for missing char16_t/char32_t instantiations in MSVC2015
std::wstring_convert<std::codecvt_utf8_utf16<__int16>, __int16> convert;
std::basic_string<__int16> tmp_buffer(input.cbegin(), input.cend());
@ -309,7 +309,7 @@ std::string UTF16ToUTF8(const std::u16string& input)
std::u16string UTF8ToUTF16(const std::string& input)
{
#if _MSC_VER >= 1900 && defined(__MINGW64__)
#if _MSC_VER >= 1900 || defined(__MINGW64__)
// Workaround for missing char16_t/char32_t instantiations in MSVC2015
std::wstring_convert<std::codecvt_utf8_utf16<__int16>, __int16> convert;
auto tmp_buffer = convert.from_bytes(input);