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/settings.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/settings.h')
| -rw-r--r-- | src/settings.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/settings.h b/src/settings.h index d41f134cd..80d41fd79 100644 --- a/src/settings.h +++ b/src/settings.h @@ -22,7 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "irrlichttypes_bloated.h" #include "util/string.h" -#include "jthread/jmutex.h" +#include "threading/mutex.h" #include <string> #include <map> #include <list> @@ -225,8 +225,8 @@ private: std::map<std::string, std::vector<std::pair<setting_changed_callback,void*> > > m_callbacks; - mutable JMutex m_callbackMutex; - mutable JMutex m_mutex; // All methods that access m_settings/m_defaults directly should lock this. + mutable Mutex m_callbackMutex; + mutable Mutex m_mutex; // All methods that access m_settings/m_defaults directly should lock this. }; |