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

[Noel Grandin (via logerrit)]

 svtools/source/misc/templatefoldercache.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 86143150ac287d497d7b887435de580cfb8486b9
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Mon Aug 2 19:00:42 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Aug 3 13:21:25 2021 +0200

    osl::Mutex->std::mutex in TemplateFolderCacheImpl
    
    Change-Id: Iaec29ac3706cac485032840776ba3a63b3727905
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119896
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx
index df219f93fcf6..1faa04470f41 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -41,6 +41,7 @@
 
 #include <comphelper/processfactory.hxx>
 
+#include <mutex>
 #include <vector>
 #include <algorithm>
 
@@ -384,7 +385,7 @@ namespace svt
         TemplateFolderContent           m_aPreviousState;   // the current state of the template dirs (as found on the HD)
         TemplateFolderContent           m_aCurrentState;    // the previous state of the template dirs (as found in the cache file)
 
-        osl::Mutex                      m_aMutex;
+        std::mutex                      m_aMutex;
         // will be lazy inited; never access directly; use getOfficeInstDirs().
         uno::Reference< util::XOfficeInstallationDirectories > m_xOfficeInstDirs;
 
@@ -757,7 +758,7 @@ namespace svt
     {
         if ( !m_xOfficeInstDirs.is() )
         {
-            osl::MutexGuard aGuard( m_aMutex );
+            std::lock_guard aGuard( m_aMutex );
             if ( !m_xOfficeInstDirs.is() )
             {
                 uno::Reference< uno::XComponentContext > xCtx(