[Libreoffice-commits] core.git: vcl/unx

[Arnaud Versini (via logerrit)]

 vcl/unx/generic/printer/ppdparser.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 80255dcde14755bb4a342b7392fb26d27580ff6d
Author:     Arnaud Versini <arnaud.versini at libreoffice.org>
AuthorDate: Sun May 30 19:29:07 2021 +0200
Commit:     Arnaud Versini <arnaud.versini at libreoffice.org>
CommitDate: Sat Jun 5 11:28:02 2021 +0200

    vcl unix : use std::thread in PPDParser::getParser
    
    Change-Id: Iff31fbdec6516b490590e31db6915397033c1027
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116413
    Tested-by: Jenkins
    Reviewed-by: Arnaud Versini <arnaud.versini at libreoffice.org>

diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index c976a2f7519d..ea03299ed7fb 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -36,7 +36,6 @@
 #include <tools/stream.hxx>
 #include <tools/zcodec.hxx>
 #include <o3tl/safeint.hxx>
-#include <osl/mutex.hxx>
 #include <osl/file.hxx>
 #include <osl/process.h>
 #include <osl/thread.h>
@@ -48,6 +47,7 @@
 
 #include <com/sun/star/lang/Locale.hpp>
 
+#include <mutex>
 #include <unordered_map>
 
 #ifdef ENABLE_CUPS
@@ -531,8 +531,8 @@ OUString PPDParser::getPPDFile( const OUString& rFile )
 
 const PPDParser* PPDParser::getParser( const OUString& rFile )
 {
-    static ::osl::Mutex aMutex;
-    ::osl::Guard< ::osl::Mutex > aGuard( aMutex );
+    static std::mutex aMutex;
+    std::lock_guard aGuard( aMutex );
 
     OUString aFile = rFile;
     if( !rFile.startsWith( "CUPS:" ) && !rFile.startsWith( "CPD:" ) )