diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-12-03 13:46:24 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-01-31 17:41:35 +0100 |
| commit | 001dbc2dab1a1548bf1091ecbdfafd1f7de9b019 (patch) | |
| tree | f4f050191347c9830b208f41982637dc0ef945fe /sal | |
| parent | bb9833594b031c6d0ec91422f85968c4b1f2f8bc (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)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87760
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/qa/rtl/oustring/rtl_OUString2.cxx | 2 | ||||
| -rw-r--r-- | sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx | 3 | ||||
| -rw-r--r-- | sal/qa/rtl/strings/test_oustring_stringliterals.cxx | 1 | ||||
| -rw-r--r-- | sal/qa/rtl/textenc/rtl_textcvt.cxx | 1 |
4 files changed, 7 insertions, 0 deletions
diff --git a/sal/qa/rtl/oustring/rtl_OUString2.cxx b/sal/qa/rtl/oustring/rtl_OUString2.cxx index 52e8656efd96..4a3a405d8fc5 100644 --- a/sal/qa/rtl/oustring/rtl_OUString2.cxx +++ b/sal/qa/rtl/oustring/rtl_OUString2.cxx @@ -30,6 +30,8 @@ #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> +#include <o3tl/cppunittraitshelper.hxx> + #include <stringhelper.hxx> #include <valueequal.hxx> diff --git a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx index f1a151fdc836..80ce83b1d2d0 100644 --- a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx +++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx @@ -7,6 +7,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include <sal/config.h> + +#include <o3tl/cppunittraitshelper.hxx> #include <sal/types.h> #include <cppunit/TestFixture.h> #include <cppunit/TestAssert.h> diff --git a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx index 33902e28ad3b..9c7116ef5edb 100644 --- a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx +++ b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx @@ -14,6 +14,7 @@ #include <utility> +#include <o3tl/cppunittraitshelper.hxx> #include <sal/types.h> #include <config_global.h> #include <cppunit/TestFixture.h> diff --git a/sal/qa/rtl/textenc/rtl_textcvt.cxx b/sal/qa/rtl/textenc/rtl_textcvt.cxx index 795950a0347a..0bf6c5647ff0 100644 --- a/sal/qa/rtl/textenc/rtl_textcvt.cxx +++ b/sal/qa/rtl/textenc/rtl_textcvt.cxx @@ -27,6 +27,7 @@ #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> +#include <o3tl/cppunittraitshelper.hxx> #include <rtl/string.hxx> #include <rtl/ustring.hxx> #include <rtl/tencinfo.h> |