From e82dec5c0f6708164242192cb3c9f43e2fc6ec36 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Thu, 16 Jan 2014 23:37:23 +0000 Subject: [PATCH] Use LLVM_EXPLICIT instead of a function pointer as bool. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@199437 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/ErrorOr.h | 7 ++----- unittests/Support/ErrorOrTest.cpp | 4 +++- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/include/llvm/Support/ErrorOr.h b/include/llvm/Support/ErrorOr.h index 543f50766ec..39fec3b5ae3 100644 --- a/include/llvm/Support/ErrorOr.h +++ b/include/llvm/Support/ErrorOr.h @@ -169,12 +169,9 @@ public: getStorage()->~storage_type(); } - typedef void (*unspecified_bool_type)(); - static void unspecified_bool_true() {} - /// \brief Return false if there is an error. - operator unspecified_bool_type() const { - return HasError ? 0 : unspecified_bool_true; + LLVM_EXPLICIT operator bool() const { + return !HasError; } reference get() { return *getStorage(); } diff --git a/unittests/Support/ErrorOrTest.cpp b/unittests/Support/ErrorOrTest.cpp index 8a5b068d479..7a0c31f484d 100644 --- a/unittests/Support/ErrorOrTest.cpp +++ b/unittests/Support/ErrorOrTest.cpp @@ -20,7 +20,9 @@ ErrorOr t2() { return errc::invalid_argument; } TEST(ErrorOr, SimpleValue) { ErrorOr 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 b = a; -- 2.11.0