From ed44fcd268e0691e8afe09d879a107fbff194d75 Mon Sep 17 00:00:00 2001
From: Robert Ramey <ramey@rrsd.com>
Date: Fri, 10 Jul 2020 11:24:31 -0700
Subject: [PATCH] =?UTF-8?q?changes=20made=20in=20the=20hope=20of=20elimina?=
 =?UTF-8?q?ted=20=E2=80=9Cstable=E2=80=9D=20error=20for=20functions=20prev?=
 =?UTF-8?q?iously=20defined=20in=20the=20header.=20=20Moved=20those=20func?=
 =?UTF-8?q?tion=20to=20codecvt=5Fnull.cpp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/boost/archive/codecvt_null.hpp              | 7 +++----
 include/boost/archive/detail/utf8_codecvt_facet.hpp | 1 -
 src/codecvt_null.cpp                                | 7 +++++++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/include/boost/archive/codecvt_null.hpp b/include/boost/archive/codecvt_null.hpp
index 58d3d495..3905d43a 100644
--- a/include/boost/archive/codecvt_null.hpp
+++ b/include/boost/archive/codecvt_null.hpp
@@ -100,10 +100,9 @@ class BOOST_SYMBOL_VISIBLE codecvt_null<wchar_t> :
         return do_encoding();
     }
 public:
-    BOOST_SYMBOL_EXPORT explicit codecvt_null(std::size_t no_locale_manage = 0) :
-        std::codecvt<wchar_t, char, std::mbstate_t>(no_locale_manage)
-    {}
-    BOOST_SYMBOL_EXPORT ~codecvt_null() BOOST_OVERRIDE {};
+    BOOST_SYMBOL_EXPORT explicit codecvt_null(std::size_t no_locale_manage = 0);
+
+    BOOST_SYMBOL_EXPORT ~codecvt_null() BOOST_OVERRIDE ;
 };
 
 } // namespace archive
diff --git a/include/boost/archive/detail/utf8_codecvt_facet.hpp b/include/boost/archive/detail/utf8_codecvt_facet.hpp
index 2b473eea..5c785484 100644
--- a/include/boost/archive/detail/utf8_codecvt_facet.hpp
+++ b/include/boost/archive/detail/utf8_codecvt_facet.hpp
@@ -17,7 +17,6 @@
 #include <boost/archive/detail/decl.hpp>
 #define BOOST_UTF8_BEGIN_NAMESPACE \
      namespace boost { namespace archive { namespace detail {
-#define   BOOST_ARCHIVE_DECL
 #define BOOST_UTF8_END_NAMESPACE }}}
 
 #include <boost/detail/utf8_codecvt_facet.hpp>
diff --git a/src/codecvt_null.cpp b/src/codecvt_null.cpp
index 716ee255..2011e77b 100644
--- a/src/codecvt_null.cpp
+++ b/src/codecvt_null.cpp
@@ -80,5 +80,12 @@ codecvt_null<wchar_t>::do_in(
     return std::codecvt_base::ok;
 }
 
+BOOST_SYMBOL_EXPORT codecvt_null<wchar_t>::codecvt_null(std::size_t no_locale_manage) :
+    std::codecvt<wchar_t, char, std::mbstate_t>(no_locale_manage)
+{}
+
+BOOST_SYMBOL_EXPORT codecvt_null<wchar_t>::~codecvt_null()
+{}
+
 } // namespace archive
 } // namespace boost