diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-12-21 17:25:53 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-01-01 07:14:38 +0100 |
| commit | 35c92336c5e1e81f87597350975296172bc36258 (patch) | |
| tree | 1cfebff5357ca2b5439ac1a9cb06e8a4a9aa5b0b /sw/source | |
| parent | 102a29d59a0a195ee42a52d5563adf99fa32a541 (diff) | |
osl::Mutex->std::mutex in SwThreadJoiner
Change-Id: Id0fb961e78c7db9e352babce12625ac355d99d51
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127810
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/core/docnode/swthreadjoiner.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/core/docnode/swthreadjoiner.cxx b/sw/source/core/docnode/swthreadjoiner.cxx index d506bb7f115b..6ff198d7dda3 100644 --- a/sw/source/core/docnode/swthreadjoiner.cxx +++ b/sw/source/core/docnode/swthreadjoiner.cxx @@ -20,7 +20,7 @@ #include <swthreadjoiner.hxx> #include <com/sun/star/util/JobManager.hpp> #include <comphelper/processfactory.hxx> -#include <osl/mutex.hxx> +#include <mutex> // Testing @@ -33,8 +33,8 @@ uno::Reference<util::XJobManager> pThreadJoiner; uno::Reference<util::XJobManager>& SwThreadJoiner::GetThreadJoiner() { - static osl::Mutex theJoinerMutex; - osl::MutexGuard aGuard(theJoinerMutex); + static std::mutex theJoinerMutex; + std::unique_lock aGuard(theJoinerMutex); if (!pThreadJoiner.is()) { |