[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - xmlsecurity/source

[Libreoffice Gerrit user]

 xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 647a5a3761ad81bc544fa3709a6055c59aa661e9
Author:     Tor Lillqvist <t...@collabora.com>
AuthorDate: Tue Dec 11 15:47:14 2018 +0200
Commit:     Tor Lillqvist <t...@collabora.com>
CommitDate: Tue Dec 11 15:47:14 2018 +0200

    Fix C2695: overriding virtual function differs only by calling convention
    
    Change-Id: Icc85d3ff747d7372968cf4a3f514f0d3b7f8647c

diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx 
b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx
index d537ff7942bb..8f0fd2ac4287 100644
--- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx
@@ -84,7 +84,7 @@ class X509Certificate_NssImpl : public ::cppu::WeakImplHelper<
         virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< 
sal_Int8 >& aIdentifier ) override;
 
         /// @see xmlsecurity::Certificate::getSHA256Thumbprint().
-        virtual css::uno::Sequence<sal_Int8> getSHA256Thumbprint() override;
+        virtual css::uno::Sequence<sal_Int8> SAL_CALL getSHA256Thumbprint() 
override;
 
         static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId() ;
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits