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/environment.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/environment.h')
| -rw-r--r-- | src/environment.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/environment.h b/src/environment.h index ff3942599..4c00ef9e8 100644 --- a/src/environment.h +++ b/src/environment.h @@ -34,10 +34,10 @@ with this program; if not, write to the Free Software Foundation, Inc., #include <queue> #include <map> #include <atomic> +#include <mutex> #include "irr_v3d.h" #include "activeobject.h" #include "util/numeric.h" -#include "threading/mutex.h" #include "network/networkprotocol.h" // for AccessDeniedCode class IGameDef; @@ -120,7 +120,7 @@ protected: IGameDef *m_gamedef; private: - Mutex m_time_lock; + std::mutex m_time_lock; DISABLE_CLASS_COPY(Environment); }; |