Ticket #8400: boost-serialization-shared_ptr-no-rtti.patch

boost/serialization/detail/shared_count_132.hpp

@@ -35 +35 @@
 #include <functional>       // std::less
 #include <exception>        // std::exception
 #include <new>              // std::bad_alloc
-#include <typeinfo>         // std::type_info in get_deleter
+#include <boost/detail/sp_typeinfo.hpp> // boost::detail::sp_typeinfo in get_deleter
 #include <cstddef>          // std::size_t
 
 #include <boost/config.hpp> // msvc 6.0 needs this for warning suppression
@@ -119 +119 @@
         delete this;
     }
 
-    virtual void * get_deleter(std::type_info const & ti) = 0;
+    virtual void * get_deleter(boost::detail::sp_typeinfo const & ti) = 0;
 
     void add_ref_copy()
     {
@@ -269 +269 @@
         del(ptr);
     }
 
-    virtual void * get_deleter(std::type_info const & ti)
+    virtual void * get_deleter(boost::detail::sp_typeinfo const & ti)
     {
-        return ti == typeid(D)? &del: 0;
+        return ti == BOOST_SP_TYPEID(D)? &del: 0;
     }
 
 #if defined(BOOST_SP_USE_STD_ALLOCATOR)
@@ -441 +441 @@
         return std::less<sp_counted_base *>()(a.pi_, b.pi_);
     }
 
-    void * get_deleter(std::type_info const & ti) const
+    void * get_deleter(boost::detail::sp_typeinfo const & ti) const
     {
         return pi_? pi_->get_deleter(ti): 0;
     }

boost/serialization/detail/shared_ptr_132.hpp

@@ -320 +320 @@
         return pn < rhs.pn;
     }
 
-    void * _internal_get_deleter(std::type_info const & ti) const
+    void * _internal_get_deleter(boost::detail::sp_typeinfo const & ti) const
     {
         return pn.get_deleter(ti);
     }
@@ -454 +454 @@
 
 template<class D, class T> D * get_deleter(shared_ptr< T > const & p)
 {
-    void const * q = p._internal_get_deleter(typeid(D));
+    void const * q = p._internal_get_deleter(BOOST_SP_TYPEID(D));
     return const_cast<D *>(static_cast<D const *>(q));
 }
 
@@ -462 +462 @@
 
 template<class D, class T> D * get_deleter(shared_ptr< T > const & p)
 {
-    return static_cast<D *>(p._internal_get_deleter(typeid(D)));
+    return static_cast<D *>(p._internal_get_deleter(BOOST_SP_TYPEID(D)));
 }
 
 #endif