diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2023-01-23 10:34:20 +0100 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2023-02-01 15:38:08 +0000 |
| commit | 86d5d85c28a6a90afc4f2736eb6d63a2bd850fc4 (patch) | |
| tree | 5f872d04a8bfd053d246e11dd57d0e517c7e5418 | |
| parent | 8b2b44128018e2df1c236be32d28dac36c90e165 (diff) | |
| download | qtwebengine-chromium-86d5d85c28a6a90afc4f2736eb6d63a2bd850fc4.tar.gz | |
[Backport] Disable ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE for clang-cl.
The Lexan and MSVC toolchains both set _MSC_VER. The MSVC toolchain must
set `ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE` and
`ABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE`, in order to use Abseil
workarounds in the absence of these types. This is not necessary for
clang-cl.
This change excludes clang-cl from the predicate setting these
variables.
Original commit:
https://github.com/abseil/abseil-cpp/commit/0c92330442d6b1be934e0407115c8084250ef347
Task-number: QTBUG-108240
Change-Id: I591cec6326a4a2a9d800ee067dcc9f0a8629ecb7
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/455715
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, 1 insertions, 1 deletions
diff --git a/chromium/third_party/abseil-cpp/absl/base/config.h b/chromium/third_party/abseil-cpp/absl/base/config.h index 4458987f4a6..bb463cb75ce 100644 --- a/chromium/third_party/abseil-cpp/absl/base/config.h +++ b/chromium/third_party/abseil-cpp/absl/base/config.h @@ -203,7 +203,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' || (!defined(__clang__) && defined(__GNUC__) && \ (__GNUC__ > 7 || (__GNUC__ == 7 && __GNUC_MINOR__ >= 4)) && \ (defined(_LIBCPP_VERSION) || defined(__GLIBCXX__))) || \ - (defined(_MSC_VER) && !defined(__NVCC__)) + (defined(_MSC_VER) && !defined(__NVCC__) && !defined(__clang__)) #define ABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE 1 #define ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE 1 #endif |