From 85d8b2f34bbb50288217fae395f72e1d1df7f4d6 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 4 Aug 2021 21:08:59 +0200 Subject: osl::Mutex->std::mutex in StdOutputStream Change-Id: I32f9366eef17f213d6b3dc9b5c0b6ba7ff9e7d83 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120020 Tested-by: Jenkins Reviewed-by: Noel Grandin --- ucb/source/ucp/cmis/std_outputstream.cxx | 6 +++--- ucb/source/ucp/cmis/std_outputstream.hxx | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'ucb') diff --git a/ucb/source/ucp/cmis/std_outputstream.cxx b/ucb/source/ucp/cmis/std_outputstream.cxx index deb70fb65f95..c1a3087a1923 100644 --- a/ucb/source/ucp/cmis/std_outputstream.cxx +++ b/ucb/source/ucp/cmis/std_outputstream.cxx @@ -50,7 +50,7 @@ namespace cmis void SAL_CALL StdOutputStream::writeBytes ( const uno::Sequence< sal_Int8 >& aData ) { - osl::MutexGuard aGuard( m_aMutex ); + std::scoped_lock aGuard( m_aMutex ); if (!m_pStream) throw io::IOException( ); @@ -68,7 +68,7 @@ namespace cmis void SAL_CALL StdOutputStream::flush ( ) { - osl::MutexGuard aGuard( m_aMutex ); + std::scoped_lock aGuard( m_aMutex ); if (!m_pStream) throw io::IOException( ); @@ -86,7 +86,7 @@ namespace cmis void SAL_CALL StdOutputStream::closeOutput ( ) { - osl::MutexGuard aGuard( m_aMutex ); + std::scoped_lock aGuard( m_aMutex ); if (!m_pStream) throw io::IOException( ); diff --git a/ucb/source/ucp/cmis/std_outputstream.hxx b/ucb/source/ucp/cmis/std_outputstream.hxx index 4cf10646e7b9..74eb4681e912 100644 --- a/ucb/source/ucp/cmis/std_outputstream.hxx +++ b/ucb/source/ucp/cmis/std_outputstream.hxx @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include @@ -45,7 +45,7 @@ namespace cmis private: - osl::Mutex m_aMutex; + std::mutex m_aMutex; boost::shared_ptr< std::ostream > m_pStream; }; } -- cgit