summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLC <mathew1800@gmail.com>2021-02-08 09:27:13 +0100
committerGitHub <noreply@github.com>2021-02-08 09:27:13 +0100
commit903311729a2c9409f4ae7f072d67e6055c1f7e32 (patch)
tree2ffe2636170f954878334b98bc60accb41ca83db
parentMerge pull request #5339 from german77/interactive (diff)
parentstring_util: Remove MSVC workaround for converting between UTF8/UTF16 (diff)
downloadyuzu-903311729a2c9409f4ae7f072d67e6055c1f7e32.tar
yuzu-903311729a2c9409f4ae7f072d67e6055c1f7e32.tar.gz
yuzu-903311729a2c9409f4ae7f072d67e6055c1f7e32.tar.bz2
yuzu-903311729a2c9409f4ae7f072d67e6055c1f7e32.tar.lz
yuzu-903311729a2c9409f4ae7f072d67e6055c1f7e32.tar.xz
yuzu-903311729a2c9409f4ae7f072d67e6055c1f7e32.tar.zst
yuzu-903311729a2c9409f4ae7f072d67e6055c1f7e32.zip
-rw-r--r--src/common/string_util.cpp14
1 files changed, 0 insertions, 14 deletions
diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp
index 4cba2aaa4..7b614ad89 100644
--- a/src/common/string_util.cpp
+++ b/src/common/string_util.cpp
@@ -141,27 +141,13 @@ std::string ReplaceAll(std::string result, const std::string& src, const std::st
}
std::string UTF16ToUTF8(const std::u16string& input) {
-#ifdef _MSC_VER
- // Workaround for missing char16_t/char32_t instantiations in MSVC2017
- std::wstring_convert<std::codecvt_utf8_utf16<__int16>, __int16> convert;
- std::basic_string<__int16> tmp_buffer(input.cbegin(), input.cend());
- return convert.to_bytes(tmp_buffer);
-#else
std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> convert;
return convert.to_bytes(input);
-#endif
}
std::u16string UTF8ToUTF16(const std::string& input) {
-#ifdef _MSC_VER
- // Workaround for missing char16_t/char32_t instantiations in MSVC2017
- std::wstring_convert<std::codecvt_utf8_utf16<__int16>, __int16> convert;
- auto tmp_buffer = convert.from_bytes(input);
- return std::u16string(tmp_buffer.cbegin(), tmp_buffer.cend());
-#else
std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> convert;
return convert.from_bytes(input);
-#endif
}
#ifdef _WIN32