X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=libstdc%2B%2B-v3%2Finclude%2Fbits%2Fshared_ptr_base.h;h=3d4d12ba312875b9f6ca027bfdf7c635e5a1e711;hp=d39050fcc8d2959589a093ca4397c01f66e411e7;hb=c213e768612f68e25e4070ea54ee50ca76049f2e;hpb=e50a7faac600da70a5486a897460349160cec62e diff --git a/libstdc++-v3/include/bits/shared_ptr_base.h b/libstdc++-v3/include/bits/shared_ptr_base.h index d39050fcc8d..3d4d12ba312 100644 --- a/libstdc++-v3/include/bits/shared_ptr_base.h +++ b/libstdc++-v3/include/bits/shared_ptr_base.h @@ -1,6 +1,7 @@ // shared_ptr and weak_ptr implementation details -*- C++ -*- -// Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +// Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 +// Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -43,13 +44,15 @@ /** @file bits/shared_ptr_base.h * This is an internal header file, included by other library headers. - * You should not attempt to use it directly. + * Do not attempt to use it directly. @headername{memory} */ #ifndef _SHARED_PTR_BASE_H #define _SHARED_PTR_BASE_H 1 -_GLIBCXX_BEGIN_NAMESPACE(std) +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @brief Exception possibly thrown by @c shared_ptr. @@ -59,8 +62,9 @@ _GLIBCXX_BEGIN_NAMESPACE(std) { public: virtual char const* - what() const throw() - { return "std::bad_weak_ptr"; } + what() const noexcept; + + virtual ~bad_weak_ptr() noexcept; }; // Substitute for bad_weak_ptr object in the case of -fno-exceptions. @@ -105,21 +109,21 @@ _GLIBCXX_BEGIN_NAMESPACE(std) : public _Mutex_base<_Lp> { public: - _Sp_counted_base() + _Sp_counted_base() noexcept : _M_use_count(1), _M_weak_count(1) { } virtual - ~_Sp_counted_base() // nothrow + ~_Sp_counted_base() noexcept { } // Called when _M_use_count drops to zero, to release the resources // managed by *this. virtual void - _M_dispose() = 0; // nothrow + _M_dispose() noexcept = 0; // Called when _M_weak_count drops to zero. virtual void - _M_destroy() // nothrow + _M_destroy() noexcept { delete this; } virtual void* @@ -133,7 +137,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) _M_add_ref_lock(); void - _M_release() // nothrow + _M_release() noexcept { // Be race-detector-friendly. For more info see bits/c++config. _GLIBCXX_SYNCHRONIZATION_HAPPENS_BEFORE(&_M_use_count); @@ -163,11 +167,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std) } void - _M_weak_add_ref() // nothrow + _M_weak_add_ref() noexcept { __gnu_cxx::__atomic_add_dispatch(&_M_weak_count, 1); } void - _M_weak_release() // nothrow + _M_weak_release() noexcept { // Be race-detector-friendly. For more info see bits/c++config. _GLIBCXX_SYNCHRONIZATION_HAPPENS_BEFORE(&_M_weak_count); @@ -186,16 +190,16 @@ _GLIBCXX_BEGIN_NAMESPACE(std) } long - _M_get_use_count() const // nothrow + _M_get_use_count() const noexcept { // No memory barrier is used here so there is no synchronization // with other threads. - return const_cast(_M_use_count); + return __atomic_load_n(&_M_use_count, __ATOMIC_RELAXED); } private: - _Sp_counted_base(_Sp_counted_base const&); - _Sp_counted_base& operator=(_Sp_counted_base const&); + _Sp_counted_base(_Sp_counted_base const&) = delete; + _Sp_counted_base& operator=(_Sp_counted_base const&) = delete; _Atomic_word _M_use_count; // #shared _Atomic_word _M_weak_count; // #weak + (#shared != 0) @@ -232,18 +236,17 @@ _GLIBCXX_BEGIN_NAMESPACE(std) _M_add_ref_lock() { // Perform lock-free add-if-not-zero operation. - _Atomic_word __count; + _Atomic_word __count = _M_use_count; do { - __count = _M_use_count; if (__count == 0) __throw_bad_weak_ptr(); - // Replace the current counter value with the old value + 1, as // long as it's not changed meanwhile. } - while (!__sync_bool_compare_and_swap(&_M_use_count, __count, - __count + 1)); + while (!__atomic_compare_exchange_n(&_M_use_count, &__count, __count + 1, + true, __ATOMIC_ACQ_REL, + __ATOMIC_RELAXED)); } @@ -278,7 +281,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // Counted ptr with no deleter or allocator support template - class _Sp_counted_ptr : public _Sp_counted_base<_Lp> + class _Sp_counted_ptr final : public _Sp_counted_base<_Lp> { public: explicit @@ -286,11 +289,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std) : _M_ptr(__p) { } virtual void - _M_dispose() // nothrow + _M_dispose() noexcept { delete _M_ptr; } virtual void - _M_destroy() // nothrow + _M_destroy() noexcept { delete this; } virtual void* @@ -306,56 +309,54 @@ _GLIBCXX_BEGIN_NAMESPACE(std) template<> inline void - _Sp_counted_ptr::_M_dispose() { } + _Sp_counted_ptr::_M_dispose() noexcept { } template<> inline void - _Sp_counted_ptr::_M_dispose() { } + _Sp_counted_ptr::_M_dispose() noexcept { } template<> inline void - _Sp_counted_ptr::_M_dispose() { } + _Sp_counted_ptr::_M_dispose() noexcept { } // Support for custom deleter and/or allocator template - class _Sp_counted_deleter : public _Sp_counted_ptr<_Ptr, _Lp> + class _Sp_counted_deleter final : public _Sp_counted_base<_Lp> { - typedef typename _Alloc::template - rebind<_Sp_counted_deleter>::other _My_alloc_type; - // Helper class that stores the Deleter and also acts as an allocator. // Used to dispose of the owned pointer and the internal refcount // Requires that copies of _Alloc can free each other's memory. struct _My_Deleter - : public _My_alloc_type // copy constructor must not throw + : public _Alloc // copy constructor must not throw { - _Deleter _M_del; // copy constructor must not throw + _Deleter _M_del; // copy constructor must not throw _My_Deleter(_Deleter __d, const _Alloc& __a) - : _My_alloc_type(__a), _M_del(__d) { } + : _Alloc(__a), _M_del(__d) { } }; - protected: - typedef _Sp_counted_ptr<_Ptr, _Lp> _Base_type; - public: // __d(__p) must not throw. _Sp_counted_deleter(_Ptr __p, _Deleter __d) - : _Base_type(__p), _M_del(__d, _Alloc()) { } + : _M_ptr(__p), _M_del(__d, _Alloc()) { } // __d(__p) must not throw. _Sp_counted_deleter(_Ptr __p, _Deleter __d, const _Alloc& __a) - : _Base_type(__p), _M_del(__d, __a) { } + : _M_ptr(__p), _M_del(__d, __a) { } + + ~_Sp_counted_deleter() noexcept { } virtual void - _M_dispose() // nothrow - { _M_del._M_del(_Base_type::_M_ptr); } + _M_dispose() noexcept + { _M_del._M_del(_M_ptr); } virtual void - _M_destroy() // nothrow + _M_destroy() noexcept { - _My_alloc_type __a(_M_del); - this->~_Sp_counted_deleter(); - __a.deallocate(this, 1); + typedef typename allocator_traits<_Alloc>::template + rebind_traits<_Sp_counted_deleter> _Alloc_traits; + typename _Alloc_traits::allocator_type __a(_M_del); + _Alloc_traits::destroy(__a, this); + _Alloc_traits::deallocate(__a, this, 1); } virtual void* @@ -369,72 +370,71 @@ _GLIBCXX_BEGIN_NAMESPACE(std) } protected: + _Ptr _M_ptr; // copy constructor must not throw _My_Deleter _M_del; // copy constructor must not throw }; // helpers for make_shared / allocate_shared - template - struct _Sp_destroy_inplace - { - void operator()(_Tp* __p) const { if (__p) __p->~_Tp(); } - }; - struct _Sp_make_shared_tag { }; template - class _Sp_counted_ptr_inplace - : public _Sp_counted_deleter<_Tp*, _Sp_destroy_inplace<_Tp>, _Alloc, _Lp> + class _Sp_counted_ptr_inplace final : public _Sp_counted_base<_Lp> { - typedef _Sp_counted_deleter<_Tp*, _Sp_destroy_inplace<_Tp>, _Alloc, _Lp> - _Base_type; - - public: - explicit - _Sp_counted_ptr_inplace(_Alloc __a) - : _Base_type(static_cast<_Tp*>(0), _Sp_destroy_inplace<_Tp>(), __a) - , _M_storage() + // Helper class that stores the pointer and also acts as an allocator. + // Used to dispose of the owned pointer and the internal refcount + // Requires that copies of _Alloc can free each other's memory. + struct _Impl + : public _Alloc // copy constructor must not throw { - void* __p = &_M_storage; - ::new (__p) _Tp(); // might throw - _Base_type::_Base_type::_M_ptr = static_cast<_Tp*>(__p); - } + _Impl(_Alloc __a) : _Alloc(__a), _M_ptr() { } + _Tp* _M_ptr; + }; + public: template _Sp_counted_ptr_inplace(_Alloc __a, _Args&&... __args) - : _Base_type(static_cast<_Tp*>(0), _Sp_destroy_inplace<_Tp>(), __a) - , _M_storage() + : _M_impl(__a) { - void* __p = &_M_storage; - ::new (__p) _Tp(std::forward<_Args>(__args)...); // might throw - _Base_type::_Base_type::_M_ptr = static_cast<_Tp*>(__p); + _M_impl._M_ptr = static_cast<_Tp*>(static_cast(&_M_storage)); + // _GLIBCXX_RESOLVE_LIB_DEFECTS + // 2070. allocate_shared should use allocator_traits::construct + allocator_traits<_Alloc>::construct(__a, _M_impl._M_ptr, + std::forward<_Args>(__args)...); // might throw } + ~_Sp_counted_ptr_inplace() noexcept { } + + virtual void + _M_dispose() noexcept + { allocator_traits<_Alloc>::destroy(_M_impl, _M_impl._M_ptr); } + // Override because the allocator needs to know the dynamic type virtual void - _M_destroy() // nothrow + _M_destroy() noexcept { - typedef typename _Alloc::template - rebind<_Sp_counted_ptr_inplace>::other _My_alloc_type; - _My_alloc_type __a(_Base_type::_M_del); - this->~_Sp_counted_ptr_inplace(); - __a.deallocate(this, 1); + typedef typename allocator_traits<_Alloc>::template + rebind_traits<_Sp_counted_ptr_inplace> _Alloc_traits; + typename _Alloc_traits::allocator_type __a(_M_impl); + _Alloc_traits::destroy(__a, this); + _Alloc_traits::deallocate(__a, this, 1); } // Sneaky trick so __shared_ptr can get the managed pointer virtual void* - _M_get_deleter(const std::type_info& __ti) + _M_get_deleter(const std::type_info& __ti) noexcept { #ifdef __GXX_RTTI return __ti == typeid(_Sp_make_shared_tag) ? static_cast(&_M_storage) - : _Base_type::_M_get_deleter(__ti); + : 0; #else return 0; #endif } private: + _Impl _M_impl; typename aligned_storage::value>::type _M_storage; }; @@ -443,7 +443,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) class __shared_count { public: - constexpr __shared_count() : _M_pi(0) // nothrow + constexpr __shared_count() noexcept : _M_pi(0) { } template @@ -467,18 +467,21 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // The allocator's value_type doesn't matter, will rebind it anyway. typedef std::allocator _Alloc; typedef _Sp_counted_deleter<_Ptr, _Deleter, _Alloc, _Lp> _Sp_cd_type; - typedef std::allocator<_Sp_cd_type> _Alloc2; - _Alloc2 __a2; + typedef typename allocator_traits<_Alloc>::template + rebind_traits<_Sp_cd_type> _Alloc_traits; + typename _Alloc_traits::allocator_type __a; + _Sp_cd_type* __mem = 0; __try { - _M_pi = __a2.allocate(1); - ::new(static_cast(_M_pi)) _Sp_cd_type(__p, __d); + __mem = _Alloc_traits::allocate(__a, 1); + _Alloc_traits::construct(__a, __mem, __p, std::move(__d)); + _M_pi = __mem; } __catch(...) { __d(__p); // Call _Deleter on __p. - if (_M_pi) - __a2.deallocate(static_cast<_Sp_cd_type*>(_M_pi), 1); + if (__mem) + _Alloc_traits::deallocate(__a, __mem, 1); __throw_exception_again; } } @@ -487,44 +490,50 @@ _GLIBCXX_BEGIN_NAMESPACE(std) __shared_count(_Ptr __p, _Deleter __d, _Alloc __a) : _M_pi(0) { typedef _Sp_counted_deleter<_Ptr, _Deleter, _Alloc, _Lp> _Sp_cd_type; - typedef typename _Alloc::template rebind<_Sp_cd_type>::other _Alloc2; - _Alloc2 __a2(__a); + typedef typename allocator_traits<_Alloc>::template + rebind_traits<_Sp_cd_type> _Alloc_traits; + typename _Alloc_traits::allocator_type __a2(__a); + _Sp_cd_type* __mem = 0; __try { - _M_pi = __a2.allocate(1); - ::new(static_cast(_M_pi)) _Sp_cd_type(__p, __d, __a); + __mem = _Alloc_traits::allocate(__a2, 1); + _Alloc_traits::construct(__a2, __mem, + __p, std::move(__d), std::move(__a)); + _M_pi = __mem; } __catch(...) { __d(__p); // Call _Deleter on __p. - if (_M_pi) - __a2.deallocate(static_cast<_Sp_cd_type*>(_M_pi), 1); + if (__mem) + _Alloc_traits::deallocate(__a2, __mem, 1); __throw_exception_again; } } template - __shared_count(_Sp_make_shared_tag, _Tp*, _Alloc __a, _Args&&... __args) + __shared_count(_Sp_make_shared_tag, _Tp*, const _Alloc& __a, + _Args&&... __args) : _M_pi(0) { typedef _Sp_counted_ptr_inplace<_Tp, _Alloc, _Lp> _Sp_cp_type; - typedef typename _Alloc::template rebind<_Sp_cp_type>::other _Alloc2; - _Alloc2 __a2(__a); + typedef typename allocator_traits<_Alloc>::template + rebind_traits<_Sp_cp_type> _Alloc_traits; + typename _Alloc_traits::allocator_type __a2(__a); + _Sp_cp_type* __mem = _Alloc_traits::allocate(__a2, 1); __try { - _M_pi = __a2.allocate(1); - ::new(static_cast(_M_pi)) _Sp_cp_type(__a, + _Alloc_traits::construct(__a2, __mem, std::move(__a), std::forward<_Args>(__args)...); + _M_pi = __mem; } __catch(...) { - if (_M_pi) - __a2.deallocate(static_cast<_Sp_cp_type*>(_M_pi), 1); + _Alloc_traits::deallocate(__a2, __mem, 1); __throw_exception_again; } } -#if _GLIBCXX_DEPRECATED +#if _GLIBCXX_USE_DEPRECATED // Special case for auto_ptr<_Tp> to provide the strong guarantee. template explicit @@ -543,21 +552,21 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // Throw bad_weak_ptr when __r._M_get_use_count() == 0. explicit __shared_count(const __weak_count<_Lp>& __r); - ~__shared_count() // nothrow + ~__shared_count() noexcept { if (_M_pi != 0) _M_pi->_M_release(); } - __shared_count(const __shared_count& __r) - : _M_pi(__r._M_pi) // nothrow + __shared_count(const __shared_count& __r) noexcept + : _M_pi(__r._M_pi) { if (_M_pi != 0) _M_pi->_M_add_ref_copy(); } __shared_count& - operator=(const __shared_count& __r) // nothrow + operator=(const __shared_count& __r) noexcept { _Sp_counted_base<_Lp>* __tmp = __r._M_pi; if (__tmp != _M_pi) @@ -572,7 +581,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) } void - _M_swap(__shared_count& __r) // nothrow + _M_swap(__shared_count& __r) noexcept { _Sp_counted_base<_Lp>* __tmp = __r._M_pi; __r._M_pi = _M_pi; @@ -580,28 +589,28 @@ _GLIBCXX_BEGIN_NAMESPACE(std) } long - _M_get_use_count() const // nothrow + _M_get_use_count() const noexcept { return _M_pi != 0 ? _M_pi->_M_get_use_count() : 0; } bool - _M_unique() const // nothrow + _M_unique() const noexcept { return this->_M_get_use_count() == 1; } void* - _M_get_deleter(const std::type_info& __ti) const + _M_get_deleter(const std::type_info& __ti) const noexcept { return _M_pi ? _M_pi->_M_get_deleter(__ti) : 0; } bool - _M_less(const __shared_count& __rhs) const + _M_less(const __shared_count& __rhs) const noexcept { return std::less<_Sp_counted_base<_Lp>*>()(this->_M_pi, __rhs._M_pi); } bool - _M_less(const __weak_count<_Lp>& __rhs) const + _M_less(const __weak_count<_Lp>& __rhs) const noexcept { return std::less<_Sp_counted_base<_Lp>*>()(this->_M_pi, __rhs._M_pi); } // Friend function injected into enclosing namespace and found by ADL friend inline bool - operator==(const __shared_count& __a, const __shared_count& __b) + operator==(const __shared_count& __a, const __shared_count& __b) noexcept { return __a._M_pi == __b._M_pi; } private: @@ -612,7 +621,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) _S_create_from_up(std::unique_ptr<_Tp, _Del>&& __r, typename std::enable_if::value>::type* = 0) { - return new _Sp_counted_deleter<_Tp*, _Del, std::allocator<_Tp>, + return new _Sp_counted_deleter<_Tp*, _Del, std::allocator, _Lp>(__r.get(), __r.get_deleter()); } @@ -623,7 +632,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) { typedef typename std::remove_reference<_Del>::type _Del1; typedef std::reference_wrapper<_Del1> _Del2; - return new _Sp_counted_deleter<_Tp*, _Del2, std::allocator<_Tp>, + return new _Sp_counted_deleter<_Tp*, _Del2, std::allocator, _Lp>(__r.get(), std::ref(__r.get_deleter())); } @@ -635,29 +644,31 @@ _GLIBCXX_BEGIN_NAMESPACE(std) class __weak_count { public: - constexpr __weak_count() : _M_pi(0) // nothrow + constexpr __weak_count() noexcept : _M_pi(0) { } - __weak_count(const __shared_count<_Lp>& __r) : _M_pi(__r._M_pi) // nothrow + __weak_count(const __shared_count<_Lp>& __r) noexcept + : _M_pi(__r._M_pi) { if (_M_pi != 0) _M_pi->_M_weak_add_ref(); } - __weak_count(const __weak_count<_Lp>& __r) : _M_pi(__r._M_pi) // nothrow + __weak_count(const __weak_count<_Lp>& __r) noexcept + : _M_pi(__r._M_pi) { if (_M_pi != 0) _M_pi->_M_weak_add_ref(); } - ~__weak_count() // nothrow + ~__weak_count() noexcept { if (_M_pi != 0) _M_pi->_M_weak_release(); } __weak_count<_Lp>& - operator=(const __shared_count<_Lp>& __r) // nothrow + operator=(const __shared_count<_Lp>& __r) noexcept { _Sp_counted_base<_Lp>* __tmp = __r._M_pi; if (__tmp != 0) @@ -669,7 +680,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) } __weak_count<_Lp>& - operator=(const __weak_count<_Lp>& __r) // nothrow + operator=(const __weak_count<_Lp>& __r) noexcept { _Sp_counted_base<_Lp>* __tmp = __r._M_pi; if (__tmp != 0) @@ -681,7 +692,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) } void - _M_swap(__weak_count<_Lp>& __r) // nothrow + _M_swap(__weak_count<_Lp>& __r) noexcept { _Sp_counted_base<_Lp>* __tmp = __r._M_pi; __r._M_pi = _M_pi; @@ -689,20 +700,20 @@ _GLIBCXX_BEGIN_NAMESPACE(std) } long - _M_get_use_count() const // nothrow + _M_get_use_count() const noexcept { return _M_pi != 0 ? _M_pi->_M_get_use_count() : 0; } bool - _M_less(const __weak_count& __rhs) const + _M_less(const __weak_count& __rhs) const noexcept { return std::less<_Sp_counted_base<_Lp>*>()(this->_M_pi, __rhs._M_pi); } bool - _M_less(const __shared_count<_Lp>& __rhs) const + _M_less(const __shared_count<_Lp>& __rhs) const noexcept { return std::less<_Sp_counted_base<_Lp>*>()(this->_M_pi, __rhs._M_pi); } // Friend function injected into enclosing namespace and found by ADL friend inline bool - operator==(const __weak_count& __a, const __weak_count& __b) + operator==(const __weak_count& __a, const __weak_count& __b) noexcept { return __a._M_pi == __b._M_pi; } private: @@ -730,18 +741,18 @@ _GLIBCXX_BEGIN_NAMESPACE(std) void __enable_shared_from_this_helper(const __shared_count<_Lp>&, const __enable_shared_from_this<_Tp1, - _Lp>*, const _Tp2*); + _Lp>*, const _Tp2*) noexcept; // Friend of enable_shared_from_this. template void __enable_shared_from_this_helper(const __shared_count<>&, const enable_shared_from_this<_Tp1>*, - const _Tp2*); + const _Tp2*) noexcept; template<_Lock_policy _Lp> inline void - __enable_shared_from_this_helper(const __shared_count<_Lp>&, ...) + __enable_shared_from_this_helper(const __shared_count<_Lp>&, ...) noexcept { } @@ -751,8 +762,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) public: typedef _Tp element_type; - constexpr __shared_ptr() - : _M_ptr(0), _M_refcount() // never throws + constexpr __shared_ptr() noexcept + : _M_ptr(0), _M_refcount() { } template @@ -774,8 +785,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) } template - __shared_ptr(_Tp1* __p, _Deleter __d, const _Alloc& __a) - : _M_ptr(__p), _M_refcount(__p, __d, __a) + __shared_ptr(_Tp1* __p, _Deleter __d, _Alloc __a) + : _M_ptr(__p), _M_refcount(__p, __d, std::move(__a)) { __glibcxx_function_requires(_ConvertibleConcept<_Tp1*, _Tp*>) // TODO requires _Deleter CopyConstructible and __d(__p) well-formed @@ -788,25 +799,27 @@ _GLIBCXX_BEGIN_NAMESPACE(std) { } template - __shared_ptr(nullptr_t __p, _Deleter __d, const _Alloc& __a) - : _M_ptr(0), _M_refcount(__p, __d, __a) + __shared_ptr(nullptr_t __p, _Deleter __d, _Alloc __a) + : _M_ptr(0), _M_refcount(__p, __d, std::move(__a)) { } template - __shared_ptr(const __shared_ptr<_Tp1, _Lp>& __r, _Tp* __p) + __shared_ptr(const __shared_ptr<_Tp1, _Lp>& __r, _Tp* __p) noexcept : _M_ptr(__p), _M_refcount(__r._M_refcount) // never throws { } - // generated copy constructor, assignment, destructor are fine. + __shared_ptr(const __shared_ptr&) noexcept = default; + __shared_ptr& operator=(const __shared_ptr&) noexcept = default; + ~__shared_ptr() = default; template::value>::type> - __shared_ptr(const __shared_ptr<_Tp1, _Lp>& __r) - : _M_ptr(__r._M_ptr), _M_refcount(__r._M_refcount) // never throws + __shared_ptr(const __shared_ptr<_Tp1, _Lp>& __r) noexcept + : _M_ptr(__r._M_ptr), _M_refcount(__r._M_refcount) { } - __shared_ptr(__shared_ptr&& __r) - : _M_ptr(__r._M_ptr), _M_refcount() // never throws + __shared_ptr(__shared_ptr&& __r) noexcept + : _M_ptr(__r._M_ptr), _M_refcount() { _M_refcount._M_swap(__r._M_refcount); __r._M_ptr = 0; @@ -814,8 +827,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) template::value>::type> - __shared_ptr(__shared_ptr<_Tp1, _Lp>&& __r) - : _M_ptr(__r._M_ptr), _M_refcount() // never throws + __shared_ptr(__shared_ptr<_Tp1, _Lp>&& __r) noexcept + : _M_ptr(__r._M_ptr), _M_refcount() { _M_refcount._M_swap(__r._M_refcount); __r._M_ptr = 0; @@ -843,7 +856,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) __enable_shared_from_this_helper(_M_refcount, __tmp, __tmp); } -#if _GLIBCXX_DEPRECATED +#if _GLIBCXX_USE_DEPRECATED // Postcondition: use_count() == 1 and __r.get() == 0 template __shared_ptr(std::auto_ptr<_Tp1>&& __r) @@ -858,20 +871,20 @@ _GLIBCXX_BEGIN_NAMESPACE(std) #endif /* TODO: use delegating constructor */ - constexpr __shared_ptr(nullptr_t) - : _M_ptr(0), _M_refcount() // never throws + constexpr __shared_ptr(nullptr_t) noexcept + : _M_ptr(0), _M_refcount() { } template __shared_ptr& - operator=(const __shared_ptr<_Tp1, _Lp>& __r) // never throws + operator=(const __shared_ptr<_Tp1, _Lp>& __r) noexcept { _M_ptr = __r._M_ptr; _M_refcount = __r._M_refcount; // __shared_count::op= doesn't throw return *this; } -#if _GLIBCXX_DEPRECATED +#if _GLIBCXX_USE_DEPRECATED template __shared_ptr& operator=(std::auto_ptr<_Tp1>&& __r) @@ -882,7 +895,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) #endif __shared_ptr& - operator=(__shared_ptr&& __r) + operator=(__shared_ptr&& __r) noexcept { __shared_ptr(std::move(__r)).swap(*this); return *this; @@ -890,7 +903,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) template __shared_ptr& - operator=(__shared_ptr<_Tp1, _Lp>&& __r) + operator=(__shared_ptr<_Tp1, _Lp>&& __r) noexcept { __shared_ptr(std::move(__r)).swap(*this); return *this; @@ -905,7 +918,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) } void - reset() // never throws + reset() noexcept { __shared_ptr().swap(*this); } template @@ -924,41 +937,41 @@ _GLIBCXX_BEGIN_NAMESPACE(std) template void - reset(_Tp1* __p, _Deleter __d, const _Alloc& __a) - { __shared_ptr(__p, __d, __a).swap(*this); } + reset(_Tp1* __p, _Deleter __d, _Alloc __a) + { __shared_ptr(__p, __d, std::move(__a)).swap(*this); } // Allow class instantiation when _Tp is [cv-qual] void. typename std::add_lvalue_reference<_Tp>::type - operator*() const // never throws + operator*() const noexcept { _GLIBCXX_DEBUG_ASSERT(_M_ptr != 0); return *_M_ptr; } _Tp* - operator->() const // never throws + operator->() const noexcept { _GLIBCXX_DEBUG_ASSERT(_M_ptr != 0); return _M_ptr; } _Tp* - get() const // never throws + get() const noexcept { return _M_ptr; } explicit operator bool() const // never throws { return _M_ptr == 0 ? false : true; } bool - unique() const // never throws + unique() const noexcept { return _M_refcount._M_unique(); } long - use_count() const // never throws + use_count() const noexcept { return _M_refcount._M_get_use_count(); } void - swap(__shared_ptr<_Tp, _Lp>& __other) // never throws + swap(__shared_ptr<_Tp, _Lp>& __other) noexcept { std::swap(_M_ptr, __other._M_ptr); _M_refcount._M_swap(__other._M_refcount); @@ -978,7 +991,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) protected: // This constructor is non-standard, it is used by allocate_shared. template - __shared_ptr(_Sp_make_shared_tag __tag, _Alloc __a, _Args&&... __args) + __shared_ptr(_Sp_make_shared_tag __tag, const _Alloc& __a, + _Args&&... __args) : _M_ptr(), _M_refcount(__tag, (_Tp*)0, __a, std::forward<_Args>(__args)...) { @@ -994,26 +1008,32 @@ _GLIBCXX_BEGIN_NAMESPACE(std) { void operator()(_Tp* __ptr) { - _M_alloc.destroy(__ptr); - _M_alloc.deallocate(__ptr, 1); + typedef allocator_traits<_Alloc> _Alloc_traits; + _Alloc_traits::destroy(_M_alloc, __ptr); + _Alloc_traits::deallocate(_M_alloc, __ptr, 1); } _Alloc _M_alloc; }; template - __shared_ptr(_Sp_make_shared_tag __tag, _Alloc __a, _Args&&... __args) + __shared_ptr(_Sp_make_shared_tag __tag, const _Alloc& __a, + _Args&&... __args) : _M_ptr(), _M_refcount() { typedef typename _Alloc::template rebind<_Tp>::other _Alloc2; _Deleter<_Alloc2> __del = { _Alloc2(__a) }; - _M_ptr = __del._M_alloc.allocate(1); + typedef allocator_traits<_Alloc2> __traits; + _M_ptr = __traits::allocate(__del._M_alloc, 1); __try { - __del._M_alloc.construct(_M_ptr, std::forward<_Args>(__args)...); + // _GLIBCXX_RESOLVE_LIB_DEFECTS + // 2070. allocate_shared should use allocator_traits::construct + __traits::construct(__del._M_alloc, _M_ptr, + std::forward<_Args>(__args)...); } __catch(...) { - __del._M_alloc.deallocate(_M_ptr, 1); + __traits::deallocate(__del._M_alloc, _M_ptr, 1); __throw_exception_again; } __shared_count<_Lp> __count(_M_ptr, __del, __del._M_alloc); @@ -1025,18 +1045,18 @@ _GLIBCXX_BEGIN_NAMESPACE(std) template friend __shared_ptr<_Tp1, _Lp1> - __allocate_shared(_Alloc __a, _Args&&... __args); + __allocate_shared(const _Alloc& __a, _Args&&... __args); private: void* - _M_get_deleter(const std::type_info& __ti) const + _M_get_deleter(const std::type_info& __ti) const noexcept { return _M_refcount._M_get_deleter(__ti); } template friend class __shared_ptr; template friend class __weak_ptr; template - friend _Del* get_deleter(const __shared_ptr<_Tp1, _Lp1>&); + friend _Del* get_deleter(const __shared_ptr<_Tp1, _Lp1>&) noexcept; _Tp* _M_ptr; // Contained pointer. __shared_count<_Lp> _M_refcount; // Reference counter. @@ -1047,46 +1067,107 @@ _GLIBCXX_BEGIN_NAMESPACE(std) template inline bool operator==(const __shared_ptr<_Tp1, _Lp>& __a, - const __shared_ptr<_Tp2, _Lp>& __b) + const __shared_ptr<_Tp2, _Lp>& __b) noexcept { return __a.get() == __b.get(); } template inline bool - operator==(const __shared_ptr<_Tp, _Lp>& __a, nullptr_t) - { return __a.get() == nullptr; } + operator==(const __shared_ptr<_Tp, _Lp>& __a, nullptr_t) noexcept + { return !__a; } template inline bool - operator==(nullptr_t, const __shared_ptr<_Tp, _Lp>& __b) - { return nullptr == __b.get(); } + operator==(nullptr_t, const __shared_ptr<_Tp, _Lp>& __a) noexcept + { return !__a; } template inline bool operator!=(const __shared_ptr<_Tp1, _Lp>& __a, - const __shared_ptr<_Tp2, _Lp>& __b) + const __shared_ptr<_Tp2, _Lp>& __b) noexcept { return __a.get() != __b.get(); } template inline bool - operator!=(const __shared_ptr<_Tp, _Lp>& __a, nullptr_t) - { return __a.get() != nullptr; } + operator!=(const __shared_ptr<_Tp, _Lp>& __a, nullptr_t) noexcept + { return (bool)__a; } template inline bool - operator!=(nullptr_t, const __shared_ptr<_Tp, _Lp>& __b) - { return nullptr != __b.get(); } + operator!=(nullptr_t, const __shared_ptr<_Tp, _Lp>& __a) noexcept + { return (bool)__a; } template inline bool operator<(const __shared_ptr<_Tp1, _Lp>& __a, - const __shared_ptr<_Tp2, _Lp>& __b) - { return __a.get() < __b.get(); } + const __shared_ptr<_Tp2, _Lp>& __b) noexcept + { + typedef typename std::common_type<_Tp1*, _Tp2*>::type _CT; + return std::less<_CT>()(__a.get(), __b.get()); + } + + template + inline bool + operator<(const __shared_ptr<_Tp, _Lp>& __a, nullptr_t) noexcept + { return std::less<_Tp*>()(__a.get(), nullptr); } + + template + inline bool + operator<(nullptr_t, const __shared_ptr<_Tp, _Lp>& __a) noexcept + { return std::less<_Tp*>()(nullptr, __a.get()); } + + template + inline bool + operator<=(const __shared_ptr<_Tp1, _Lp>& __a, + const __shared_ptr<_Tp2, _Lp>& __b) noexcept + { return !(__b < __a); } + + template + inline bool + operator<=(const __shared_ptr<_Tp, _Lp>& __a, nullptr_t) noexcept + { return !(nullptr < __a); } + + template + inline bool + operator<=(nullptr_t, const __shared_ptr<_Tp, _Lp>& __a) noexcept + { return !(__a < nullptr); } + + template + inline bool + operator>(const __shared_ptr<_Tp1, _Lp>& __a, + const __shared_ptr<_Tp2, _Lp>& __b) noexcept + { return (__b < __a); } + + template + inline bool + operator>(const __shared_ptr<_Tp, _Lp>& __a, nullptr_t) noexcept + { return std::less<_Tp*>()(nullptr, __a.get()); } + + template + inline bool + operator>(nullptr_t, const __shared_ptr<_Tp, _Lp>& __a) noexcept + { return std::less<_Tp*>()(__a.get(), nullptr); } + + template + inline bool + operator>=(const __shared_ptr<_Tp1, _Lp>& __a, + const __shared_ptr<_Tp2, _Lp>& __b) noexcept + { return !(__a < __b); } + + template + inline bool + operator>=(const __shared_ptr<_Tp, _Lp>& __a, nullptr_t) noexcept + { return !(__a < nullptr); } + + template + inline bool + operator>=(nullptr_t, const __shared_ptr<_Tp, _Lp>& __a) noexcept + { return !(nullptr < __a); } template struct _Sp_less : public binary_function<_Sp, _Sp, bool> { bool - operator()(const _Sp& __lhs, const _Sp& __rhs) const + operator()(const _Sp& __lhs, const _Sp& __rhs) const noexcept { typedef typename _Sp::element_type element_type; return std::less()(__lhs.get(), __rhs.get()); @@ -1098,29 +1179,10 @@ _GLIBCXX_BEGIN_NAMESPACE(std) : public _Sp_less<__shared_ptr<_Tp, _Lp>> { }; - // XXX LessThanComparable<_Tp> concept should provide >, >= and <= - template - inline bool - operator>(const __shared_ptr<_Tp, _Lp>& __a, - const __shared_ptr<_Tp, _Lp>& __b) - { return __a.get() > __b.get(); } - - template - inline bool - operator>=(const __shared_ptr<_Tp, _Lp>& __a, - const __shared_ptr<_Tp, _Lp>& __b) - { return __a.get() >= __b.get(); } - - template - inline bool - operator<=(const __shared_ptr<_Tp, _Lp>& __a, - const __shared_ptr<_Tp, _Lp>& __b) - { return __a.get() <= __b.get(); } - // 2.2.3.8 shared_ptr specialized algorithms. template inline void - swap(__shared_ptr<_Tp, _Lp>& __a, __shared_ptr<_Tp, _Lp>& __b) + swap(__shared_ptr<_Tp, _Lp>& __a, __shared_ptr<_Tp, _Lp>& __b) noexcept { __a.swap(__b); } // 2.2.3.9 shared_ptr casts @@ -1132,7 +1194,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /// static_pointer_cast template inline __shared_ptr<_Tp, _Lp> - static_pointer_cast(const __shared_ptr<_Tp1, _Lp>& __r) + static_pointer_cast(const __shared_ptr<_Tp1, _Lp>& __r) noexcept { return __shared_ptr<_Tp, _Lp>(__r, static_cast<_Tp*>(__r.get())); } // The seemingly equivalent code: @@ -1142,7 +1204,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /// const_pointer_cast template inline __shared_ptr<_Tp, _Lp> - const_pointer_cast(const __shared_ptr<_Tp1, _Lp>& __r) + const_pointer_cast(const __shared_ptr<_Tp1, _Lp>& __r) noexcept { return __shared_ptr<_Tp, _Lp>(__r, const_cast<_Tp*>(__r.get())); } // The seemingly equivalent code: @@ -1152,7 +1214,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /// dynamic_pointer_cast template inline __shared_ptr<_Tp, _Lp> - dynamic_pointer_cast(const __shared_ptr<_Tp1, _Lp>& __r) + dynamic_pointer_cast(const __shared_ptr<_Tp1, _Lp>& __r) noexcept { if (_Tp* __p = dynamic_cast<_Tp*>(__r.get())) return __shared_ptr<_Tp, _Lp>(__r, __p); @@ -1166,11 +1228,13 @@ _GLIBCXX_BEGIN_NAMESPACE(std) public: typedef _Tp element_type; - constexpr __weak_ptr() - : _M_ptr(0), _M_refcount() // never throws + constexpr __weak_ptr() noexcept + : _M_ptr(0), _M_refcount() { } - // Generated copy constructor, assignment, destructor are fine. + __weak_ptr(const __weak_ptr&) noexcept = default; + __weak_ptr& operator=(const __weak_ptr&) noexcept = default; + ~__weak_ptr() = default; // The "obvious" converting constructor implementation: // @@ -1188,19 +1252,19 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // in multithreaded programs __r._M_ptr may be invalidated at any point. template::value>::type> - __weak_ptr(const __weak_ptr<_Tp1, _Lp>& __r) - : _M_refcount(__r._M_refcount) // never throws + __weak_ptr(const __weak_ptr<_Tp1, _Lp>& __r) noexcept + : _M_refcount(__r._M_refcount) { _M_ptr = __r.lock().get(); } template::value>::type> - __weak_ptr(const __shared_ptr<_Tp1, _Lp>& __r) - : _M_ptr(__r._M_ptr), _M_refcount(__r._M_refcount) // never throws + __weak_ptr(const __shared_ptr<_Tp1, _Lp>& __r) noexcept + : _M_ptr(__r._M_ptr), _M_refcount(__r._M_refcount) { } template __weak_ptr& - operator=(const __weak_ptr<_Tp1, _Lp>& __r) // never throws + operator=(const __weak_ptr<_Tp1, _Lp>& __r) noexcept { _M_ptr = __r.lock().get(); _M_refcount = __r._M_refcount; @@ -1209,7 +1273,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) template __weak_ptr& - operator=(const __shared_ptr<_Tp1, _Lp>& __r) // never throws + operator=(const __shared_ptr<_Tp1, _Lp>& __r) noexcept { _M_ptr = __r._M_ptr; _M_refcount = __r._M_refcount; @@ -1217,7 +1281,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) } __shared_ptr<_Tp, _Lp> - lock() const // never throws + lock() const noexcept { #ifdef __GTHREADS // Optimization: avoid throw overhead. @@ -1245,11 +1309,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std) } // XXX MT long - use_count() const // never throws + use_count() const noexcept { return _M_refcount._M_get_use_count(); } bool - expired() const // never throws + expired() const noexcept { return _M_refcount._M_get_use_count() == 0; } template @@ -1263,11 +1327,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std) { return _M_refcount._M_less(__rhs._M_refcount); } void - reset() // never throws + reset() noexcept { __weak_ptr().swap(*this); } void - swap(__weak_ptr& __s) // never throws + swap(__weak_ptr& __s) noexcept { std::swap(_M_ptr, __s._M_ptr); _M_refcount._M_swap(__s._M_refcount); @@ -1276,7 +1340,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) private: // Used by __enable_shared_from_this. void - _M_assign(_Tp* __ptr, const __shared_count<_Lp>& __refcount) + _M_assign(_Tp* __ptr, const __shared_count<_Lp>& __refcount) noexcept { _M_ptr = __ptr; _M_refcount = __refcount; @@ -1294,7 +1358,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // 20.8.13.3.7 weak_ptr specialized algorithms. template inline void - swap(__weak_ptr<_Tp, _Lp>& __a, __weak_ptr<_Tp, _Lp>& __b) + swap(__weak_ptr<_Tp, _Lp>& __a, __weak_ptr<_Tp, _Lp>& __b) noexcept { __a.swap(__b); } template @@ -1328,12 +1392,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std) class __enable_shared_from_this { protected: - constexpr __enable_shared_from_this() { } + constexpr __enable_shared_from_this() noexcept { } - __enable_shared_from_this(const __enable_shared_from_this&) { } + __enable_shared_from_this(const __enable_shared_from_this&) noexcept { } __enable_shared_from_this& - operator=(const __enable_shared_from_this&) + operator=(const __enable_shared_from_this&) noexcept { return *this; } ~__enable_shared_from_this() { } @@ -1350,14 +1414,14 @@ _GLIBCXX_BEGIN_NAMESPACE(std) private: template void - _M_weak_assign(_Tp1* __p, const __shared_count<_Lp>& __n) const + _M_weak_assign(_Tp1* __p, const __shared_count<_Lp>& __n) const noexcept { _M_weak_this._M_assign(__p, __n); } template friend void __enable_shared_from_this_helper(const __shared_count<_Lp>& __pn, const __enable_shared_from_this* __pe, - const _Tp1* __px) + const _Tp1* __px) noexcept { if (__pe != 0) __pe->_M_weak_assign(const_cast<_Tp1*>(__px), __pn); @@ -1369,10 +1433,10 @@ _GLIBCXX_BEGIN_NAMESPACE(std) template inline __shared_ptr<_Tp, _Lp> - __allocate_shared(_Alloc __a, _Args&&... __args) + __allocate_shared(const _Alloc& __a, _Args&&... __args) { - return __shared_ptr<_Tp, _Lp>(_Sp_make_shared_tag(), - std::forward<_Alloc>(__a), std::forward<_Args>(__args)...); + return __shared_ptr<_Tp, _Lp>(_Sp_make_shared_tag(), __a, + std::forward<_Args>(__args)...); } template @@ -1380,20 +1444,21 @@ _GLIBCXX_BEGIN_NAMESPACE(std) __make_shared(_Args&&... __args) { typedef typename std::remove_const<_Tp>::type _Tp_nc; - return __allocate_shared<_Tp, _Lp>(std::allocator<_Tp_nc>(), - std::forward<_Args>(__args)...); + return std::__allocate_shared<_Tp, _Lp>(std::allocator<_Tp_nc>(), + std::forward<_Args>(__args)...); } /// std::hash specialization for __shared_ptr. template struct hash<__shared_ptr<_Tp, _Lp>> - : public std::unary_function<__shared_ptr<_Tp, _Lp>, size_t> + : public __hash_base> { size_t - operator()(const __shared_ptr<_Tp, _Lp>& __s) const + operator()(const __shared_ptr<_Tp, _Lp>& __s) const noexcept { return std::hash<_Tp*>()(__s.get()); } }; -_GLIBCXX_END_NAMESPACE +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace #endif // _SHARED_PTR_BASE_H