Ticket #3957: patchfile.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){