c97c60f70e
pdfium_arm64.patch.1 is now upstreamed as <https://pdfium-review.googlesource.com/c/pdfium/+/96010>. Change-Id: Iafb1ba480161429094db5446ab50314068ae4cfc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139876 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
31 lines
1.4 KiB
Diff
31 lines
1.4 KiB
Diff
--- third_party/abseil-cpp/absl/meta/type_traits.h
|
|
+++ third_party/abseil-cpp/absl/meta/type_traits.h
|
|
@@ -501,27 +501,7 @@ struct is_trivially_move_assignable
|
|
// operation that is not trivial. `is_trivially_copy_assignable<T>` is simply
|
|
// `is_trivially_assignable<T&, const T&>`.
|
|
template <typename T>
|
|
-struct is_trivially_copy_assignable
|
|
-#ifdef ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE
|
|
- : std::is_trivially_copy_assignable<T> {
|
|
-#else
|
|
- : std::integral_constant<
|
|
- bool, __has_trivial_assign(typename std::remove_reference<T>::type) &&
|
|
- absl::is_copy_assignable<T>::value> {
|
|
-#endif
|
|
-#ifdef ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE
|
|
- private:
|
|
- static constexpr bool compliant =
|
|
- std::is_trivially_copy_assignable<T>::value ==
|
|
- is_trivially_copy_assignable::value;
|
|
- static_assert(compliant || std::is_trivially_copy_assignable<T>::value,
|
|
- "Not compliant with std::is_trivially_copy_assignable; "
|
|
- "Standard: false, Implementation: true");
|
|
- static_assert(compliant || !std::is_trivially_copy_assignable<T>::value,
|
|
- "Not compliant with std::is_trivially_copy_assignable; "
|
|
- "Standard: true, Implementation: false");
|
|
-#endif // ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE
|
|
-};
|
|
+using is_trivially_copy_assignable = std::is_trivially_copy_assignable<T>;
|
|
|
|
#if defined(__cpp_lib_remove_cvref) && __cpp_lib_remove_cvref >= 201711L
|
|
template <typename T>
|