From b4a5e6f025973b5a4ba8210168569fc1a5a34254 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 20 Feb 2023 15:49:41 +0200 Subject: osl::Mutex->std::mutex in ucbhelper::FdInputStream Change-Id: I10482c3a5f9848f45463837d5d8982476b3910a7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147340 Tested-by: Jenkins Reviewed-by: Noel Grandin --- include/ucbhelper/fd_inputstream.hxx | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/ucbhelper/fd_inputstream.hxx b/include/ucbhelper/fd_inputstream.hxx index ebef7dae7869..5035ecd906dd 100644 --- a/include/ucbhelper/fd_inputstream.hxx +++ b/include/ucbhelper/fd_inputstream.hxx @@ -24,9 +24,8 @@ #include #include #include -#include - #include +#include namespace ucbhelper { @@ -37,9 +36,7 @@ namespace ucbhelper /** Implements a seekable InputStream * working on a buffer. */ - class UCBHELPER_DLLPUBLIC FdInputStream final - : protected cppu::BaseMutex, - public FdInputStream_Base + class UCBHELPER_DLLPUBLIC FdInputStream final : public FdInputStream_Base { public: @@ -83,6 +80,7 @@ namespace ucbhelper getLength() override; private: + std::mutex m_aMutex; oslFileHandle m_tmpfl; sal_uInt64 m_nLength; }; -- cgit