diff options
author | Nathan James <n.james93@hotmail.co.uk> | 2022-11-08 13:11:10 +0000 |
---|---|---|
committer | Nathan James <n.james93@hotmail.co.uk> | 2022-11-08 13:11:41 +0000 |
commit | 632a389f96355cbe7ed8fa7b8d2ed6267c92457c (patch) | |
tree | 11459955fe1fbe372cb32dc3a262c837b811e9b6 /llvm/unittests/ADT/OptionalTest.cpp | |
parent | 46d53f45d89b54d55304cfd7cd3d6c6232dbf529 (diff) | |
download | llvm-632a389f96355cbe7ed8fa7b8d2ed6267c92457c.zip llvm-632a389f96355cbe7ed8fa7b8d2ed6267c92457c.tar.gz llvm-632a389f96355cbe7ed8fa7b8d2ed6267c92457c.tar.bz2 |
Revert "[llvm][NFC] Use c++17 style variable type traits"
This reverts commit 1834a310d060d55748ca38d4ae0482864c2047d8.
Diffstat (limited to 'llvm/unittests/ADT/OptionalTest.cpp')
-rw-r--r-- | llvm/unittests/ADT/OptionalTest.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/llvm/unittests/ADT/OptionalTest.cpp b/llvm/unittests/ADT/OptionalTest.cpp index 5f1f88d..e615d56e 100644 --- a/llvm/unittests/ADT/OptionalTest.cpp +++ b/llvm/unittests/ADT/OptionalTest.cpp @@ -18,10 +18,10 @@ using namespace llvm; -static_assert(std::is_trivially_copyable_v<Optional<int>>, +static_assert(std::is_trivially_copyable<Optional<int>>::value, "trivially copyable"); -static_assert(std::is_trivially_copyable_v<Optional<std::array<int, 3>>>, +static_assert(std::is_trivially_copyable<Optional<std::array<int, 3>>>::value, "trivially copyable"); void OptionalWorksInConstexpr() { @@ -70,8 +70,9 @@ unsigned NonDefaultConstructible::CopyConstructions = 0; unsigned NonDefaultConstructible::Destructions = 0; unsigned NonDefaultConstructible::CopyAssignments = 0; -static_assert(!std::is_trivially_copyable_v<Optional<NonDefaultConstructible>>, - "not trivially copyable"); +static_assert( + !std::is_trivially_copyable<Optional<NonDefaultConstructible>>::value, + "not trivially copyable"); TEST(OptionalTest, NonDefaultConstructibleTest) { Optional<NonDefaultConstructible> O; @@ -240,7 +241,7 @@ struct MultiArgConstructor { }; unsigned MultiArgConstructor::Destructions = 0; -static_assert(!std::is_trivially_copyable_v<Optional<MultiArgConstructor>>, +static_assert(!std::is_trivially_copyable<Optional<MultiArgConstructor>>::value, "not trivially copyable"); TEST(OptionalTest, Emplace) { @@ -322,7 +323,7 @@ unsigned MoveOnly::MoveConstructions = 0; unsigned MoveOnly::Destructions = 0; unsigned MoveOnly::MoveAssignments = 0; -static_assert(!std::is_trivially_copyable_v<Optional<MoveOnly>>, +static_assert(!std::is_trivially_copyable<Optional<MoveOnly>>::value, "not trivially copyable"); TEST(OptionalTest, MoveOnlyNull) { @@ -426,7 +427,7 @@ private: unsigned Immovable::Constructions = 0; unsigned Immovable::Destructions = 0; -static_assert(!std::is_trivially_copyable_v<Optional<Immovable>>, +static_assert(!std::is_trivially_copyable<Optional<Immovable>>::value, "not trivially copyable"); TEST(OptionalTest, ImmovableEmplace) { @@ -564,7 +565,7 @@ TEST(OptionalTest, DeletedMoveConstructor) { NonTMove1 = std::move(NonTMove2); static_assert( - std::is_trivially_copyable_v<NoTMoveOptT>, + std::is_trivially_copyable<NoTMoveOptT>::value, "Expect Optional<NoTMove> to still use the trivial specialization " "of OptionalStorage despite the deleted move constructor / assignment."); } |