Merge pull request #778 from gpakosz/C4389

Re-enable MSVC++ C4389 warning in CmdHelperEq()

Merge pull request #778 from gpakosz/C4389
Re-enable MSVC++ C4389 warning in CmdHelperEq()
5490beb0 · Gennadiy Civil · GitHub · 0062e486 · 7990f566 · 5490beb0
Unverified Commit 5490beb0 authored Dec 21, 2017 by Gennadiy Civil Committed by GitHub Dec 21, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

googletest/include/gtest/gtest.h googletest/include/gtest/gtest.h +0 -2

No files found.
--- a/googletest/include/gtest/gtest.h
+++ b/googletest/include/gtest/gtest.h
@@ -1386,11 +1386,9 @@ AssertionResult CmpHelperEQ(const char* lhs_expression,
                            const char* rhs_expression,
                            const T1& lhs,
                            const T2& rhs) {
-GTEST_DISABLE_MSC_WARNINGS_PUSH_(4389 /* signed/unsigned mismatch */)
  if (lhs == rhs) {
    return AssertionSuccess();
  }
-GTEST_DISABLE_MSC_WARNINGS_POP_()
  return CmpHelperEQFailure(lhs_expression, rhs_expression, lhs, rhs);
 }