feedc0de/boost_smart_ptr
1
0
Fork 0
forked from boostorg/smart_ptr
Code Pull Requests Activity

More fixes for MSVC 6.0.

Browse Source 
[SVN r45086]
This commit is contained in:
Peter Dimov
2008-05-03 19:43:52 +00:00
parent 83c43617af
commit d13f1d8694
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
include/boost/shared_ptr.hpp
View File

@ -740,7 +740,11 @@ public:
detail::shared_count().swap( _deleter ); detail::shared_count().swap( _deleter );
} }
template<typename D> template<typename D>
#if defined( BOOST_MSVC ) && BOOST_WORKAROUND( BOOST_MSVC, < 1300 )
D* get_deleter( D* ) const
#else
D* get_deleter() const D* get_deleter() const
#endif
{ {
return boost::detail::basic_get_deleter<D>(_deleter); return boost::detail::basic_get_deleter<D>(_deleter);
} }
@ -752,18 +756,25 @@ template<class D, class T> D * get_deleter( shared_ptr<T> const & p )
{ {
D *del = detail::basic_get_deleter<D>( p.get_shared_count() ); D *del = detail::basic_get_deleter<D>( p.get_shared_count() );
#if defined( BOOST_MSVC ) && BOOST_WORKAROUND( BOOST_MSVC, < 1300 )
#else
if( del == 0 ) if( del == 0 )
{ {
detail::sp_deleter_wrapper *del_wrapper = detail::basic_get_deleter<detail::sp_deleter_wrapper>(p.get_shared_count()); detail::sp_deleter_wrapper *del_wrapper = detail::basic_get_deleter<detail::sp_deleter_wrapper>(p.get_shared_count());
// The following get_deleter method call is fully qualified because
// older versions of gcc (2.95, 3.2.3) fail to compile it when written del_wrapper->get_deleter<D>() #if defined( BOOST_MSVC ) && BOOST_WORKAROUND( BOOST_MSVC, < 1300 )
if(del_wrapper) del = del_wrapper->::boost::detail::sp_deleter_wrapper::get_deleter<D>();
} if( del_wrapper ) del = del_wrapper->get_deleter( (D*)0 );
#elif defined( __GNUC__ ) && BOOST_WORKAROUND( __GNUC__, < 4 )
if( del_wrapper ) del = del_wrapper->::boost::detail::sp_deleter_wrapper::get_deleter<D>();
#else
if( del_wrapper ) del = del_wrapper->get_deleter<D>();
#endif #endif
}
return del; return del;
} }