mirror of
				https://github.com/boostorg/smart_ptr.git
				synced 2025-11-03 17:21:51 +01:00 
			
		
		
		
	Merge pull request #79 from EugeneZelenko/use-boost-override
Fix Clang-tidy modernize-use-override warnings.
This commit is contained in:
		@@ -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";
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
@@ -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_;
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
@@ -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<char&>( 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<char&>( 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<char&>( 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<char&>( d_ );
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user