README.md | 2 +- configure.ac | 4 ++-- sal/qa/rtl/strings/test_ostring_concat.cxx | 10 ++++------ sal/qa/rtl/strings/test_oustring_concat.cxx | 5 ++--- 4 files changed, 9 insertions(+), 12 deletions(-)
New commits: commit fe6043136fd3ba0333b99b8ca4dda699961c2bfd Author: Stephan Bergmann <[email protected]> AuthorDate: Wed Feb 16 17:16:55 2022 +0100 Commit: Stephan Bergmann <[email protected]> CommitDate: Thu Feb 17 18:03:49 2022 +0100 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 <[email protected]> diff --git a/README.md b/README.md index 4052f0580c08..546330ac86cb 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ run and compile LibreOffice, also used by the TDF builds: * Build: 10.14.4 + Xcode 11.3 * Linux: * Runtime: RHEL 7 or CentOS 7 - * Build: either GCC 7.0.0; or Clang 5.0.2 with libstdc++ 7.3.0 + * Build: either GCC 7.0.0; or Clang 8.0.1 with libstdc++ 7.3.0 * iOS (only for LibreOfficeKit): * Runtime: 11.4 (only support for newer i devices == 64 bit) * Build: Xcode 9.3 and iPhone SDK 11.4 diff --git a/configure.ac b/configure.ac index 4e84f9a33980..ea1db348659c 100644 --- a/configure.ac +++ b/configure.ac @@ -4326,10 +4326,10 @@ if test "$COM_IS_CLANG" = TRUE; then CLANG_FULL_VERSION=`echo __clang_version__ | $CC $my_args -` CLANGVER=`echo $clang_version \ | $AWK -F. '{ print \$1*10000+(\$2<100?\$2:99)*100+(\$3<100?\$3:99) }'` - if test "$CLANGVER" -ge 50002; then + if test "$CLANGVER" -ge 80001; then AC_MSG_RESULT([yes ($clang_version)]) else - AC_MSG_ERROR(["$CLANG_FULL_VERSION" is too old or unrecognized, must be at least Clang 5.0.2]) + AC_MSG_ERROR(["$CLANG_FULL_VERSION" is too old or unrecognized, must be at least Clang 8.0.1]) fi AC_DEFINE_UNQUOTED(CLANG_VERSION,$CLANGVER) AC_DEFINE_UNQUOTED(CLANG_FULL_VERSION,$CLANG_FULL_VERSION) 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
