diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2021-03-11 09:13:51 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2021-03-11 21:33:25 +0100 |
| commit | 4af56d8189012f96d0471d7f50a3e44636666516 (patch) | |
| tree | 97f9e80ca28e332b956180a60aff7e999b608454 /xmlsecurity | |
| parent | 2b808bad616a557fabb080b49c5b925d2481b9b5 (diff) | |
Don't use std::ostream operator <<(char16_t const *) deleted in C++20
Building with --with-latest-c++:
> C:/lo/core/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx(664): error C2280: 'std::basic_ostream<char,std::char_traits<char>> &std::operator <<<std::char_traits<char>>(std::basic_ostream<char,std::char_traits<char>> &,const char16_t *)': attempting to reference a deleted function
> C:\PROGRA~2\MIB055~1\2019\COMMUN~1\VC\Tools\MSVC\1428~1.299\Include\ostream(951): note: see declaration of 'std::operator <<'
etc.
Change-Id: I70ae201c761fae907e602b6a929e23e3c8e7f692
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112318
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx index ce65672987c5..b40639f586d8 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx @@ -661,7 +661,7 @@ static bool EncodeDistinguishedName(std::u16string_view const rName, CERT_NAME_B reinterpret_cast<LPCWSTR>(rName.data()), CERT_X500_NAME_STR, nullptr, nullptr, &rBlob.cbData, &pszError)) { - SAL_INFO("xmlsecurity.xmlsec", "CertStrToNameW failed: " << WindowsErrorString(GetLastError()) << "; " << reinterpret_cast<char16_t const*>(pszError)); + SAL_INFO("xmlsecurity.xmlsec", "CertStrToNameW failed: " << WindowsErrorString(GetLastError()) << "; " << OUString(o3tl::toU(pszError))); return false; } rBlob.pbData = new BYTE[rBlob.cbData]; @@ -669,7 +669,7 @@ static bool EncodeDistinguishedName(std::u16string_view const rName, CERT_NAME_B reinterpret_cast<LPCWSTR>(rName.data()), CERT_X500_NAME_STR, nullptr, rBlob.pbData, &rBlob.cbData, &pszError)) { - SAL_INFO("xmlsecurity.xmlsec", "CertStrToNameW failed: " << WindowsErrorString(GetLastError()) << "; " << reinterpret_cast<char16_t const*>(pszError)); + SAL_INFO("xmlsecurity.xmlsec", "CertStrToNameW failed: " << WindowsErrorString(GetLastError()) << "; " << OUString(o3tl::toU(pszError))); return false; } return true; |