OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR libstdc++/64651 (std::rethrow_exception not found by ADL) 

PR libstdc++/64651
	* libsupc++/exception_ptr.h (rethrow_exception): Add using-declaration
	to __exception_ptr namespace.
	* testsuite/18_support/exception_ptr/rethrow_exception.cc: Test ADL.
	Remove unnecessary test variables.

From-SVN: r230147
This commit is contained in:
Jonathan Wakely 2015-11-11 10:08:23 +00:00 committed by Jonathan Wakely
parent 9a55713856
commit 832ca6ac72
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,11 @@
2015-11-11 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/64651
* libsupc++/exception_ptr.h (rethrow_exception): Add using-declaration
to __exception_ptr namespace.
* testsuite/18_support/exception_ptr/rethrow_exception.cc: Test ADL.
Remove unnecessary test variables.
2015-11-10 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/68190

2
libstdc++-v3/libsupc++/exception_ptr.h
View File

@ -68,6 +68,8 @@ namespace std
namespace __exception_ptr
{
using std::rethrow_exception;
/**
* @brief An opaque pointer to an arbitrary exception.
* @ingroup exceptions

14
libstdc++-v3/testsuite/18_support/exception_ptr/rethrow_exception.cc
View File

@ -30,7 +30,6 @@
void test01()
{
bool test __attribute__((unused)) = true;
using namespace std;
try {
@ -54,7 +53,6 @@ void test02()
void test03()
{
bool test __attribute__((unused)) = true;
using namespace std;
exception_ptr ep;
@ -71,7 +69,6 @@ void test03()
void test04()
{
bool test __attribute__((unused)) = true;
using namespace std;
// Weave the exceptions in an attempt to confuse the machinery.
@ -103,12 +100,23 @@ void test04()
}
}
void test05()
{
// libstdc++/64651 std::rethrow_exception not found by ADL
// This is not required to work but is a conforming extension.
try {
rethrow_exception(std::make_exception_ptr(0));
} catch(...) {
}
}
int main()
{
test01();
test02();
test03();
test04();
test05();
return 0;
}