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

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


 xmlsecurity/source/xmlsec/nss/digestcontext.cxx |    4 ++--
 xmlsecurity/source/xmlsec/nss/digestcontext.hxx |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit e5982d9148d84874237470102e804c52432aa502
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Sat Jul 31 18:53:58 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sun Aug 1 13:57:55 2021 +0200

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

diff --git a/xmlsecurity/source/xmlsec/nss/digestcontext.cxx b/xmlsecurity/source/xmlsec/nss/digestcontext.cxx
index d8c46543c0ae..4f05dd4b0da9 100644
--- a/xmlsecurity/source/xmlsec/nss/digestcontext.cxx
+++ b/xmlsecurity/source/xmlsec/nss/digestcontext.cxx
@@ -37,7 +37,7 @@ ODigestContext::~ODigestContext()
 
 void SAL_CALL ODigestContext::updateDigest( const uno::Sequence< ::sal_Int8 >& aData )
 {
-    ::osl::MutexGuard aGuard( m_aMutex );
+    std::lock_guard aGuard( m_aMutex );
 
     if ( m_bBroken )
         throw uno::RuntimeException();
@@ -65,7 +65,7 @@ void SAL_CALL ODigestContext::updateDigest( const uno::Sequence< ::sal_Int8 >& a
 
 uno::Sequence< ::sal_Int8 > SAL_CALL ODigestContext::finalizeDigestAndDispose()
 {
-    ::osl::MutexGuard aGuard( m_aMutex );
+    std::lock_guard aGuard( m_aMutex );
 
     if ( m_bBroken )
         throw uno::RuntimeException();
diff --git a/xmlsecurity/source/xmlsec/nss/digestcontext.hxx b/xmlsecurity/source/xmlsec/nss/digestcontext.hxx
index 91326daca395..72e1864851fc 100644
--- a/xmlsecurity/source/xmlsec/nss/digestcontext.hxx
+++ b/xmlsecurity/source/xmlsec/nss/digestcontext.hxx
@@ -22,13 +22,13 @@
 #include <com/sun/star/xml/crypto/XDigestContext.hpp>
 
 #include <cppuhelper/implbase.hxx>
-#include <osl/mutex.hxx>
+#include <mutex>
 #include <secmodt.h>
 
 class ODigestContext : public cppu::WeakImplHelper< css::xml::crypto::XDigestContext >
 {
 private:
-    ::osl::Mutex m_aMutex;
+    std::mutex m_aMutex;
 
     PK11Context* m_pContext;
     sal_Int32 const m_nDigestLength;


More information about the Libreoffice-commits mailing list