diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-07-17 18:49:36 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-18 10:35:36 +0200 |
| commit | e2a3e483844e84445c316cad35fdfcaf3b18198d (patch) | |
| tree | bed6ff8e55b275cff9ea1ec13a1edc1473728109 /cppuhelper | |
| parent | 4b99e377473e74160627d3b257fec7b3bc8e7763 (diff) | |
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 <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/source/typemanager.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
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 <cstddef> #include <cstdlib> #include <cstring> +#include <mutex> #include <set> #include <stack> #include <string_view> @@ -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", |