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/mesh_generator_thread.h | |
| parent | 8bdde45895658f16aa6b2546ccb59c5c4c9fc699 (diff) | |
| download | minetest-d4c0f91275fe70fef73b316c36abfb989dfd55b1.tar.xz | |
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/mesh_generator_thread.h')
| -rw-r--r-- | src/mesh_generator_thread.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesh_generator_thread.h b/src/mesh_generator_thread.h index 6edb6906d..3ac086e30 100644 --- a/src/mesh_generator_thread.h +++ b/src/mesh_generator_thread.h @@ -20,6 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef MESH_GENERATOR_THREAD_HEADER #define MESH_GENERATOR_THREAD_HEADER +#include <mutex> #include "mapblock_mesh.h" #include "threading/mutex_auto_lock.h" #include "util/thread.h" @@ -83,7 +84,7 @@ private: std::vector<QueuedMeshUpdate *> m_queue; std::set<v3s16> m_urgents; std::map<v3s16, CachedMapBlockData *> m_cache; - Mutex m_mutex; + std::mutex m_mutex; // TODO: Add callback to update these when g_settings changes bool m_cache_enable_shaders; |