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/settings.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/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 e570c1a84..d1edca6b6 100644 --- a/src/settings.h +++ b/src/settings.h @@ -22,10 +22,10 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "irrlichttypes_bloated.h" #include "util/string.h" -#include "threading/mutex.h" #include <string> #include <list> #include <set> +#include <mutex> class Settings; struct NoiseParams; @@ -232,10 +232,10 @@ private: SettingsCallbackMap m_callbacks; - mutable Mutex m_callback_mutex; + mutable std::mutex m_callback_mutex; // All methods that access m_settings/m_defaults directly should lock this. - mutable Mutex m_mutex; + mutable std::mutex m_mutex; }; |