summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2023-02-20 15:49:41 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2023-02-20 17:45:49 +0000
commitb4a5e6f025973b5a4ba8210168569fc1a5a34254 (patch)
treeda57043fb66850c47e84554aef4bc9ce24fc826a /include
parent15405dc68b2e88b53585578567da13e3e99962db (diff)
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 <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
-rw-r--r--include/ucbhelper/fd_inputstream.hxx8
1 files changed, 3 insertions, 5 deletions
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 <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/io/XSeekable.hpp>
#include <cppuhelper/implbase.hxx>
-#include <cppuhelper/basemutex.hxx>
-
#include <ucbhelper/ucbhelperdllapi.h>
+#include <mutex>
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;
};