From 48393d452cbd891eba335b2468b3e4aa3d7b2a4e Mon Sep 17 00:00:00 2001
From: Yuri Kunde Schlesner <yuriks@yuriks.net>
Date: Sun, 2 Aug 2015 18:43:33 -0300
Subject: Common: Work around bug in MSVC2015 standard library
The char16_t/char32_t implementations aren't present in the library and
cause linker errors. This is a known issue that wasn't fixed in VS2015
RTM.
---
src/common/string_util.cpp | 14 ++++++++++++++
1 file changed, 14 insertions(+)
(limited to 'src/common/string_util.cpp')
diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp
index b2f7f7b1d0..6d6fc591fc 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)
--
cgit v1.2.3-70-g09d2