Ticket #4698: ser_cannot_export.patch

archive/impl/archive_serializer_map.ipp

@@ -26 +26 @@
 #  pragma warning(disable : 4511 4512)
 #endif
 
-namespace { // anon
+namespace extra_detail { // anon
     template<class Archive>
     class map : public basic_serializer_map 
     {};
@@ -40 +40 @@
 BOOST_ARCHIVE_OR_WARCHIVE_DECL(bool)
 archive_serializer_map<Archive>::insert(const basic_serializer * bs){
     return boost::serialization::singleton<
-        map<Archive>
+        extra_detail::map<Archive>
     >::get_mutable_instance().insert(bs);
 }
 
@@ -48 +48 @@
 BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
 archive_serializer_map<Archive>::erase(const basic_serializer * bs){
     if(boost::serialization::singleton<
-        map<Archive>
+        extra_detail::map<Archive>
     >::is_destroyed())
         return;
     boost::serialization::singleton<
-        map<Archive>
+        extra_detail::map<Archive>
     >::get_mutable_instance().erase(bs);
 }
 
@@ -62 +62 @@
     const boost::serialization::extended_type_info & eti
 ) {
     return boost::serialization::singleton<
-        map<Archive>
+        extra_detail::map<Archive>
     >::get_const_instance().find(eti);
 }
 

serialization/export.hpp

@@ -120 +120 @@
 // This was made this way so that export.hpp could be included
 // in other headers.  This is still under study.
 
-namespace {
+namespace extra_detail {
 
 template<class T>
 struct guid_initializer
@@ -156 +156 @@
     namespace boost {                                        \
     namespace archive {                                      \
     namespace detail {                                       \
-    namespace {                                              \
+    namespace extra_detail {                                 \
     template<>                                               \
     struct init_guid< T > {                                  \
         static guid_initializer< T > const & g;              \