From 43d6a33dddd339b0bc8d42fece9e22dc44c9da57 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noelgrandin@gmail.com>
Date: Thu, 5 Aug 2021 20:36:28 +0200
Subject: osl::Mutex->std::mutex in DAVSessionFactory

Change-Id: I1fa55f09e3a9d398a61856986cb0a91e225c7b79
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120087
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx | 4 ++--
 ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx b/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx
index fd6fca081e80..d58171bdef6e 100644
--- a/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx
+++ b/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx
@@ -44,7 +44,7 @@ rtl::Reference< DAVSession > DAVSessionFactory::createDAVSession(
                 const uno::Sequence< beans::NamedValue >& rFlags,
                 const uno::Reference< uno::XComponentContext > & rxContext )
 {
-    osl::MutexGuard aGuard( m_aMutex );
+    std::scoped_lock aGuard( m_aMutex );
 
     m_xContext = rxContext;
 
@@ -91,7 +91,7 @@ rtl::Reference< DAVSession > DAVSessionFactory::createDAVSession(
 void DAVSessionFactory::releaseElement( DAVSession const * pElement )
 {
     OSL_ASSERT( pElement );
-    osl::MutexGuard aGuard( m_aMutex );
+    std::scoped_lock aGuard( m_aMutex );
     if ( pElement->m_aContainerIt != m_aMap.end() )
         m_aMap.erase( pElement->m_aContainerIt );
 }
diff --git a/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx b/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx
index eac25471e826..fd185d11ae8a 100644
--- a/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx
@@ -33,7 +33,7 @@
 #include <config_lgpl.h>
 #include <map>
 #include <memory>
-#include <osl/mutex.hxx>
+#include <mutex>
 #include <salhelper/simplereferenceobject.hxx>
 #include <rtl/ref.hxx>
 #include <com/sun/star/uno/Reference.hxx>
@@ -70,7 +70,7 @@ private:
     typedef std::map< OUString, DAVSession * > Map;
 
     Map m_aMap;
-    osl::Mutex m_aMutex;
+    std::mutex m_aMutex;
     std::unique_ptr< ucbhelper::InternetProxyDecider > m_xProxyDecider;
 
     ::uno::Reference< ::uno::XComponentContext > m_xContext;
-- 
cgit