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/threading/mutex_auto_lock.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/threading/mutex_auto_lock.h')
-rw-r--r-- | src/threading/mutex_auto_lock.h | 40 |
1 files changed, 4 insertions, 36 deletions
diff --git a/src/threading/mutex_auto_lock.h b/src/threading/mutex_auto_lock.h index d79c68a93..c809ff8f5 100644 --- a/src/threading/mutex_auto_lock.h +++ b/src/threading/mutex_auto_lock.h @@ -23,40 +23,8 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef THREADING_MUTEX_AUTO_LOCK_H -#define THREADING_MUTEX_AUTO_LOCK_H - -#include "threads.h" - -#if USE_CPP11_MUTEX - #include <mutex> - using MutexAutoLock = std::unique_lock<std::mutex>; - using RecursiveMutexAutoLock = std::unique_lock<std::recursive_mutex>; -#else - -#include "threading/mutex.h" - - -class MutexAutoLock -{ -public: - MutexAutoLock(Mutex &m) : mutex(m) { mutex.lock(); } - ~MutexAutoLock() { mutex.unlock(); } - -private: - Mutex &mutex; -}; - -class RecursiveMutexAutoLock -{ -public: - RecursiveMutexAutoLock(RecursiveMutex &m) : mutex(m) { mutex.lock(); } - ~RecursiveMutexAutoLock() { mutex.unlock(); } - -private: - RecursiveMutex &mutex; -}; -#endif - -#endif +#pragma once +#include <mutex> +using MutexAutoLock = std::unique_lock<std::mutex>; +using RecursiveMutexAutoLock = std::unique_lock<std::recursive_mutex>; |