From 083d04dd4a62ebbf037079b06e49b323c5e1192a Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Tue, 7 Aug 2018 11:43:34 -0700 Subject: Export of internal Abseil changes. -- c1f3a243ff3713917eaf0255c86ddd1b40461ba9 by Abseil Team : Remove stray space. PiperOrigin-RevId: 207753171 -- 4abe43b174f7fafa390d2f6eb96f31977a38fc69 by Shaindel Schwartz : Typo fix. PiperOrigin-RevId: 207572868 -- e7757b409256b025cadba20a84a93cb9dc4319e1 by Abseil Team : Adds backported is_(copy|move)_assignable PiperOrigin-RevId: 207572180 GitOrigin-RevId: c1f3a243ff3713917eaf0255c86ddd1b40461ba9 Change-Id: I1202715e5092b54d5967017728044715d6eb2ec0 --- absl/base/exception_safety_testing_test.cc | 4 +- absl/meta/type_traits.h | 23 +++++++-- absl/meta/type_traits_test.cc | 76 ++++++++++++++++++++++++++++++ absl/strings/numbers.h | 2 +- absl/strings/string_view.h | 2 +- absl/types/internal/variant.h | 8 ++-- absl/types/optional.h | 4 +- absl/types/optional_test.cc | 29 ++++++------ absl/types/variant_test.cc | 10 ++-- 9 files changed, 126 insertions(+), 32 deletions(-) diff --git a/absl/base/exception_safety_testing_test.cc b/absl/base/exception_safety_testing_test.cc index 97c8d6f8..724c0ad5 100644 --- a/absl/base/exception_safety_testing_test.cc +++ b/absl/base/exception_safety_testing_test.cc @@ -931,8 +931,8 @@ TEST(ThrowingValueTraitsTest, RelationalOperators) { } TEST(ThrowingAllocatorTraitsTest, Assignablility) { - EXPECT_TRUE(std::is_move_assignable>::value); - EXPECT_TRUE(std::is_copy_assignable>::value); + EXPECT_TRUE(absl::is_move_assignable>::value); + EXPECT_TRUE(absl::is_copy_assignable>::value); EXPECT_TRUE(std::is_nothrow_move_assignable>::value); EXPECT_TRUE(std::is_nothrow_copy_assignable>::value); } diff --git a/absl/meta/type_traits.h b/absl/meta/type_traits.h index 457b8908..23ebd6ed 100644 --- a/absl/meta/type_traits.h +++ b/absl/meta/type_traits.h @@ -105,8 +105,25 @@ template class Op, class... Args> struct is_detected_convertible : is_detected_convertible_impl::type {}; +template +using IsCopyAssignableImpl = + decltype(std::declval() = std::declval()); + +template +using IsMoveAssignableImpl = decltype(std::declval() = std::declval()); + } // namespace type_traits_internal +template +struct is_copy_assignable : type_traits_internal::is_detected< + type_traits_internal::IsCopyAssignableImpl, T> { +}; + +template +struct is_move_assignable : type_traits_internal::is_detected< + type_traits_internal::IsMoveAssignableImpl, T> { +}; + // void_t() // // Ignores the type of any its arguments and returns `void`. In general, this @@ -309,7 +326,7 @@ template struct is_trivially_copy_assignable : std::integral_constant< bool, __has_trivial_assign(typename std::remove_reference::type) && - std::is_copy_assignable::value> { + absl::is_copy_assignable::value> { #ifdef ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE private: static constexpr bool compliant = @@ -409,11 +426,11 @@ struct IsHashEnabled : absl::conjunction>, std::is_copy_constructible>, std::is_destructible>, - std::is_copy_assignable>, + absl::is_copy_assignable>, IsHashable> {}; + } // namespace type_traits_internal } // namespace absl - #endif // ABSL_META_TYPE_TRAITS_H_ diff --git a/absl/meta/type_traits_test.cc b/absl/meta/type_traits_test.cc index 81b4bd32..f51f5ded 100644 --- a/absl/meta/type_traits_test.cc +++ b/absl/meta/type_traits_test.cc @@ -877,4 +877,80 @@ TEST(TypeTraitsTest, TestResultOf) { EXPECT_EQ(TypeEnum::D, GetTypeExt(Wrap())); } +template +bool TestCopyAssign() { + return absl::is_copy_assignable::value == + std::is_copy_assignable::value; +} + +TEST(TypeTraitsTest, IsCopyAssignable) { + EXPECT_TRUE(TestCopyAssign()); + EXPECT_TRUE(TestCopyAssign()); + EXPECT_TRUE(TestCopyAssign()); + + struct S {}; + EXPECT_TRUE(TestCopyAssign()); + EXPECT_TRUE(TestCopyAssign()); + EXPECT_TRUE(TestCopyAssign()); + + class C { + public: + explicit C(C* c) : c_(c) {} + ~C() { delete c_; } + + private: + C* c_; + }; + EXPECT_TRUE(TestCopyAssign()); + EXPECT_TRUE(TestCopyAssign()); + EXPECT_TRUE(TestCopyAssign()); + + // Reason for ifndef: add_lvalue_reference in libc++ breaks for these cases +#ifndef _LIBCPP_VERSION + EXPECT_TRUE(TestCopyAssign()); + EXPECT_TRUE(TestCopyAssign()); + EXPECT_TRUE(TestCopyAssign()); + EXPECT_TRUE(TestCopyAssign()); +#endif // _LIBCPP_VERSION +} + +template +bool TestMoveAssign() { + return absl::is_move_assignable::value == + std::is_move_assignable::value; +} + +TEST(TypeTraitsTest, IsMoveAssignable) { + EXPECT_TRUE(TestMoveAssign()); + EXPECT_TRUE(TestMoveAssign()); + EXPECT_TRUE(TestMoveAssign()); + + struct S {}; + EXPECT_TRUE(TestMoveAssign()); + EXPECT_TRUE(TestMoveAssign()); + EXPECT_TRUE(TestMoveAssign()); + + class C { + public: + explicit C(C* c) : c_(c) {} + ~C() { delete c_; } + void operator=(const C&) = delete; + void operator=(C&&) = delete; + + private: + C* c_; + }; + EXPECT_TRUE(TestMoveAssign()); + EXPECT_TRUE(TestMoveAssign()); + EXPECT_TRUE(TestMoveAssign()); + + // Reason for ifndef: add_lvalue_reference in libc++ breaks for these cases +#ifndef _LIBCPP_VERSION + EXPECT_TRUE(TestMoveAssign()); + EXPECT_TRUE(TestMoveAssign()); + EXPECT_TRUE(TestMoveAssign()); + EXPECT_TRUE(TestMoveAssign()); +#endif // _LIBCPP_VERSION +} + } // namespace diff --git a/absl/strings/numbers.h b/absl/strings/numbers.h index cf3c5972..fbed273e 100644 --- a/absl/strings/numbers.h +++ b/absl/strings/numbers.h @@ -44,7 +44,7 @@ namespace absl { // Converts the given std::string into an integer value, returning `true` if // successful. The std::string must reflect a base-10 integer (optionally followed or // preceded by ASCII whitespace) whose value falls within the range of the -// integer type, +// integer type. template ABSL_MUST_USE_RESULT bool SimpleAtoi(absl::string_view s, int_type* out); diff --git a/absl/strings/string_view.h b/absl/strings/string_view.h index a7f91992..1537a3f8 100644 --- a/absl/strings/string_view.h +++ b/absl/strings/string_view.h @@ -141,7 +141,7 @@ namespace absl { // All empty `string_view` objects whether null or not, are equal: // // absl::string_view() == absl::string_view("", 0) -// absl::string_view(nullptr, 0) == absl:: string_view("abcdef"+6, 0) +// absl::string_view(nullptr, 0) == absl::string_view("abcdef"+6, 0) class string_view { public: using traits_type = std::char_traits; diff --git a/absl/types/internal/variant.h b/absl/types/internal/variant.h index 7708e67c..28ae1a5a 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 using VariantMoveAssignBase = absl::conditional_t< - absl::disjunction>, + absl::disjunction>, std::is_move_constructible>, std::is_destructible>>, absl::negation..., - std::is_move_assignable...>>>::value, + absl::is_move_assignable...>>>::value, VariantCopyBase, VariantMoveAssignBaseNontrivial>; // Base that is dependent on whether or not the copy-assign can be trivial. template using VariantCopyAssignBase = absl::conditional_t< - absl::disjunction>, + absl::disjunction>, std::is_copy_constructible>, std::is_destructible>>, absl::negation..., - std::is_copy_assignable...>>>::value, + absl::is_copy_assignable...>>>::value, VariantMoveAssignBase, VariantCopyAssignBaseNontrivial>; template diff --git a/absl/types/optional.h b/absl/types/optional.h index c837cdde..79475e3e 100644 --- a/absl/types/optional.h +++ b/absl/types/optional.h @@ -411,10 +411,10 @@ constexpr copy_traits get_ctor_copy_traits() { template constexpr copy_traits get_assign_copy_traits() { - return std::is_copy_assignable::value && + return absl::is_copy_assignable::value && std::is_copy_constructible::value ? copy_traits::copyable - : std::is_move_assignable::value && + : absl::is_move_assignable::value && std::is_move_constructible::value ? copy_traits::movable : copy_traits::non_movable; diff --git a/absl/types/optional_test.cc b/absl/types/optional_test.cc index 179bfd66..d90db9f8 100644 --- a/absl/types/optional_test.cc +++ b/absl/types/optional_test.cc @@ -607,11 +607,12 @@ TEST(optionalTest, CopyAssignment) { opt2_to_empty = empty; EXPECT_FALSE(opt2_to_empty); - EXPECT_FALSE(std::is_copy_assignable>::value); - EXPECT_TRUE(std::is_copy_assignable>::value); - EXPECT_FALSE(std::is_copy_assignable>::value); - EXPECT_FALSE(std::is_copy_assignable>::value); - EXPECT_FALSE(std::is_copy_assignable>::value); + EXPECT_FALSE(absl::is_copy_assignable>::value); + EXPECT_TRUE(absl::is_copy_assignable>::value); + EXPECT_FALSE(absl::is_copy_assignable>::value); + EXPECT_FALSE( + absl::is_copy_assignable>::value); + EXPECT_FALSE(absl::is_copy_assignable>::value); EXPECT_TRUE(absl::is_trivially_copy_assignable::value); EXPECT_TRUE(absl::is_trivially_copy_assignable::value); @@ -625,9 +626,9 @@ TEST(optionalTest, CopyAssignment) { }; EXPECT_TRUE(absl::is_trivially_copy_assignable::value); - EXPECT_FALSE(std::is_copy_assignable::value); - EXPECT_FALSE(std::is_copy_assignable::value); - EXPECT_TRUE(std::is_copy_assignable::value); + EXPECT_FALSE(absl::is_copy_assignable::value); + EXPECT_FALSE(absl::is_copy_assignable::value); + EXPECT_TRUE(absl::is_copy_assignable::value); EXPECT_FALSE(absl::is_trivially_copy_assignable::value); // std::optional doesn't support volatile nontrivial types. @@ -695,11 +696,11 @@ TEST(optionalTest, MoveAssignment) { EXPECT_EQ(1, listener.volatile_move_assign); } #endif // ABSL_HAVE_STD_OPTIONAL - EXPECT_FALSE(std::is_move_assignable>::value); - EXPECT_TRUE(std::is_move_assignable>::value); - EXPECT_TRUE(std::is_move_assignable>::value); - EXPECT_TRUE(std::is_move_assignable>::value); - EXPECT_FALSE(std::is_move_assignable>::value); + EXPECT_FALSE(absl::is_move_assignable>::value); + EXPECT_TRUE(absl::is_move_assignable>::value); + EXPECT_TRUE(absl::is_move_assignable>::value); + EXPECT_TRUE(absl::is_move_assignable>::value); + EXPECT_FALSE(absl::is_move_assignable>::value); EXPECT_FALSE( std::is_nothrow_move_assignable>::value); @@ -1619,7 +1620,7 @@ TEST(optionalTest, AssignmentConstraints) { EXPECT_TRUE( (std::is_assignable&, const AnyLike&>::value)); EXPECT_TRUE(std::is_move_assignable>::value); - EXPECT_TRUE(std::is_copy_assignable>::value); + EXPECT_TRUE(absl::is_copy_assignable>::value); } } // namespace diff --git a/absl/types/variant_test.cc b/absl/types/variant_test.cc index 262bd944..bfb8bd7a 100644 --- a/absl/types/variant_test.cc +++ b/absl/types/variant_test.cc @@ -403,7 +403,7 @@ struct is_trivially_move_constructible template struct is_trivially_move_assignable - : std::is_move_assignable>::type {}; + : absl::is_move_assignable>::type {}; TEST(VariantTest, NothrowMoveConstructible) { // Verify that variant is nothrow move constructible iff its template @@ -2439,14 +2439,14 @@ TEST(VariantTest, TestMoveConversionViaConvertVariantTo) { TEST(VariantTest, TestCopyAndMoveTypeTraits) { EXPECT_TRUE(std::is_copy_constructible>::value); - EXPECT_TRUE(std::is_copy_assignable>::value); + EXPECT_TRUE(absl::is_copy_assignable>::value); EXPECT_TRUE(std::is_move_constructible>::value); - EXPECT_TRUE(std::is_move_assignable>::value); + EXPECT_TRUE(absl::is_move_assignable>::value); EXPECT_TRUE(std::is_move_constructible>>::value); - EXPECT_TRUE(std::is_move_assignable>>::value); + EXPECT_TRUE(absl::is_move_assignable>>::value); EXPECT_FALSE( std::is_copy_constructible>>::value); - EXPECT_FALSE(std::is_copy_assignable>>::value); + EXPECT_FALSE(absl::is_copy_assignable>>::value); EXPECT_FALSE( absl::is_trivially_copy_constructible>::value); -- cgit v1.2.3