diff options
author | Benjamin Kosnik <bkoz@redhat.com> | 2009-08-10 18:24:47 +0000 |
---|---|---|
committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2009-08-10 18:24:47 +0000 |
commit | 8d1b99e26ad5c88a05c7c7ba2fbb05bdc345e9d2 (patch) | |
tree | 230597b4bbde6bf2acfd8a8a8dea94ffdc056bd0 /libstdc++-v3/libsupc++ | |
parent | 35076532472d49156e476529d846466a53d989c9 (diff) | |
download | gcc-8d1b99e26ad5c88a05c7c7ba2fbb05bdc345e9d2.zip gcc-8d1b99e26ad5c88a05c7c7ba2fbb05bdc345e9d2.tar.gz gcc-8d1b99e26ad5c88a05c7c7ba2fbb05bdc345e9d2.tar.bz2 |
future: Fixes for -fno-exceptions.
2009-08-10 Benjamin Kosnik <bkoz@redhat.com>
* include/std/future: Fixes for -fno-exceptions.
* include/bits/functexcept.h: Same.
* libsupc++/exception_ptr.h: Same.
* src/pool_allocator.cc: Same.
* src/future.cc: Same.
* src/functexcept.cc: Same.
* config/abi/pre/gnu.ver: New exports.
* testsuite/30_threads/packaged_task/cons/assign_neg.cc: Adjust.
* testsuite/30_threads/packaged_task/cons/copy_neg.cc: Same.
* testsuite/30_threads/unique_future/cons/assign_neg.cc: Same.
* testsuite/30_threads/unique_future/cons/copy_neg.cc: Same.
* testsuite/30_threads/shared_future/cons/assign_neg.cc: Same.
* testsuite/30_threads/promise/cons/assign_neg.cc: Same.
* testsuite/30_threads/promise/cons/copy_neg.cc: Same.
* testsuite/23_containers/deque/operators/1.cc: Separate in two...
* testsuite/23_containers/deque/operators/2.cc: New.
From-SVN: r150633
Diffstat (limited to 'libstdc++-v3/libsupc++')
-rw-r--r-- | libstdc++-v3/libsupc++/exception_ptr.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libstdc++-v3/libsupc++/exception_ptr.h b/libstdc++-v3/libsupc++/exception_ptr.h index 23477c9..9192a22 100644 --- a/libstdc++-v3/libsupc++/exception_ptr.h +++ b/libstdc++-v3/libsupc++/exception_ptr.h @@ -156,11 +156,13 @@ namespace std { __try { +#ifdef __EXCEPTIONS throw __ex; +#endif } __catch(...) { - return current_exception (); + return current_exception(); } } |