Ticket #3957: patchfile-2.patch

libs/serialization/src/shared_ptr_helper.cpp

@@ -66 +66 @@
     collection_type::iterator i = m_pointers->find(sp);
 
     if(i == m_pointers->end()){
-        std::pair<collection_type::iterator, bool> result;
-        shared_ptr<const void> sp(const_cast<void * >(od), void_deleter(true_type));
-        result = m_pointers->insert(sp);
-        assert(result.second);
-        i = result.first;
+        // temp: std::pair<collection_type::iterator, bool> result;
+        // temp: shared_ptr<const void> sp(const_cast<void * >(od), void_deleter(true_type));
+        // temp: result = m_pointers->insert(sp);
+        // temp: assert(result.second);
+        // temp: i = result.first;
+        shared_ptr<void> np;
+        return np;
     }
     od = void_upcast(
         *true_type, 
@@ -92 +94 @@
     );
 }
 
+BOOST_ARCHIVE_DECL(void)
+shared_ptr_helper::append(const boost::shared_ptr<const void> &sp){
+
+    // make tracking array if necessary
+    if(NULL == m_pointers)
+        m_pointers = new collection_type;
+
+    collection_type::iterator i = m_pointers->find(sp);
+
+    if(i == m_pointers->end()){
+        std::pair<collection_type::iterator, bool> result;
+        result = m_pointers->insert(sp);
+        assert(result.second);
+    }
+}
+
 //  #ifdef BOOST_SERIALIZATION_SHARED_PTR_132_HPP
 BOOST_ARCHIVE_DECL(void)
 shared_ptr_helper::append(const boost_132::shared_ptr<const void> & t){

boost/archive/shared_ptr_helper.hpp

@@ -121 +121 @@
         const boost::serialization::extended_type_info * this_type
     );
 
+    BOOST_ARCHIVE_DECL(void)
+    append(const boost::shared_ptr<const void> &);
+
     template<class T>
     struct non_polymorphic {
         static const boost::serialization::extended_type_info * 
@@ -179 +182 @@
                 this_type
             );
 
-        s = shared_ptr<T>(
-            r,
-            static_cast<T *>(r.get())
-        );
+        if (!r)
+        {
+           s.reset(t);
+           const void * od = void_downcast(
+               *true_type,
+               *this_type,
+               static_cast<const void *>(t)
+           );
+           shared_ptr<const void> sp(s, od);
+           append(sp);
+        }
+        else
+        {
+            s = shared_ptr<T>(
+                r,
+                static_cast<T *>(r.get())
+            );
+        }
 
         //s = static_pointer_cast<T,void>(
         //    const_pointer_cast<void, const void>(*r)