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

[Noel Grandin (via logerrit)]

 cppu/source/uno/lbmap.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit f0ed5d46373f34a78a260617cf22606f7fd3c399
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sun May 8 19:40:03 2022 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon May 9 10:15:24 2022 +0200

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

diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index 43818eb85025..102ef135ef1a 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -154,7 +154,7 @@ struct MappingsData
     t_OUString2Entry    aName2Entry;
     t_Mapping2Entry     aMapping2Entry;
 
-    Mutex               aCallbacksMutex;
+    std::mutex          aCallbacksMutex;
     std::set< uno_getMappingFunc >
                         aCallbacks;
 
@@ -621,7 +621,7 @@ void SAL_CALL uno_getMapping(
 
         // try callback chain
         {
-            MutexGuard aGuard(rData.aCallbacksMutex);
+            std::unique_lock aGuard(rData.aCallbacksMutex);
             for (const auto& rCallback : rData.aCallbacks)
             {
                 (*rCallback)(ppMapping, pFrom, pTo, aAddPurpose.pData);
@@ -735,7 +735,7 @@ void SAL_CALL uno_registerMappingCallback(
 {
     OSL_ENSURE( pCallback, "### null ptr!" );
     MappingsData & rData = getMappingsData();
-    MutexGuard aGuard( rData.aCallbacksMutex );
+    std::unique_lock aGuard( rData.aCallbacksMutex );
     rData.aCallbacks.insert( pCallback );
 }
 
@@ -745,7 +745,7 @@ void SAL_CALL uno_revokeMappingCallback(
 {
     OSL_ENSURE( pCallback, "### null ptr!" );
     MappingsData & rData = getMappingsData();
-    MutexGuard aGuard( rData.aCallbacksMutex );
+    std::unique_lock aGuard( rData.aCallbacksMutex );
     rData.aCallbacks.erase( pCallback );
 }
 } // extern "C"