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/inc/osx/runinmain.hxx | |
| 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/inc/osx/runinmain.hxx')
| -rw-r--r-- | vcl/inc/osx/runinmain.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/inc/osx/runinmain.hxx b/vcl/inc/osx/runinmain.hxx index 287479981aa3..e68bc4d35010 100644 --- a/vcl/inc/osx/runinmain.hxx +++ b/vcl/inc/osx/runinmain.hxx @@ -72,7 +72,7 @@ union RuninmainResult DBG_TESTSOLARMUTEX(); \ SalYieldMutex *aMutex = static_cast<SalYieldMutex*>(instance->GetYieldMutex()); \ { \ - std::unique_lock<std::mutex> g(aMutex->m_runInMainMutex); \ + std::scoped_lock<std::mutex> g(aMutex->m_runInMainMutex); \ assert( !aMutex->m_aCodeBlock ); \ aMutex->m_aCodeBlock = Block_copy(^{ \ command; \ @@ -98,7 +98,7 @@ union RuninmainResult DBG_TESTSOLARMUTEX(); \ SalYieldMutex *aMutex = static_cast<SalYieldMutex*>(instance->GetYieldMutex()); \ { \ - std::unique_lock<std::mutex> g(aMutex->m_runInMainMutex); \ + std::scoped_lock<std::mutex> g(aMutex->m_runInMainMutex); \ assert( !aMutex->m_aCodeBlock ); \ aMutex->m_aCodeBlock = Block_copy(^{ \ aMutex->m_aResult.pointer = static_cast<void*>( command ); \ @@ -124,7 +124,7 @@ union RuninmainResult DBG_TESTSOLARMUTEX(); \ SalYieldMutex *aMutex = static_cast<SalYieldMutex*>(instance->GetYieldMutex()); \ { \ - std::unique_lock<std::mutex> g(aMutex->m_runInMainMutex); \ + std::scoped_lock<std::mutex> g(aMutex->m_runInMainMutex); \ assert( !aMutex->m_aCodeBlock ); \ aMutex->m_aCodeBlock = Block_copy(^{ \ aMutex->m_aResult.member = command; \ |