1 files changed, 7 insertions, 10 deletions
diff --git a/unittests/Support/ErrorOrTest.cpp b/unittests/Support/ErrorOrTest.cpp
index feb6a08..18ce507 100644
--- a/unittests/Support/ErrorOrTest.cpp
+++ b/unittests/Support/ErrorOrTest.cpp
@@ -8,9 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Support/ErrorOr.h"
-
 #include "gtest/gtest.h"
-
 #include <memory>
 
 using namespace llvm;
@@ -22,22 +20,25 @@ ErrorOr<int> t2() { return errc::invalid_argument; }
 
 TEST(ErrorOr, SimpleValue) {
   ErrorOr<int> a = t1();
-  EXPECT_TRUE(a);
+  // FIXME: This is probably a bug in gtest. EXPECT_TRUE should expand to
+  // include the !! to make it friendly to explicit bool operators.
+  EXPECT_TRUE(!!a);
   EXPECT_EQ(1, *a);
 
+  ErrorOr<int> b = a;
+  EXPECT_EQ(1, *b);
+
   a = t2();
   EXPECT_FALSE(a);
-  EXPECT_EQ(errc::invalid_argument, a);
+  EXPECT_EQ(errc::invalid_argument, a.getError());
 #ifdef EXPECT_DEBUG_DEATH
   EXPECT_DEBUG_DEATH(*a, "Cannot get value when an error exists");
 #endif
 }
 
-#if LLVM_HAS_CXX11_STDLIB
 ErrorOr<std::unique_ptr<int> > t3() {
   return std::unique_ptr<int>(new int(3));
 }
-#endif
 
 TEST(ErrorOr, Types) {
   int x;
@@ -45,10 +46,8 @@ TEST(ErrorOr, Types) {
   *a = 42;
   EXPECT_EQ(42, x);
 
-#if LLVM_HAS_CXX11_STDLIB
   // Move only types.
   EXPECT_EQ(3, **t3());
-#endif
 }
 
 struct B {};
@@ -58,9 +57,7 @@ TEST(ErrorOr, Covariant) {
   ErrorOr<B*> b(ErrorOr<D*>(0));
   b = ErrorOr<D*>(0);
 
-#if LLVM_HAS_CXX11_STDLIB
   ErrorOr<std::unique_ptr<B> > b1(ErrorOr<std::unique_ptr<D> >(0));
   b1 = ErrorOr<std::unique_ptr<D> >(0);
-#endif
 }
 } // end anon namespace