diff options
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-08-25 23:01:40 +0000 |
|---|---|---|
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-08-25 23:01:40 +0000 |
| commit | dd4f6b0f2a582152b7bb98141615dcbd6a0d9629 (patch) | |
| tree | 14a840fae3c8a2b3e7a91873a4133ad272af91d9 /libstdc++-v3/include/std/future | |
| parent | 23b5e150a2b4b405ec97a6ac8a24cd4adcf5c86c (diff) | |
| download | ppe42-gcc-dd4f6b0f2a582152b7bb98141615dcbd6a0d9629.tar.gz ppe42-gcc-dd4f6b0f2a582152b7bb98141615dcbd6a0d9629.zip | |
PR libstdc++/54297
* include/std/future (~_Async_state_impl): Join thread before
derived class members are destroyed.
(~_Async_state_common): Only define non-trivial destructor when
included from future.cc for ABI compatibility reasons.
* src/c++11/future.cc (_GLIBCXX_ABI_COMPAT_ASYNC): Define.
* testsuite/30_threads/async/54297.cc: New.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@190672 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/std/future')
| -rw-r--r-- | libstdc++-v3/include/std/future | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libstdc++-v3/include/std/future b/libstdc++-v3/include/std/future index a8d71121d9a..feae382fe00 100644 --- a/libstdc++-v3/include/std/future +++ b/libstdc++-v3/include/std/future @@ -1427,10 +1427,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION class __future_base::_Async_state_common : public __future_base::_State_base { protected: -#ifdef _GLIBCXX_HAVE_TLS +#if defined(_GLIBCXX_HAVE_TLS) && defined(_GLIBCXX_ABI_COMPAT_ASYNC) ~_Async_state_common(); #else - ~_Async_state_common() { _M_join(); } + ~_Async_state_common() = default; #endif // Allow non-timed waiting functions to block until the thread completes, @@ -1457,6 +1457,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } }; } + ~_Async_state_impl() { _M_join(); } + private: typedef __future_base::_Ptr<_Result<_Res>> _Ptr_type; _Ptr_type _M_result; |
