oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-07-02 16:38:41 +00:00
Code Wiki Activity

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

Browse source
This commit is contained in:
Loïc Blot 2017-06-06 14:34:14 +02:00 • committed by GitHub
parent a6678d6e5a
commit b3dfe5332c
4 changed files with 11 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/threading/thread.h
View file

@ -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;