diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-06-06 16:29:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-06 16:29:28 +0200 |
| commit | d4c0f91275fe70fef73b316c36abfb989dfd55b1 (patch) | |
| tree | 6bbd5ebbdbac352c2991854fd88d84abe3ac2224 /src/threading/thread.h | |
| parent | 8bdde45895658f16aa6b2546ccb59c5c4c9fc699 (diff) | |
| download | minetest-d4c0f91275fe70fef73b316c36abfb989dfd55b1.tar.gz minetest-d4c0f91275fe70fef73b316c36abfb989dfd55b1.tar.bz2 minetest-d4c0f91275fe70fef73b316c36abfb989dfd55b1.zip | |
Use C++11 mutexes only (remove compat code) (#5922)
* Fix event LINT & remove default constructor/destructors
* remove compat code & modernize autolock header
Diffstat (limited to 'src/threading/thread.h')
| -rw-r--r-- | src/threading/thread.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/threading/thread.h b/src/threading/thread.h index 671a9be0b..ab943f094 100644 --- a/src/threading/thread.h +++ b/src/threading/thread.h @@ -27,11 +27,11 @@ DEALINGS IN THE SOFTWARE. #define THREADING_THREAD_H #include "util/basic_macros.h" -#include "threading/mutex.h" #include "threads.h" #include <string> #include <atomic> +#include <mutex> #ifdef _AIX #include <sys/thread.h> // for tid_t @@ -153,8 +153,8 @@ private: bool m_joinable; std::atomic<bool> m_request_stop; std::atomic<bool> m_running; - Mutex m_mutex; - Mutex m_start_finished_mutex; + std::mutex m_mutex; + std::mutex m_start_finished_mutex; #if USE_CPP11_THREADS std::thread *m_thread_obj; |