cppu/source/uno/lbmap.cxx | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 4408001f5c0a76107d8fe01053a0e6348100a878
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sun Jul 18 14:18:30 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Jul 19 08:54:19 2021 +0200
osl::Mutex->std::mutex in MappingsData
Change-Id: I12f46a5468e7d7dde9bfde977adf4ea13eb89ae3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119138
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 685bf6d4a2a8..a39eb409a765 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -24,6 +24,7 @@
#include "IdentityMapping.hxx"
#include <cassert>
+#include <mutex>
#include <set>
#include <unordered_map>
@@ -158,7 +159,7 @@ struct MappingsData
set< uno_getMappingFunc >
aCallbacks;
- Mutex aNegativeLibsMutex;
+ std::mutex aNegativeLibsMutex;
set<OUString> aNegativeLibs;
};
@@ -318,7 +319,7 @@ static OUString getBridgeName(
static void setNegativeBridge( const OUString & rBridgeName )
{
MappingsData & rData = getMappingsData();
- MutexGuard aGuard( rData.aNegativeLibsMutex );
+ std::lock_guard aGuard( rData.aNegativeLibsMutex );
rData.aNegativeLibs.insert( rBridgeName );
}
@@ -355,7 +356,7 @@ static bool loadModule(osl::Module & rModule, const
OUString & rBridgeName)
bool bNeg;
{
MappingsData & rData = getMappingsData();
- MutexGuard aGuard( rData.aNegativeLibsMutex );
+ std::lock_guard aGuard( rData.aNegativeLibsMutex );
const auto iFind( rData.aNegativeLibs.find( rBridgeName ) );
bNeg = (iFind != rData.aNegativeLibs.end());
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
