diff options
| author | ShadowNinja <shadowninja@minetest.net> | 2015-04-07 06:13:12 -0400 |
|---|---|---|
| committer | ShadowNinja <shadowninja@minetest.net> | 2015-08-23 22:04:06 -0400 |
| commit | e4bff8be94c0db4f94e63ad448d0eeb869ccdbbd (patch) | |
| tree | 7935586e79da5c8c7144e345a8c0fc1cda53beed /src/clientmap.h | |
| parent | 6a1047d8c116f793890b63427d53f04ceca95d54 (diff) | |
| download | minetest-e4bff8be94c0db4f94e63ad448d0eeb869ccdbbd.tar.gz minetest-e4bff8be94c0db4f94e63ad448d0eeb869ccdbbd.tar.bz2 minetest-e4bff8be94c0db4f94e63ad448d0eeb869ccdbbd.zip | |
Clean up threading
* Rename everything.
* Strip J prefix.
* Change UpperCamelCase functions to lowerCamelCase.
* Remove global (!) semaphore count mutex on OSX.
* Remove semaphore count getter (unused, unsafe, depended on internal
API functions on Windows, and used a hack on OSX).
* Add `Atomic<type>`.
* Make `Thread` handle thread names.
* Add support for C++11 multi-threading.
* Combine pthread and win32 sources.
* Remove `ThreadStarted` (unused, unneeded).
* Move some includes from the headers to the sources.
* Move all of `Event` into its header (allows inlining with no new includes).
* Make `Event` use `Semaphore` (except on Windows).
* Move some porting functions into `Thread`.
* Integrate logging with `Thread`.
* Add threading test.
Diffstat (limited to 'src/clientmap.h')
| -rw-r--r-- | src/clientmap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/clientmap.h b/src/clientmap.h index 492e23fa5..54d1dc96d 100644 --- a/src/clientmap.h +++ b/src/clientmap.h @@ -89,7 +89,7 @@ public: void updateCamera(v3f pos, v3f dir, f32 fov, v3s16 offset) { - JMutexAutoLock lock(m_camera_mutex); + MutexAutoLock lock(m_camera_mutex); m_camera_position = pos; m_camera_direction = dir; m_camera_fov = fov; @@ -149,7 +149,7 @@ private: v3f m_camera_direction; f32 m_camera_fov; v3s16 m_camera_offset; - JMutex m_camera_mutex; + Mutex m_camera_mutex; std::map<v3s16, MapBlock*> m_drawlist; |