diff options
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/schedulerimpl.hxx | 17 | ||||
| -rw-r--r-- | vcl/inc/svdata.hxx | 4 |
2 files changed, 3 insertions, 18 deletions
diff --git a/vcl/inc/schedulerimpl.hxx b/vcl/inc/schedulerimpl.hxx index 26a9c47de11f..f6d5dda708bd 100644 --- a/vcl/inc/schedulerimpl.hxx +++ b/vcl/inc/schedulerimpl.hxx @@ -21,7 +21,6 @@ #define INCLUDED_VCL_INC_SCHEDULERIMPL_HXX #include "salwtype.hxx" -#include <osl/mutex.hxx> #include <vcl/scheduler.hxx> class Task; @@ -38,22 +37,6 @@ struct ImplSchedulerData final const char *GetDebugName() const; }; -class SchedulerMutex final -{ - // this simulates a non-recursive mutex - bool m_bIsLocked; - osl::Mutex m_aMutex; - -public: - SchedulerMutex() - : m_bIsLocked(false) - { - } - - void acquire(); - void release(); -}; - class SchedulerGuard final { public: diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index e7a423234043..564c28bdc9b0 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -38,6 +38,7 @@ #include "salwtype.hxx" #include "displayconnectiondispatch.hxx" +#include <mutex> #include <vector> #include <unordered_map> #include <boost/functional/hash.hpp> @@ -369,7 +370,8 @@ struct ImplSchedulerContext SalTimer* mpSalTimer = nullptr; ///< interface to sal event loop / system timer sal_uInt64 mnTimerStart = 0; ///< start time of the timer sal_uInt64 mnTimerPeriod = SAL_MAX_UINT64; ///< current timer period - SchedulerMutex maMutex; ///< lock counting mutex for scheduler locking + std::mutex maMutex; ///< the "scheduler mutex" (see + ///< vcl/README.scheduler) bool mbActive = true; ///< is the scheduler active? }; |