diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-08-03 11:36:01 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-08-03 12:20:53 +0200 |
| commit | 05ab38359ae72f2a54dc0b5f1b84ac5f649c507a (patch) | |
| tree | 5830c7ee2442984e0bc804def7bd95ddd8a25410 /canvas | |
| parent | Pass context and resource string down to boost::locale separately (diff) | |
| download | core-05ab38359ae72f2a54dc0b5f1b84ac5f649c507a.tar.gz core-05ab38359ae72f2a54dc0b5f1b84ac5f649c507a.zip | |
Consolidate on C++17 std::scoped_lock instead of std::lock_guard
as in commit 9376f65a26240441bf9dd6ae1f69886dc9fa60fa
Change-Id: I3ad9afd4d113582a214a4a4bc7eea55e38cd6ff9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119927
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/factory/cf_service.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx index 6919d56fb219..8f16ce0db008 100644 --- a/canvas/source/factory/cf_service.cxx +++ b/canvas/source/factory/cf_service.cxx @@ -288,7 +288,7 @@ Reference<XInterface> CanvasFactory::lookupAndUse( OUString const & serviceName, Sequence<Any> const & args, Reference<XComponentContext> const & xContext ) const { - std::lock_guard guard(m_mutex); + std::scoped_lock guard(m_mutex); // forcing last entry from impl list, if config flag set bool bForceLastEntry(false); |