luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-14 09:05:19 +02:00
Code Activity

Use C++11 mutexes only (remove compat code) (#5922)

Browse Source 
* Fix event LINT & remove default constructor/destructors
* remove compat code & modernize autolock header
This commit is contained in:
Loïc Blot
2017-06-06 16:29:28 +02:00
committed by GitHub
parent 8bdde45895
commit d4c0f91275
36 changed files with 59 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/minimap.h
View File

@@ -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;
};