C++11 patchset 3: remove Atomic/GenericAtomic and use std::atomic (#5906)

nerzhul · web-flow · commit b3dfe5332cd3 · 2017-06-06T14:34:14.000+02:00
diff --git a/src/environment.h b/src/environment.h
@@ -33,11 +33,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <list>
 #include <queue>
 #include <map>
+#include <atomic>
 #include "irr_v3d.h"
 #include "activeobject.h"
 #include "util/numeric.h"
 #include "threading/mutex.h"
-#include "threading/atomic.h"
 #include "network/networkprotocol.h" // for AccessDeniedCode
 
 class IGameDef;
@@ -81,7 +81,7 @@ class Environment
 	IGameDef *getGameDef() { return m_gamedef; }
 
 protected:
-	GenericAtomic<float> m_time_of_day_speed;
+	std::atomic<float> m_time_of_day_speed;
 
 	/*
 	 * Below: values managed by m_time_lock
@@ -98,7 +98,7 @@ class Environment
 	u32 m_day_night_ratio_override;
 	// Days from the server start, accounts for time shift
 	// in game (e.g. /time or bed usage)
-	Atomic<u32> m_day_count;
+	std::atomic<u32> m_day_count;
 	/*
 	 * Above: values managed by m_time_lock
 	*/
diff --git a/src/threading/atomic.h b/src/threading/atomic.h
diff --git 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 @@ class Thread {
 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;
 
diff --git a/src/unittest/test_threading.cpp b/src/unittest/test_threading.cpp
@@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "test.h"
 
-#include "threading/atomic.h"
+#include <atomic>
 #include "threading/semaphore.h"
 #include "threading/thread.h"
 
@@ -137,7 +137,7 @@ void TestThreading::testThreadKill()
 
 class AtomicTestThread : public Thread {
 public:
-	AtomicTestThread(Atomic<u32> &v, Semaphore &trigger) :
+	AtomicTestThread(std::atomic<u32> &v, Semaphore &trigger) :
 		Thread("AtomicTest"),
 		val(v),
 		trigger(trigger)
@@ -153,14 +153,14 @@ class AtomicTestThread : public Thread {
 		return NULL;
 	}
 
-	Atomic<u32> &val;
+	std::atomic<u32> &val;
 	Semaphore &trigger;
 };
 
 
 void TestThreading::testAtomicSemaphoreThread()
 {
-	Atomic<u32> val;
+	std::atomic<u32> val;
 	val = 0;
 	Semaphore trigger;
 	static const u8 num_threads = 4;
