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/emerge.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/emerge.h')

diff --git a/src/emerge.h b/src/emerge.h
index 55be370d2..2b5d57434 100644
--- a/src/emerge.h
+++ b/src/emerge.h
@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define EMERGE_HEADER
 
 #include <map>
+#include <mutex>
 #include "irr_v3d.h"
 #include "util/container.h"
 #include "mapgen.h" // for MapgenParams
@@ -155,7 +156,7 @@ private:
 	std::vector<EmergeThread *> m_threads;
 	bool m_threads_active;
 
-	Mutex m_queue_mutex;
+	std::mutex m_queue_mutex;
 	std::map<v3s16, BlockEmergeData> m_blocks_enqueued;
 	std::unordered_map<u16, u16> m_peer_queue_count;
 
-- 
cgit v1.2.3