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/minimap.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/minimap.h')
| -rw-r--r-- | src/minimap.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/minimap.h b/src/minimap.h index c50530335..58d05d668 100644 --- a/src/minimap.h +++ b/src/minimap.h @@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "irrlichttypes_extrabloated.h" #include "client.h" #include "voxel.h" -#include "threading/mutex.h" #include "threading/semaphore.h" #include <map> #include <string> @@ -112,7 +111,7 @@ protected: virtual void doUpdate(); private: - Mutex m_queue_mutex; + std::mutex m_queue_mutex; std::deque<QueuedMinimapUpdate> m_update_queue; std::map<v3s16, MinimapMapblock *> m_blocks_cache; }; @@ -161,7 +160,7 @@ private: bool m_enable_shaders; u16 m_surface_mode_scan_height; f32 m_angle; - Mutex m_mutex; + std::mutex m_mutex; std::list<v2f> m_active_markers; }; |