Ticket #3604: ticket3604.patch

boost/serialization/void_cast.hpp

@@ -108 +108 @@
 protected:
     void recursive_register(bool includes_virtual_base = false) const;
     void recursive_unregister() const;
+private:
+    // Data members
+    mutable bool m_includes_virtual_base;
 public:
-    // Data members
     const extended_type_info * m_derived;
     const extended_type_info * m_base;
     /*const*/ std::ptrdiff_t m_difference;

libs/serialization/src/void_cast.cpp

@@ -211 +211 @@
 void_caster::recursive_register(bool includes_virtual_base) const {
     void_cast_detail::set_type & s
         = void_cast_detail::void_caster_registry::get_mutable_instance();
+    m_includes_virtual_base = includes_virtual_base;
 
     #ifdef BOOST_SERIALIZATION_LOG
     std::clog << "recursive_register\n";
@@ -239 +240 @@
                     (*it)->m_derived, 
                     m_base,
                     m_difference + (*it)->m_difference,
-                    includes_virtual_base,
+                    includes_virtual_base || (*it)->m_includes_virtual_base,
                     this
                 );
             }
@@ -256 +257 @@
                     m_derived, 
                     (*it)->m_base, 
                     m_difference + (*it)->m_difference,
-                    includes_virtual_base,
+                    includes_virtual_base || (*it)->m_includes_virtual_base,
                     this
                 );
             }