oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Use C++11 mutexes only (remove compat code) (#5922)

Browse source 
* Fix event LINT & remove default constructor/destructors
* remove compat code & modernize autolock header
This commit is contained in:
Loïc Blot 2017-06-06 16:29:28 +02:00 • committed by GitHub
parent 8bdde45895
commit d4c0f91275
36 changed files with 59 additions and 363 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/script/cpp_api/s_async.h
View file

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

3
src/script/cpp_api/s_base.h
View file

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