[Boost-commit] svn:boost r86610 - trunk/boost/archive/impl

Subject: [Boost-commit] svn:boost r86610 - trunk/boost/archive/impl
From: ramey_at_[hidden]
Date: 2013-11-10 20:56:19

Author: ramey
Date: 2013-11-10 20:56:19 EST (Sun, 10 Nov 2013)
New Revision: 86610
URL: http://svn.boost.org/trac/boost/changeset/86610

Log:
changed codecvt_utf8 so that serialization uses the standard one if available.  If there is no standard one available, it uses the one in boost/utility.

Text files modified: 
   trunk/boost/archive/impl/xml_wiarchive_impl.ipp |    11 +++++++++--                             
   trunk/boost/archive/impl/xml_woarchive_impl.ipp |     9 ++++++++-                               
   2 files changed, 17 insertions(+), 3 deletions(-)

Modified: trunk/boost/archive/impl/xml_wiarchive_impl.ipp
==============================================================================
--- trunk/boost/archive/impl/xml_wiarchive_impl.ipp	Sun Nov 10 20:55:39 2013	(r86609)
+++ trunk/boost/archive/impl/xml_wiarchive_impl.ipp	2013-11-10 20:56:19 EST (Sun, 10 Nov 2013)	(r86610)
@@ -34,9 +34,16 @@
 
 #include <boost/serialization/string.hpp>
 #include <boost/archive/add_facet.hpp>
-#include <boost/archive/xml_archive_exception.hpp>
-#include <boost/archive/detail/utf8_codecvt_facet.hpp>
+#ifndef BOOST_NO_CXX11_HDR_CODECVT
+    #include <codecvt>
+    namespace boost { namespace archive { namespace detail {
+        typedef std::codecvt_utf8 utf8_codecvt_facet;
+    } } }
+#else
+    #include <boost/archive/detail/utf8_codecvt_facet.hpp>
+#endif
 
+#include <boost/archive/xml_archive_exception.hpp>
 #include <boost/archive/iterators/mb_from_wchar.hpp>
 
 #include <boost/archive/basic_xml_archive.hpp>

Modified: trunk/boost/archive/impl/xml_woarchive_impl.ipp
==============================================================================
--- trunk/boost/archive/impl/xml_woarchive_impl.ipp	Sun Nov 10 20:55:39 2013	(r86609)
+++ trunk/boost/archive/impl/xml_woarchive_impl.ipp	2013-11-10 20:56:19 EST (Sun, 10 Nov 2013)	(r86610)
@@ -39,7 +39,14 @@
 #include <boost/archive/iterators/dataflow_exception.hpp>
 
 #include <boost/archive/add_facet.hpp>
-#include <boost/archive/detail/utf8_codecvt_facet.hpp>
+#ifndef BOOST_NO_CXX11_HDR_CODECVT
+    #include <codecvt>
+    namespace boost { namespace archive { namespace detail {
+        typedef std::codecvt_utf8 utf8_codecvt_facet;
+    } } }
+#else
+    #include <boost/archive/detail/utf8_codecvt_facet.hpp>
+#endif
 
 namespace boost {
 namespace archive {