diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-08-04 21:08:59 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-08-05 20:37:44 +0200 |
| commit | 85d8b2f34bbb50288217fae395f72e1d1df7f4d6 (patch) | |
| tree | 17a32e19e2d74b7935b7c1dec922ee1326622a32 /ucb | |
| parent | ae1ac7eaf14a78bff050b90daaf7a9996cfc2f9a (diff) | |
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 <noel.grandin@collabora.co.uk>
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/cmis/std_outputstream.cxx | 6 | ||||
| -rw-r--r-- | ucb/source/ucp/cmis/std_outputstream.hxx | 4 |
2 files changed, 5 insertions, 5 deletions
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 <boost/shared_ptr.hpp> #include <ostream> -#include <osl/mutex.hxx> +#include <mutex> #include <cppuhelper/weak.hxx> #include <com/sun/star/io/XOutputStream.hpp> @@ -45,7 +45,7 @@ namespace cmis private: - osl::Mutex m_aMutex; + std::mutex m_aMutex; boost::shared_ptr< std::ostream > m_pStream; }; } |