summaryrefslogtreecommitdiff
path: root/src/player.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/player.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/player.h')
-rw-r--r--src/player.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/player.h b/src/player.h
index 3432069c0..00d27cb90 100644
--- a/src/player.h
+++ b/src/player.h
@@ -22,8 +22,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "irrlichttypes_bloated.h"
#include "inventory.h"
-#include "threading/mutex.h"
#include <list>
+#include <mutex>
#define PLAYERNAME_SIZE 20
@@ -186,7 +186,7 @@ private:
// Protect some critical areas
// hud for example can be modified by EmergeThread
// and ServerThread
- Mutex m_mutex;
+ std::mutex m_mutex;
};
#endif