From d330deb82cf5082bb57ddc7cc8e3396837bc4f72 Mon Sep 17 00:00:00 2001
From: Robert Ramey <ramey@rrsd.com>
Date: Mon, 18 Jan 2016 11:41:22 -0800
Subject: [PATCH] return utf8 back to state of 22 ocober

---
 .../boost/archive/detail/utf8_codecvt_facet.hpp    |  1 -
 include/boost/archive/impl/xml_iarchive_impl.ipp   |  2 +-
 src/utf8_codecvt_facet.cpp                         | 14 ++++++++------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/include/boost/archive/detail/utf8_codecvt_facet.hpp b/include/boost/archive/detail/utf8_codecvt_facet.hpp
index c72402c5..b5410d9a 100644
--- a/include/boost/archive/detail/utf8_codecvt_facet.hpp
+++ b/include/boost/archive/detail/utf8_codecvt_facet.hpp
@@ -26,5 +26,4 @@
         typedef std::codecvt_utf8<wchar_t> utf8_codecvt_facet;
     } } }
 #endif // BOOST_NO_CXX11_HDR_CODECVT
-
 #endif // BOOST_ARCHIVE_DETAIL_UTF8_CODECVT_FACET_HPP
diff --git a/include/boost/archive/impl/xml_iarchive_impl.ipp b/include/boost/archive/impl/xml_iarchive_impl.ipp
index d7757ba9..478e1be7 100644
--- a/include/boost/archive/impl/xml_iarchive_impl.ipp
+++ b/include/boost/archive/impl/xml_iarchive_impl.ipp
@@ -100,7 +100,7 @@ xml_iarchive_impl<Archive>::load(wchar_t * ws){
             )
         );
         
-    std::mbstate_t mbs;
+    std::mbstate_t mbs = std::mbstate_t();
     const char * start = s.data();
     const char * end = start + s.size();
     while(start < end){
diff --git a/src/utf8_codecvt_facet.cpp b/src/utf8_codecvt_facet.cpp
index e2875e15..c55c7e97 100644
--- a/src/utf8_codecvt_facet.cpp
+++ b/src/utf8_codecvt_facet.cpp
@@ -3,21 +3,23 @@
 // (See accompanying file LICENSE_1_0.txt
 // or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#define BOOST_ARCHIVE_SOURCE
 #include <boost/config.hpp>
+
+#include <boost/archive/detail/auto_link_archive.hpp>
+#include <boost/archive/detail/utf8_codecvt_facet.hpp>
+
 #ifdef BOOST_NO_STD_WSTREAMBUF
-    #error "wide char i/o not supported on this platform"
+#error "wide char i/o not supported on this platform"
 #else
     #ifdef BOOST_NO_CXX11_HDR_CODECVT
-        #define BOOST_UTF8_DECL BOOST_ARCHIVE_DECL
         #define BOOST_UTF8_BEGIN_NAMESPACE \
              namespace boost { namespace archive { namespace detail {
+        #define BOOST_UTF8_DECL
         #define BOOST_UTF8_END_NAMESPACE }}}
-        #define BOOST_ARCHIVE_SOURCE
-        #include <boost/serialization/config.hpp>
-        #include <boost/archive/detail/utf8_codecvt_facet.hpp>
         #include <boost/detail/utf8_codecvt_facet.ipp>
         #undef BOOST_UTF8_END_NAMESPACE
-        #undef BOOST_UTF8_BEGIN_NAMESPACE
         #undef BOOST_UTF8_DECL
+        #undef BOOST_UTF8_BEGIN_NAMESPACE
     #endif // BOOST_NO_CXX11_HDR_CODECVT
 #endif // BOOST_NO_STD_WSTREAMBUF