diff -ru boost/serialization/detail/shared_count_132.hpp boost/serialization/detail/shared_count_132.hpp --- boost/serialization/detail/shared_count_132.hpp 2013-04-02 16:39:41.197617739 +0200 +++ boost/serialization/detail/shared_count_132.hpp 2013-04-05 09:54:49.832187723 +0200 @@ -35,7 +35,7 @@ #include // std::less #include // std::exception #include // std::bad_alloc -#include // std::type_info in get_deleter +#include // boost::detail::sp_typeinfo in get_deleter #include // std::size_t #include // msvc 6.0 needs this for warning suppression @@ -119,7 +119,7 @@ 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,9 +269,9 @@ 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,7 +441,7 @@ return std::less()(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; } diff -ru boost/serialization/detail/shared_ptr_132.hpp boost/serialization/detail/shared_ptr_132.hpp --- boost/serialization/detail/shared_ptr_132.hpp 2013-04-02 16:39:41.195838217 +0200 +++ boost/serialization/detail/shared_ptr_132.hpp 2013-04-04 18:55:38.826990243 +0200 @@ -320,7 +320,7 @@ 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,7 +454,7 @@ template 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(static_cast(q)); } @@ -462,7 +462,7 @@ template D * get_deleter(shared_ptr< T > const & p) { - return static_cast(p._internal_get_deleter(typeid(D))); + return static_cast(p._internal_get_deleter(BOOST_SP_TYPEID(D))); } #endif