diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-07-31 18:52:52 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-08-01 12:41:02 +0200 |
| commit | 5b5d3d90f3d91f94b50a9c6a98bece0fd7e6593c (patch) | |
| tree | 21d831f30972c0bada98d4862bb0fe58f451ff1a /xmlsecurity | |
| parent | 499adc4cc3597486a49b3781ba21e3c216668ea4 (diff) | |
osl::Mutex->std::mutex in SecurityEnvironment_NssImpl
Change-Id: I4b00afbe71b5459a9b1b8e612e44af71616a9b8c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119749
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 2 | ||||
| -rw-r--r-- | xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx index 081d37e0a01d..2f0d878d11db 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx @@ -211,7 +211,7 @@ void SecurityEnvironment_NssImpl::adoptSymKey( PK11SymKey* aSymKey ) { void SecurityEnvironment_NssImpl::updateSlots() { //In case new tokens are present then we can obtain the corresponding slot - osl::MutexGuard guard(m_mutex); + std::lock_guard guard(m_mutex); m_Slots.clear(); m_tSymKeyList.clear(); diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx index f2f04d1bef07..12310372096d 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx @@ -31,7 +31,7 @@ #include <com/sun/star/xml/crypto/XCertificateCreator.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> -#include <osl/mutex.hxx> +#include <mutex> #include <keythi.h> #include <certt.h> @@ -56,7 +56,7 @@ private: /// The last used certificate which has the private key for signing. css::uno::Reference<css::security::XCertificate> m_xSigningCertificate; - osl::Mutex m_mutex; + std::mutex m_mutex; CERTCertDBHandle* m_pHandler ; std::vector< PK11SymKey* > m_tSymKeyList ; |