summaryrefslogtreecommitdiff
path: root/unittests
diff options
context:
space:
mode:
authorNAKAMURA Takumi <geek4civic@gmail.com>2017-11-01 05:14:31 +0000
committerNAKAMURA Takumi <geek4civic@gmail.com>2017-11-01 05:14:31 +0000
commit89f198924daf253cca81e93376531d06e3cb9436 (patch)
tree9f105f5fed46ad2fd23e0ae2ada651e181efd3d9 /unittests
parentb1a2e303f233fc22f4d4bc34f78d19c4c600e24d (diff)
Revert rL317019, "[ADT] Split optional to only include copy mechanics and dtor for non-trivial types."
Seems g++-4.8 (eg. Ubuntu 14.04) doesn't like this. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@317077 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'unittests')
-rw-r--r--unittests/ADT/OptionalTest.cpp9
1 files changed, 0 insertions, 9 deletions
diff --git a/unittests/ADT/OptionalTest.cpp b/unittests/ADT/OptionalTest.cpp
index a9a37bf820d..46d4fe0780c 100644
--- a/unittests/ADT/OptionalTest.cpp
+++ b/unittests/ADT/OptionalTest.cpp
@@ -518,14 +518,5 @@ TEST_F(OptionalTest, OperatorGreaterEqual) {
CheckRelation<GreaterEqual>(InequalityLhs, InequalityRhs, !IsLess);
}
-#if (__has_feature(is_trivially_copyable) && defined(_LIBCPP_VERSION)) || \
- (defined(__GNUC__) && __GNUC__ >= 5)
-static_assert(std::is_trivially_copyable<Optional<int>>::value,
- "Should be trivially copyable");
-static_assert(
- !std::is_trivially_copyable<Optional<NonDefaultConstructible>>::value,
- "Shouldn't be trivially copyable");
-#endif
-
} // end anonymous namespace