aboutsummaryrefslogtreecommitdiff
path: root/llvm/unittests/Support/ErrorOrTest.cpp
diff options
context:
space:
mode:
authorAndrew Trick <atrick@apple.com>2013-02-05 22:50:20 +0000
committerAndrew Trick <atrick@apple.com>2013-02-05 22:50:20 +0000
commit780ebadc1adcd0b59ba327510e78aa23444a0d79 (patch)
tree932887c1acaab6380c969f84780800bd1bc5c70a /llvm/unittests/Support/ErrorOrTest.cpp
parent3f12ac2138b0c4c0be2dcb35a08a30c589b58d22 (diff)
downloadllvm-780ebadc1adcd0b59ba327510e78aa23444a0d79.zip
llvm-780ebadc1adcd0b59ba327510e78aa23444a0d79.tar.gz
llvm-780ebadc1adcd0b59ba327510e78aa23444a0d79.tar.bz2
Revert "[Support][ErrorOr] Add support for convertable types."
This reverts commit a33e1fafac7fedb1b080ef07ddf9ad6ddff3a830. This unit test crashes on Darwon. It needs to be temporarily reverted to unblock the test infrastructure. llvm-svn: 174458
Diffstat (limited to 'llvm/unittests/Support/ErrorOrTest.cpp')
-rw-r--r--llvm/unittests/Support/ErrorOrTest.cpp11
1 files changed, 0 insertions, 11 deletions
diff --git a/llvm/unittests/Support/ErrorOrTest.cpp b/llvm/unittests/Support/ErrorOrTest.cpp
index 6cef4fc..a860886 100644
--- a/llvm/unittests/Support/ErrorOrTest.cpp
+++ b/llvm/unittests/Support/ErrorOrTest.cpp
@@ -53,17 +53,6 @@ TEST(ErrorOr, Types) {
EXPECT_EQ(3, **t3());
#endif
}
-
-struct B {};
-struct D : B {};
-
-TEST(ErrorOr, Covariant) {
- ErrorOr<B*> b(ErrorOr<D*>(0));
-
-#if LLVM_HAS_CXX11_STDLIB
- ErrorOr<std::unique_ptr<B> > b1(ErrorOr<std::unique_ptr<D> >(0));
-#endif
-}
} // end anon namespace
struct InvalidArgError {