summaryrefslogtreecommitdiff
path: root/canvas
diff options
context:
space:
mode:
authorArnaud Versini <arnaud.versini@libreoffice.org>2021-05-30 19:36:59 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2021-05-31 15:20:25 +0200
commit39aa29712fe4c7a1c432cecf03d9d491537c02e6 (patch)
tree08d9d94e31a9022851b49c07ff8fe670c64e7a5c /canvas
parent9abedad72c73ad83b66f3f8d261efdc5ce889683 (diff)
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.grandin@collabora.co.uk>
Diffstat (limited to 'canvas')
-rw-r--r--canvas/source/factory/cf_service.cxx6
1 files changed, 3 insertions, 3 deletions
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);