diff options
| author | Billy Donahue <BillyDonahue@users.noreply.github.com> | 2016-06-26 15:15:54 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-26 15:15:54 (GMT) |
| commit | faee7d1fbcf1214f3d72271addf35c094f317369 (patch) | |
| tree | 4d9afd57e20ae60144f1e2d514b4111eae9a46a5 | |
| parent | 0a439623f75c029912728d80cb7f1b8b48739ca4 (diff) | |
| parent | 2489c307474809d1c2e2c177353bfbd82b9235f9 (diff) | |
| download | googletest-faee7d1fbcf1214f3d72271addf35c094f317369.zip googletest-faee7d1fbcf1214f3d72271addf35c094f317369.tar.gz googletest-faee7d1fbcf1214f3d72271addf35c094f317369.tar.bz2 | |
Merge pull request #808 from djmott/master
fix to operator precedence in GTEST_TEST_BOOLEAN_ with expressions th…
| -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 9efba75..0ee03d0 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, \ |