diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-12-21 21:10:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-21 21:10:03 -0500 |
| commit | 5490beb0602eab560fa3969a4410e11d94bf12af (patch) | |
| tree | b11ad700237e08718f158c736b33f423dcdafce1 | |
| parent | 0062e4869f07a3ef235703ddf63af604b712446c (diff) | |
| parent | 7990f56637d68573358c22369ec5f1f540cc9532 (diff) | |
| download | googletest-5490beb0602eab560fa3969a4410e11d94bf12af.tar.gz googletest-5490beb0602eab560fa3969a4410e11d94bf12af.tar.bz2 googletest-5490beb0602eab560fa3969a4410e11d94bf12af.zip | |
Merge pull request #778 from gpakosz/C4389
Re-enable MSVC++ C4389 warning in CmdHelperEq()
| -rw-r--r-- | googletest/include/gtest/gtest.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/googletest/include/gtest/gtest.h b/googletest/include/gtest/gtest.h index 1b55677a..a19625f3 100644 --- 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); } |