From e427716dc2be931cd7cda025ee079302b740461c Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sat, 18 Feb 2006 19:17:33 +0000 Subject: [PATCH] Fully qualified detail:: to work around a subtle VC 7.1 problem. [SVN r32994] --- include/boost/shared_ptr.hpp | 4 ++-- include/boost/weak_ptr.hpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/boost/shared_ptr.hpp b/include/boost/shared_ptr.hpp index 50e6716..bab848d 100644 --- a/include/boost/shared_ptr.hpp +++ b/include/boost/shared_ptr.hpp @@ -236,7 +236,7 @@ public: #if !defined( BOOST_NO_SFINAE ) && !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION ) template - explicit shared_ptr( Ap r, typename detail::sp_enable_if_auto_ptr::type = 0 ): px( r.get() ), pn() + explicit shared_ptr( Ap r, typename boost::detail::sp_enable_if_auto_ptr::type = 0 ): px( r.get() ), pn() { typename Ap::element_type * tmp = r.get(); pn = boost::detail::shared_count( r ); @@ -272,7 +272,7 @@ public: #if !defined( BOOST_NO_SFINAE ) && !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION ) template - 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 ); return *this; diff --git a/include/boost/weak_ptr.hpp b/include/boost/weak_ptr.hpp index cd9ee63..8f4230f 100644 --- a/include/boost/weak_ptr.hpp +++ b/include/boost/weak_ptr.hpp @@ -141,7 +141,7 @@ public: 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; pn = pn2; @@ -164,8 +164,8 @@ private: #endif - T * px; // contained pointer - detail::weak_count pn; // reference counter + T * px; // contained pointer + boost::detail::weak_count pn; // reference counter }; // weak_ptr