diff options
| author |  Abseil Team <absl-team@google.com> | 2018-08-07 11:43:34 -0700 |
|---|---|---|
| committer |  Derek Mauro <dmauro@google.com> | 2018-08-08 09:53:34 -0400 |
| commit | 083d04dd4a62ebbf037079b06e49b323c5e1192a (patch) | |
| tree | c403907fc531e9061cab3007b1cc0d29aa56969c /absl/types/internal/variant.h | |
| parent | bea85b52733022294eef108a2e42d77b616ddca2 (diff) | |
Export of internal Abseil changes.
--
c1f3a243ff3713917eaf0255c86ddd1b40461ba9 by Abseil Team <absl-team@google.com>:
Remove stray space.
PiperOrigin-RevId: 207753171
--
4abe43b174f7fafa390d2f6eb96f31977a38fc69 by Shaindel Schwartz <shaindel@google.com>:
Typo fix.
PiperOrigin-RevId: 207572868
--
e7757b409256b025cadba20a84a93cb9dc4319e1 by Abseil Team <absl-team@google.com>:
Adds backported is_(copy|move)_assignable<T>
PiperOrigin-RevId: 207572180
GitOrigin-RevId: c1f3a243ff3713917eaf0255c86ddd1b40461ba9
Change-Id: I1202715e5092b54d5967017728044715d6eb2ec0
Diffstat (limited to 'absl/types/internal/variant.h')
| -rw-r--r-- | absl/types/internal/variant.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/absl/types/internal/variant.h b/absl/types/internal/variant.h index 7708e67..28ae1a5 100644 --- a/absl/types/internal/variant.h +++ b/absl/types/internal/variant.h @@ -1227,23 +1227,23 @@ using VariantCopyBase = absl::conditional_t< // Base that is dependent on whether or not the move-assign can be trivial. template <class... T> using VariantMoveAssignBase = absl::conditional_t< - absl::disjunction<absl::conjunction<std::is_move_assignable<Union<T...>>, + absl::disjunction<absl::conjunction<absl::is_move_assignable<Union<T...>>, std::is_move_constructible<Union<T...>>, std::is_destructible<Union<T...>>>, absl::negation<absl::conjunction< std::is_move_constructible<T>..., - std::is_move_assignable<T>...>>>::value, + absl::is_move_assignable<T>...>>>::value, VariantCopyBase<T...>, VariantMoveAssignBaseNontrivial<T...>>; // Base that is dependent on whether or not the copy-assign can be trivial. template <class... T> using VariantCopyAssignBase = absl::conditional_t< - absl::disjunction<absl::conjunction<std::is_copy_assignable<Union<T...>>, + absl::disjunction<absl::conjunction<absl::is_copy_assignable<Union<T...>>, std::is_copy_constructible<Union<T...>>, std::is_destructible<Union<T...>>>, absl::negation<absl::conjunction< std::is_copy_constructible<T>..., - std::is_copy_assignable<T>...>>>::value, + absl::is_copy_assignable<T>...>>>::value, VariantMoveAssignBase<T...>, VariantCopyAssignBaseNontrivial<T...>>; template <class... T> |