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/emerge.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/emerge.h')
| -rw-r--r-- | src/emerge.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/emerge.h b/src/emerge.h index 55be370d2..2b5d57434 100644 --- a/src/emerge.h +++ b/src/emerge.h @@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #define EMERGE_HEADER #include <map> +#include <mutex> #include "irr_v3d.h" #include "util/container.h" #include "mapgen.h" // for MapgenParams @@ -155,7 +156,7 @@ private: std::vector<EmergeThread *> m_threads; bool m_threads_active; - Mutex m_queue_mutex; + std::mutex m_queue_mutex; std::map<v3s16, BlockEmergeData> m_blocks_enqueued; std::unordered_map<u16, u16> m_peer_queue_count; |