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

Noel Grandin (via logerrit) logerrit at kemper.freedesktop.org
Sun Aug 1 21:00:13 UTC 2021


 stoc/source/javavm/interact.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 7c38362dbe1922c9825dffb463072030948d406b
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Sun Aug 1 18:59:31 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sun Aug 1 22:59:38 2021 +0200

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

diff --git a/stoc/source/javavm/interact.cxx b/stoc/source/javavm/interact.cxx
index 58be91615d2f..45fba8aab597 100644
--- a/stoc/source/javavm/interact.cxx
+++ b/stoc/source/javavm/interact.cxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/task/XInteractionAbort.hpp>
 #include <com/sun/star/task/XInteractionRetry.hpp>
 #include <cppuhelper/implbase.hxx>
-#include <osl/mutex.hxx>
+#include <mutex>
 
 namespace com::sun::star::task { class XInteractionContinuation; }
 
@@ -62,19 +62,19 @@ public:
 private:
     virtual ~RetryContinuation() override {}
 
-    mutable osl::Mutex m_aMutex;
+    mutable std::mutex m_aMutex;
     bool m_bSelected;
 };
 
 void SAL_CALL InteractionRequest::RetryContinuation::select()
 {
-    osl::MutexGuard aGuard(m_aMutex);
+    std::lock_guard aGuard(m_aMutex);
     m_bSelected = true;
 }
 
 bool InteractionRequest::RetryContinuation::isSelected() const
 {
-    osl::MutexGuard aGuard(m_aMutex);
+    std::lock_guard aGuard(m_aMutex);
     return m_bSelected;
 }
 


More information about the Libreoffice-commits mailing list