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

[Noel Grandin (via logerrit)]

 ucb/source/ucp/file/prov.cxx |    2 +-
 ucb/source/ucp/file/prov.hxx |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 949e6d0a6f2024a9d864fe1ed2d0d1d34838bde6
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Wed Aug 4 21:44:18 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Aug 5 22:28:18 2021 +0200

    osl::Mutex->std::mutex in fileaccess::FileProvider
    
    Change-Id: Ie110938cc7673739cc31588508987ca18617e5c9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120026
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx
index 9fa76da40c1a..dfc4e373d7b8 100644
--- a/ucb/source/ucp/file/prov.cxx
+++ b/ucb/source/ucp/file/prov.cxx
@@ -307,7 +307,7 @@ XPropertySetInfoImpl2::hasPropertyByName(
 
 void FileProvider::initProperties()
 {
-    osl::MutexGuard aGuard( m_aMutex );
+    std::scoped_lock aGuard( m_aMutex );
     if(  m_xPropertySetInfo.is() )
         return;
 
diff --git a/ucb/source/ucp/file/prov.hxx b/ucb/source/ucp/file/prov.hxx
index 84aeb43505ee..c12a87867224 100644
--- a/ucb/source/ucp/file/prov.hxx
+++ b/ucb/source/ucp/file/prov.hxx
@@ -19,7 +19,6 @@
 
 #pragma once
 
-#include <osl/mutex.hxx>
 #include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
@@ -32,6 +31,7 @@
 #include <com/sun/star/ucb/XFileIdentifierConverter.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <memory>
+#include <mutex>
 
 // FileProvider
 
@@ -145,7 +145,7 @@ namespace fileaccess {
         css::uno::Reference< css::uno::XComponentContext >      m_xContext;
 
         void initProperties();
-        osl::Mutex   m_aMutex;
+        std::mutex   m_aMutex;
         OUString m_HostName;
         OUString m_HomeDirectory;
         sal_Int32     m_FileSystemNotation;