diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-06-06 14:34:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-06 14:34:14 +0200 |
| commit | b3dfe5332cd345c7f33b8a3828649122145f7a12 (patch) | |
| tree | 8cbde893ad87e4663946f35cc9d19f2b52fcf16b /src/threading/thread.h | |
| parent | a6678d6e5a46c847c298bdca01e4499b8d601337 (diff) | |
| download | dragonfireclient-b3dfe5332cd345c7f33b8a3828649122145f7a12.tar.xz | |
C++11 patchset 3: remove Atomic/GenericAtomic and use std::atomic (#5906)
Diffstat (limited to 'src/threading/thread.h')
| -rw-r--r-- | src/threading/thread.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/threading/thread.h b/src/threading/thread.h index 4785d3e03..671a9be0b 100644 --- a/src/threading/thread.h +++ b/src/threading/thread.h @@ -27,11 +27,12 @@ DEALINGS IN THE SOFTWARE. #define THREADING_THREAD_H #include "util/basic_macros.h" -#include "threading/atomic.h" #include "threading/mutex.h" #include "threads.h" #include <string> +#include <atomic> + #ifdef _AIX #include <sys/thread.h> // for tid_t #endif @@ -150,8 +151,8 @@ protected: private: void *m_retval; bool m_joinable; - Atomic<bool> m_request_stop; - Atomic<bool> m_running; + std::atomic<bool> m_request_stop; + std::atomic<bool> m_running; Mutex m_mutex; Mutex m_start_finished_mutex; |