update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / boost / libs / spirit / test / qi / to_utf8.cpp

diff --git a/ceph/src/boost/libs/spirit/test/qi/to_utf8.cpp b/ceph/src/boost/libs/spirit/test/qi/to_utf8.cpp
index d0fbdf71e384acb0f079238f279e3bef152c7a97..075eb28594bd1643201a2f9dc23b8763b92e5d65 100644 (file)
--- a/ceph/src/boost/libs/spirit/test/qi/to_utf8.cpp
+++ b/ceph/src/boost/libs/spirit/test/qi/to_utf8.cpp
@@ -15,8 +15,8 @@ int main()
 {
     using boost::spirit::to_utf8;
 
-    // Assume wchar_t is 16-bit on Windows and 32-bit on Unix
-#if defined(_WIN32) || defined(__CYGWIN__)
+    // Assume wchar_t content is UTF-16 on MSVC, or mingw/wineg++ with -fshort-wchar
+#if defined(_MSC_VER) || defined(__SIZEOF_WCHAR_T__) && __SIZEOF_WCHAR_T__ == 2
     BOOST_TEST_CSTR_EQ("\xEF\xBF\xA1", to_utf8(L'\uFFE1').c_str());
 #else
     BOOST_TEST_CSTR_EQ("\xF0\x9F\xA7\x90", to_utf8(L'\U0001F9D0').c_str());