From c3b968a2f1e8e824ace86c37d0e500440374bd09 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sun, 21 Nov 2021 12:35:24 +0200 Subject: osl::Mutex->std::mutex in StatusIndicatorFactory Change-Id: I2365e172ef8d631f30cfffdb650ebcb3035f77f4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125620 Tested-by: Jenkins Reviewed-by: Noel Grandin --- framework/source/helper/statusindicatorfactory.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'framework') diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx index 285d53fb683f..0a87c9bea258 100644 --- a/framework/source/helper/statusindicatorfactory.cxx +++ b/framework/source/helper/statusindicatorfactory.cxx @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include @@ -512,15 +512,15 @@ void StatusIndicatorFactory::impl_reschedule(bool bForce) if (!bReschedule) return; - static osl::Mutex rescheduleLock; + static std::mutex rescheduleLock; // SAFE -> - osl::ResettableMutexGuard aRescheduleGuard(rescheduleLock); + std::unique_lock aRescheduleGuard(rescheduleLock); if (m_nInReschedule != 0) return; ++m_nInReschedule; - aRescheduleGuard.clear(); + aRescheduleGuard.unlock(); // <- SAFE { @@ -529,7 +529,7 @@ void StatusIndicatorFactory::impl_reschedule(bool bForce) } // SAFE -> - aRescheduleGuard.reset(); + aRescheduleGuard.lock(); --m_nInReschedule; } -- cgit