diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-08-04 21:47:49 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-08-05 18:23:49 +0200 |
| commit | c0ab666edcd3507961eda47d80efaba4f4da129d (patch) | |
| tree | fe8fb2e808ff2378739ffe9776b057ffc97a61c5 | |
| parent | osl::Mutex->std::mutex in SidebarWinAccessibleContext (diff) | |
| download | core-c0ab666edcd3507961eda47d80efaba4f4da129d.tar.gz core-c0ab666edcd3507961eda47d80efaba4f4da129d.zip | |
osl::Mutex->std::mutex in HierarchyDataAccess
Change-Id: I267c4efcedba5904b3b373f0b9ff3460731b7011
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120027
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | ucb/source/ucp/hierarchy/hierarchydatasource.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx index 5970ba178a7d..a74524e70f35 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx @@ -40,6 +40,7 @@ #include <com/sun/star/util/XChangesNotifier.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <ucbhelper/macros.hxx> +#include <mutex> using namespace com::sun::star; using namespace hierarchy_ucp; @@ -72,7 +73,7 @@ class HierarchyDataAccess : public cppu::OWeakObject, public util::XChangesNotifier, public util::XChangesBatch { - osl::Mutex m_aMutex; + std::mutex m_aMutex; uno::Reference< uno::XInterface > m_xConfigAccess; uno::Reference< lang::XComponent > m_xCfgC; uno::Reference< lang::XSingleServiceFactory > m_xCfgSSF; @@ -478,7 +479,7 @@ css::uno::Reference<T> HierarchyDataAccess::ensureOrigInterface(css::uno::Refere { if ( x.is() ) return x; - osl::Guard< osl::Mutex > aGuard( m_aMutex ); + std::scoped_lock aGuard( m_aMutex ); if ( !x.is() ) x.set( m_xConfigAccess, uno::UNO_QUERY ); return x; |