From eaf85795f372a3fe6dcbcd1c4f74e07a51c5cbc3 Mon Sep 17 00:00:00 2001
From: Robert Ramey <ramey@rrsd.com>
Date: Wed, 14 Jun 2017 15:25:49 -0700
Subject: [PATCH] adjustment to export codecvt_null<wchar_t>

---
 include/boost/archive/codecvt_null.hpp            | 13 ++++++++-----
 include/boost/archive/impl/xml_woarchive_impl.ipp |  2 ++
 include/boost/archive/iterators/mb_from_wchar.hpp |  3 ++-
 include/boost/archive/iterators/wchar_from_mb.hpp |  2 ++
 include/boost/archive/wcslen.hpp                  |  2 ++
 src/codecvt_null.cpp                              |  4 ++--
 6 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/include/boost/archive/codecvt_null.hpp b/include/boost/archive/codecvt_null.hpp
index 9cc9e572..7bce2b9b 100644
--- a/include/boost/archive/codecvt_null.hpp
+++ b/include/boost/archive/codecvt_null.hpp
@@ -18,8 +18,11 @@
 
 #include <locale>
 #include <cstddef> // NULL, size_t
+#ifndef BOOST_NO_CWCHAR
 #include <cwchar>   // for mbstate_t
+#endif
 #include <boost/config.hpp>
+#include <boost/serialization/force_include.hpp>
 #include <boost/archive/detail/auto_link_archive.hpp>
 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header
 
@@ -62,7 +65,7 @@ public:
 template<>
 class BOOST_SYMBOL_VISIBLE codecvt_null<wchar_t> : public std::codecvt<wchar_t, char, std::mbstate_t>
 {
-    virtual BOOST_WARCHIVE_DECL std::codecvt_base::result
+    virtual BOOST_WARCHIVE_DECL BOOST_DLLEXPORT std::codecvt_base::result
     do_out(
         std::mbstate_t & state,
         const wchar_t * first1,
@@ -71,8 +74,8 @@ class BOOST_SYMBOL_VISIBLE codecvt_null<wchar_t> : public std::codecvt<wchar_t,
         char * first2,
         char * last2,
         char * & next2
-    ) const;
-    virtual BOOST_WARCHIVE_DECL std::codecvt_base::result
+    ) const BOOST_USED;
+    virtual BOOST_WARCHIVE_DECL BOOST_DLLEXPORT std::codecvt_base::result
     do_in(
         std::mbstate_t & state,
         const char * first1,
@@ -81,7 +84,7 @@ class BOOST_SYMBOL_VISIBLE codecvt_null<wchar_t> : public std::codecvt<wchar_t,
         wchar_t * first2,
         wchar_t * last2,
         wchar_t * & next2
-    ) const;
+    ) const BOOST_USED;
     virtual int do_encoding( ) const throw( ){
         return sizeof(wchar_t) / sizeof(char);
     }
@@ -89,7 +92,7 @@ class BOOST_SYMBOL_VISIBLE codecvt_null<wchar_t> : public std::codecvt<wchar_t,
         return do_encoding();
     }
 public:
-    explicit codecvt_null(std::size_t no_locale_manage = 0) :
+    BOOST_DLLEXPORT explicit codecvt_null(std::size_t no_locale_manage = 0) :
         std::codecvt<wchar_t, char, std::mbstate_t>(no_locale_manage)
     {}
     virtual ~codecvt_null(){};
diff --git a/include/boost/archive/impl/xml_woarchive_impl.ipp b/include/boost/archive/impl/xml_woarchive_impl.ipp
index 58f92c9d..01b1a052 100644
--- a/include/boost/archive/impl/xml_woarchive_impl.ipp
+++ b/include/boost/archive/impl/xml_woarchive_impl.ipp
@@ -17,7 +17,9 @@
 
 #include <cstring> // strlen
 #include <cstdlib> // mbtowc
+#ifndef BOOST_NO_CWCHAR
 #include <cwchar>  // wcslen
+#endif
 
 #include <boost/config.hpp>
 #if defined(BOOST_NO_STDC_NAMESPACE)
diff --git a/include/boost/archive/iterators/mb_from_wchar.hpp b/include/boost/archive/iterators/mb_from_wchar.hpp
index b6dc9b21..05df71c2 100644
--- a/include/boost/archive/iterators/mb_from_wchar.hpp
+++ b/include/boost/archive/iterators/mb_from_wchar.hpp
@@ -18,8 +18,9 @@
 
 #include <boost/assert.hpp>
 #include <cstddef> // size_t
+#ifndef BOOST_NO_CWCHAR
 #include <cwchar> //  mbstate_t
-
+#endif
 #include <boost/config.hpp>
 #if defined(BOOST_NO_STDC_NAMESPACE)
 namespace std{ 
diff --git a/include/boost/archive/iterators/wchar_from_mb.hpp b/include/boost/archive/iterators/wchar_from_mb.hpp
index 52a44bdc..2af8f640 100644
--- a/include/boost/archive/iterators/wchar_from_mb.hpp
+++ b/include/boost/archive/iterators/wchar_from_mb.hpp
@@ -19,7 +19,9 @@
 #include <boost/assert.hpp>
 #include <cctype>
 #include <cstddef> // size_t
+#ifndef BOOST_NO_CWCHAR
 #include <cwchar>  // mbstate_t
+#endif
 #include <algorithm> // copy
 
 #include <boost/config.hpp>
diff --git a/include/boost/archive/wcslen.hpp b/include/boost/archive/wcslen.hpp
index 2a3d6351..0b60004f 100644
--- a/include/boost/archive/wcslen.hpp
+++ b/include/boost/archive/wcslen.hpp
@@ -44,7 +44,9 @@ inline std::size_t wcslen(const wchar_t * ws)
 
 #else
 
+#ifndef BOOST_NO_CWCHAR
 #include <cwchar>
+#endif
 #ifdef BOOST_NO_STDC_NAMESPACE
 namespace std{ using ::wcslen; }
 #endif
diff --git a/src/codecvt_null.cpp b/src/codecvt_null.cpp
index 2f0115bf..5506348e 100644
--- a/src/codecvt_null.cpp
+++ b/src/codecvt_null.cpp
@@ -18,7 +18,7 @@
 namespace boost {
 namespace archive {
 
-BOOST_WARCHIVE_DECL std::codecvt_base::result
+BOOST_WARCHIVE_DECL BOOST_DLLEXPORT std::codecvt_base::result
 codecvt_null<wchar_t>::do_out(
     std::mbstate_t & /*state*/,
     const wchar_t * first1, 
@@ -46,7 +46,7 @@ codecvt_null<wchar_t>::do_out(
     return std::codecvt_base::ok;
 }
 
-BOOST_WARCHIVE_DECL std::codecvt_base::result
+BOOST_WARCHIVE_DECL BOOST_DLLEXPORT std::codecvt_base::result
 codecvt_null<wchar_t>::do_in(
     std::mbstate_t & /*state*/,
     const char * first1,