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/util/container.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/util/container.h') diff --git a/src/util/container.h b/src/util/container.h index 7f66b89ac..caaa1c328 100644 --- a/src/util/container.h +++ b/src/util/container.h @@ -22,7 +22,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "../irrlichttypes.h" #include "../exceptions.h" -#include "../threading/mutex.h" #include "../threading/mutex_auto_lock.h" #include "../threading/semaphore.h" #include @@ -117,7 +116,7 @@ public: private: std::map m_values; - mutable Mutex m_mutex; + mutable std::mutex m_mutex; }; @@ -225,12 +224,12 @@ public: } protected: - Mutex &getMutex() { return m_mutex; } + std::mutex &getMutex() { return m_mutex; } std::deque &getQueue() { return m_queue; } std::deque m_queue; - mutable Mutex m_mutex; + mutable std::mutex m_mutex; Semaphore m_signal; }; -- cgit v1.2.3