canvas/source/factory/cf_service.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 39aa29712fe4c7a1c432cecf03d9d491537c02e6
Author: Arnaud Versini <arnaud.vers...@libreoffice.org>
AuthorDate: Sun May 30 19:36:59 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon May 31 15:20:25 2021 +0200
canvas : use std::mutex in CanvasFactory
Change-Id: Ic492f6b398ace3796d4b2cd45455d9ddec6cd728
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116416
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/canvas/source/factory/cf_service.cxx
b/canvas/source/factory/cf_service.cxx
index 4e31197de2be..6919d56fb219 100644
--- a/canvas/source/factory/cf_service.cxx
+++ b/canvas/source/factory/cf_service.cxx
@@ -21,6 +21,7 @@
#include <sal/log.hxx>
#include <algorithm>
+#include <mutex>
#include <utility>
#include <vector>
@@ -34,7 +35,6 @@
#include <comphelper/propertysequence.hxx>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
-#include <osl/mutex.hxx>
#include <o3tl/functional.hxx>
#include <config_features.h>
#include <vcl/skia/SkiaHelper.hxx>
@@ -58,7 +58,7 @@ class CanvasFactory
typedef std::vector< CachePair > CacheVector;
- mutable ::osl::Mutex m_mutex;
+ mutable std::mutex m_mutex;
Reference<XComponentContext> m_xContext;
Reference<container::XNameAccess> m_xCanvasConfigNameAccess;
AvailVector m_aAvailableImplementations;
@@ -288,7 +288,7 @@ Reference<XInterface> CanvasFactory::lookupAndUse(
OUString const & serviceName, Sequence<Any> const & args,
Reference<XComponentContext> const & xContext ) const
{
- ::osl::MutexGuard guard(m_mutex);
+ std::lock_guard guard(m_mutex);
// forcing last entry from impl list, if config flag set
bool bForceLastEntry(false);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
