update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / boost / boost / spirit / home / support / utf8.hpp

diff --git a/ceph/src/boost/boost/spirit/home/support/utf8.hpp b/ceph/src/boost/boost/spirit/home/support/utf8.hpp
index 8b67f505e520d6653052290093896c1e9c1c4cb6..30a8072fc3c2edf5bca63224dbf4d445c417e0b3 100644 (file)
--- a/ceph/src/boost/boost/spirit/home/support/utf8.hpp
+++ b/ceph/src/boost/boost/spirit/home/support/utf8.hpp
@@ -68,8 +68,8 @@ namespace boost { namespace spirit
         return result;
     }
 
-    // Assume wchar_t content is UTF-16 on Windows and UCS-4 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
     inline utf8_string to_utf8(wchar_t value)
     {
         utf8_string result;