unotools/source/ucbhelper/ucblockbytes.cxx | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 2f8635fc919906fe8238fa5ef9e77cfe2f23df83
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sat Jul 17 18:56:54 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Jul 17 22:16:55 2021 +0200
osl::Mutex->std::mutex in ModeratorsActiveDataSink
Change-Id: If1e4af0d9acf75bd0f2744f134a42c29e41d56f1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119110
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx
b/unotools/source/ucbhelper/ucblockbytes.cxx
index d3e090cae679..4ed6dec1a236 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.cxx
@@ -57,6 +57,7 @@
#include <comphelper/storagehelper.hxx>
#include <ucbhelper/content.hxx>
+#include <mutex>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::io;
@@ -333,13 +334,13 @@ public:
virtual Reference<XInputStream> SAL_CALL getInputStream() override
{
- osl::MutexGuard aGuard(m_aMutex);
+ std::lock_guard aGuard(m_aMutex);
return m_xStream;
}
private:
Moderator& m_aModerator;
- osl::Mutex m_aMutex;
+ std::mutex m_aMutex;
Reference<XInputStream> m_xStream;
};
@@ -357,7 +358,7 @@ ModeratorsActiveDataSink::setInputStream (
)
{
m_aModerator.setInputStream(rxInputStream);
- osl::MutexGuard aGuard(m_aMutex);
+ std::lock_guard aGuard(m_aMutex);
m_xStream = rxInputStream;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
