From b3dfe5332cd345c7f33b8a3828649122145f7a12 Mon Sep 17 00:00:00 2001
From: Loïc Blot <nerzhul@users.noreply.github.com>
Date: Tue, 6 Jun 2017 14:34:14 +0200
Subject: C++11 patchset 3: remove Atomic/GenericAtomic and use std::atomic
 (#5906)

---
 src/threading/thread.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/threading/thread.h')

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;
 
-- 
cgit v1.2.3