RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2024-11-25 12:49:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use LLVM_EXPLICIT instead of a function pointer as bool.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@199437 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola 2014-01-16 23:37:23 +00:00
parent ad60d3c304
commit e82dec5c0f
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/llvm/Support/ErrorOr.h
View File

@ -169,12 +169,9 @@ public:
getStorage()->~storage_type(); getStorage()->~storage_type();
} }
typedef void (*unspecified_bool_type)();
static void unspecified_bool_true() {}
/// \brief Return false if there is an error. /// \brief Return false if there is an error.
operator unspecified_bool_type() const { LLVM_EXPLICIT operator bool() const {
return HasError ? 0 : unspecified_bool_true; return !HasError;
} }
reference get() { return *getStorage(); } reference get() { return *getStorage(); }

4
unittests/Support/ErrorOrTest.cpp
View File

@ -20,7 +20,9 @@ ErrorOr<int> t2() { return errc::invalid_argument; }
TEST(ErrorOr, SimpleValue) { TEST(ErrorOr, SimpleValue) {
ErrorOr<int> a = t1(); 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); EXPECT_EQ(1, *a);
ErrorOr<int> b = a; ErrorOr<int> b = a;