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 /bridges | |
| 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 'bridges')
| -rw-r--r-- | bridges/source/cpp_uno/shared/vtablefactory.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx b/bridges/source/cpp_uno/shared/vtablefactory.cxx index a74d75ed1f28..a8aa7a9c2bfa 100644 --- a/bridges/source/cpp_uno/shared/vtablefactory.cxx +++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx @@ -214,7 +214,7 @@ VtableFactory::VtableFactory(): m_arena( VtableFactory::~VtableFactory() { { - std::lock_guard guard(m_mutex); + std::scoped_lock guard(m_mutex); for (const auto& rEntry : m_map) { for (sal_Int32 j = 0; j < rEntry.second.count; ++j) { freeBlock(rEntry.second.blocks[j]); @@ -228,7 +228,7 @@ const VtableFactory::Vtables& VtableFactory::getVtables( typelib_InterfaceTypeDescription * type) { OUString name(type->aBase.pTypeName); - std::lock_guard guard(m_mutex); + std::scoped_lock guard(m_mutex); Map::iterator i(m_map.find(name)); if (i == m_map.end()) { GuardedBlocks blocks(*this); |