From 3691e8eea4192b23e610b6f9664d0efc2ac83e8e Mon Sep 17 00:00:00 2001
From: Robert Ramey <ramey@rrsd.com>
Date: Thu, 16 Jul 2009 21:19:47 +0000
Subject: [PATCH] Fix test dll exported

[SVN r54986]
---
 src/basic_serializer_map.cpp |  6 +++---
 src/binary_iarchive.cpp      |  4 ++++
 src/binary_oarchive.cpp      |  5 ++++-
 src/binary_wiarchive.cpp     |  6 +++++-
 src/binary_woarchive.cpp     |  4 +++-
 src/polymorphic_iarchive.cpp | 15 +++++++++++++--
 src/polymorphic_oarchive.cpp | 17 +++++++++++++++--
 src/text_iarchive.cpp        |  8 ++++++++
 src/text_oarchive.cpp        |  3 +++
 src/text_wiarchive.cpp       |  5 ++++-
 src/text_woarchive.cpp       |  4 ++++
 src/xml_iarchive.cpp         |  4 ++++
 src/xml_oarchive.cpp         |  5 ++++-
 src/xml_wiarchive.cpp        |  4 ++++
 src/xml_woarchive.cpp        |  7 ++++---
 15 files changed, 82 insertions(+), 15 deletions(-)

diff --git a/src/basic_serializer_map.cpp b/src/basic_serializer_map.cpp
index 3aa5fd41..d166aa36 100644
--- a/src/basic_serializer_map.cpp
+++ b/src/basic_serializer_map.cpp
@@ -38,7 +38,7 @@ basic_serializer_map::insert(const basic_serializer * bs){
 }
 
 BOOST_ARCHIVE_DECL(void) 
-basic_serializer_map::erase(basic_serializer * bs){
+basic_serializer_map::erase(const basic_serializer * bs){
     map_type::iterator it = m_map.begin();
     map_type::iterator it_end = m_map.end();
 
@@ -57,8 +57,7 @@ basic_serializer_map::erase(basic_serializer * bs){
     //if(*it == bs)
     //    m_map.erase(it);
 }
-
-BOOST_ARCHIVE_DECL(const basic_serializer *) 
+BOOST_ARCHIVE_DECL(const basic_serializer *)
 basic_serializer_map::find(
     const boost::serialization::extended_type_info & eti
 ) const {
@@ -72,3 +71,4 @@ basic_serializer_map::find(
 } // namespace detail
 } // namespace archive
 } // namespace boost
+
diff --git a/src/binary_iarchive.cpp b/src/binary_iarchive.cpp
index 8c8603e1..7bb0435c 100644
--- a/src/binary_iarchive.cpp
+++ b/src/binary_iarchive.cpp
@@ -12,7 +12,9 @@
 
 #define BOOST_ARCHIVE_SOURCE
 #include <boost/archive/binary_iarchive.hpp>
+#include <boost/archive/detail/archive_serializer_map.hpp>
 
+#include <boost/archive/impl/archive_serializer_map.ipp>
 #include <boost/archive/impl/basic_binary_iprimitive.ipp>
 #include <boost/archive/impl/basic_binary_iarchive.ipp>
 
@@ -20,6 +22,7 @@ namespace boost {
 namespace archive {
 
 // explicitly instantiate for this type of stream
+template class detail::archive_serializer_map<naked_binary_iarchive>;
 template class basic_binary_iprimitive<
     naked_binary_iarchive,
     std::istream::char_type, 
@@ -33,6 +36,7 @@ template class binary_iarchive_impl<
 >;
 
 // explicitly instantiate for this type of stream
+template class detail::archive_serializer_map<binary_iarchive>;
 template class basic_binary_iprimitive<
     binary_iarchive,
     std::istream::char_type, 
diff --git a/src/binary_oarchive.cpp b/src/binary_oarchive.cpp
index 4a4b4e91..e7ab9040 100644
--- a/src/binary_oarchive.cpp
+++ b/src/binary_oarchive.cpp
@@ -12,14 +12,17 @@
 
 #define BOOST_ARCHIVE_SOURCE
 #include <boost/archive/binary_oarchive.hpp>
+#include <boost/archive/detail/archive_serializer_map.hpp>
 
+// explicitly instantiate for this type of binary stream
+#include <boost/archive/impl/archive_serializer_map.ipp>
 #include <boost/archive/impl/basic_binary_oprimitive.ipp>
 #include <boost/archive/impl/basic_binary_oarchive.ipp>
 
 namespace boost {
 namespace archive {
 
-// explicitly instantiate for this type of binary stream
+template class detail::archive_serializer_map<binary_oarchive>;
 template class basic_binary_oprimitive<
     binary_oarchive, 
     std::ostream::char_type, 
diff --git a/src/binary_wiarchive.cpp b/src/binary_wiarchive.cpp
index b2da8947..a6135c8c 100644
--- a/src/binary_wiarchive.cpp
+++ b/src/binary_wiarchive.cpp
@@ -16,14 +16,17 @@
 
 #define BOOST_WARCHIVE_SOURCE
 #include <boost/archive/binary_wiarchive.hpp>
+#include <boost/archive/detail/archive_serializer_map.hpp>
 
+// explicitly instantiate for this type of text stream
+#include <boost/archive/impl/archive_serializer_map.ipp>
 #include <boost/archive/impl/basic_binary_iprimitive.ipp>
 #include <boost/archive/impl/basic_binary_iarchive.ipp>
 
 namespace boost {
 namespace archive {
 
-// explicitly instantiate for this type of text stream
+template class detail::archive_serializer_map<naked_binary_wiarchive>;
 template class basic_binary_iprimitive<
     naked_binary_wiarchive,
     wchar_t, 
@@ -37,6 +40,7 @@ template class binary_iarchive_impl<
 >;
 
 // explicitly instantiate for this type of text stream
+template class detail::archive_serializer_map<binary_wiarchive>;
 template class basic_binary_iprimitive<
     binary_wiarchive,
     wchar_t, 
diff --git a/src/binary_woarchive.cpp b/src/binary_woarchive.cpp
index d1ae54a2..905a319d 100644
--- a/src/binary_woarchive.cpp
+++ b/src/binary_woarchive.cpp
@@ -17,13 +17,15 @@
 #define BOOST_WARCHIVE_SOURCE
 #include <boost/archive/binary_woarchive.hpp>
 
+// explicitly instantiate for this type of text stream
+#include <boost/archive/impl/archive_serializer_map.ipp>
 #include <boost/archive/impl/basic_binary_oprimitive.ipp>
 #include <boost/archive/impl/basic_binary_oarchive.ipp>
 
 namespace boost {
 namespace archive {
 
-// explicitly instantiate for this type of text stream
+template class detail::archive_serializer_map<binary_woarchive>;
 template class basic_binary_oprimitive<
     binary_woarchive, 
     wchar_t, 
diff --git a/src/polymorphic_iarchive.cpp b/src/polymorphic_iarchive.cpp
index 205929d8..5e8c9867 100644
--- a/src/polymorphic_iarchive.cpp
+++ b/src/polymorphic_iarchive.cpp
@@ -12,7 +12,18 @@
 #  pragma warning (disable : 4786) // too long name, harmless warning
 #endif
 
-#include <istream>
-
 #define BOOST_ARCHIVE_SOURCE
+#include <boost/archive/detail/archive_serializer_map.hpp>
+
+#include <boost/archive/impl/archive_serializer_map.ipp>
 #include <boost/archive/polymorphic_iarchive.hpp>
+
+namespace boost {
+namespace archive {
+namespace detail {
+
+template class archive_serializer_map<polymorphic_iarchive>;
+
+} // detail
+} // archive
+} // boost
diff --git a/src/polymorphic_oarchive.cpp b/src/polymorphic_oarchive.cpp
index 3b1cf14c..9a1d4669 100644
--- a/src/polymorphic_oarchive.cpp
+++ b/src/polymorphic_oarchive.cpp
@@ -12,7 +12,20 @@
 #  pragma warning (disable : 4786) // too long name, harmless warning
 #endif
 
-#include <ostream>
-
 #define BOOST_ARCHIVE_SOURCE
+#include <boost/archive/detail/archive_serializer_map.hpp>
+#define BOOST_ARCHIVE_SOURCE
+#include <boost/archive/detail/archive_serializer_map.hpp>
+
+#include <boost/archive/impl/archive_serializer_map.ipp>
 #include <boost/archive/polymorphic_oarchive.hpp>
+
+namespace boost {
+namespace archive {
+namespace detail {
+
+template class archive_serializer_map<polymorphic_oarchive>;
+
+} // detail
+} // archive
+} // boost
diff --git a/src/text_iarchive.cpp b/src/text_iarchive.cpp
index 67f580ee..cb9017fa 100644
--- a/src/text_iarchive.cpp
+++ b/src/text_iarchive.cpp
@@ -8,19 +8,27 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
+#if (defined _MSC_VER) && (_MSC_VER == 1200)
+#  pragma warning (disable : 4786) // too long name, harmless warning
+#endif
+
 #define BOOST_ARCHIVE_SOURCE
 #include <boost/archive/text_iarchive.hpp>
+#include <boost/archive/detail/archive_serializer_map.hpp>
 
 // explicitly instantiate for this type of text stream
+#include <boost/archive/impl/archive_serializer_map.ipp>
 #include <boost/archive/impl/basic_text_iarchive.ipp>
 #include <boost/archive/impl/text_iarchive_impl.ipp>
 
 namespace boost {
 namespace archive {
 
+template class detail::archive_serializer_map<naked_text_iarchive>;
 template class basic_text_iarchive<naked_text_iarchive> ;
 template class text_iarchive_impl<naked_text_iarchive> ;
 
+template class detail::archive_serializer_map<text_iarchive>;
 template class basic_text_iarchive<text_iarchive> ;
 template class text_iarchive_impl<text_iarchive> ;
 
diff --git a/src/text_oarchive.cpp b/src/text_oarchive.cpp
index 38ba6598..19165d62 100644
--- a/src/text_oarchive.cpp
+++ b/src/text_oarchive.cpp
@@ -14,8 +14,10 @@
 
 #define BOOST_ARCHIVE_SOURCE
 #include <boost/archive/text_oarchive.hpp>
+#include <boost/archive/detail/archive_serializer_map.hpp>
 
 // explicitly instantiate for this type of text stream
+#include <boost/archive/impl/archive_serializer_map.ipp>
 #include <boost/archive/impl/basic_text_oarchive.ipp>
 #include <boost/archive/impl/text_oarchive_impl.ipp>
 
@@ -23,6 +25,7 @@ namespace boost {
 namespace archive {
 
 //template class basic_text_oprimitive<std::ostream> ;
+template class detail::archive_serializer_map<text_oarchive>;
 template class basic_text_oarchive<text_oarchive> ;
 template class text_oarchive_impl<text_oarchive> ;
 
diff --git a/src/text_wiarchive.cpp b/src/text_wiarchive.cpp
index 39f2e61f..a6630c03 100644
--- a/src/text_wiarchive.cpp
+++ b/src/text_wiarchive.cpp
@@ -16,17 +16,21 @@
 
 #define BOOST_WARCHIVE_SOURCE
 #include <boost/archive/text_wiarchive.hpp>
+#include <boost/archive/detail/archive_serializer_map.hpp>
 
 // explicitly instantiate for this type of text stream
+#include <boost/archive/impl/archive_serializer_map.ipp>
 #include <boost/archive/impl/basic_text_iarchive.ipp>
 #include <boost/archive/impl/text_wiarchive_impl.ipp>
 
 namespace boost {
 namespace archive {
 
+template class detail::archive_serializer_map<naked_text_wiarchive>;
 template class basic_text_iarchive<naked_text_wiarchive> ;
 template class text_wiarchive_impl<naked_text_wiarchive> ;
 
+template class detail::archive_serializer_map<text_wiarchive>;
 template class basic_text_iarchive<text_wiarchive> ;
 template class text_wiarchive_impl<text_wiarchive> ;
 
@@ -35,4 +39,3 @@ template class text_wiarchive_impl<text_wiarchive> ;
 
 #endif // BOOST_NO_STD_WSTREAMBUF
 
-
diff --git a/src/text_woarchive.cpp b/src/text_woarchive.cpp
index b5ed44b4..54b4a0df 100644
--- a/src/text_woarchive.cpp
+++ b/src/text_woarchive.cpp
@@ -15,13 +15,17 @@
 
 #define BOOST_WARCHIVE_SOURCE
 #include <boost/archive/text_woarchive.hpp>
+#include <boost/archive/detail/archive_serializer_map.hpp>
 
+// explicitly instantiate for this type of text stream
+#include <boost/archive/impl/archive_serializer_map.ipp>
 #include <boost/archive/impl/basic_text_oarchive.ipp>
 #include <boost/archive/impl/text_woarchive_impl.ipp>
 
 namespace boost {
 namespace archive {
 
+template class detail::archive_serializer_map<text_woarchive>;
 template class basic_text_oarchive<text_woarchive> ;
 template class text_woarchive_impl<text_woarchive> ;
 
diff --git a/src/xml_iarchive.cpp b/src/xml_iarchive.cpp
index 347210b0..6d0de772 100644
--- a/src/xml_iarchive.cpp
+++ b/src/xml_iarchive.cpp
@@ -24,17 +24,21 @@
 #endif
 
 #include <boost/archive/xml_iarchive.hpp>
+#include <boost/archive/detail/archive_serializer_map.hpp>
 
 // explicitly instantiate for this type of xml stream
+#include <boost/archive/impl/archive_serializer_map.ipp>
 #include <boost/archive/impl/basic_xml_iarchive.ipp>
 #include <boost/archive/impl/xml_iarchive_impl.ipp>
 
 namespace boost {
 namespace archive {
 
+template class detail::archive_serializer_map<naked_xml_iarchive>;
 template class basic_xml_iarchive<naked_xml_iarchive> ;
 template class xml_iarchive_impl<naked_xml_iarchive> ;
 
+template class detail::archive_serializer_map<xml_iarchive>;
 template class basic_xml_iarchive<xml_iarchive> ;
 template class xml_iarchive_impl<xml_iarchive> ;
 
diff --git a/src/xml_oarchive.cpp b/src/xml_oarchive.cpp
index 343fba0a..88bcdd65 100644
--- a/src/xml_oarchive.cpp
+++ b/src/xml_oarchive.cpp
@@ -14,14 +14,17 @@
 
 #define BOOST_ARCHIVE_SOURCE
 #include <boost/archive/xml_oarchive.hpp>
+#include <boost/archive/detail/archive_serializer_map.hpp>
 
+// explicitly instantiate for this type of xml stream
+#include <boost/archive/impl/archive_serializer_map.ipp>
 #include <boost/archive/impl/basic_xml_oarchive.ipp>
 #include <boost/archive/impl/xml_oarchive_impl.ipp>
 
 namespace boost {
 namespace archive {
 
-// explicitly instantiate for this type of xml stream
+template class detail::archive_serializer_map<xml_oarchive>;
 template class basic_xml_oarchive<xml_oarchive> ;
 template class xml_oarchive_impl<xml_oarchive> ;
 
diff --git a/src/xml_wiarchive.cpp b/src/xml_wiarchive.cpp
index d0090e67..2e10947b 100644
--- a/src/xml_wiarchive.cpp
+++ b/src/xml_wiarchive.cpp
@@ -29,17 +29,21 @@
 #endif
 
 #include <boost/archive/xml_wiarchive.hpp>
+#include <boost/archive/detail/archive_serializer_map.hpp>
 
 // explicitly instantiate for this type of xml stream
+#include <boost/archive/impl/archive_serializer_map.ipp>
 #include <boost/archive/impl/basic_xml_iarchive.ipp>
 #include <boost/archive/impl/xml_wiarchive_impl.ipp>
 
 namespace boost {
 namespace archive {
 
+template class detail::archive_serializer_map<naked_xml_wiarchive>;
 template class basic_xml_iarchive<naked_xml_wiarchive> ;
 template class xml_wiarchive_impl<naked_xml_wiarchive> ;
 
+template class detail::archive_serializer_map<xml_wiarchive>;
 template class basic_xml_iarchive<xml_wiarchive> ;
 template class xml_wiarchive_impl<xml_wiarchive> ;
 
diff --git a/src/xml_woarchive.cpp b/src/xml_woarchive.cpp
index 135ee2d5..e71daaf6 100644
--- a/src/xml_woarchive.cpp
+++ b/src/xml_woarchive.cpp
@@ -15,16 +15,17 @@
 
 #define BOOST_WARCHIVE_SOURCE
 #include <boost/archive/xml_woarchive.hpp>
+#include <boost/archive/detail/archive_serializer_map.hpp>
 
-/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
-// implemenations of functions specific to wide char archives
-
+// explicitly instantiate for this type of text stream
+#include <boost/archive/impl/archive_serializer_map.ipp>
 #include <boost/archive/impl/basic_xml_oarchive.ipp>
 #include <boost/archive/impl/xml_woarchive_impl.ipp>
 
 namespace boost {
 namespace archive {
 
+template class detail::archive_serializer_map<xml_woarchive>;
 template class basic_xml_oarchive<xml_woarchive> ;
 template class xml_woarchive_impl<xml_woarchive> ;