X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ceph%2Fsrc%2Fboost%2Flibs%2Fserialization%2Fsrc%2Futf8_codecvt_facet.cpp;h=f6550d07dee7d3fc6d991f0aa7324dd8fc80382d;hb=b32b81446b3b05102be0267e79203f59329c1d97;hp=c0a64f2912c1f823b58dda3e4550425ab031b6cf;hpb=215dd7151453fae88e6f968c975b6ce309d42dcf;p=ceph.git

diff --git a/ceph/src/boost/libs/serialization/src/utf8_codecvt_facet.cpp b/ceph/src/boost/libs/serialization/src/utf8_codecvt_facet.cpp
index c0a64f291..f6550d07d 100644
--- a/ceph/src/boost/libs/serialization/src/utf8_codecvt_facet.cpp
+++ b/ceph/src/boost/libs/serialization/src/utf8_codecvt_facet.cpp
@@ -4,20 +4,19 @@
 // or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/config.hpp>
+
 #ifdef BOOST_NO_STD_WSTREAMBUF
 #error "wide char i/o not supported on this platform"
-#else
-//    #ifdef BOOST_NO_CXX11_HDR_CODECVT
-    #if 1
-        # define BOOST_ARCHIVE_SOURCE
-        #include <boost/archive/detail/decl.hpp>
-        #define BOOST_UTF8_BEGIN_NAMESPACE \
-             namespace boost { namespace archive { namespace detail {
-        #define BOOST_UTF8_DECL BOOST_ARCHIVE_DECL
-        #define BOOST_UTF8_END_NAMESPACE }}}
-        #include <boost/detail/utf8_codecvt_facet.ipp>
-        #undef BOOST_UTF8_END_NAMESPACE
-        #undef BOOST_UTF8_DECL
-        #undef BOOST_UTF8_BEGIN_NAMESPACE
-    #endif // BOOST_NO_CXX11_HDR_CODECVT
-#endif // BOOST_NO_STD_WSTREAMBUF
+#endif
+
+// include boost implementation of utf8 codecvt facet
+# define BOOST_ARCHIVE_SOURCE
+#include <boost/archive/detail/decl.hpp>
+#define BOOST_UTF8_BEGIN_NAMESPACE \
+     namespace boost { namespace archive { namespace detail {
+#define BOOST_UTF8_DECL BOOST_ARCHIVE_DECL
+#define BOOST_UTF8_END_NAMESPACE }}}
+#include <boost/detail/utf8_codecvt_facet.ipp>
+#undef BOOST_UTF8_END_NAMESPACE
+#undef BOOST_UTF8_DECL
+#undef BOOST_UTF8_BEGIN_NAMESPACE