diff options
| author | Abseil Team <absl-team@google.com> | 2018-08-07T18·43-0700 |
|---|---|---|
| committer | Derek Mauro <dmauro@google.com> | 2018-08-08T13·53-0400 |
| commit | 083d04dd4a62ebbf037079b06e49b323c5e1192a (patch) | |
| tree | c403907fc531e9061cab3007b1cc0d29aa56969c /absl/types/optional.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/optional.h')
| -rw-r--r-- | absl/types/optional.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/absl/types/optional.h b/absl/types/optional.h index c837cddeef48..79475e3ea3b3 100644 --- a/absl/types/optional.h +++ b/absl/types/optional.h @@ -411,10 +411,10 @@ constexpr copy_traits get_ctor_copy_traits() { template <typename T> constexpr copy_traits get_assign_copy_traits() { - return std::is_copy_assignable<T>::value && + return absl::is_copy_assignable<T>::value && std::is_copy_constructible<T>::value ? copy_traits::copyable - : std::is_move_assignable<T>::value && + : absl::is_move_assignable<T>::value && std::is_move_constructible<T>::value ? copy_traits::movable : copy_traits::non_movable; |