From d4c0f91275fe70fef73b316c36abfb989dfd55b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Blot?= <nerzhul@users.noreply.github.com>
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 +++----
 src/util/numeric.h   | 1 -
 src/util/thread.h    | 3 +--
 3 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'src/util')

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 <list>
@@ -117,7 +116,7 @@ public:
 
 private:
 	std::map<Key, Value> 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<T> &getQueue() { return m_queue; }
 
 	std::deque<T> m_queue;
-	mutable Mutex m_mutex;
+	mutable std::mutex m_mutex;
 	Semaphore m_signal;
 };
 
diff --git a/src/util/numeric.h b/src/util/numeric.h
index 4a27f657d..3b1b85f64 100644
--- a/src/util/numeric.h
+++ b/src/util/numeric.h
@@ -25,7 +25,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "../irr_v2d.h"
 #include "../irr_v3d.h"
 #include "../irr_aabb3d.h"
-#include "../threading/mutex.h"
 
 #define rangelim(d, min, max) ((d) < (min) ? (min) : ((d) > (max) ? (max) : (d)))
 #define myfloor(x) ((x) < 0.0 ? (int)(x) - 1 : (int)(x))
diff --git a/src/util/thread.h b/src/util/thread.h
index b96f302f6..201d09a08 100644
--- a/src/util/thread.h
+++ b/src/util/thread.h
@@ -22,7 +22,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "../irrlichttypes.h"
 #include "../threading/thread.h"
-#include "../threading/mutex.h"
 #include "../threading/mutex_auto_lock.h"
 #include "porting.h"
 #include "log.h"
@@ -51,7 +50,7 @@ public:
 	// You pretty surely want to grab the lock when accessing this
 	T m_value;
 private:
-	Mutex m_mutex;
+	std::mutex m_mutex;
 };
 
 /*
-- 
cgit v1.2.3