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

Noel Grandin (via logerrit) logerrit at kemper.freedesktop.org
Mon Jul 19 06:54:44 UTC 2021


 stoc/source/servicemanager/servicemanager.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e9570e324a750d103d0116a2e3495306757f1a64
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Sun Jul 18 12:00:11 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Jul 19 08:54:03 2021 +0200

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

diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx
index f1543d293de7..ad7cef754c60 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -216,7 +216,7 @@ public:
     virtual Any SAL_CALL nextElement() override;
 
 private:
-    Mutex                           aMutex;
+    std::mutex                      aMutex;
     HashSet_Ref                     aImplementationMap;
     HashSet_Ref::iterator           aIt;
 };
@@ -224,14 +224,14 @@ private:
 // XEnumeration
 sal_Bool ImplementationEnumeration_Impl::hasMoreElements()
 {
-    MutexGuard aGuard( aMutex );
+    std::lock_guard aGuard( aMutex );
     return aIt != aImplementationMap.end();
 }
 
 // XEnumeration
 Any ImplementationEnumeration_Impl::nextElement()
 {
-    MutexGuard aGuard( aMutex );
+    std::lock_guard aGuard( aMutex );
     if( aIt == aImplementationMap.end() )
         throw NoSuchElementException("no more elements");
 


More information about the Libreoffice-commits mailing list