From 053779f3ee8949fceb5d516cb336ae2cf0b5ebda Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Mon, 28 Jan 2019 20:52:28 +0200 Subject: [PATCH] Add BOOST_SP_NOEXCEPT to sp_counted_base_clang.hpp --- .../detail/sp_counted_base_clang.hpp | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/include/boost/smart_ptr/detail/sp_counted_base_clang.hpp b/include/boost/smart_ptr/detail/sp_counted_base_clang.hpp index c2c20d3..90b6f22 100644 --- a/include/boost/smart_ptr/detail/sp_counted_base_clang.hpp +++ b/include/boost/smart_ptr/detail/sp_counted_base_clang.hpp @@ -16,6 +16,7 @@ // http://www.boost.org/LICENSE_1_0.txt #include +#include #include #include @@ -27,17 +28,17 @@ namespace detail typedef _Atomic( boost::int_least32_t ) atomic_int_least32_t; -inline void atomic_increment( atomic_int_least32_t * pw ) +inline void atomic_increment( atomic_int_least32_t * pw ) BOOST_SP_NOEXCEPT { __c11_atomic_fetch_add( pw, 1, __ATOMIC_RELAXED ); } -inline boost::int_least32_t atomic_decrement( atomic_int_least32_t * pw ) +inline boost::int_least32_t atomic_decrement( atomic_int_least32_t * pw ) BOOST_SP_NOEXCEPT { return __c11_atomic_fetch_sub( pw, 1, __ATOMIC_ACQ_REL ); } -inline boost::int_least32_t atomic_conditional_increment( atomic_int_least32_t * pw ) +inline boost::int_least32_t atomic_conditional_increment( atomic_int_least32_t * pw ) BOOST_SP_NOEXCEPT { // long r = *pw; // if( r != 0 ) ++*pw; @@ -76,43 +77,43 @@ private: public: - sp_counted_base() + sp_counted_base() BOOST_SP_NOEXCEPT { __c11_atomic_init( &use_count_, 1 ); __c11_atomic_init( &weak_count_, 1 ); } - virtual ~sp_counted_base() // nothrow + virtual ~sp_counted_base() /*BOOST_SP_NOEXCEPT*/ { } // dispose() is called when use_count_ drops to zero, to release // the resources managed by *this. - virtual void dispose() = 0; // nothrow + virtual void dispose() BOOST_SP_NOEXCEPT = 0; // nothrow // destroy() is called when weak_count_ drops to zero. - virtual void destroy() // nothrow + virtual void destroy() BOOST_SP_NOEXCEPT // nothrow { delete this; } - virtual void * get_deleter( sp_typeinfo const & ti ) = 0; - virtual void * get_local_deleter( sp_typeinfo const & ti ) = 0; - virtual void * get_untyped_deleter() = 0; + virtual void * get_deleter( sp_typeinfo const & ti ) BOOST_SP_NOEXCEPT = 0; + virtual void * get_local_deleter( sp_typeinfo const & ti ) BOOST_SP_NOEXCEPT = 0; + virtual void * get_untyped_deleter() BOOST_SP_NOEXCEPT = 0; - void add_ref_copy() + void add_ref_copy() BOOST_SP_NOEXCEPT { atomic_increment( &use_count_ ); } - bool add_ref_lock() // true on success + bool add_ref_lock() BOOST_SP_NOEXCEPT // true on success { return atomic_conditional_increment( &use_count_ ) != 0; } - void release() // nothrow + void release() BOOST_SP_NOEXCEPT { if( atomic_decrement( &use_count_ ) == 1 ) { @@ -121,12 +122,12 @@ public: } } - void weak_add_ref() // nothrow + void weak_add_ref() BOOST_SP_NOEXCEPT { atomic_increment( &weak_count_ ); } - void weak_release() // nothrow + void weak_release() BOOST_SP_NOEXCEPT { if( atomic_decrement( &weak_count_ ) == 1 ) { @@ -134,7 +135,7 @@ public: } } - long use_count() const // nothrow + long use_count() const BOOST_SP_NOEXCEPT { return __c11_atomic_load( const_cast< atomic_int_least32_t* >( &use_count_ ), __ATOMIC_ACQUIRE ); }