diff options
author | Billy Donahue <BillyDonahue@users.noreply.github.com> | 2016-06-26 19:09:45 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-26 19:09:45 -0400 |
commit | 10799abad25aa9ec7dcd08d9a46cad093f8bb074 (patch) | |
tree | eae440abe878ffe211251ba46ec9fa1794c1c64d | |
parent | faee7d1fbcf1214f3d72271addf35c094f317369 (diff) | |
parent | ce7ec96edab73ec86c5c890b763c4043bbad8dc7 (diff) | |
download | googletest-10799abad25aa9ec7dcd08d9a46cad093f8bb074.tar.gz googletest-10799abad25aa9ec7dcd08d9a46cad093f8bb074.tar.bz2 googletest-10799abad25aa9ec7dcd08d9a46cad093f8bb074.zip |
Merge pull request #810 from google/rollback_808
Rollback change #808.
-rw-r--r-- | googletest/include/gtest/gtest.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/googletest/include/gtest/gtest.h b/googletest/include/gtest/gtest.h index 0ee03d06..f846c5bd 100644 --- a/googletest/include/gtest/gtest.h +++ b/googletest/include/gtest/gtest.h @@ -1857,13 +1857,13 @@ class TestWithParam : public Test, public WithParamInterface<T> { // AssertionResult. For more information on how to use AssertionResult with // these macros see comments on that class. #define EXPECT_TRUE(condition) \ - GTEST_TEST_BOOLEAN_(!!(condition), #condition, false, true, \ + GTEST_TEST_BOOLEAN_((condition), #condition, false, true, \ GTEST_NONFATAL_FAILURE_) #define EXPECT_FALSE(condition) \ GTEST_TEST_BOOLEAN_(!(condition), #condition, true, false, \ GTEST_NONFATAL_FAILURE_) #define ASSERT_TRUE(condition) \ - GTEST_TEST_BOOLEAN_(!!(condition), #condition, false, true, \ + GTEST_TEST_BOOLEAN_((condition), #condition, false, true, \ GTEST_FATAL_FAILURE_) #define ASSERT_FALSE(condition) \ GTEST_TEST_BOOLEAN_(!(condition), #condition, true, false, \ |