diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-12-03 13:46:24 +0100 |
|---|---|---|
| committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2021-04-20 23:40:52 +0200 |
| commit | 3b9646b509fd02a37c53e77f84e37105e233440b (patch) | |
| tree | e51abc863805ecc358e14e3514967540dadef124 /cppu/qa | |
| parent | 690d078f2b91d769f31e048b8a1d523af18e6d11 (diff) | |
Adapt CPPUNIT_ASSERT to C++20 deleted ostream << for sal_Unicode (aka char16_t)
<http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2019/p1423r3.html> "char8_t
backward compatibility remediation", as implemented now by <https://gcc.gnu.org/
git/?p=gcc.git;a=commit;h=0c5b35933e5b150df0ab487efb2f11ef5685f713> "libstdc++:
P1423R3 char8_t remediation (2/4)" for -std=c++2a, deletes operator << overloads
that would print an integer rather than a (presumably expected) character.
But for simplicity (and to avoid issues with non-printing characters), keep
printing an integer here.
Change-Id: I751b99ee32d418eb488131ffa130d6f7d6d38dc7
Reviewed-on: https://gerrit.libreoffice.org/84348
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 5d8f0fad50f90195a11873c70ddab4644f5839ea)
Conflicts:
cppu/qa/test_any.cxx
svl/qa/unit/lockfiles/test_lockfiles.cxx
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
sw/qa/extras/rtfexport/rtfexport4.cxx
sw/qa/extras/uiwriter/uiwriter.cxx
Diffstat (limited to 'cppu/qa')
| -rw-r--r-- | cppu/qa/cppumaker/test_cppumaker.cxx | 1 | ||||
| -rw-r--r-- | cppu/qa/test_any.cxx | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/cppu/qa/cppumaker/test_cppumaker.cxx b/cppu/qa/cppumaker/test_cppumaker.cxx index e73a502333f8..0ac7f854fe76 100644 --- a/cppu/qa/cppumaker/test_cppumaker.cxx +++ b/cppu/qa/cppumaker/test_cppumaker.cxx @@ -360,6 +360,7 @@ #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> +#include <o3tl/cppunittraitshelper.hxx> #include <rtl/ustring.hxx> #include <cstddef> diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx index 7787176ffd3b..ea4013b2e2bc 100644 --- a/cppu/qa/test_any.cxx +++ b/cppu/qa/test_any.cxx @@ -50,6 +50,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Type.hxx> #include <com/sun/star/uno/XInterface.hpp> +#include <o3tl/cppunittraitshelper.hxx> #include <osl/interlck.h> #include <rtl/string.h> #include <rtl/ustring.h> |