From be38506d7c74405ca24bd4eb02ddcf2de466dd30 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Sun, 5 Feb 2012 23:55:51 +0000 Subject: re PR libstdc++/52104 (go1 fails to run on Solaris 10/11 x86 with with gld) PR libstdc++/52104 * include/std/future (__future_base::_Async_state_common): Define destructor inline for targets without TLS. * src/c++11/future.cc (__future_base::_Async_state_common): Only define destructor for TLS targets. From-SVN: r183920 --- libstdc++-v3/include/std/future | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libstdc++-v3/include/std') diff --git a/libstdc++-v3/include/std/future b/libstdc++-v3/include/std/future index 1093e3f1bb4..962400bda65 100644 --- a/libstdc++-v3/include/std/future +++ b/libstdc++-v3/include/std/future @@ -1425,7 +1425,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION class __future_base::_Async_state_common : public __future_base::_State_base { protected: +#ifdef _GLIBCXX_HAVE_TLS ~_Async_state_common(); +#else + ~_Async_state_common() { _M_join(); } +#endif // Allow non-timed waiting functions to block until the thread completes, // as if joined. -- cgit v1.2.1