From d4c0f91275fe70fef73b316c36abfb989dfd55b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Blot?= Date: Tue, 6 Jun 2017 16:29:28 +0200 Subject: Use C++11 mutexes only (remove compat code) (#5922) * Fix event LINT & remove default constructor/destructors * remove compat code & modernize autolock header --- src/script/cpp_api/s_async.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/script/cpp_api/s_async.h') 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 #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 jobQueue; // Mutex to protect result queue - Mutex resultQueueMutex; + std::mutex resultQueueMutex; // Result queue std::deque resultQueue; -- cgit v1.2.3