diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2023-01-23 10:37:15 +0100 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2023-02-01 15:38:16 +0000 |
| commit | d29902afc5bd4d3ae0fb16125bfc0970cde21ae3 (patch) | |
| tree | d351b1cf241bb8bc41d39ddd77af13305e69cb26 | |
| parent | 86d5d85c28a6a90afc4f2736eb6d63a2bd850fc4 (diff) | |
| download | qtwebengine-chromium-d29902afc5bd4d3ae0fb16125bfc0970cde21ae3.tar.gz | |
[Backport] Fix more clang deprecated builtins
If you compile with clang 15+, the uses of trivially destructible and
assignable are deprecated. This sets this configuration correctly as the
ifdef to fix the build.
Fixes https://github.com/abseil/abseil-cpp/issues/1201
Related https://github.com/abseil/abseil-cpp/pull/1277
Original Pull Request:
https://github.com/abseil/abseil-cpp/pull/1289
Task-number: QTBUG-108240
Change-Id: Id5456e3da01e16e9370f9fa6ed279360e1df523d
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/455716
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/third_party/abseil-cpp/absl/base/config.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chromium/third_party/abseil-cpp/absl/base/config.h b/chromium/third_party/abseil-cpp/absl/base/config.h index bb463cb75ce..84fa8938b8b 100644 --- a/chromium/third_party/abseil-cpp/absl/base/config.h +++ b/chromium/third_party/abseil-cpp/absl/base/config.h @@ -178,6 +178,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' || #ifdef ABSL_HAVE_STD_IS_TRIVIALLY_DESTRUCTIBLE #error ABSL_HAVE_STD_IS_TRIVIALLY_DESTRUCTIBLE cannot be directly set #elif defined(_LIBCPP_VERSION) || \ + (defined(__clang__) && __clang_major__ >= 15) || \ (!defined(__clang__) && defined(__GNUC__) && defined(__GLIBCXX__) && \ (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8))) || \ defined(_MSC_VER) @@ -200,6 +201,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' || #elif defined(ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE) #error ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE cannot directly set #elif (defined(__clang__) && defined(_LIBCPP_VERSION)) || \ + (defined(__clang__) && __clang_major__ >= 15) || \ (!defined(__clang__) && defined(__GNUC__) && \ (__GNUC__ > 7 || (__GNUC__ == 7 && __GNUC_MINOR__ >= 4)) && \ (defined(_LIBCPP_VERSION) || defined(__GLIBCXX__))) || \ |