summaryrefslogtreecommitdiff
path: root/cppu
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2022-05-08 19:40:03 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2022-05-09 10:15:24 +0200
commitf0ed5d46373f34a78a260617cf22606f7fd3c399 (patch)
tree46157c2f41e71cab571376f9401a776692724f84 /cppu
parentc06b2ac50ec198a4c75345c15103541ab45462a4 (diff)
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.grandin@collabora.co.uk>
Diffstat (limited to 'cppu')
-rw-r--r--cppu/source/uno/lbmap.cxx8
1 files changed, 4 insertions, 4 deletions
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"