cppu/qa/cppumaker/test_cppumaker.cxx | 1 +
cppu/qa/test_any.cxx | 1 +
2 files changed, 2 insertions(+)
New commits:
commit 4ee0ad0541a9767cbf527a268df321d554b00384
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Jan 13 10:55:19 2022 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Jan 13 12:25:26 2022 +0100
Fix build
...after 840b4eb2f3443ff883016e6a8a8ae49e9cbd9e4e "Recheck modules [a-c]*
with
IWYU" causing
> In file included from
workdir/UnpackedTarball/cppunit/include/cppunit/TestAssert.h:8,
> from
workdir/UnpackedTarball/cppunit/include/cppunit/TestCase.h:6,
> from
workdir/UnpackedTarball/cppunit/include/cppunit/TestCaller.h:5,
> from
workdir/UnpackedTarball/cppunit/include/cppunit/extensions/HelperMacros.h:9,
> from cppu/qa/test_any.cxx:26:
> workdir/UnpackedTarball/cppunit/include/cppunit/tools/StringHelper.h: In
instantiation of ‘typename std::enable_if<(! std::is_enum<_Tp>::value),
std::__cxx11::basic_string<char> >::type CppUnit::StringHelper::toString(const
T&) [with T = char16_t; typename std::enable_if<(! std::is_enum<_Tp>::value),
std::__cxx11::basic_string<char> >::type = std::__cxx11::basic_string<char>]’:
> workdir/UnpackedTarball/cppunit/include/cppunit/TestAssert.h:74:50:
required from ‘static std::string CppUnit::assertion_traits<T>::toString(const
T&) [with T = char16_t; std::string = std::__cxx11::basic_string<char>]’
> workdir/UnpackedTarball/cppunit/include/cppunit/TestAssert.h:168:58:
required from ‘void CppUnit::assertEquals(const T&, const T&, SourceLine, const
std::string&) [with T = char16_t; std::string =
std::__cxx11::basic_string<char>]’
> cppu/qa/test_any.cxx:282:9: required from here
>
workdir/UnpackedTarball/cppunit/include/cppunit/tools/StringHelper.h:25:9:
error: use of deleted function ‘std::basic_ostream<char, _Traits>&
std::operator<<(basic_ostream<char, _Traits>&, char16_t) [with _Traits =
char_traits<char>]’
> 25 | ost << x;
> | ~~~~^~~~
> In file included from ~/gcc/trunk/inst/include/c++/12.0.0/istream:39,
> from ~/gcc/trunk/inst/include/c++/12.0.0/sstream:38,
> from
workdir/UnpackedTarball/cppunit/include/cppunit/portability/Stream.h:283,
> from
workdir/UnpackedTarball/cppunit/include/cppunit/TestAssert.h:7,
> from
workdir/UnpackedTarball/cppunit/include/cppunit/TestCase.h:6,
> from
workdir/UnpackedTarball/cppunit/include/cppunit/TestCaller.h:5,
> from
workdir/UnpackedTarball/cppunit/include/cppunit/extensions/HelperMacros.h:9,
> from cppu/qa/test_any.cxx:26:
> ~/gcc/trunk/inst/include/c++/12.0.0/ostream:558:5: note: declared here
> 558 | operator<<(basic_ostream<char, _Traits>&, char16_t) = delete;
> | ^~~~~~~~
etc.
Change-Id: I2e6d3591dec9eeb6647738d37296c7d2bfa6a186
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128369
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/cppu/qa/cppumaker/test_cppumaker.cxx
b/cppu/qa/cppumaker/test_cppumaker.cxx
index e1c3a414d4b3..78097e26e854 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 69ab2a04723c..4cf9d181984f 100644
--- a/cppu/qa/test_any.cxx
+++ b/cppu/qa/test_any.cxx
@@ -45,6 +45,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/Type.hxx>
+#include <o3tl/cppunittraitshelper.hxx>
#include <osl/interlck.h>
#include <rtl/ustring.hxx>
