diff options
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-10-01 12:34:10 +0000 |
|---|---|---|
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-10-01 12:34:10 +0000 |
| commit | b14c3ddd1b8749827e97a72b0ccb84fc2d5edc15 (patch) | |
| tree | b8846cfc9da39aa7cfa941ad8b2fa2da3db5a631 /libstdc++-v3/include/std | |
| parent | 9b574f1ece055ed1ad5ba32bc9ce570e9d9e2b29 (diff) | |
| download | ppe42-gcc-b14c3ddd1b8749827e97a72b0ccb84fc2d5edc15.tar.gz ppe42-gcc-b14c3ddd1b8749827e97a72b0ccb84fc2d5edc15.zip | |
* include/std/mutex (try_lock): Do not swallow exceptions.
* testsuite/30_threads/try_lock/4.cc: Fix test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_9-branch@215755 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/std')
| -rw-r--r-- | libstdc++-v3/include/std/mutex | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libstdc++-v3/include/std/mutex b/libstdc++-v3/include/std/mutex index 8e9dd27e2b9..c6b7f1373fa 100644 --- a/libstdc++-v3/include/std/mutex +++ b/libstdc++-v3/include/std/mutex @@ -648,12 +648,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { int __idx; auto __locks = std::tie(__l1, __l2, __l3...); - __try - { __try_lock_impl<0>::__do_try_lock(__locks, __idx); } - __catch(const __cxxabiv1::__forced_unwind&) - { __throw_exception_again; } - __catch(...) - { } + __try_lock_impl<0>::__do_try_lock(__locks, __idx); return __idx; } |
