diff options
author | Andrew Trick <atrick@apple.com> | 2013-02-05 22:50:20 +0000 |
---|---|---|
committer | Andrew Trick <atrick@apple.com> | 2013-02-05 22:50:20 +0000 |
commit | 2a78bb961ad99cfc9ae4e8a05a9a5a6bf84e41f3 (patch) | |
tree | c350dda529e96cf533410901a2ba6647b73108c2 /unittests/Support/ErrorOrTest.cpp | |
parent | 8c74ecfbddabe89e150abff4fdff0a27108874b9 (diff) |
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.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@174458 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'unittests/Support/ErrorOrTest.cpp')
-rw-r--r-- | unittests/Support/ErrorOrTest.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/unittests/Support/ErrorOrTest.cpp b/unittests/Support/ErrorOrTest.cpp index 6cef4fc212..a8608860b8 100644 --- a/unittests/Support/ErrorOrTest.cpp +++ b/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 { |