From ae34be773f948d20667c47b1eb1c664591d8e456 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Fri, 11 Dec 2009 22:36:35 +0000 Subject: [PATCH] Qualify detail:: references. Detabify sp_typeinfo_test.cpp. [SVN r58306] --- include/boost/smart_ptr/intrusive_ptr.hpp | 2 +- include/boost/smart_ptr/shared_ptr.hpp | 10 +++++----- include/boost/smart_ptr/weak_ptr.hpp | 6 +++--- test/sp_typeinfo_test.cpp | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/boost/smart_ptr/intrusive_ptr.hpp b/include/boost/smart_ptr/intrusive_ptr.hpp index 0e30ece..e72eb21 100644 --- a/include/boost/smart_ptr/intrusive_ptr.hpp +++ b/include/boost/smart_ptr/intrusive_ptr.hpp @@ -77,7 +77,7 @@ public: template #if !defined( BOOST_SP_NO_SP_CONVERTIBLE ) - intrusive_ptr( intrusive_ptr const & rhs, typename detail::sp_enable_if_convertible::type = detail::sp_empty() ) + intrusive_ptr( intrusive_ptr const & rhs, typename boost::detail::sp_enable_if_convertible::type = boost::detail::sp_empty() ) #else diff --git a/include/boost/smart_ptr/shared_ptr.hpp b/include/boost/smart_ptr/shared_ptr.hpp index d826783..3f1c1d3 100644 --- a/include/boost/smart_ptr/shared_ptr.hpp +++ b/include/boost/smart_ptr/shared_ptr.hpp @@ -222,7 +222,7 @@ public: template #if !defined( BOOST_SP_NO_SP_CONVERTIBLE ) - shared_ptr( shared_ptr const & r, typename detail::sp_enable_if_convertible::type = detail::sp_empty() ) + shared_ptr( shared_ptr const & r, typename boost::detail::sp_enable_if_convertible::type = boost::detail::sp_empty() ) #else @@ -347,7 +347,7 @@ public: template #if !defined( BOOST_SP_NO_SP_CONVERTIBLE ) - shared_ptr( shared_ptr && r, typename detail::sp_enable_if_convertible::type = detail::sp_empty() ) + shared_ptr( shared_ptr && r, typename boost::detail::sp_enable_if_convertible::type = boost::detail::sp_empty() ) #else @@ -442,7 +442,7 @@ public: return pn < rhs.pn; } - void * _internal_get_deleter( detail::sp_typeinfo const & ti ) const + void * _internal_get_deleter( boost::detail::sp_typeinfo const & ti ) const { return pn.get_deleter( ti ); } @@ -639,10 +639,10 @@ public: template D * get_deleter(shared_ptr const & p) { - D *del = detail::basic_get_deleter(p); + D *del = boost::detail::basic_get_deleter(p); if(del == 0) { - detail::esft2_deleter_wrapper *del_wrapper = detail::basic_get_deleter(p); + boost::detail::esft2_deleter_wrapper *del_wrapper = boost::detail::basic_get_deleter(p); // 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() if(del_wrapper) del = del_wrapper->::boost::detail::esft2_deleter_wrapper::get_deleter(); diff --git a/include/boost/smart_ptr/weak_ptr.hpp b/include/boost/smart_ptr/weak_ptr.hpp index ceb026b..db56103 100644 --- a/include/boost/smart_ptr/weak_ptr.hpp +++ b/include/boost/smart_ptr/weak_ptr.hpp @@ -63,7 +63,7 @@ public: template #if !defined( BOOST_SP_NO_SP_CONVERTIBLE ) - weak_ptr( weak_ptr const & r, typename detail::sp_enable_if_convertible::type = detail::sp_empty() ) + weak_ptr( weak_ptr const & r, typename boost::detail::sp_enable_if_convertible::type = boost::detail::sp_empty() ) #else @@ -79,7 +79,7 @@ public: template #if !defined( BOOST_SP_NO_SP_CONVERTIBLE ) - weak_ptr( weak_ptr && r, typename detail::sp_enable_if_convertible::type = detail::sp_empty() ) + weak_ptr( weak_ptr && r, typename boost::detail::sp_enable_if_convertible::type = boost::detail::sp_empty() ) #else @@ -110,7 +110,7 @@ public: template #if !defined( BOOST_SP_NO_SP_CONVERTIBLE ) - weak_ptr( shared_ptr const & r, typename detail::sp_enable_if_convertible::type = detail::sp_empty() ) + weak_ptr( shared_ptr const & r, typename boost::detail::sp_enable_if_convertible::type = boost::detail::sp_empty() ) #else diff --git a/test/sp_typeinfo_test.cpp b/test/sp_typeinfo_test.cpp index c47d04e..e29e576 100644 --- a/test/sp_typeinfo_test.cpp +++ b/test/sp_typeinfo_test.cpp @@ -28,7 +28,7 @@ int main() BOOST_TEST( !ti.before( ti ) ); char const * nti = ti.name(); - std::cout << nti << std::endl; + std::cout << nti << std::endl; boost::detail::sp_typeinfo const & tv = BOOST_SP_TYPEID( void ); @@ -40,7 +40,7 @@ int main() BOOST_TEST( !tv.before( tv ) ); char const * ntv = tv.name(); - std::cout << ntv << std::endl; + std::cout << ntv << std::endl; BOOST_TEST( ti != tv ); BOOST_TEST( !( ti == tv ) );