diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-06-06 16:29:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-06 16:29:28 +0200 |
| commit | d4c0f91275fe70fef73b316c36abfb989dfd55b1 (patch) | |
| tree | 6bbd5ebbdbac352c2991854fd88d84abe3ac2224 /src/clientiface.h | |
| parent | 8bdde45895658f16aa6b2546ccb59c5c4c9fc699 (diff) | |
| download | minetest-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/clientiface.h')
| -rw-r--r-- | src/clientiface.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/clientiface.h b/src/clientiface.h index 107ed3bf3..edcd91ef3 100644 --- a/src/clientiface.h +++ b/src/clientiface.h @@ -23,13 +23,13 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "constants.h" #include "serialization.h" // for SER_FMT_VER_INVALID -#include "threading/mutex.h" #include "network/networkpacket.h" #include "porting.h" #include <list> #include <vector> #include <set> +#include <mutex> class MapBlock; class ServerEnvironment; @@ -508,14 +508,14 @@ private: // Connection con::Connection* m_con; - Mutex m_clients_mutex; + std::mutex m_clients_mutex; // Connected clients (behind the con mutex) RemoteClientMap m_clients; std::vector<std::string> m_clients_names; //for announcing masterserver // Environment ServerEnvironment *m_env; - Mutex m_env_mutex; + std::mutex m_env_mutex; float m_print_info_timer; |