summaryrefslogtreecommitdiff
path: root/src/log.h
diff options
context:
space:
mode:
authorLoïc Blot <nerzhul@users.noreply.github.com>2017-06-06 16:29:28 +0200
committerGitHub <noreply@github.com>2017-06-06 16:29:28 +0200
commitd4c0f91275fe70fef73b316c36abfb989dfd55b1 (patch)
tree6bbd5ebbdbac352c2991854fd88d84abe3ac2224 /src/log.h
parent8bdde45895658f16aa6b2546ccb59c5c4c9fc699 (diff)
downloadminetest-d4c0f91275fe70fef73b316c36abfb989dfd55b1.tar.gz
minetest-d4c0f91275fe70fef73b316c36abfb989dfd55b1.tar.bz2
minetest-d4c0f91275fe70fef73b316c36abfb989dfd55b1.zip
Use C++11 mutexes only (remove compat code) (#5922)
* Fix event LINT & remove default constructor/destructors * remove compat code & modernize autolock header
Diffstat (limited to 'src/log.h')
-rw-r--r--src/log.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/log.h b/src/log.h
index 219255d9a..c017d127e 100644
--- a/src/log.h
+++ b/src/log.h
@@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <queue>
#include <string>
#include <fstream>
+#include <mutex>
#include "threads.h"
#include "irrlichttypes.h"
@@ -79,7 +80,7 @@ private:
// Works on all known architectures (x86, ARM, MIPS).
volatile bool m_silenced_levels[LL_MAX];
std::map<threadid_t, std::string> m_thread_names;
- mutable Mutex m_mutex;
+ mutable std::mutex m_mutex;
bool m_trace_enabled;
};