From 1460b6139de0305a33206d3106eaa925ac4ffcf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Thu, 16 Feb 2017 21:07:25 -0800 Subject: [PATCH] Cleanup. --- include/bx/mpscqueue.h | 2 +- include/bx/mutex.h | 22 ---------------------- include/bx/mutex.inl | 11 ----------- 3 files changed, 1 insertion(+), 34 deletions(-) diff --git a/include/bx/mpscqueue.h b/include/bx/mpscqueue.h index de4a664..324ceb4 100644 --- a/include/bx/mpscqueue.h +++ b/include/bx/mpscqueue.h @@ -29,7 +29,7 @@ namespace bx void push(Ty* _ptr) // producer only { - LwMutexScope lock(m_write); + MutexScope lock(m_write); m_queue.push(_ptr); } diff --git a/include/bx/mutex.h b/include/bx/mutex.h index eddcd03..6603cb4 100644 --- a/include/bx/mutex.h +++ b/include/bx/mutex.h @@ -57,28 +57,6 @@ namespace bx Mutex& m_mutex; }; - typedef Mutex LwMutex; - - /// - class LwMutexScope - { - BX_CLASS(LwMutexScope - , NO_DEFAULT_CTOR - , NO_COPY - , NO_ASSIGNMENT - ); - - public: - /// - LwMutexScope(LwMutex& _mutex); - - /// - ~LwMutexScope(); - - private: - LwMutex& m_mutex; - }; - } // namespace bx #include "mutex.inl" diff --git a/include/bx/mutex.inl b/include/bx/mutex.inl index 0d41402..0d086bd 100644 --- a/include/bx/mutex.inl +++ b/include/bx/mutex.inl @@ -20,15 +20,4 @@ namespace bx m_mutex.unlock(); } - inline LwMutexScope::LwMutexScope(LwMutex& _mutex) - : m_mutex(_mutex) - { - m_mutex.lock(); - } - - inline LwMutexScope::~LwMutexScope() - { - m_mutex.unlock(); - } - } // namespace bx