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/threading/event.h | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'src/threading/event.h') diff --git a/src/threading/event.h b/src/threading/event.h index 79a99ce1f..458864c82 100644 --- a/src/threading/event.h +++ b/src/threading/event.h @@ -28,11 +28,8 @@ DEALINGS IN THE SOFTWARE. #include "threads.h" -#if USE_CPP11_MUTEX #include -#include "threading/mutex.h" #include "threading/mutex_auto_lock.h" -#endif /** A syncronization primitive that will wake up one waiting thread when signaled. * Calling @c signal() multiple times before a waiting thread has had a chance @@ -43,25 +40,13 @@ DEALINGS IN THE SOFTWARE. class Event { public: - Event(); -#ifndef USE_CPP11_MUTEX - ~Event(); -#endif void wait(); void signal(); private: -#if USE_CPP11_MUTEX std::condition_variable cv; - Mutex mutex; - bool notified; -#elif USE_WIN_MUTEX - HANDLE event; -#else - pthread_cond_t cv; - pthread_mutex_t mutex; - bool notified; -#endif + std::mutex mutex; + bool notified = false; }; #endif -- cgit v1.2.3