Skip to content

Commit

Permalink
Remove uses of BOOST_OVERRIDE and BOOST_NOEXCEPT_OR_NOTHROW
Browse files Browse the repository at this point in the history
  • Loading branch information
@pdimov
pdimov committed Oct 4, 2024
1 parent 1c98875 commit 8b22f5c
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 25 deletions.
4 changes: 2 additions & 2 deletions include/boost/smart_ptr/allocate_local_shared_array.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ class BOOST_SYMBOL_VISIBLE lsp_array_base
count_ = shared_count(base);
}

void local_cb_destroy() noexcept BOOST_OVERRIDE {
void local_cb_destroy() noexcept override {
shared_count().swap(count_);
}

shared_count local_cb_get_shared_count() const
noexcept BOOST_OVERRIDE {
noexcept override {
return count_;
}

Expand Down
10 changes: 5 additions & 5 deletions include/boost/smart_ptr/allocate_shared_array.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,29 +195,29 @@ class BOOST_SYMBOL_VISIBLE sp_array_base
return state_;
}

void dispose() noexcept BOOST_OVERRIDE {
void dispose() noexcept override {
boost::alloc_destroy_n(state_.allocator(),
boost::first_scalar(sp_array_start<type>(this)),
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(),
state_.size());
this->~sp_array_base();
other.destroy(this);
}

void* get_deleter(const sp_typeinfo_&) noexcept BOOST_OVERRIDE {
void* get_deleter(const sp_typeinfo_&) noexcept override {
return 0;
}

void* get_local_deleter(const sp_typeinfo_&)
noexcept BOOST_OVERRIDE {
noexcept override {
return 0;
}

void* get_untyped_deleter() noexcept BOOST_OVERRIDE {
void* get_untyped_deleter() noexcept override {
return 0;
}

Expand Down
2 changes: 1 addition & 1 deletion include/boost/smart_ptr/bad_weak_ptr.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class bad_weak_ptr: public std::exception
{
public:

char const * what() const BOOST_NOEXCEPT_OR_NOTHROW BOOST_OVERRIDE
char const * what() const noexcept override
{
return "tr1::bad_weak_ptr";
}
Expand Down
8 changes: 4 additions & 4 deletions include/boost/smart_ptr/detail/local_counted_base.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,12 @@ class BOOST_SYMBOL_VISIBLE local_counted_impl: public local_counted_base
{
}

void local_cb_destroy() noexcept BOOST_OVERRIDE
void local_cb_destroy() noexcept override
{
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_;
}
Expand All @@ -126,12 +126,12 @@ class BOOST_SYMBOL_VISIBLE local_counted_impl_em: public local_counted_base

shared_count pn_;

void local_cb_destroy() noexcept BOOST_OVERRIDE
void local_cb_destroy() noexcept override
{
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_;
}
Expand Down
26 changes: 13 additions & 13 deletions include/boost/smart_ptr/detail/sp_counted_impl.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,25 +81,25 @@ template<class X> class BOOST_SYMBOL_VISIBLE sp_counted_impl_p: public sp_counte
#endif
}

void dispose() noexcept BOOST_OVERRIDE
void dispose() noexcept override
{
#if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
boost::sp_scalar_destructor_hook( px_, sizeof(X), this );
#endif
boost::checked_delete( px_ );
}

void * get_deleter( sp_typeinfo_ const & ) noexcept BOOST_OVERRIDE
void * get_deleter( sp_typeinfo_ const & ) noexcept override
{
return 0;
}

void * get_local_deleter( sp_typeinfo_ const & ) noexcept BOOST_OVERRIDE
void * get_local_deleter( sp_typeinfo_ const & ) noexcept override
{
return 0;
}

void * get_untyped_deleter() noexcept BOOST_OVERRIDE
void * get_untyped_deleter() noexcept override
{
return 0;
}
Expand Down Expand Up @@ -157,22 +157,22 @@ template<class P, class D> class BOOST_SYMBOL_VISIBLE sp_counted_impl_pd: public
{
}

void dispose() noexcept BOOST_OVERRIDE
void dispose() noexcept override
{
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;
}

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;
}

void * get_untyped_deleter() noexcept BOOST_OVERRIDE
void * get_untyped_deleter() noexcept override
{
return &reinterpret_cast<char&>( del );
}
Expand Down Expand Up @@ -231,12 +231,12 @@ template<class P, class D, class A> class BOOST_SYMBOL_VISIBLE sp_counted_impl_p
{
}

void dispose() noexcept BOOST_OVERRIDE
void dispose() noexcept override
{
d_( p_ );
}

void destroy() noexcept BOOST_OVERRIDE
void destroy() noexcept override
{
typedef typename std::allocator_traits<A>::template rebind_alloc< this_type > A2;

Expand All @@ -247,17 +247,17 @@ template<class P, class D, class A> class BOOST_SYMBOL_VISIBLE sp_counted_impl_p
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;
}

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;
}

void * get_untyped_deleter() noexcept BOOST_OVERRIDE
void * get_untyped_deleter() noexcept override
{
return &reinterpret_cast<char&>( d_ );
}
Expand Down

0 comments on commit 8b22f5c

Please sign in to comment.