diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-11-21 12:35:24 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-11-21 15:47:05 +0100 |
| commit | c3b968a2f1e8e824ace86c37d0e500440374bd09 (patch) | |
| tree | f340cb9ddb5538b81d167e0d7552d7dd6b077493 /framework | |
| parent | 805fd18d934c7323f678eb4df2f4b770ea8184f1 (diff) | |
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 <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/helper/statusindicatorfactory.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
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 <comphelper/sequenceashashmap.hxx> #include <unotools/mediadescriptor.hxx> #include <vcl/svapp.hxx> -#include <osl/mutex.hxx> +#include <mutex> #include <rtl/ref.hxx> #include <officecfg/Office/Common.hxx> @@ -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; } |