package/source/xstor/disposelistener.cxx | 4 ++-- package/source/xstor/disposelistener.hxx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit afc9c4454f7bab73087c28ed454d1fd00968e124 Author: Noel Grandin <noelgran...@gmail.com> AuthorDate: Sun Jul 18 18:50:52 2021 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Tue Jul 20 18:55:28 2021 +0200 osl::Mutex->std::mutex in OChildDispListener_Impl Change-Id: I0aa9e24d3ebcb5f89f2bf5b5759fa44985495b6f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119277 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/package/source/xstor/disposelistener.cxx b/package/source/xstor/disposelistener.cxx index f8436971ada8..ab30f99ca129 100644 --- a/package/source/xstor/disposelistener.cxx +++ b/package/source/xstor/disposelistener.cxx @@ -31,13 +31,13 @@ OChildDispListener_Impl::~OChildDispListener_Impl() void OChildDispListener_Impl::OwnerIsDisposed() { - ::osl::MutexGuard aGuard( m_aMutex ); + std::lock_guard aGuard( m_aMutex ); m_pStorage = nullptr; } void SAL_CALL OChildDispListener_Impl::disposing( const lang::EventObject& Source ) { - ::osl::MutexGuard aGuard( m_aMutex ); + std::lock_guard aGuard( m_aMutex ); // ObjectIsDisposed must not contain any locking! if ( m_pStorage && Source.Source.is() ) m_pStorage->ChildIsDisposed( Source.Source ); diff --git a/package/source/xstor/disposelistener.hxx b/package/source/xstor/disposelistener.hxx index 79b0976d8188..b635b58ce30a 100644 --- a/package/source/xstor/disposelistener.hxx +++ b/package/source/xstor/disposelistener.hxx @@ -22,12 +22,12 @@ #include <com/sun/star/lang/XEventListener.hpp> #include <cppuhelper/implbase.hxx> -#include <osl/mutex.hxx> +#include <mutex> class OStorage; class OChildDispListener_Impl : public ::cppu::WeakImplHelper<css::lang::XEventListener> { - ::osl::Mutex m_aMutex; + std::mutex m_aMutex; OStorage* m_pStorage; public: _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits