[Libreoffice-commits] core.git: include/comphelper

[Noel Grandin (via logerrit)]

 include/comphelper/IdPropArrayHelper.hxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit e6f2736be82559c513aa07c765e9f6c0dd72072b
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Thu Nov 11 20:41:58 2021 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Nov 13 07:34:48 2021 +0100

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

diff --git a/include/comphelper/IdPropArrayHelper.hxx 
b/include/comphelper/IdPropArrayHelper.hxx
index 705de3db8925..8b70db849ed5 100644
--- a/include/comphelper/IdPropArrayHelper.hxx
+++ b/include/comphelper/IdPropArrayHelper.hxx
@@ -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)