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

Remove uses of BOOST_SP_NOEXCEPT from enable_shared_from_this.hpp

Browse Source
This commit is contained in:
Peter Dimov
2024-10-02 21:26:52 +03:00
parent 78057574cf
commit 96ef19e72d
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/boost/smart_ptr/enable_shared_from_this.hpp
View File

@@ -15,7 +15,6 @@
#include <boost/smart_ptr/weak_ptr.hpp> #include <boost/smart_ptr/weak_ptr.hpp>
#include <boost/smart_ptr/shared_ptr.hpp> #include <boost/smart_ptr/shared_ptr.hpp>
#include <boost/smart_ptr/detail/sp_noexcept.hpp>
#include <boost/assert.hpp> #include <boost/assert.hpp>
#include <boost/config.hpp> #include <boost/config.hpp>
@@ -26,20 +25,20 @@ template<class T> class enable_shared_from_this
{ {
protected: protected:
BOOST_CONSTEXPR enable_shared_from_this() BOOST_SP_NOEXCEPT BOOST_CONSTEXPR enable_shared_from_this() noexcept
{ {
} }
BOOST_CONSTEXPR enable_shared_from_this(enable_shared_from_this const &) BOOST_SP_NOEXCEPT BOOST_CONSTEXPR enable_shared_from_this(enable_shared_from_this const &) noexcept
{ {
} }
enable_shared_from_this & operator=(enable_shared_from_this const &) BOOST_SP_NOEXCEPT enable_shared_from_this & operator=(enable_shared_from_this const &) noexcept
{ {
return *this; return *this;
} }
~enable_shared_from_this() BOOST_SP_NOEXCEPT // ~weak_ptr<T> newer throws, so this call also must not throw ~enable_shared_from_this() noexcept // ~weak_ptr<T> newer throws, so this call also must not throw
{ {
} }
@@ -59,12 +58,12 @@ public:
return p; return p;
} }
weak_ptr<T> weak_from_this() BOOST_SP_NOEXCEPT weak_ptr<T> weak_from_this() noexcept
{ {
return weak_this_; return weak_this_;
} }
weak_ptr<T const> weak_from_this() const BOOST_SP_NOEXCEPT weak_ptr<T const> weak_from_this() const noexcept
{ {
return weak_this_; return weak_this_;
} }
@@ -72,7 +71,7 @@ public:
public: // actually private, but avoids compiler template friendship issues public: // actually private, but avoids compiler template friendship issues
// Note: invoked automatically by shared_ptr; do not call // Note: invoked automatically by shared_ptr; do not call
template<class X, class Y> void _internal_accept_owner( shared_ptr<X> const * ppx, Y * py ) const BOOST_SP_NOEXCEPT template<class X, class Y> void _internal_accept_owner( shared_ptr<X> const * ppx, Y * py ) const noexcept
{ {
if( weak_this_.expired() ) if( weak_this_.expired() )
{ {