[Libreoffice-commits] core.git: unotools/source

Noel Grandin (via logerrit) logerrit at kemper.freedesktop.org
Sun Jul 18 07:06:20 UTC 2021


 unotools/source/ucbhelper/ucblockbytes.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5060c0c8b9070c3093bf036de31c551ceb109ca7
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Sat Jul 17 18:57:37 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sun Jul 18 09:05:41 2021 +0200

    osl::Mutex->std::mutex in ModeratorsActiveDataStreamer
    
    Change-Id: I9ea32f7f843a0255ce37de8b95d9fc9d29c43157
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119111
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx
index 4ed6dec1a236..1afa874d49f8 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.cxx
@@ -308,14 +308,14 @@ public:
 
     virtual Reference<XStream> SAL_CALL getStream () 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<XStream> m_xStream;
 };
 
@@ -376,7 +376,7 @@ ModeratorsActiveDataStreamer::setStream (
 )
 {
     m_aModerator.setStream(rxStream);
-    osl::MutexGuard aGuard(m_aMutex);
+    std::lock_guard aGuard(m_aMutex);
     m_xStream = rxStream;
 }
 


More information about the Libreoffice-commits mailing list