summaryrefslogtreecommitdiff
path: root/cppu
diff options
context:
space:
mode:
Diffstat (limited to 'cppu')
-rw-r--r--cppu/source/uno/EnvStack.cxx4
-rw-r--r--cppu/source/uno/lbmap.cxx4
2 files changed, 4 insertions, 4 deletions
diff --git a/cppu/source/uno/EnvStack.cxx b/cppu/source/uno/EnvStack.cxx
index 033f9d94ce3f..2356948c51c5 100644
--- a/cppu/source/uno/EnvStack.cxx
+++ b/cppu/source/uno/EnvStack.cxx
@@ -76,7 +76,7 @@ static void s_setCurrent(uno_Environment * pEnv)
{
oslThreadIdentifier threadId = osl::Thread::getCurrentIdentifier();
- std::lock_guard guard(s_threadMap_mutex);
+ std::scoped_lock guard(s_threadMap_mutex);
if (pEnv)
{
s_threadMap[threadId] = pEnv;
@@ -95,7 +95,7 @@ static uno_Environment * s_getCurrent()
oslThreadIdentifier threadId = osl::Thread::getCurrentIdentifier();
- std::lock_guard guard(s_threadMap_mutex);
+ std::scoped_lock guard(s_threadMap_mutex);
ThreadMap::iterator iEnv = s_threadMap.find(threadId);
if(iEnv != s_threadMap.end())
pEnv = iEnv->second;
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index a39eb409a765..a88259627b2c 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -319,7 +319,7 @@ static OUString getBridgeName(
static void setNegativeBridge( const OUString & rBridgeName )
{
MappingsData & rData = getMappingsData();
- std::lock_guard aGuard( rData.aNegativeLibsMutex );
+ std::scoped_lock aGuard( rData.aNegativeLibsMutex );
rData.aNegativeLibs.insert( rBridgeName );
}
@@ -356,7 +356,7 @@ static bool loadModule(osl::Module & rModule, const OUString & rBridgeName)
bool bNeg;
{
MappingsData & rData = getMappingsData();
- std::lock_guard aGuard( rData.aNegativeLibsMutex );
+ std::scoped_lock aGuard( rData.aNegativeLibsMutex );
const auto iFind( rData.aNegativeLibs.find( rBridgeName ) );
bNeg = (iFind != rData.aNegativeLibs.end());
}