diff options
Diffstat (limited to 'boost/smart_ptr/enable_shared_from_this.hpp')
| -rw-r--r-- | boost/smart_ptr/enable_shared_from_this.hpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/boost/smart_ptr/enable_shared_from_this.hpp b/boost/smart_ptr/enable_shared_from_this.hpp index 642403a0a3..fc4de0b571 100644 --- a/boost/smart_ptr/enable_shared_from_this.hpp +++ b/boost/smart_ptr/enable_shared_from_this.hpp @@ -10,7 +10,7 @@ // See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt // -// http://www.boost.org/libs/smart_ptr/enable_shared_from_this.html +// See http://www.boost.org/libs/smart_ptr/ for documentation. // #include <boost/smart_ptr/weak_ptr.hpp> @@ -26,11 +26,11 @@ template<class T> class enable_shared_from_this { protected: - enable_shared_from_this() BOOST_SP_NOEXCEPT + BOOST_CONSTEXPR enable_shared_from_this() BOOST_SP_NOEXCEPT { } - enable_shared_from_this(enable_shared_from_this const &) BOOST_SP_NOEXCEPT + BOOST_CONSTEXPR enable_shared_from_this(enable_shared_from_this const &) BOOST_SP_NOEXCEPT { } @@ -59,12 +59,12 @@ public: return p; } - weak_ptr<T> weak_from_this() BOOST_NOEXCEPT + weak_ptr<T> weak_from_this() BOOST_SP_NOEXCEPT { return weak_this_; } - weak_ptr<T const> weak_from_this() const BOOST_NOEXCEPT + weak_ptr<T const> weak_from_this() const BOOST_SP_NOEXCEPT { return weak_this_; } @@ -72,7 +72,7 @@ public: public: // actually private, but avoids compiler template friendship issues // 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 + template<class X, class Y> void _internal_accept_owner( shared_ptr<X> const * ppx, Y * py ) const BOOST_SP_NOEXCEPT { if( weak_this_.expired() ) { |