LibreOffice/core
1
0
Fork 0
mirror of https://github.com/LibreOffice/core.git synced 2025-08-21 21:54:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

osl::Mutex->std::mutex in OIdPropertyArrayUsageHelper

Browse Source 
Change-Id: I19bad304c5c8099fd24be77ec7251e837b513c81
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125117
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2021-11-11 20:41:58 +02:00
committed by Noel Grandin
parent f4a2c9e91e
commit e6f2736be8
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/comphelper/IdPropArrayHelper.hxx
View File

@ -20,7 +20,7 @@
#include <sal/config.h>
#include <osl/mutex.hxx>
#include <mutex>
#include <cppuhelper/propshlp.hxx>
#include <cassert>
#include <unordered_map>
@ -36,7 +36,7 @@ namespace comphelper
OIdPropertyArrayUsageHelper();
virtual ~OIdPropertyArrayUsageHelper()
{
::osl::MutexGuard aGuard(theMutex());
std::unique_lock aGuard(theMutex());
assert(s_nRefCount > 0 && "OIdPropertyArrayUsageHelper::~OIdPropertyArrayUsageHelper : suspicious call : have a refcount of 0 !");
if (!--s_nRefCount)
{
@ -64,9 +64,9 @@ namespace comphelper
private:
static sal_Int32 s_nRefCount;
static OIdPropertyArrayMap* s_pMap;
static osl::Mutex& theMutex()
static std::mutex& theMutex()
{
static osl::Mutex SINGLETON;
static std::mutex SINGLETON;
return SINGLETON;
}
};
@ -80,7 +80,7 @@ namespace comphelper
template <class TYPE>
OIdPropertyArrayUsageHelper<TYPE>::OIdPropertyArrayUsageHelper()
{
::osl::MutexGuard aGuard(theMutex());
std::unique_lock aGuard(theMutex());
// create the map if necessary
if (!s_pMap)
s_pMap = new OIdPropertyArrayMap;
@ -91,7 +91,7 @@ namespace comphelper
::cppu::IPropertyArrayHelper* OIdPropertyArrayUsageHelper<TYPE>::getArrayHelper(sal_Int32 nId)
{
assert(s_nRefCount && "OIdPropertyArrayUsageHelper::getArrayHelper : suspicious call : have a refcount of 0 !");
::osl::MutexGuard aGuard(theMutex());
std::unique_lock aGuard(theMutex());
// do we have the array already?
auto& rEntry = (*s_pMap)[nId];
if (!rEntry)