diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-02-13 14:18:29 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-02-13 16:07:51 +0000 |
| commit | 0fdee9f9864f7f119e0503e1d9e1b7ff7250025e (patch) | |
| tree | e6555ff8b56d6329d5dabcb0124174b7fe473a04 /ucb | |
| parent | bcd2650598dbe7c2c6bcaa693f5ba3880e08c4ad (diff) | |
osl::Mutex->std::mutex in DynamicResultSetWrapperListener
Change-Id: Ie8673462fac30132f4e6b3cf7792d8554bf4f14a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146901
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/cacher/dynamicresultsetwrapper.cxx | 6 | ||||
| -rw-r--r-- | ucb/source/cacher/dynamicresultsetwrapper.hxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx index fb37a5fa6864..cf2b4fd9c3dd 100644 --- a/ucb/source/cacher/dynamicresultsetwrapper.cxx +++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx @@ -459,7 +459,7 @@ css::uno::Any SAL_CALL DynamicResultSetWrapperListener::queryInterface( const cs //virtual void SAL_CALL DynamicResultSetWrapperListener::disposing( const EventObject& rEventObject ) { - osl::Guard< osl::Mutex > aGuard( m_aMutex ); + std::unique_lock aGuard( m_aMutex ); if( m_pOwner ) m_pOwner->impl_disposing( rEventObject ); @@ -468,7 +468,7 @@ void SAL_CALL DynamicResultSetWrapperListener::disposing( const EventObject& rEv //virtual void SAL_CALL DynamicResultSetWrapperListener::notify( const ListEvent& Changes ) { - osl::Guard< osl::Mutex > aGuard( m_aMutex ); + std::unique_lock aGuard( m_aMutex ); if( m_pOwner ) m_pOwner->impl_notify( Changes ); @@ -480,7 +480,7 @@ void SAL_CALL DynamicResultSetWrapperListener::notify( const ListEvent& Changes void DynamicResultSetWrapperListener::impl_OwnerDies() { - osl::Guard< osl::Mutex > aGuard( m_aMutex ); + std::unique_lock aGuard( m_aMutex ); m_pOwner = nullptr; } diff --git a/ucb/source/cacher/dynamicresultsetwrapper.hxx b/ucb/source/cacher/dynamicresultsetwrapper.hxx index c6a363cff796..66aec8194145 100644 --- a/ucb/source/cacher/dynamicresultsetwrapper.hxx +++ b/ucb/source/cacher/dynamicresultsetwrapper.hxx @@ -19,7 +19,7 @@ #pragma once -#include <osl/mutex.hxx> +#include <mutex> #include <osl/conditn.hxx> #include <cppuhelper/weak.hxx> #include <comphelper/interfacecontainer3.hxx> @@ -150,7 +150,7 @@ class DynamicResultSetWrapperListener , public css::ucb::XDynamicResultSetListener { DynamicResultSetWrapper* m_pOwner; - osl::Mutex m_aMutex; + std::mutex m_aMutex; public: DynamicResultSetWrapperListener( DynamicResultSetWrapper* pOwner ); |