[Libreoffice-commits] core.git: ucb/source

[Noel Grandin (via logerrit)]

 ucb/source/ucp/hierarchy/hierarchydatasource.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit c0ab666edcd3507961eda47d80efaba4f4da129d
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Wed Aug 4 21:47:49 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Aug 5 18:23:49 2021 +0200

    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 at collabora.co.uk>

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;