From e2a3e483844e84445c316cad35fdfcaf3b18198d Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sat, 17 Jul 2021 18:49:36 +0200 Subject: osl::Mutex->std::mutex in Enumeration Change-Id: I1f4e99e4a3619b1381d01a16b98128ae9bbbce07 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119108 Tested-by: Jenkins Reviewed-by: Noel Grandin --- cppuhelper/source/typemanager.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'cppuhelper') diff --git a/cppuhelper/source/typemanager.cxx b/cppuhelper/source/typemanager.cxx index eb6d7246009e..857018e204ec 100644 --- a/cppuhelper/source/typemanager.cxx +++ b/cppuhelper/source/typemanager.cxx @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -1668,7 +1669,7 @@ private: css::uno::Sequence< css::uno::TypeClass > types_; bool deep_; - osl::Mutex mutex_; + std::mutex mutex_; std::stack< Position > positions_; OUString current_; }; @@ -1678,7 +1679,7 @@ Enumeration::nextTypeDescription() { OUString name; { - osl::MutexGuard g(mutex_); + std::lock_guard g(mutex_); if (positions_.empty()) { throw css::container::NoSuchElementException( "exhausted XTypeDescriptionEnumeration", -- cgit