diff --git a/boost/smart_ptr/detail/sp_counted_base_snc_ps3.hpp b/boost/smart_ptr/detail/sp_counted_base_snc_ps3.hpp index a043e02918b..56ed79fa97f 100644 --- a/boost/smart_ptr/detail/sp_counted_base_snc_ps3.hpp +++ b/boost/smart_ptr/detail/sp_counted_base_snc_ps3.hpp @@ -30,7 +30,7 @@ namespace detail inline uint32_t compare_and_swap( uint32_t * dest_, uint32_t compare_, uint32_t swap_ ) { - return __builtin_cellAtomicCompareAndSwap32(dest_,compare_,swap_); + return __builtin_cellAtomicCompareAndSwap32(dest_,compare_,swap_); } inline uint32_t atomic_fetch_and_add( uint32_t * pw, uint32_t dv ) diff --git a/boost/smart_ptr/shared_ptr.hpp b/boost/smart_ptr/shared_ptr.hpp index 2d903a37601..b34b0ac5828 100644 --- a/boost/smart_ptr/shared_ptr.hpp +++ b/boost/smart_ptr/shared_ptr.hpp @@ -910,12 +910,12 @@ class esft2_deleter_wrapper deleter_ = deleter; } - template D* get_deleter() const BOOST_NOEXCEPT + template D* get_deleter() const BOOST_NOEXCEPT { return boost::detail::basic_get_deleter( deleter_ ); } - template< class T> void operator()( T* ) + template< class T> void operator()( T* ) { BOOST_ASSERT( deleter_.use_count() <= 1 ); deleter_.reset(); @@ -928,7 +928,7 @@ template D * get_deleter( shared_ptr const & p ) BOOST_NOEX { D *del = boost::detail::basic_get_deleter(p); - if(del == 0) + if(del == 0) { boost::detail::esft2_deleter_wrapper *del_wrapper = boost::detail::basic_get_deleter(p); // The following get_deleter method call is fully qualified because @@ -936,7 +936,7 @@ template D * get_deleter( shared_ptr const & p ) BOOST_NOEX if(del_wrapper) del = del_wrapper->::boost::detail::esft2_deleter_wrapper::get_deleter(); } - return del; + return del; } // atomic access diff --git a/libs/smart_ptr/test/array_fail_upa_sp_a.cpp b/libs/smart_ptr/test/array_fail_upa_sp_a.cpp index b44e07ee6a2..4d87fdd478f 100644 --- a/libs/smart_ptr/test/array_fail_upa_sp_a.cpp +++ b/libs/smart_ptr/test/array_fail_upa_sp_a.cpp @@ -15,6 +15,6 @@ struct X int main() { - std::unique_ptr px; + std::unique_ptr px; boost::shared_ptr px2; px2 = px; } diff --git a/libs/smart_ptr/test/array_fail_upa_sp_c.cpp b/libs/smart_ptr/test/array_fail_upa_sp_c.cpp index fe620440166..259fda05018 100644 --- a/libs/smart_ptr/test/array_fail_upa_sp_c.cpp +++ b/libs/smart_ptr/test/array_fail_upa_sp_c.cpp @@ -15,6 +15,6 @@ struct X int main() { - std::unique_ptr px; + std::unique_ptr px; boost::shared_ptr px2( px ); }