From 2af343a2cb8db2d0b6b0864ecb357cc92fa03cbd Mon Sep 17 00:00:00 2001 From: Eugene Zelenko Date: Tue, 12 May 2020 18:01:55 -0700 Subject: [PATCH] Fix Clang-tidy modernize-use-override warnings. --- include/boost/smart_ptr/bad_weak_ptr.hpp | 2 +- .../smart_ptr/detail/local_counted_base.hpp | 8 +++--- .../smart_ptr/detail/sp_counted_impl.hpp | 26 +++++++++---------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/boost/smart_ptr/bad_weak_ptr.hpp b/include/boost/smart_ptr/bad_weak_ptr.hpp index c21a2c5..e9c00d6 100644 --- a/include/boost/smart_ptr/bad_weak_ptr.hpp +++ b/include/boost/smart_ptr/bad_weak_ptr.hpp @@ -47,7 +47,7 @@ class bad_weak_ptr: public std::exception { public: - virtual char const * what() const BOOST_NOEXCEPT_OR_NOTHROW BOOST_OVERRIDE + char const * what() const BOOST_NOEXCEPT_OR_NOTHROW BOOST_OVERRIDE { return "tr1::bad_weak_ptr"; } diff --git a/include/boost/smart_ptr/detail/local_counted_base.hpp b/include/boost/smart_ptr/detail/local_counted_base.hpp index 3914aa1..f730419 100644 --- a/include/boost/smart_ptr/detail/local_counted_base.hpp +++ b/include/boost/smart_ptr/detail/local_counted_base.hpp @@ -113,12 +113,12 @@ public: #endif - virtual void local_cb_destroy() BOOST_SP_NOEXCEPT BOOST_OVERRIDE + void local_cb_destroy() BOOST_SP_NOEXCEPT BOOST_OVERRIDE { delete this; } - virtual boost::detail::shared_count local_cb_get_shared_count() const BOOST_SP_NOEXCEPT BOOST_OVERRIDE + boost::detail::shared_count local_cb_get_shared_count() const BOOST_SP_NOEXCEPT BOOST_OVERRIDE { return pn_; } @@ -130,12 +130,12 @@ public: shared_count pn_; - virtual void local_cb_destroy() BOOST_SP_NOEXCEPT BOOST_OVERRIDE + void local_cb_destroy() BOOST_SP_NOEXCEPT BOOST_OVERRIDE { shared_count().swap( pn_ ); } - virtual boost::detail::shared_count local_cb_get_shared_count() const BOOST_SP_NOEXCEPT BOOST_OVERRIDE + boost::detail::shared_count local_cb_get_shared_count() const BOOST_SP_NOEXCEPT BOOST_OVERRIDE { return pn_; } diff --git a/include/boost/smart_ptr/detail/sp_counted_impl.hpp b/include/boost/smart_ptr/detail/sp_counted_impl.hpp index 23ea339..1a46fb8 100644 --- a/include/boost/smart_ptr/detail/sp_counted_impl.hpp +++ b/include/boost/smart_ptr/detail/sp_counted_impl.hpp @@ -85,7 +85,7 @@ public: #endif } - virtual void dispose() BOOST_SP_NOEXCEPT BOOST_OVERRIDE + void dispose() BOOST_SP_NOEXCEPT BOOST_OVERRIDE { #if defined(BOOST_SP_ENABLE_DEBUG_HOOKS) boost::sp_scalar_destructor_hook( px_, sizeof(X), this ); @@ -93,17 +93,17 @@ public: boost::checked_delete( px_ ); } - virtual void * get_deleter( sp_typeinfo_ const & ) BOOST_SP_NOEXCEPT BOOST_OVERRIDE + void * get_deleter( sp_typeinfo_ const & ) BOOST_SP_NOEXCEPT BOOST_OVERRIDE { return 0; } - virtual void * get_local_deleter( sp_typeinfo_ const & ) BOOST_SP_NOEXCEPT BOOST_OVERRIDE + void * get_local_deleter( sp_typeinfo_ const & ) BOOST_SP_NOEXCEPT BOOST_OVERRIDE { return 0; } - virtual void * get_untyped_deleter() BOOST_SP_NOEXCEPT BOOST_OVERRIDE + void * get_untyped_deleter() BOOST_SP_NOEXCEPT BOOST_OVERRIDE { return 0; } @@ -168,22 +168,22 @@ public: { } - virtual void dispose() BOOST_SP_NOEXCEPT BOOST_OVERRIDE + void dispose() BOOST_SP_NOEXCEPT BOOST_OVERRIDE { del( ptr ); } - virtual void * get_deleter( sp_typeinfo_ const & ti ) BOOST_SP_NOEXCEPT BOOST_OVERRIDE + void * get_deleter( sp_typeinfo_ const & ti ) BOOST_SP_NOEXCEPT BOOST_OVERRIDE { return ti == BOOST_SP_TYPEID_(D)? &reinterpret_cast( del ): 0; } - virtual void * get_local_deleter( sp_typeinfo_ const & ti ) BOOST_SP_NOEXCEPT BOOST_OVERRIDE + void * get_local_deleter( sp_typeinfo_ const & ti ) BOOST_SP_NOEXCEPT BOOST_OVERRIDE { return ti == BOOST_SP_TYPEID_(D)? boost::detail::get_local_deleter( boost::addressof( del ) ): 0; } - virtual void * get_untyped_deleter() BOOST_SP_NOEXCEPT BOOST_OVERRIDE + void * get_untyped_deleter() BOOST_SP_NOEXCEPT BOOST_OVERRIDE { return &reinterpret_cast( del ); } @@ -242,12 +242,12 @@ public: { } - virtual void dispose() BOOST_SP_NOEXCEPT + void dispose() BOOST_SP_NOEXCEPT BOOST_OVERRIDE { d_( p_ ); } - virtual void destroy() BOOST_SP_NOEXCEPT + void destroy() BOOST_SP_NOEXCEPT BOOST_OVERRIDE { #if !defined( BOOST_NO_CXX11_ALLOCATOR ) @@ -266,17 +266,17 @@ public: a2.deallocate( this, 1 ); } - virtual void * get_deleter( sp_typeinfo_ const & ti ) BOOST_SP_NOEXCEPT + void * get_deleter( sp_typeinfo_ const & ti ) BOOST_SP_NOEXCEPT BOOST_OVERRIDE { return ti == BOOST_SP_TYPEID_( D )? &reinterpret_cast( d_ ): 0; } - virtual void * get_local_deleter( sp_typeinfo_ const & ti ) BOOST_SP_NOEXCEPT + void * get_local_deleter( sp_typeinfo_ const & ti ) BOOST_SP_NOEXCEPT BOOST_OVERRIDE { return ti == BOOST_SP_TYPEID_( D )? boost::detail::get_local_deleter( boost::addressof( d_ ) ): 0; } - virtual void * get_untyped_deleter() BOOST_SP_NOEXCEPT + void * get_untyped_deleter() BOOST_SP_NOEXCEPT BOOST_OVERRIDE { return &reinterpret_cast( d_ ); }