From 65dbcbfc58d55d7a7396f3c7c280afefabf34eb4 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noelgrandin@gmail.com>
Date: Thu, 23 Dec 2021 17:51:42 +0200
Subject: osl::Mutex->std::mutex in DAVSessionFactory

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

diff --git a/ucb/source/ucp/webdav-curl/DAVSessionFactory.cxx b/ucb/source/ucp/webdav-curl/DAVSessionFactory.cxx
index bbb7a48bcf0a..b89928b5d02b 100644
--- a/ucb/source/ucp/webdav-curl/DAVSessionFactory.cxx
+++ b/ucb/source/ucp/webdav-curl/DAVSessionFactory.cxx
@@ -34,7 +34,7 @@ rtl::Reference< DAVSession > DAVSessionFactory::createDAVSession(
                 const uno::Sequence< beans::NamedValue >& rFlags,
                 const uno::Reference< uno::XComponentContext > & rxContext )
 {
-    osl::MutexGuard aGuard( m_aMutex );
+    std::unique_lock aGuard( m_aMutex );
 
     if (!m_xProxyDecider)
         m_xProxyDecider.reset( new ucbhelper::InternetProxyDecider( rxContext ) );
@@ -79,7 +79,7 @@ rtl::Reference< DAVSession > DAVSessionFactory::createDAVSession(
 void DAVSessionFactory::releaseElement( DAVSession * pElement )
 {
     assert( pElement );
-    osl::MutexGuard aGuard( m_aMutex );
+    std::unique_lock aGuard( m_aMutex );
     if ( pElement->m_aContainerIt != m_aMap.end() )
         m_aMap.erase( pElement->m_aContainerIt );
 }
diff --git a/ucb/source/ucp/webdav-curl/DAVSessionFactory.hxx b/ucb/source/ucp/webdav-curl/DAVSessionFactory.hxx
index b0d426f43bf3..b931e1b4a8ec 100644
--- a/ucb/source/ucp/webdav-curl/DAVSessionFactory.hxx
+++ b/ucb/source/ucp/webdav-curl/DAVSessionFactory.hxx
@@ -24,7 +24,7 @@
 #endif
 #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>
@@ -61,7 +61,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;
 
     void releaseElement(DAVSession* pElement);
-- 
cgit