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/src | |
| parent | 23b5e150a2b4b405ec97a6ac8a24cd4adcf5c86c (diff) | |
| download | gcc-dd4f6b0f2a582152b7bb98141615dcbd6a0d9629.tar.gz | |
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/src')
| -rw-r--r-- | libstdc++-v3/src/c++11/future.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libstdc++-v3/src/c++11/future.cc b/libstdc++-v3/src/c++11/future.cc index 380c3a45185..eaea39375e7 100644 --- a/libstdc++-v3/src/c++11/future.cc +++ b/libstdc++-v3/src/c++11/future.cc @@ -22,6 +22,8 @@ // see the files COPYING3 and COPYING.RUNTIME respectively. If not, see // <http://www.gnu.org/licenses/>. +#define _GLIBCXX_ABI_COMPAT_ASYNC + #include <future> namespace @@ -86,6 +88,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __future_base::_State_base::~_State_base() = default; #ifdef _GLIBCXX_HAVE_TLS + // Exported for compatibility with ABI version 3.4.17 __future_base::_Async_state_common::~_Async_state_common() { _M_join(); } // Explicit instantiation due to -fno-implicit-instantiation. |