aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3/testsuite/30_threads
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely.gcc@gmail.com>2013-04-24 22:00:16 +0000
committerJonathan Wakely <redi@gcc.gnu.org>2013-04-24 23:00:16 +0100
commitec98d01014c53501f9bf03b57ee1952233b45c60 (patch)
treee2f44526ebfdbc4e96f7cc71152db007247579d7 /libstdc++-v3/testsuite/30_threads
parent77bce07cce1eee85627b0deb61f3ecf6e0da461f (diff)
downloadgcc-ec98d01014c53501f9bf03b57ee1952233b45c60.zip
gcc-ec98d01014c53501f9bf03b57ee1952233b45c60.tar.gz
gcc-ec98d01014c53501f9bf03b57ee1952233b45c60.tar.bz2
re PR libstdc++/56905 ([C++11][DR 1130] std::copy_exception should be removed or no longer be used)
PR libstdc++/56905 * libsupc++/exception_ptr.h (copy_exception): Deprecate and move implementation to make_exception_ptr. * include/std/future (_State_base::_M_break_promise): Replace copy_exception with make_exception_ptr. * testsuite/18_support/exception_ptr/move.cc: Likewise. * testsuite/18_support/exception_ptr/rethrow_exception.cc: Likewise. * testsuite/30_threads/future/members/get2.cc: Likewise. * testsuite/30_threads/promise/members/set_exception.cc: Likewise. * testsuite/30_threads/promise/members/set_exception2.cc: Likewise. * testsuite/30_threads/promise/members/set_value2.cc: Likewise. * testsuite/30_threads/shared_future/members/get2.cc: Likewise. From-SVN: r198265
Diffstat (limited to 'libstdc++-v3/testsuite/30_threads')
-rw-r--r--libstdc++-v3/testsuite/30_threads/future/members/get2.cc6
-rw-r--r--libstdc++-v3/testsuite/30_threads/promise/members/set_exception.cc2
-rw-r--r--libstdc++-v3/testsuite/30_threads/promise/members/set_exception2.cc6
-rw-r--r--libstdc++-v3/testsuite/30_threads/promise/members/set_value2.cc2
-rw-r--r--libstdc++-v3/testsuite/30_threads/shared_future/members/get2.cc6
5 files changed, 11 insertions, 11 deletions
diff --git a/libstdc++-v3/testsuite/30_threads/future/members/get2.cc b/libstdc++-v3/testsuite/30_threads/future/members/get2.cc
index b74c84d..2f05240 100644
--- a/libstdc++-v3/testsuite/30_threads/future/members/get2.cc
+++ b/libstdc++-v3/testsuite/30_threads/future/members/get2.cc
@@ -37,7 +37,7 @@ void test01()
std::promise<int> p1;
std::future<int> f1(p1.get_future());
- p1.set_exception(std::copy_exception(value));
+ p1.set_exception(std::make_exception_ptr(value));
try
{
(void) f1.get();
@@ -57,7 +57,7 @@ void test02()
std::promise<int&> p1;
std::future<int&> f1(p1.get_future());
- p1.set_exception(std::copy_exception(value));
+ p1.set_exception(std::make_exception_ptr(value));
try
{
(void) f1.get();
@@ -77,7 +77,7 @@ void test03()
std::promise<void> p1;
std::future<void> f1(p1.get_future());
- p1.set_exception(std::copy_exception(value));
+ p1.set_exception(std::make_exception_ptr(value));
try
{
f1.get();
diff --git a/libstdc++-v3/testsuite/30_threads/promise/members/set_exception.cc b/libstdc++-v3/testsuite/30_threads/promise/members/set_exception.cc
index c7f1df2..920c116 100644
--- a/libstdc++-v3/testsuite/30_threads/promise/members/set_exception.cc
+++ b/libstdc++-v3/testsuite/30_threads/promise/members/set_exception.cc
@@ -36,7 +36,7 @@ void test01()
VERIFY( f1.valid() );
- p1.set_exception(std::copy_exception(0));
+ p1.set_exception(std::make_exception_ptr(0));
try
{
diff --git a/libstdc++-v3/testsuite/30_threads/promise/members/set_exception2.cc b/libstdc++-v3/testsuite/30_threads/promise/members/set_exception2.cc
index 527cfbb..84c26d6 100644
--- a/libstdc++-v3/testsuite/30_threads/promise/members/set_exception2.cc
+++ b/libstdc++-v3/testsuite/30_threads/promise/members/set_exception2.cc
@@ -34,11 +34,11 @@ void test01()
std::promise<int> p1;
std::future<int> f1 = p1.get_future();
- p1.set_exception(std::copy_exception(0));
+ p1.set_exception(std::make_exception_ptr(0));
try
{
- p1.set_exception(std::copy_exception(1));
+ p1.set_exception(std::make_exception_ptr(1));
VERIFY( false );
}
catch (std::future_error& e)
@@ -72,7 +72,7 @@ void test02()
try
{
- p1.set_exception(std::copy_exception(0));
+ p1.set_exception(std::make_exception_ptr(0));
VERIFY( false );
}
catch (std::future_error& e)
diff --git a/libstdc++-v3/testsuite/30_threads/promise/members/set_value2.cc b/libstdc++-v3/testsuite/30_threads/promise/members/set_value2.cc
index fcba745..2ee5987 100644
--- a/libstdc++-v3/testsuite/30_threads/promise/members/set_value2.cc
+++ b/libstdc++-v3/testsuite/30_threads/promise/members/set_value2.cc
@@ -65,7 +65,7 @@ void test02()
try
{
- p1.set_exception(std::copy_exception(4));
+ p1.set_exception(std::make_exception_ptr(4));
VERIFY( false );
}
catch (std::future_error& e)
diff --git a/libstdc++-v3/testsuite/30_threads/shared_future/members/get2.cc b/libstdc++-v3/testsuite/30_threads/shared_future/members/get2.cc
index 1b8ccea..2fed6d5 100644
--- a/libstdc++-v3/testsuite/30_threads/shared_future/members/get2.cc
+++ b/libstdc++-v3/testsuite/30_threads/shared_future/members/get2.cc
@@ -38,7 +38,7 @@ void test01()
std::shared_future<int> f1(p1.get_future());
std::shared_future<int> f2(f1);
- p1.set_exception(std::copy_exception(value));
+ p1.set_exception(std::make_exception_ptr(value));
try
{
(void) f1.get();
@@ -67,7 +67,7 @@ void test02()
std::shared_future<int&> f1(p1.get_future());
std::shared_future<int&> f2(f1);
- p1.set_exception(std::copy_exception(value));
+ p1.set_exception(std::make_exception_ptr(value));
try
{
(void) f1.get();
@@ -96,7 +96,7 @@ void test03()
std::shared_future<void> f1(p1.get_future());
std::shared_future<void> f2(f1);
- p1.set_exception(std::copy_exception(value));
+ p1.set_exception(std::make_exception_ptr(value));
try
{
f1.get();