git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add noexcept to enable_shared_from_this::weak_from_this 

* include/bits/shared_ptr.h (enable_shared_from_this::weak_from_this):
	Add noexcept.
	* include/bits/shared_ptr_base.h
	(__enable_shared_from_this::weak_from_this): Likewise.
	* testsuite/20_util/enable_shared_from_this/members/weak_from_this.cc:
	Test exception-specification of weak_from_this.

From-SVN: r240917
This commit is contained in:
Jonathan Wakely 2016-10-10 12:44:05 +01:00 committed by Jonathan Wakely
parent 30102051a5
commit 208b8b69b6
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,12 @@
2016-10-10 Jonathan Wakely <jwakely@redhat.com>
* include/bits/shared_ptr.h (enable_shared_from_this::weak_from_this):
Add noexcept.
* include/bits/shared_ptr_base.h
(__enable_shared_from_this::weak_from_this): Likewise.
* testsuite/20_util/enable_shared_from_this/members/weak_from_this.cc:
Test exception-specification of weak_from_this.
2016-10-07 Jonathan Wakely <jwakely@redhat.com> 2016-10-07 Jonathan Wakely <jwakely@redhat.com>
* doc/xml/manual/status_cxx1998.xml: Improve documentation of * doc/xml/manual/status_cxx1998.xml: Improve documentation of

4
libstdc++-v3/include/bits/shared_ptr.h
View File

@ -593,11 +593,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#if __cplusplus > 201402L || !defined(__STRICT_ANSI__) // c++1z or gnu++11 #if __cplusplus > 201402L || !defined(__STRICT_ANSI__) // c++1z or gnu++11
#define __cpp_lib_enable_shared_from_this 201603 #define __cpp_lib_enable_shared_from_this 201603
weak_ptr<_Tp> weak_ptr<_Tp>
weak_from_this() weak_from_this() noexcept
{ return this->_M_weak_this; } { return this->_M_weak_this; }
weak_ptr<const _Tp> weak_ptr<const _Tp>
weak_from_this() const weak_from_this() const noexcept
{ return this->_M_weak_this; } { return this->_M_weak_this; }
#endif #endif

4
libstdc++-v3/include/bits/shared_ptr_base.h
View File

@ -1562,11 +1562,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#if __cplusplus > 201402L || !defined(__STRICT_ANSI__) // c++1z or gnu++11 #if __cplusplus > 201402L || !defined(__STRICT_ANSI__) // c++1z or gnu++11
__weak_ptr<_Tp, _Lp> __weak_ptr<_Tp, _Lp>
weak_from_this() weak_from_this() noexcept
{ return this->_M_weak_this; } { return this->_M_weak_this; }
__weak_ptr<const _Tp, _Lp> __weak_ptr<const _Tp, _Lp>
weak_from_this() const weak_from_this() const noexcept
{ return this->_M_weak_this; } { return this->_M_weak_this; }
#endif #endif

3
libstdc++-v3/testsuite/20_util/enable_shared_from_this/members/weak_from_this.cc
View File

@ -26,6 +26,9 @@
struct X : public std::enable_shared_from_this<X> { }; struct X : public std::enable_shared_from_this<X> { };
static_assert( noexcept(std::declval<X&>().weak_from_this()) );
static_assert( noexcept(std::declval<const X&>().weak_from_this()) );
void void
test01() test01()
{ {