[Libreoffice-commits] core.git: cpputools/source

[Arnaud Versini (via logerrit)]

 cpputools/source/unoexe/unoexe.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 8fa40be492f4ae85eb3f0db363bd8d2cf7c214a6
Author:     Arnaud Versini <arnaud.vers...@libreoffice.org>
AuthorDate: Wed Mar 30 11:00:10 2022 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Apr 1 10:07:55 2022 +0200

    cpputools : use std::mutex instead of osl::Mutex
    
    Change-Id: I75879a0f03d8212ac9392c04fb76113cf24d510e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132300
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/cpputools/source/unoexe/unoexe.cxx 
b/cpputools/source/unoexe/unoexe.cxx
index b9dca78b67ce..31d6d6bdfac2 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <stdio.h>
+#include <mutex>
 #include <string_view>
 
 #include <sal/main.h>
@@ -229,7 +230,7 @@ class OInstanceProvider
 {
     Reference< XComponentContext > _xContext;
 
-    Mutex                             _aSingleInstanceMutex;
+    std::mutex                        _aSingleInstanceMutex;
     Reference< XInterface >           _xSingleInstance;
     bool                              _bSingleInstance;
 
@@ -296,7 +297,7 @@ Reference< XInterface > OInstanceProvider::getInstance( 
const OUString & rName )
             {
                 if (! _xSingleInstance.is())
                 {
-                    MutexGuard aGuard( _aSingleInstanceMutex );
+                    std::lock_guard aGuard( _aSingleInstanceMutex );
                     if (! _xSingleInstance.is())
                     {
                         _xSingleInstance = createInstance();