forked from microsoft/vcpkg
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[abseil] Fix CompressedTuple move constructor on MSVC (microsoft#10721)
* [abseil] Fix CompressedTuple move constructor on MSVC * [abseil] Add comment for new patch
- Loading branch information
Showing
3 changed files
with
67 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters