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

Fully qualified detail:: to work around a subtle VC 7.1 problem.

Browse Source 
[SVN r32994]
This commit is contained in:
Peter Dimov
2006-02-18 19:17:33 +00:00
parent 8c256502cc
commit e427716dc2
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/shared_ptr.hpp
View File

@ -236,7 +236,7 @@ public:
#if !defined( BOOST_NO_SFINAE ) && !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION ) #if !defined( BOOST_NO_SFINAE ) && !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
template<class Ap> template<class Ap>
explicit shared_ptr( Ap r, typename detail::sp_enable_if_auto_ptr<Ap, int>::type = 0 ): px( r.get() ), pn() explicit shared_ptr( Ap r, typename boost::detail::sp_enable_if_auto_ptr<Ap, int>::type = 0 ): px( r.get() ), pn()
{ {
typename Ap::element_type * tmp = r.get(); typename Ap::element_type * tmp = r.get();
pn = boost::detail::shared_count( r ); pn = boost::detail::shared_count( r );
@ -272,7 +272,7 @@ public:
#if !defined( BOOST_NO_SFINAE ) && !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION ) #if !defined( BOOST_NO_SFINAE ) && !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
template<class Ap> template<class Ap>
typename detail::sp_enable_if_auto_ptr< Ap, shared_ptr & >::type operator=( Ap r ) typename boost::detail::sp_enable_if_auto_ptr< Ap, shared_ptr & >::type operator=( Ap r )
{ {
this_type( r ).swap( *this ); this_type( r ).swap( *this );
return *this; return *this;

6
include/boost/weak_ptr.hpp
View File

@ -141,7 +141,7 @@ public:
pn.swap(other.pn); pn.swap(other.pn);
} }
void _internal_assign(T * px2, detail::shared_count const & pn2) void _internal_assign(T * px2, boost::detail::shared_count const & pn2)
{ {
px = px2; px = px2;
pn = pn2; pn = pn2;
@ -164,8 +164,8 @@ private:
#endif #endif
T * px; // contained pointer T * px; // contained pointer
detail::weak_count pn; // reference counter boost::detail::weak_count pn; // reference counter
}; // weak_ptr }; // weak_ptr