cppuhelper/source/typemanager.cxx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit e2a3e483844e84445c316cad35fdfcaf3b18198d
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sat Jul 17 18:49:36 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun Jul 18 10:35:36 2021 +0200
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.gran...@collabora.co.uk>
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",
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
