diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-06-20 09:03:25 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-06-20 10:19:33 +0200 |
| commit | 6ad13e0e5d1caa8e1ffcf7092e1c04011b5df055 (patch) | |
| tree | 7c23a0cecafd94959d26909cfe0199f5e7f20253 /vcl/osx | |
| parent | b520005b1d42ce80296cbbc6b4fc3cc5e5d8cae0 (diff) | |
Demote from std::unique_lock to std::scoped_lock where applicable
Change-Id: I53a019f05978bab62ad0da3d0eb08f37f8ec1e18
Reviewed-on: https://gerrit.libreoffice.org/74414
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl/osx')
| -rw-r--r-- | vcl/osx/salinst.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx index b31f870d9e12..6ed28b7a1d5a 100644 --- a/vcl/osx/salinst.cxx +++ b/vcl/osx/salinst.cxx @@ -232,7 +232,7 @@ void SalYieldMutex::doAcquire( sal_uInt32 nLockCount ) block(); pInst->mbNoYieldLock = false; Block_release( block ); - std::unique_lock<std::mutex> g(m_runInMainMutex); + std::scoped_lock<std::mutex> g(m_runInMainMutex); assert(!m_resultReady); m_resultReady = true; m_aResultCondition.notify_all(); @@ -255,7 +255,7 @@ sal_uInt32 SalYieldMutex::doRelease( const bool bUnlockAll ) return 1; sal_uInt32 nCount; { - std::unique_lock<std::mutex> g(m_runInMainMutex); + std::scoped_lock<std::mutex> g(m_runInMainMutex); // read m_nCount before doRelease bool const isReleased(bUnlockAll || m_nCount == 1); nCount = comphelper::SolarMutex::doRelease( bUnlockAll ); |