diff options
author | CJ Johnson <johnsoncj@google.com> | 2021-01-26 20:42:45 (GMT) |
---|---|---|
committer | CJ Johnson <johnsoncj@google.com> | 2021-01-26 20:42:45 (GMT) |
commit | 4898cdacfec11e71fa3083cdbc935852ad8162e9 (patch) | |
tree | b2acf4de3d5361997015fe75ac8b5c0bea04b0bf /googletest/src | |
parent | 2c06d021d6bb680ff28240bab1672e346cbe1c07 (diff) | |
parent | 100ffc33f5bbe5c38d64b81838d81744c0701c5e (diff) | |
download | googletest-4898cdacfec11e71fa3083cdbc935852ad8162e9.zip googletest-4898cdacfec11e71fa3083cdbc935852ad8162e9.tar.gz googletest-4898cdacfec11e71fa3083cdbc935852ad8162e9.tar.bz2 |
Merge pull request #3204 from kuzkry:CmpHelperXX-overloads-removal
PiperOrigin-RevId: 352626267
Diffstat (limited to 'googletest/src')
-rw-r--r-- | googletest/src/gtest.cc | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index f134a6f..3dedfc7 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -1603,57 +1603,6 @@ AssertionResult DoubleLE(const char* expr1, const char* expr2, namespace internal { -// The helper function for {ASSERT|EXPECT}_EQ with int or enum -// arguments. -AssertionResult CmpHelperEQ(const char* lhs_expression, - const char* rhs_expression, - BiggestInt lhs, - BiggestInt rhs) { - if (lhs == rhs) { - return AssertionSuccess(); - } - - return EqFailure(lhs_expression, - rhs_expression, - FormatForComparisonFailureMessage(lhs, rhs), - FormatForComparisonFailureMessage(rhs, lhs), - false); -} - -// A macro for implementing the helper functions needed to implement -// ASSERT_?? and EXPECT_?? with integer or enum arguments. It is here -// just to avoid copy-and-paste of similar code. -#define GTEST_IMPL_CMP_HELPER_(op_name, op)\ -AssertionResult CmpHelper##op_name(const char* expr1, const char* expr2, \ - BiggestInt val1, BiggestInt val2) {\ - if (val1 op val2) {\ - return AssertionSuccess();\ - } else {\ - return AssertionFailure() \ - << "Expected: (" << expr1 << ") " #op " (" << expr2\ - << "), actual: " << FormatForComparisonFailureMessage(val1, val2)\ - << " vs " << FormatForComparisonFailureMessage(val2, val1);\ - }\ -} - -// Implements the helper function for {ASSERT|EXPECT}_NE with int or -// enum arguments. -GTEST_IMPL_CMP_HELPER_(NE, !=) -// Implements the helper function for {ASSERT|EXPECT}_LE with int or -// enum arguments. -GTEST_IMPL_CMP_HELPER_(LE, <=) -// Implements the helper function for {ASSERT|EXPECT}_LT with int or -// enum arguments. -GTEST_IMPL_CMP_HELPER_(LT, < ) -// Implements the helper function for {ASSERT|EXPECT}_GE with int or -// enum arguments. -GTEST_IMPL_CMP_HELPER_(GE, >=) -// Implements the helper function for {ASSERT|EXPECT}_GT with int or -// enum arguments. -GTEST_IMPL_CMP_HELPER_(GT, > ) - -#undef GTEST_IMPL_CMP_HELPER_ - // The helper function for {ASSERT|EXPECT}_STREQ. AssertionResult CmpHelperSTREQ(const char* lhs_expression, const char* rhs_expression, |