summaryrefslogtreecommitdiff
path: root/src/threading/thread.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/threading/thread.h')
-rw-r--r--src/threading/thread.h7
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;