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

[Noel Grandin (via logerrit)]

 ucb/source/ucp/webdav-curl/DAVTypes.cxx      |    8 ++++----
 ucb/source/ucp/webdav-curl/DAVTypes.hxx      |    4 ++--
 ucb/source/ucp/webdav-curl/PropfindCache.cxx |    6 +++---
 ucb/source/ucp/webdav-curl/PropfindCache.hxx |    4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 1308bcda6fa8d682af01b6342deb0ec47ff314c0
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Thu Dec 23 17:50:21 2021 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Dec 27 17:04:37 2021 +0100

    osl::Mutex->std::mutex in DAVOptionsCache
    
    Change-Id: I4798f1e4de268522fe81505181ebde5fcacda55f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127589
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/ucb/source/ucp/webdav-curl/DAVTypes.cxx 
b/ucb/source/ucp/webdav-curl/DAVTypes.cxx
index 015c3520bf73..972f70cbc17a 100644
--- a/ucb/source/ucp/webdav-curl/DAVTypes.cxx
+++ b/ucb/source/ucp/webdav-curl/DAVTypes.cxx
@@ -104,7 +104,7 @@ DAVOptionsCache::~DAVOptionsCache()
 
 bool DAVOptionsCache::getDAVOptions( const OUString & rURL, DAVOptions & 
rDAVOptions )
 {
-    osl::MutexGuard aGuard( m_aMutex );
+    std::unique_lock aGuard( m_aMutex );
     OUString aEncodedUrl( ucb_impl::urihelper::encodeURI( DecodeURI(rURL) ) );
     normalizeURLLastChar( aEncodedUrl );
 
@@ -132,7 +132,7 @@ bool DAVOptionsCache::getDAVOptions( const OUString & rURL, 
DAVOptions & rDAVOpt
 
 void DAVOptionsCache::removeDAVOptions( const OUString & rURL )
 {
-    osl::MutexGuard aGuard( m_aMutex );
+    std::unique_lock aGuard( m_aMutex );
     OUString aEncodedUrl( ucb_impl::urihelper::encodeURI( DecodeURI(rURL) ) );
     normalizeURLLastChar( aEncodedUrl );
 
@@ -146,7 +146,7 @@ void DAVOptionsCache::removeDAVOptions( const OUString & 
rURL )
 
 void DAVOptionsCache::addDAVOptions( DAVOptions & rDAVOptions, const 
sal_uInt32 nLifeTime )
 {
-    osl::MutexGuard aGuard( m_aMutex );
+    std::unique_lock aGuard( m_aMutex );
     OUString aURL( rDAVOptions.getURL() );
 
     OUString aEncodedUrl( ucb_impl::urihelper::encodeURI( DecodeURI(aURL) ) );
@@ -175,7 +175,7 @@ void DAVOptionsCache::addDAVOptions( DAVOptions & 
rDAVOptions, const sal_uInt32
 
 void DAVOptionsCache::setHeadAllowed( const OUString & rURL, const bool 
HeadAllowed )
 {
-    osl::MutexGuard aGuard( m_aMutex );
+    std::unique_lock aGuard( m_aMutex );
     OUString aEncodedUrl( ucb_impl::urihelper::encodeURI( DecodeURI(rURL) ) );
     normalizeURLLastChar( aEncodedUrl );
 
diff --git a/ucb/source/ucp/webdav-curl/DAVTypes.hxx 
b/ucb/source/ucp/webdav-curl/DAVTypes.hxx
index e57e1f480fd7..7bf8bc37624e 100644
--- a/ucb/source/ucp/webdav-curl/DAVTypes.hxx
+++ b/ucb/source/ucp/webdav-curl/DAVTypes.hxx
@@ -23,7 +23,7 @@
 #include <memory>
 #include <list>
 #include <map>
-#include <osl/mutex.hxx>
+#include <mutex>
 #include <rtl/uri.hxx>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Any.hxx>
@@ -161,7 +161,7 @@ namespace http_dav_ucp
     class DAVOptionsCache
     {
         DAVOptionsMap m_aTheCache;
-        osl::Mutex         m_aMutex;
+        std::mutex    m_aMutex;
     public:
         explicit DAVOptionsCache();
         ~DAVOptionsCache();
commit a5e9a6ddda92f8f5c80d2a10ab048f87309d5755
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Thu Dec 23 17:48:37 2021 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Dec 27 17:04:29 2021 +0100

    osl::Mutex->std::mutex in PropertyNamesCache
    
    Change-Id: I9af4098a30383ce695147bf7e1442769b98f6fb1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127588
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/ucb/source/ucp/webdav-curl/PropfindCache.cxx 
b/ucb/source/ucp/webdav-curl/PropfindCache.cxx
index 4bf9bf933f0b..7196bd791d9c 100644
--- a/ucb/source/ucp/webdav-curl/PropfindCache.cxx
+++ b/ucb/source/ucp/webdav-curl/PropfindCache.cxx
@@ -42,7 +42,7 @@ namespace http_dav_ucp
     bool PropertyNamesCache::getCachedPropertyNames( const OUString& rURL, 
PropertyNames& rCacheElement )
     {
         // search the URL in the static map
-        osl::MutexGuard aGuard( m_aMutex );
+        std::unique_lock aGuard( m_aMutex );
         PropNameCache::const_iterator it;
         it = m_aTheCache.find( rURL );
         if ( it == m_aTheCache.end() )
@@ -66,7 +66,7 @@ namespace http_dav_ucp
 
     void PropertyNamesCache::removeCachedPropertyNames( const OUString& rURL )
     {
-        osl::MutexGuard aGuard( m_aMutex );
+        std::unique_lock aGuard( m_aMutex );
         PropNameCache::const_iterator it;
         it = m_aTheCache.find( rURL );
         if ( it != m_aTheCache.end() )
@@ -77,7 +77,7 @@ namespace http_dav_ucp
 
     void PropertyNamesCache::addCachePropertyNames( PropertyNames& 
rCacheElement, const sal_uInt32 nLifeTime )
     {
-        osl::MutexGuard aGuard( m_aMutex );
+        std::unique_lock aGuard( m_aMutex );
         OUString aURL( rCacheElement.getURL() );
         TimeValue t1;
         osl_getSystemTime( &t1 );
diff --git a/ucb/source/ucp/webdav-curl/PropfindCache.hxx 
b/ucb/source/ucp/webdav-curl/PropfindCache.hxx
index 4f7b66563818..1f4d68afd688 100644
--- a/ucb/source/ucp/webdav-curl/PropfindCache.hxx
+++ b/ucb/source/ucp/webdav-curl/PropfindCache.hxx
@@ -12,7 +12,7 @@
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
-#include <osl/mutex.hxx>
+#include <mutex>
 #include <list>
 #include <map>
 #include <vector>
@@ -63,7 +63,7 @@ namespace http_dav_ucp
     class PropertyNamesCache
     {
         PropNameCache       m_aTheCache;
-        osl::Mutex          m_aMutex;
+        std::mutex          m_aMutex;
 
     public:
         PropertyNamesCache();