diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2022-02-16 17:16:55 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2022-02-17 18:03:49 +0100 |
| commit | fe6043136fd3ba0333b99b8ca4dda699961c2bfd (patch) | |
| tree | 522f7183ff071e36f7555523f5880169beefebbe /sal | |
| parent | fe8ec10eeee51f806392e14440655c8d664bc234 (diff) | |
Bump Linux Clang baseline to 8.0.1
...as discussed in the mail sub-thread starting at
<https://lists.freedesktop.org/archives/libreoffice/2022-February/088476.html>
"Also bump Linux Clang baseline to 12.0.1 (was: Bump --enable-compiler-plugins
Clang baseline?)", and clean up newly-obsolete __clang_major__ checks
Change-Id: Idacb9148b019c07e138277df3a085ba71c64a8e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130028
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/qa/rtl/strings/test_ostring_concat.cxx | 10 | ||||
| -rw-r--r-- | sal/qa/rtl/strings/test_oustring_concat.cxx | 5 |
2 files changed, 6 insertions, 9 deletions
diff --git a/sal/qa/rtl/strings/test_ostring_concat.cxx b/sal/qa/rtl/strings/test_ostring_concat.cxx index af1f31dcf162..853f97564897 100644 --- a/sal/qa/rtl/strings/test_ostring_concat.cxx +++ b/sal/qa/rtl/strings/test_ostring_concat.cxx @@ -68,22 +68,20 @@ void test::ostring::StringConcat::checkConcat() CPPUNIT_ASSERT_EQUAL( OString( "foobar" ), OString( OStringBuffer( "foo" ) + "bar" )); CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OStringBuffer, const char[ 4 ] > )), typeid( OStringBuffer( "foo" ) + "bar" )); CPPUNIT_ASSERT_EQUAL( OString( "foobar" ), OString( OStringLiteral( "foo" ) + "bar" )); -#if (defined __GNUC__ && __GNUC__ <= 11 && !defined __clang__) || (defined __clang__ && __clang_major__ <= 6) +#if defined __GNUC__ && __GNUC__ <= 11 && !defined __clang__ CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OStringLiteral<4>, const char[ 4 ] > )), typeid( OStringLiteral<4>( "foo" ) + "bar" )); // the explicit OStringLiteral<4> template argument in the unevaluated typeid context // is needed by some GCC versions, see <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96878> - // "Failed class template argument deduction in unevaluated, parenthesized context", and by - // some old Clang versions + // "Failed class template argument deduction in unevaluated, parenthesized context" #else CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OStringLiteral<4>, const char[ 4 ] > )), typeid( OStringLiteral( "foo" ) + "bar" )); #endif CPPUNIT_ASSERT_EQUAL( OString( "foobar" ), OString( OStringLiteral( "foo" ) + static_cast<const char*>("bar") )); -#if (defined __GNUC__ && __GNUC__ <= 11 && !defined __clang__) || (defined __clang__ && __clang_major__ <= 6) +#if defined __GNUC__ && __GNUC__ <= 11 && !defined __clang__ CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OStringLiteral<4>, const char* > )), typeid( OStringLiteral<4>( "foo" ) + static_cast<const char*>("bar") )); // the explicit OStringLiteral<4> template argument in the unevaluated typeid context // is needed by some GCC versions, see <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96878> - // "Failed class template argument deduction in unevaluated, parenthesized context", and by - // some old Clang versions + // "Failed class template argument deduction in unevaluated, parenthesized context" #else CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OStringLiteral<4>, const char* > )), typeid( OStringLiteral( "foo" ) + static_cast<const char*>("bar") )); #endif diff --git a/sal/qa/rtl/strings/test_oustring_concat.cxx b/sal/qa/rtl/strings/test_oustring_concat.cxx index 8e67817e1367..5a11da892d3a 100644 --- a/sal/qa/rtl/strings/test_oustring_concat.cxx +++ b/sal/qa/rtl/strings/test_oustring_concat.cxx @@ -69,12 +69,11 @@ void test::oustring::StringConcat::checkConcat() CPPUNIT_ASSERT_EQUAL( OUString( "foobar" ), OUString( OUStringBuffer( "foo" ) + "bar" )); CPPUNIT_ASSERT_EQUAL(( typeid( OUStringConcat< OUStringBuffer, const char[ 4 ] > )), typeid( OUStringBuffer( "foo" ) + "bar" )); CPPUNIT_ASSERT_EQUAL( OUString( "foobar" ), OUString( OUStringLiteral( u"foo" ) + "bar" )); -#if (defined __GNUC__ && __GNUC__ <= 11 && !defined __clang__) || (defined __clang__ && __clang_major__ <= 6) +#if defined __GNUC__ && __GNUC__ <= 11 && !defined __clang__ CPPUNIT_ASSERT_EQUAL(( typeid( OUStringConcat< OUStringLiteral<4>, const char[ 4 ] > )), typeid( OUStringLiteral<4>( u"foo" ) + "bar" )); // the explicit OUStringLiteral<4> template argument in the unevaluated typeid context // is needed by some GCC versions, see <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96878> - // "Failed class template argument deduction in unevaluated, parenthesized context", and by - // some old Clang versions + // "Failed class template argument deduction in unevaluated, parenthesized context" #else CPPUNIT_ASSERT_EQUAL(( typeid( OUStringConcat< OUStringLiteral<4>, const char[ 4 ] > )), typeid( OUStringLiteral( u"foo" ) + "bar" )); #endif |