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

[Noel Grandin (via logerrit)]

 ucb/source/ucp/webdav-neon/PropfindCache.cxx |    6 +++---
 ucb/source/ucp/webdav-neon/PropfindCache.hxx |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit c74c5a79f138dfba6a63aa8bbecf6f9d01443cee
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Wed Aug 4 18:21:32 2021 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Aug 4 21:00:50 2021 +0200

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

diff --git a/ucb/source/ucp/webdav-neon/PropfindCache.cxx 
b/ucb/source/ucp/webdav-neon/PropfindCache.cxx
index a54003661ec0..63cdff370c40 100644
--- a/ucb/source/ucp/webdav-neon/PropfindCache.cxx
+++ b/ucb/source/ucp/webdav-neon/PropfindCache.cxx
@@ -42,7 +42,7 @@ namespace webdav_ucp
     bool PropertyNamesCache::getCachedPropertyNames( const OUString& rURL, 
PropertyNames& rCacheElement )
     {
         // search the URL in the static map
-        osl::MutexGuard aGuard( m_aMutex );
+        std::scoped_lock aGuard( m_aMutex );
         PropNameCache::const_iterator it = m_aTheCache.find( rURL );
         if ( it == m_aTheCache.end() )
             return false;
@@ -65,7 +65,7 @@ namespace webdav_ucp
 
     void PropertyNamesCache::removeCachedPropertyNames( const OUString& rURL )
     {
-        osl::MutexGuard aGuard( m_aMutex );
+        std::scoped_lock aGuard( m_aMutex );
         PropNameCache::const_iterator it = m_aTheCache.find( rURL );
         if ( it != m_aTheCache.end() )
         {
@@ -75,7 +75,7 @@ namespace webdav_ucp
 
     void PropertyNamesCache::addCachePropertyNames( PropertyNames& 
rCacheElement )
     {
-        osl::MutexGuard aGuard( m_aMutex );
+        std::scoped_lock aGuard( m_aMutex );
         OUString aURL( rCacheElement.getURL() );
         TimeValue t1;
         osl_getSystemTime( &t1 );
diff --git a/ucb/source/ucp/webdav-neon/PropfindCache.hxx 
b/ucb/source/ucp/webdav-neon/PropfindCache.hxx
index 368c28193baf..b2e4008dc682 100644
--- a/ucb/source/ucp/webdav-neon/PropfindCache.hxx
+++ b/ucb/source/ucp/webdav-neon/PropfindCache.hxx
@@ -11,7 +11,7 @@
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
-#include <osl/mutex.hxx>
+#include <mutex>
 #include <map>
 #include <vector>
 
@@ -61,7 +61,7 @@ namespace webdav_ucp
     class PropertyNamesCache final
     {
         PropNameCache       m_aTheCache;
-        osl::Mutex          m_aMutex;
+        std::mutex          m_aMutex;
 
     public:
         PropertyNamesCache();