diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-09-27 22:09:42 (GMT) |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-09-27 22:09:42 (GMT) |
| commit | 2d1835b086e69570e4c3e0ad6197da509bd0a957 (patch) | |
| tree | 1732afebaad166ad92ad2f0a12ed3327b891e626 /include/gtest/gtest.h | |
| parent | b5d3a17805fe0ed2ccde463412ae1fd206c4df21 (diff) | |
| download | googletest-2d1835b086e69570e4c3e0ad6197da509bd0a957.zip googletest-2d1835b086e69570e4c3e0ad6197da509bd0a957.tar.gz googletest-2d1835b086e69570e4c3e0ad6197da509bd0a957.tar.bz2 | |
Removes uses of deprecated AssertionFailure() API (by Vlad Losev).
Diffstat (limited to 'include/gtest/gtest.h')
| -rw-r--r-- | include/gtest/gtest.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/gtest/gtest.h b/include/gtest/gtest.h index 71eccac..c725e4c 100644 --- a/include/gtest/gtest.h +++ b/include/gtest/gtest.h @@ -1385,11 +1385,10 @@ AssertionResult CmpHelper##op_name(const char* expr1, const char* expr2, \ if (val1 op val2) {\ return AssertionSuccess();\ } else {\ - Message msg;\ - msg << "Expected: (" << expr1 << ") " #op " (" << expr2\ + return AssertionFailure() \ + << "Expected: (" << expr1 << ") " #op " (" << expr2\ << "), actual: " << FormatForComparisonFailureMessage(val1, val2)\ << " vs " << FormatForComparisonFailureMessage(val2, val1);\ - return AssertionFailure(msg);\ }\ }\ GTEST_API_ AssertionResult CmpHelper##op_name(\ |