From d4c0f91275fe70fef73b316c36abfb989dfd55b1 Mon Sep 17 00:00:00 2001 From: Loïc Blot Date: Tue, 6 Jun 2017 16:29:28 +0200 Subject: Use C++11 mutexes only (remove compat code) (#5922) * Fix event LINT & remove default constructor/destructors * remove compat code & modernize autolock header --- src/settings.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/settings.h') 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 #include #include +#include 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; }; -- cgit v1.2.3