From f866c6a9ae9ac4d59a192ef224881a025fa897b6 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Wed, 2 Oct 2024 21:39:51 +0300 Subject: [PATCH] Remove uses of BOOST_SP_NOEXCEPT from shared_ptr.hpp --- include/boost/smart_ptr/shared_ptr.hpp | 144 ++++++++++++------------- 1 file changed, 72 insertions(+), 72 deletions(-) diff --git a/include/boost/smart_ptr/shared_ptr.hpp b/include/boost/smart_ptr/shared_ptr.hpp index a1adfcf..220effb 100644 --- a/include/boost/smart_ptr/shared_ptr.hpp +++ b/include/boost/smart_ptr/shared_ptr.hpp @@ -193,7 +193,7 @@ inline void sp_enable_shared_from_this( ... ) // sp_assert_convertible -template< class Y, class T > inline void sp_assert_convertible() BOOST_SP_NOEXCEPT +template< class Y, class T > inline void sp_assert_convertible() noexcept { static_assert( sp_convertible< Y, T >::value, "incompatible pointer type" ); } @@ -261,19 +261,19 @@ public: typedef typename boost::detail::sp_element< T >::type element_type; - BOOST_CONSTEXPR shared_ptr() BOOST_SP_NOEXCEPT : px( 0 ), pn() + BOOST_CONSTEXPR shared_ptr() noexcept : px( 0 ), pn() { } - BOOST_CONSTEXPR shared_ptr( std::nullptr_t ) BOOST_SP_NOEXCEPT : px( 0 ), pn() + BOOST_CONSTEXPR shared_ptr( std::nullptr_t ) noexcept : px( 0 ), pn() { } - BOOST_CONSTEXPR shared_ptr( boost::detail::sp_internal_constructor_tag, element_type * px_, boost::detail::shared_count const & pn_ ) BOOST_SP_NOEXCEPT : px( px_ ), pn( pn_ ) + BOOST_CONSTEXPR shared_ptr( boost::detail::sp_internal_constructor_tag, element_type * px_, boost::detail::shared_count const & pn_ ) noexcept : px( px_ ), pn( pn_ ) { } - BOOST_CONSTEXPR shared_ptr( boost::detail::sp_internal_constructor_tag, element_type * px_, boost::detail::shared_count && pn_ ) BOOST_SP_NOEXCEPT : px( px_ ), pn( std::move( pn_ ) ) + BOOST_CONSTEXPR shared_ptr( boost::detail::sp_internal_constructor_tag, element_type * px_, boost::detail::shared_count && pn_ ) noexcept : px( px_ ), pn( std::move( pn_ ) ) { } @@ -312,7 +312,7 @@ public: // generated copy constructor, destructor are fine... // ... except in C++0x, move disables the implicit copy - shared_ptr( shared_ptr const & r ) BOOST_SP_NOEXCEPT : px( r.px ), pn( r.pn ) + shared_ptr( shared_ptr const & r ) noexcept : px( r.px ), pn( r.pn ) { } @@ -327,7 +327,7 @@ public: template shared_ptr( weak_ptr const & r, boost::detail::sp_nothrow_tag ) - BOOST_SP_NOEXCEPT : px( 0 ), pn( r.pn, boost::detail::sp_nothrow_tag() ) + noexcept : px( 0 ), pn( r.pn, boost::detail::sp_nothrow_tag() ) { if( !pn.empty() ) { @@ -337,14 +337,14 @@ public: template shared_ptr( shared_ptr const & r, typename boost::detail::sp_enable_if_convertible::type = boost::detail::sp_empty() ) - BOOST_SP_NOEXCEPT : px( r.px ), pn( r.pn ) + noexcept : px( r.px ), pn( r.pn ) { boost::detail::sp_assert_convertible< Y, T >(); } // aliasing template< class Y > - shared_ptr( shared_ptr const & r, element_type * p ) BOOST_SP_NOEXCEPT : px( p ), pn( r.pn ) + shared_ptr( shared_ptr const & r, element_type * p ) noexcept : px( p ), pn( r.pn ) { } @@ -404,14 +404,14 @@ public: // assignment - shared_ptr & operator=( shared_ptr const & r ) BOOST_SP_NOEXCEPT + shared_ptr & operator=( shared_ptr const & r ) noexcept { this_type(r).swap(*this); return *this; } template - shared_ptr & operator=(shared_ptr const & r) BOOST_SP_NOEXCEPT + shared_ptr & operator=(shared_ptr const & r) noexcept { this_type(r).swap(*this); return *this; @@ -468,27 +468,27 @@ public: // Move support - shared_ptr( shared_ptr && r ) BOOST_SP_NOEXCEPT : px( r.px ), pn( static_cast< boost::detail::shared_count && >( r.pn ) ) + shared_ptr( shared_ptr && r ) noexcept : px( r.px ), pn( static_cast< boost::detail::shared_count && >( r.pn ) ) { r.px = 0; } template shared_ptr( shared_ptr && r, typename boost::detail::sp_enable_if_convertible::type = boost::detail::sp_empty() ) - BOOST_SP_NOEXCEPT : px( r.px ), pn( static_cast< boost::detail::shared_count && >( r.pn ) ) + noexcept : px( r.px ), pn( static_cast< boost::detail::shared_count && >( r.pn ) ) { boost::detail::sp_assert_convertible< Y, T >(); r.px = 0; } - shared_ptr & operator=( shared_ptr && r ) BOOST_SP_NOEXCEPT + shared_ptr & operator=( shared_ptr && r ) noexcept { this_type( static_cast< shared_ptr && >( r ) ).swap( *this ); return *this; } template - shared_ptr & operator=( shared_ptr && r ) BOOST_SP_NOEXCEPT + shared_ptr & operator=( shared_ptr && r ) noexcept { this_type( static_cast< shared_ptr && >( r ) ).swap( *this ); return *this; @@ -496,19 +496,19 @@ public: // aliasing move template - shared_ptr( shared_ptr && r, element_type * p ) BOOST_SP_NOEXCEPT : px( p ), pn() + shared_ptr( shared_ptr && r, element_type * p ) noexcept : px( p ), pn() { pn.swap( r.pn ); r.px = 0; } - shared_ptr & operator=( std::nullptr_t ) BOOST_SP_NOEXCEPT + shared_ptr & operator=( std::nullptr_t ) noexcept { this_type().swap(*this); return *this; } - void reset() BOOST_SP_NOEXCEPT + void reset() noexcept { this_type().swap(*this); } @@ -529,12 +529,12 @@ public: this_type( p, static_cast< D&& >( d ), a ).swap( *this ); } - template void reset( shared_ptr const & r, element_type * p ) BOOST_SP_NOEXCEPT + template void reset( shared_ptr const & r, element_type * p ) noexcept { this_type( r, p ).swap( *this ); } - template void reset( shared_ptr && r, element_type * p ) BOOST_SP_NOEXCEPT + template void reset( shared_ptr && r, element_type * p ) noexcept { this_type( static_cast< shared_ptr && >( r ), p ).swap( *this ); } @@ -559,78 +559,78 @@ public: return static_cast< typename boost::detail::sp_array_access< T >::type >( px[ i ] ); } - element_type * get() const BOOST_SP_NOEXCEPT + element_type * get() const noexcept { return px; } - explicit operator bool () const BOOST_SP_NOEXCEPT + explicit operator bool () const noexcept { return px != 0; } - bool unique() const BOOST_SP_NOEXCEPT + bool unique() const noexcept { return pn.unique(); } - long use_count() const BOOST_SP_NOEXCEPT + long use_count() const noexcept { return pn.use_count(); } - void swap( shared_ptr & other ) BOOST_SP_NOEXCEPT + void swap( shared_ptr & other ) noexcept { std::swap(px, other.px); pn.swap(other.pn); } - template bool owner_before( shared_ptr const & rhs ) const BOOST_SP_NOEXCEPT + template bool owner_before( shared_ptr const & rhs ) const noexcept { return pn < rhs.pn; } - template bool owner_before( weak_ptr const & rhs ) const BOOST_SP_NOEXCEPT + template bool owner_before( weak_ptr const & rhs ) const noexcept { return pn < rhs.pn; } - template bool owner_equals( shared_ptr const & rhs ) const BOOST_SP_NOEXCEPT + template bool owner_equals( shared_ptr const & rhs ) const noexcept { return pn == rhs.pn; } - template bool owner_equals( weak_ptr const & rhs ) const BOOST_SP_NOEXCEPT + template bool owner_equals( weak_ptr const & rhs ) const noexcept { return pn == rhs.pn; } - std::size_t owner_hash_value() const BOOST_SP_NOEXCEPT + std::size_t owner_hash_value() const noexcept { return pn.hash_value(); } - void * _internal_get_deleter( boost::detail::sp_typeinfo_ const & ti ) const BOOST_SP_NOEXCEPT + void * _internal_get_deleter( boost::detail::sp_typeinfo_ const & ti ) const noexcept { return pn.get_deleter( ti ); } - void * _internal_get_local_deleter( boost::detail::sp_typeinfo_ const & ti ) const BOOST_SP_NOEXCEPT + void * _internal_get_local_deleter( boost::detail::sp_typeinfo_ const & ti ) const noexcept { return pn.get_local_deleter( ti ); } - void * _internal_get_untyped_deleter() const BOOST_SP_NOEXCEPT + void * _internal_get_untyped_deleter() const noexcept { return pn.get_untyped_deleter(); } - bool _internal_equiv( shared_ptr const & r ) const BOOST_SP_NOEXCEPT + bool _internal_equiv( shared_ptr const & r ) const noexcept { return px == r.px && pn == r.pn; } - boost::detail::shared_count _internal_count() const BOOST_SP_NOEXCEPT + boost::detail::shared_count _internal_count() const noexcept { return pn; } @@ -646,47 +646,47 @@ private: }; // shared_ptr -template inline bool operator==(shared_ptr const & a, shared_ptr const & b) BOOST_SP_NOEXCEPT +template inline bool operator==(shared_ptr const & a, shared_ptr const & b) noexcept { return a.get() == b.get(); } -template inline bool operator!=(shared_ptr const & a, shared_ptr const & b) BOOST_SP_NOEXCEPT +template inline bool operator!=(shared_ptr const & a, shared_ptr const & b) noexcept { return a.get() != b.get(); } -template inline bool operator==( shared_ptr const & p, std::nullptr_t ) BOOST_SP_NOEXCEPT +template inline bool operator==( shared_ptr const & p, std::nullptr_t ) noexcept { return p.get() == 0; } -template inline bool operator==( std::nullptr_t, shared_ptr const & p ) BOOST_SP_NOEXCEPT +template inline bool operator==( std::nullptr_t, shared_ptr const & p ) noexcept { return p.get() == 0; } -template inline bool operator!=( shared_ptr const & p, std::nullptr_t ) BOOST_SP_NOEXCEPT +template inline bool operator!=( shared_ptr const & p, std::nullptr_t ) noexcept { return p.get() != 0; } -template inline bool operator!=( std::nullptr_t, shared_ptr const & p ) BOOST_SP_NOEXCEPT +template inline bool operator!=( std::nullptr_t, shared_ptr const & p ) noexcept { return p.get() != 0; } -template inline bool operator<(shared_ptr const & a, shared_ptr const & b) BOOST_SP_NOEXCEPT +template inline bool operator<(shared_ptr const & a, shared_ptr const & b) noexcept { return a.owner_before( b ); } -template inline void swap(shared_ptr & a, shared_ptr & b) BOOST_SP_NOEXCEPT +template inline void swap(shared_ptr & a, shared_ptr & b) noexcept { a.swap(b); } -template shared_ptr static_pointer_cast( shared_ptr const & r ) BOOST_SP_NOEXCEPT +template shared_ptr static_pointer_cast( shared_ptr const & r ) noexcept { (void) static_cast< T* >( static_cast< U* >( 0 ) ); @@ -696,7 +696,7 @@ template shared_ptr static_pointer_cast( shared_ptr cons return shared_ptr( r, p ); } -template shared_ptr const_pointer_cast( shared_ptr const & r ) BOOST_SP_NOEXCEPT +template shared_ptr const_pointer_cast( shared_ptr const & r ) noexcept { (void) const_cast< T* >( static_cast< U* >( 0 ) ); @@ -706,7 +706,7 @@ template shared_ptr const_pointer_cast( shared_ptr const return shared_ptr( r, p ); } -template shared_ptr dynamic_pointer_cast( shared_ptr const & r ) BOOST_SP_NOEXCEPT +template shared_ptr dynamic_pointer_cast( shared_ptr const & r ) noexcept { (void) dynamic_cast< T* >( static_cast< U* >( 0 ) ); @@ -716,7 +716,7 @@ template shared_ptr dynamic_pointer_cast( shared_ptr con return p? shared_ptr( r, p ): shared_ptr(); } -template shared_ptr reinterpret_pointer_cast( shared_ptr const & r ) BOOST_SP_NOEXCEPT +template shared_ptr reinterpret_pointer_cast( shared_ptr const & r ) noexcept { (void) reinterpret_cast< T* >( static_cast< U* >( 0 ) ); @@ -726,7 +726,7 @@ template shared_ptr reinterpret_pointer_cast( shared_ptr return shared_ptr( r, p ); } -template shared_ptr static_pointer_cast( shared_ptr && r ) BOOST_SP_NOEXCEPT +template shared_ptr static_pointer_cast( shared_ptr && r ) noexcept { (void) static_cast< T* >( static_cast< U* >( 0 ) ); @@ -736,7 +736,7 @@ template shared_ptr static_pointer_cast( shared_ptr && r return shared_ptr( std::move(r), p ); } -template shared_ptr const_pointer_cast( shared_ptr && r ) BOOST_SP_NOEXCEPT +template shared_ptr const_pointer_cast( shared_ptr && r ) noexcept { (void) const_cast< T* >( static_cast< U* >( 0 ) ); @@ -746,7 +746,7 @@ template shared_ptr const_pointer_cast( shared_ptr && r return shared_ptr( std::move(r), p ); } -template shared_ptr dynamic_pointer_cast( shared_ptr && r ) BOOST_SP_NOEXCEPT +template shared_ptr dynamic_pointer_cast( shared_ptr && r ) noexcept { (void) dynamic_cast< T* >( static_cast< U* >( 0 ) ); @@ -756,7 +756,7 @@ template shared_ptr dynamic_pointer_cast( shared_ptr && return p? shared_ptr( std::move(r), p ): shared_ptr(); } -template shared_ptr reinterpret_pointer_cast( shared_ptr && r ) BOOST_SP_NOEXCEPT +template shared_ptr reinterpret_pointer_cast( shared_ptr && r ) noexcept { (void) reinterpret_cast< T* >( static_cast< U* >( 0 ) ); @@ -768,7 +768,7 @@ template shared_ptr reinterpret_pointer_cast( shared_ptr // get_pointer() enables boost::mem_fn to recognize shared_ptr -template inline typename shared_ptr::element_type * get_pointer(shared_ptr const & p) BOOST_SP_NOEXCEPT +template inline typename shared_ptr::element_type * get_pointer(shared_ptr const & p) noexcept { return p.get(); } @@ -786,13 +786,13 @@ template std::ostream & operator<< (std::ostream & os, shared_ptr co namespace detail { -template D * basic_get_deleter( shared_ptr const & p ) BOOST_SP_NOEXCEPT +template D * basic_get_deleter( shared_ptr const & p ) noexcept { return static_cast( p._internal_get_deleter(BOOST_SP_TYPEID_(D)) ); } -template D * basic_get_local_deleter( D *, shared_ptr const & p ) BOOST_SP_NOEXCEPT; -template D const * basic_get_local_deleter( D const *, shared_ptr const & p ) BOOST_SP_NOEXCEPT; +template D * basic_get_local_deleter( D *, shared_ptr const & p ) noexcept; +template D const * basic_get_local_deleter( D const *, shared_ptr const & p ) noexcept; class esft2_deleter_wrapper { @@ -802,16 +802,16 @@ private: public: - esft2_deleter_wrapper() BOOST_SP_NOEXCEPT + esft2_deleter_wrapper() noexcept { } - template< class T > void set_deleter( shared_ptr const & deleter ) BOOST_SP_NOEXCEPT + template< class T > void set_deleter( shared_ptr const & deleter ) noexcept { deleter_ = deleter; } - template D* get_deleter() const BOOST_SP_NOEXCEPT + template D* get_deleter() const noexcept { return boost::detail::basic_get_deleter( deleter_ ); } @@ -825,7 +825,7 @@ public: } // namespace detail -template D * get_deleter( shared_ptr const & p ) BOOST_SP_NOEXCEPT +template D * get_deleter( shared_ptr const & p ) noexcept { D * d = boost::detail::basic_get_deleter( p ); @@ -849,34 +849,34 @@ template D * get_deleter( shared_ptr const & p ) BOOST_SP_N #if !defined(BOOST_SP_NO_ATOMIC_ACCESS) -template inline bool atomic_is_lock_free( shared_ptr const * /*p*/ ) BOOST_SP_NOEXCEPT +template inline bool atomic_is_lock_free( shared_ptr const * /*p*/ ) noexcept { return false; } -template shared_ptr atomic_load( shared_ptr const * p ) BOOST_SP_NOEXCEPT +template shared_ptr atomic_load( shared_ptr const * p ) noexcept { boost::detail::spinlock_pool<2>::scoped_lock lock( p ); return *p; } -template inline shared_ptr atomic_load_explicit( shared_ptr const * p, /*memory_order mo*/ M ) BOOST_SP_NOEXCEPT +template inline shared_ptr atomic_load_explicit( shared_ptr const * p, /*memory_order mo*/ M ) noexcept { return atomic_load( p ); } -template void atomic_store( shared_ptr * p, shared_ptr r ) BOOST_SP_NOEXCEPT +template void atomic_store( shared_ptr * p, shared_ptr r ) noexcept { boost::detail::spinlock_pool<2>::scoped_lock lock( p ); p->swap( r ); } -template inline void atomic_store_explicit( shared_ptr * p, shared_ptr r, /*memory_order mo*/ M ) BOOST_SP_NOEXCEPT +template inline void atomic_store_explicit( shared_ptr * p, shared_ptr r, /*memory_order mo*/ M ) noexcept { atomic_store( p, r ); // std::move( r ) } -template shared_ptr atomic_exchange( shared_ptr * p, shared_ptr r ) BOOST_SP_NOEXCEPT +template shared_ptr atomic_exchange( shared_ptr * p, shared_ptr r ) noexcept { boost::detail::spinlock & sp = boost::detail::spinlock_pool<2>::spinlock_for( p ); @@ -887,12 +887,12 @@ template shared_ptr atomic_exchange( shared_ptr * p, shared_ptr shared_ptr inline atomic_exchange_explicit( shared_ptr * p, shared_ptr r, /*memory_order mo*/ M ) BOOST_SP_NOEXCEPT +template shared_ptr inline atomic_exchange_explicit( shared_ptr * p, shared_ptr r, /*memory_order mo*/ M ) noexcept { return atomic_exchange( p, r ); // std::move( r ) } -template bool atomic_compare_exchange( shared_ptr * p, shared_ptr * v, shared_ptr w ) BOOST_SP_NOEXCEPT +template bool atomic_compare_exchange( shared_ptr * p, shared_ptr * v, shared_ptr w ) noexcept { boost::detail::spinlock & sp = boost::detail::spinlock_pool<2>::spinlock_for( p ); @@ -917,7 +917,7 @@ template bool atomic_compare_exchange( shared_ptr * p, shared_ptr } } -template inline bool atomic_compare_exchange_explicit( shared_ptr * p, shared_ptr * v, shared_ptr w, /*memory_order success*/ M, /*memory_order failure*/ M ) BOOST_SP_NOEXCEPT +template inline bool atomic_compare_exchange_explicit( shared_ptr * p, shared_ptr * v, shared_ptr w, /*memory_order success*/ M, /*memory_order failure*/ M ) noexcept { return atomic_compare_exchange( p, v, w ); // std::move( w ) } @@ -928,7 +928,7 @@ template inline bool atomic_compare_exchange_explicit( shared_ template< class T > struct hash; -template< class T > std::size_t hash_value( boost::shared_ptr const & p ) BOOST_SP_NOEXCEPT +template< class T > std::size_t hash_value( boost::shared_ptr const & p ) noexcept { return boost::hash< typename boost::shared_ptr::element_type* >()( p.get() ); } @@ -942,7 +942,7 @@ namespace std template struct hash< ::boost::shared_ptr > { - std::size_t operator()( ::boost::shared_ptr const & p ) const BOOST_SP_NOEXCEPT + std::size_t operator()( ::boost::shared_ptr const & p ) const noexcept { return std::hash< typename ::boost::shared_ptr::element_type* >()( p.get() ); } @@ -958,12 +958,12 @@ namespace boost namespace detail { -template D * basic_get_local_deleter( D *, shared_ptr const & p ) BOOST_SP_NOEXCEPT +template D * basic_get_local_deleter( D *, shared_ptr const & p ) noexcept { return static_cast( p._internal_get_local_deleter( BOOST_SP_TYPEID_(local_sp_deleter) ) ); } -template D const * basic_get_local_deleter( D const *, shared_ptr const & p ) BOOST_SP_NOEXCEPT +template D const * basic_get_local_deleter( D const *, shared_ptr const & p ) noexcept { return static_cast( p._internal_get_local_deleter( BOOST_SP_TYPEID_(local_sp_deleter) ) ); }