configmgr/source/readonlyaccess.cxx | 8 ++++----
configmgr/source/readwriteaccess.cxx | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 17523906a875f84e3c435127700bcd9ae932997b
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Feb 1 16:01:41 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Feb 2 07:00:23 2023 +0000
osl::Mutex->std::mutex in configmgr::read_write_access::Service
Change-Id: Ic8f688d3ad66c1be33a147e05b0e9145593214f9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146471
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/configmgr/source/readwriteaccess.cxx
b/configmgr/source/readwriteaccess.cxx
index 57e8b298a966..1e16cbb717a9 100644
--- a/configmgr/source/readwriteaccess.cxx
+++ b/configmgr/source/readwriteaccess.cxx
@@ -22,9 +22,9 @@
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/weak.hxx>
-#include <osl/mutex.hxx>
#include <rtl/ref.hxx>
#include <rtl/ustring.hxx>
+#include <mutex>
#include <utility>
#include <sal/types.h>
@@ -98,7 +98,7 @@ private:
css::uno::Reference< css::uno::XComponentContext > context_;
- osl::Mutex mutex_;
+ std::mutex mutex_;
rtl::Reference< RootAccess > root_;
};
@@ -110,7 +110,7 @@ void Service::initialize(css::uno::Sequence< css::uno::Any
> const & aArguments)
"not exactly one string argument",
static_cast< cppu::OWeakObject * >(this), -1);
}
- osl::MutexGuard g1(mutex_);
+ std::unique_lock g1(mutex_);
if (root_.is()) {
throw css::uno::RuntimeException(
"already initialized", static_cast< cppu::OWeakObject * >(this));
@@ -122,7 +122,7 @@ void Service::initialize(css::uno::Sequence< css::uno::Any
> const & aArguments)
}
rtl::Reference< RootAccess > Service::getRoot() {
- osl::MutexGuard g(mutex_);
+ std::unique_lock g(mutex_);
if (!root_.is()) {
throw css::lang::NotInitializedException(
"not initialized", static_cast< cppu::OWeakObject * >(this));
commit 90ff8cc432fd043ed662d478f7ace49438d00ff3
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Feb 1 16:00:35 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Feb 2 07:00:14 2023 +0000
osl::Mutex->std::mutex in configmgr::read_only_access::Service
Change-Id: Ia92bb76cedb45d2c28482d34869e239cfdd32ebf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146470
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/configmgr/source/readonlyaccess.cxx
b/configmgr/source/readonlyaccess.cxx
index 76ec606d5bc4..71649bc08822 100644
--- a/configmgr/source/readonlyaccess.cxx
+++ b/configmgr/source/readonlyaccess.cxx
@@ -22,7 +22,6 @@
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/weak.hxx>
-#include <osl/mutex.hxx>
#include <rtl/ref.hxx>
#include <rtl/ustring.hxx>
#include <utility>
@@ -31,6 +30,7 @@
#include "components.hxx"
#include "lock.hxx"
#include "rootaccess.hxx"
+#include <mutex>
namespace configmgr::read_only_access {
@@ -76,7 +76,7 @@ private:
css::uno::Reference< css::uno::XComponentContext > context_;
- osl::Mutex mutex_;
+ std::mutex mutex_;
rtl::Reference< RootAccess > root_;
};
@@ -88,7 +88,7 @@ void Service::initialize(css::uno::Sequence< css::uno::Any >
const & aArguments)
"not exactly one string argument",
static_cast< cppu::OWeakObject * >(this), -1);
}
- osl::MutexGuard g1(mutex_);
+ std::unique_lock g1(mutex_);
if (root_.is()) {
throw css::uno::RuntimeException(
"already initialized", static_cast< cppu::OWeakObject * >(this));
@@ -100,7 +100,7 @@ void Service::initialize(css::uno::Sequence< css::uno::Any
> const & aArguments)
}
rtl::Reference< RootAccess > Service::getRoot() {
- osl::MutexGuard g(mutex_);
+ std::unique_lock g(mutex_);
if (!root_.is()) {
throw css::lang::NotInitializedException(
"not initialized", static_cast< cppu::OWeakObject * >(this));
