diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-11-03 22:46:27 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-03 22:46:27 -0800 |
| commit | 75e24fa12478581919b7e65cddaffb87ead2a5a7 (patch) | |
| tree | 2144b810de92fc7d9f7662fd45b63512547b0997 /ports/abseil/fix-MSVCbuildfail.patch | |
| parent | 53f9a328a9b1a94514ef29a51ccb342456ea0f0a (diff) | |
| download | vcpkg-75e24fa12478581919b7e65cddaffb87ead2a5a7.tar.gz vcpkg-75e24fa12478581919b7e65cddaffb87ead2a5a7.zip | |
[abseil] Revert changes about arm build (#14109)
Diffstat (limited to 'ports/abseil/fix-MSVCbuildfail.patch')
| -rw-r--r-- | ports/abseil/fix-MSVCbuildfail.patch | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/ports/abseil/fix-MSVCbuildfail.patch b/ports/abseil/fix-MSVCbuildfail.patch deleted file mode 100644 index 7c041c27b..000000000 --- a/ports/abseil/fix-MSVCbuildfail.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff --git a/absl/container/internal/compressed_tuple.h b/absl/container/internal/compressed_tuple.h -index 4bfe92f..02bfd03 100644 ---- a/absl/container/internal/compressed_tuple.h -+++ b/absl/container/internal/compressed_tuple.h -@@ -169,9 +169,33 @@ constexpr bool ShouldAnyUseBase() { - } - - template <typename T, typename V> --using TupleMoveConstructible = typename std::conditional< -- std::is_reference<T>::value, std::is_convertible<V, T>, -- std::is_constructible<T, V&&>>::type; -+using TupleElementMoveConstructible = -+ typename std::conditional<std::is_reference<T>::value, -+ std::is_convertible<V, T>, -+ std::is_constructible<T, V&&>>::type; -+ -+template <bool SizeMatches, class T, class... Vs> -+struct TupleMoveConstructible : std::false_type {}; -+ -+template <class... Ts, class... Vs> -+struct TupleMoveConstructible<true, CompressedTuple<Ts...>, Vs...> -+ : std::integral_constant< -+ bool, absl::conjunction< -+ TupleElementMoveConstructible<Ts, Vs&&>...>::value> {}; -+ -+template <typename T> -+struct compressed_tuple_size; -+ -+template <typename... Es> -+struct compressed_tuple_size<CompressedTuple<Es...>> -+ : public std::integral_constant<std::size_t, sizeof...(Es)> {}; -+ -+template <class T, class... Vs> -+struct TupleItemsMoveConstructible -+ : std::integral_constant< -+ bool, TupleMoveConstructible<compressed_tuple_size<T>::value == -+ sizeof...(Vs), -+ T, Vs...>::value> {}; - - } // namespace internal_compressed_tuple - -@@ -217,17 +241,18 @@ class ABSL_INTERNAL_COMPRESSED_TUPLE_DECLSPEC CompressedTuple - explicit constexpr CompressedTuple(const Ts&... base) - : CompressedTuple::CompressedTupleImpl(absl::in_place, base...) {} - -- template <typename... Vs, -+ template <typename First, typename... Vs, - absl::enable_if_t< - absl::conjunction< - // Ensure we are not hiding default copy/move constructors. - absl::negation<std::is_same<void(CompressedTuple), -- void(absl::decay_t<Vs>...)>>, -- internal_compressed_tuple::TupleMoveConstructible< -- Ts, Vs&&>...>::value, -+ void(absl::decay_t<First>)>>, -+ internal_compressed_tuple::TupleItemsMoveConstructible< -+ CompressedTuple<Ts...>, First, Vs...>>::value, - bool> = true> -- explicit constexpr CompressedTuple(Vs&&... base) -+ explicit constexpr CompressedTuple(First&& first, Vs&&... base) - : CompressedTuple::CompressedTupleImpl(absl::in_place, -+ absl::forward<First>(first), - absl::forward<Vs>(base)...) {} - - template <int I> |
