Merge pull request #778 from gpakosz/C4389

Re-enable MSVC++ C4389 warning in CmdHelperEq()
This commit is contained in:
Gennadiy Civil 2017-12-21 21:10:03 -05:00 committed by GitHub
commit 5490beb060
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1386,11 +1386,9 @@ AssertionResult CmpHelperEQ(const char* lhs_expression,
const char* rhs_expression, const char* rhs_expression,
const T1& lhs, const T1& lhs,
const T2& rhs) { const T2& rhs) {
GTEST_DISABLE_MSC_WARNINGS_PUSH_(4389 /* signed/unsigned mismatch */)
if (lhs == rhs) { if (lhs == rhs) {
return AssertionSuccess(); return AssertionSuccess();
} }
GTEST_DISABLE_MSC_WARNINGS_POP_()
return CmpHelperEQFailure(lhs_expression, rhs_expression, lhs, rhs); return CmpHelperEQFailure(lhs_expression, rhs_expression, lhs, rhs);
} }