boostorg/smart_ptr
1
0
Fork 1
mirror of https://github.com/boostorg/smart_ptr.git synced 2025-07-30 04:47:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove uses of BOOST_OVERRIDE and BOOST_NOEXCEPT_OR_NOTHROW

Browse Source
This commit is contained in:
Peter Dimov
2024-10-04 21:27:07 +03:00
parent 1c988756d5
commit 8b22f5cb4f
5 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/smart_ptr/allocate_local_shared_array.hpp
View File

@ -21,12 +21,12 @@ public:
count_ = shared_count(base); count_ = shared_count(base);
} }
void local_cb_destroy() noexcept BOOST_OVERRIDE { void local_cb_destroy() noexcept override {
shared_count().swap(count_); shared_count().swap(count_);
} }
shared_count local_cb_get_shared_count() const shared_count local_cb_get_shared_count() const
noexcept BOOST_OVERRIDE { noexcept override {
return count_; return count_;
} }

10
include/boost/smart_ptr/allocate_shared_array.hpp
View File

@ -195,29 +195,29 @@ public:
return state_; return state_;
} }
void dispose() noexcept BOOST_OVERRIDE { void dispose() noexcept override {
boost::alloc_destroy_n(state_.allocator(), boost::alloc_destroy_n(state_.allocator(),
boost::first_scalar(sp_array_start<type>(this)), boost::first_scalar(sp_array_start<type>(this)),
state_.size() * sp_array_count<type>::value); state_.size() * sp_array_count<type>::value);
} }
void destroy() noexcept BOOST_OVERRIDE { void destroy() noexcept override {
sp_array_creator<allocator, sp_array_base> other(state_.allocator(), sp_array_creator<allocator, sp_array_base> other(state_.allocator(),
state_.size()); state_.size());
this->~sp_array_base(); this->~sp_array_base();
other.destroy(this); other.destroy(this);
} }
void* get_deleter(const sp_typeinfo_&) noexcept BOOST_OVERRIDE { void* get_deleter(const sp_typeinfo_&) noexcept override {
return 0; return 0;
} }
void* get_local_deleter(const sp_typeinfo_&) void* get_local_deleter(const sp_typeinfo_&)
noexcept BOOST_OVERRIDE { noexcept override {
return 0; return 0;
} }
void* get_untyped_deleter() noexcept BOOST_OVERRIDE { void* get_untyped_deleter() noexcept override {
return 0; return 0;
} }

2
include/boost/smart_ptr/bad_weak_ptr.hpp
View File

@ -33,7 +33,7 @@ class bad_weak_ptr: public std::exception
{ {
public: public:
char const * what() const BOOST_NOEXCEPT_OR_NOTHROW BOOST_OVERRIDE char const * what() const noexcept override
{ {
return "tr1::bad_weak_ptr"; return "tr1::bad_weak_ptr";
} }

8
include/boost/smart_ptr/detail/local_counted_base.hpp
View File

@ -109,12 +109,12 @@ public:
{ {
} }
void local_cb_destroy() noexcept BOOST_OVERRIDE void local_cb_destroy() noexcept override
{ {
delete this; delete this;
} }
boost::detail::shared_count local_cb_get_shared_count() const noexcept BOOST_OVERRIDE boost::detail::shared_count local_cb_get_shared_count() const noexcept override
{ {
return pn_; return pn_;
} }
@ -126,12 +126,12 @@ public:
shared_count pn_; shared_count pn_;
void local_cb_destroy() noexcept BOOST_OVERRIDE void local_cb_destroy() noexcept override
{ {
shared_count().swap( pn_ ); shared_count().swap( pn_ );
} }
boost::detail::shared_count local_cb_get_shared_count() const noexcept BOOST_OVERRIDE boost::detail::shared_count local_cb_get_shared_count() const noexcept override
{ {
return pn_; return pn_;
} }

26
include/boost/smart_ptr/detail/sp_counted_impl.hpp
View File

@ -81,7 +81,7 @@ public:
#endif #endif
} }
void dispose() noexcept BOOST_OVERRIDE void dispose() noexcept override
{ {
#if defined(BOOST_SP_ENABLE_DEBUG_HOOKS) #if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
boost::sp_scalar_destructor_hook( px_, sizeof(X), this ); boost::sp_scalar_destructor_hook( px_, sizeof(X), this );
@ -89,17 +89,17 @@ public:
boost::checked_delete( px_ ); boost::checked_delete( px_ );
} }
void * get_deleter( sp_typeinfo_ const & ) noexcept BOOST_OVERRIDE void * get_deleter( sp_typeinfo_ const & ) noexcept override
{ {
return 0; return 0;
} }
void * get_local_deleter( sp_typeinfo_ const & ) noexcept BOOST_OVERRIDE void * get_local_deleter( sp_typeinfo_ const & ) noexcept override
{ {
return 0; return 0;
} }
void * get_untyped_deleter() noexcept BOOST_OVERRIDE void * get_untyped_deleter() noexcept override
{ {
return 0; return 0;
} }
@ -157,22 +157,22 @@ public:
{ {
} }
void dispose() noexcept BOOST_OVERRIDE void dispose() noexcept override
{ {
del( ptr ); del( ptr );
} }
void * get_deleter( sp_typeinfo_ const & ti ) noexcept BOOST_OVERRIDE void * get_deleter( sp_typeinfo_ const & ti ) noexcept override
{ {
return ti == BOOST_SP_TYPEID_(D)? &reinterpret_cast<char&>( del ): 0; return ti == BOOST_SP_TYPEID_(D)? &reinterpret_cast<char&>( del ): 0;
} }
void * get_local_deleter( sp_typeinfo_ const & ti ) noexcept BOOST_OVERRIDE void * get_local_deleter( sp_typeinfo_ const & ti ) noexcept override
{ {
return ti == BOOST_SP_TYPEID_(D)? boost::detail::get_local_deleter( boost::addressof( del ) ): 0; return ti == BOOST_SP_TYPEID_(D)? boost::detail::get_local_deleter( boost::addressof( del ) ): 0;
} }
void * get_untyped_deleter() noexcept BOOST_OVERRIDE void * get_untyped_deleter() noexcept override
{ {
return &reinterpret_cast<char&>( del ); return &reinterpret_cast<char&>( del );
} }
@ -231,12 +231,12 @@ public:
{ {
} }
void dispose() noexcept BOOST_OVERRIDE void dispose() noexcept override
{ {
d_( p_ ); d_( p_ );
} }
void destroy() noexcept BOOST_OVERRIDE void destroy() noexcept override
{ {
typedef typename std::allocator_traits<A>::template rebind_alloc< this_type > A2; typedef typename std::allocator_traits<A>::template rebind_alloc< this_type > A2;
@ -247,17 +247,17 @@ public:
a2.deallocate( this, 1 ); a2.deallocate( this, 1 );
} }
void * get_deleter( sp_typeinfo_ const & ti ) noexcept BOOST_OVERRIDE void * get_deleter( sp_typeinfo_ const & ti ) noexcept override
{ {
return ti == BOOST_SP_TYPEID_( D )? &reinterpret_cast<char&>( d_ ): 0; return ti == BOOST_SP_TYPEID_( D )? &reinterpret_cast<char&>( d_ ): 0;
} }
void * get_local_deleter( sp_typeinfo_ const & ti ) noexcept BOOST_OVERRIDE void * get_local_deleter( sp_typeinfo_ const & ti ) noexcept override
{ {
return ti == BOOST_SP_TYPEID_( D )? boost::detail::get_local_deleter( boost::addressof( d_ ) ): 0; return ti == BOOST_SP_TYPEID_( D )? boost::detail::get_local_deleter( boost::addressof( d_ ) ): 0;
} }
void * get_untyped_deleter() noexcept BOOST_OVERRIDE void * get_untyped_deleter() noexcept override
{ {
return &reinterpret_cast<char&>( d_ ); return &reinterpret_cast<char&>( d_ );
} }