diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2022-05-12 20:46:55 +0100 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2022-05-13 20:40:05 +0100 |
| commit | 7f40ac326a1f347a826636bc392a4db185b78b95 (patch) | |
| tree | 70b98c6be22de0b26c81b6dd8ab32138724dacfe | |
| parent | 8659bcd6b7e692a9a516cd57bb19303a2efe78ba (diff) | |
| download | gcc-7f40ac326a1f347a826636bc392a4db185b78b95.zip gcc-7f40ac326a1f347a826636bc392a4db185b78b95.tar.gz gcc-7f40ac326a1f347a826636bc392a4db185b78b95.tar.bz2 | |
libstdc++: Make std::thread::_State private
* include/bits/std_thread.h (thread::_State, thread::_State_ptr):
Declare as private unless _GLIBCXX_THREAD_IMPL is defined.
* src/c++11/thread.cc (_GLIBCXX_THREAD_IMPL): Define.
| -rw-r--r-- | libstdc++-v3/include/bits/std_thread.h | 21 | ||||
| -rw-r--r-- | libstdc++-v3/src/c++11/thread.cc | 1 |
2 files changed, 13 insertions, 9 deletions
diff --git a/libstdc++-v3/include/bits/std_thread.h b/libstdc++-v3/include/bits/std_thread.h index f67bc11..d7fc012 100644 --- a/libstdc++-v3/include/bits/std_thread.h +++ b/libstdc++-v3/include/bits/std_thread.h @@ -79,15 +79,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { public: #ifdef _GLIBCXX_HAS_GTHREADS - // Abstract base class for types that wrap arbitrary functors to be - // invoked in the new thread of execution. - struct _State - { - virtual ~_State(); - virtual void _M_run() = 0; - }; - using _State_ptr = unique_ptr<_State>; - using native_handle_type = __gthread_t; #else using native_handle_type = int; @@ -216,6 +207,18 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION hardware_concurrency() noexcept; #ifdef _GLIBCXX_HAS_GTHREADS +#ifndef _GLIBCXX_THREAD_IMPL + private: +#endif + // Abstract base class for types that wrap arbitrary functors to be + // invoked in the new thread of execution. + struct _State + { + virtual ~_State(); + virtual void _M_run() = 0; + }; + using _State_ptr = unique_ptr<_State>; + private: template<typename _Callable> struct _State_impl : public _State diff --git a/libstdc++-v3/src/c++11/thread.cc b/libstdc++-v3/src/c++11/thread.cc index 669fbb0..707a4ad 100644 --- a/libstdc++-v3/src/c++11/thread.cc +++ b/libstdc++-v3/src/c++11/thread.cc @@ -24,6 +24,7 @@ #define _GLIBCXX_THREAD_ABI_COMPAT 1 +#define _GLIBCXX_THREAD_IMPL 1 #include <memory> // include this first so <thread> can use shared_ptr #include <thread> #include <system_error> |