diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-08-02 23:43:33 +0200 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-08-03 00:03:55 +0200 |
| commit | 48393d452cbd891eba335b2468b3e4aa3d7b2a4e (patch) | |
| tree | 395b80a0db70b77e0a1cf7bfb3ac2b2b05329553 | |
| parent | Merge pull request #999 from LittleWhite-tb/qt-save-location (diff) | |
| download | yuzu-48393d452cbd891eba335b2468b3e4aa3d7b2a4e.tar yuzu-48393d452cbd891eba335b2468b3e4aa3d7b2a4e.tar.gz yuzu-48393d452cbd891eba335b2468b3e4aa3d7b2a4e.tar.bz2 yuzu-48393d452cbd891eba335b2468b3e4aa3d7b2a4e.tar.lz yuzu-48393d452cbd891eba335b2468b3e4aa3d7b2a4e.tar.xz yuzu-48393d452cbd891eba335b2468b3e4aa3d7b2a4e.tar.zst yuzu-48393d452cbd891eba335b2468b3e4aa3d7b2a4e.zip | |
| -rw-r--r-- | src/common/string_util.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp index b2f7f7b1d..6d6fc591f 100644 --- a/src/common/string_util.cpp +++ b/src/common/string_util.cpp @@ -296,14 +296,28 @@ std::string ReplaceAll(std::string result, const std::string& src, const std::st std::string UTF16ToUTF8(const std::u16string& input) { +#if _MSC_VER >= 1900 + // 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()); + 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) { +#if _MSC_VER >= 1900 + // 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); + 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 } static std::string UTF16ToUTF8(const std::wstring& input) |