Ticket #3604: ticket3064_remove_const.patch

boost/serialization/void_cast.hpp

@@ -106 +106 @@
         void const * const
     );
 protected:
-    void recursive_register(bool includes_virtual_base = false) const;
+    void recursive_register(bool includes_virtual_base = false);
     void recursive_unregister() const;
+private:
+    // Data members
+    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

@@ -208 +208 @@
 
 // implementation of void caster base class
 BOOST_SERIALIZATION_DECL(void)
-void_caster::recursive_register(bool includes_virtual_base) const {
+void_caster::recursive_register(bool includes_virtual_base) {
     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
                 );
             }

libs/serialization/test/Jamfile.v2

@@ -72 +72 @@
      [ test-bsl-run_files test_derived_class : A ]
      [ test-bsl-run_files test_derived_class_ptr : A ]
      [ test-bsl-run_files test_diamond ]
+     [ test-bsl-run_files test_diamond_complex ]
      [ test-bsl-run_files test_exported : polymorphic_base ]
      [ test-bsl-run_files test_class_info_load ]
      [ test-bsl-run_files test_class_info_save ]