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/script | |
| 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/script')
| -rw-r--r-- | src/script/cpp_api/s_async.h | 5 | ||||
| -rw-r--r-- | src/script/cpp_api/s_base.h | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/script/cpp_api/s_async.h b/src/script/cpp_api/s_async.h index dbe0654e2..45f935d0a 100644 --- a/src/script/cpp_api/s_async.h +++ b/src/script/cpp_api/s_async.h @@ -25,7 +25,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include <map> #include "threading/thread.h" -#include "threading/mutex.h" #include "threading/semaphore.h" #include "debug.h" #include "lua.h" @@ -147,13 +146,13 @@ private: unsigned int jobIdCounter; // Mutex to protect job queue - Mutex jobQueueMutex; + std::mutex jobQueueMutex; // Job queue std::deque<LuaJobInfo> jobQueue; // Mutex to protect result queue - Mutex resultQueueMutex; + std::mutex resultQueueMutex; // Result queue std::deque<LuaJobInfo> resultQueue; diff --git a/src/script/cpp_api/s_base.h b/src/script/cpp_api/s_base.h index 5b047a081..e0f6b23ae 100644 --- a/src/script/cpp_api/s_base.h +++ b/src/script/cpp_api/s_base.h @@ -29,7 +29,6 @@ extern "C" { #include "irrlichttypes.h" #include "threads.h" -#include "threading/mutex.h" #include "threading/mutex_auto_lock.h" #include "common/c_types.h" #include "common/c_internal.h" @@ -116,7 +115,7 @@ protected: void objectrefGetOrCreate(lua_State *L, ServerActiveObject *cobj); - RecursiveMutex m_luastackmutex; + std::recursive_mutex m_luastackmutex; std::string m_last_run_mod; bool m_secure; #ifdef SCRIPTAPI_LOCK_DEBUG |