diff options
| author | Gregory Pakosz <gregory.pakosz@gmail.com> | 2016-05-18 11:16:21 (GMT) |
|---|---|---|
| committer | Gregory Pakosz <gregory.pakosz@gmail.com> | 2017-12-21 15:35:38 (GMT) |
| commit | 7990f56637d68573358c22369ec5f1f540cc9532 (patch) | |
| tree | b11ad700237e08718f158c736b33f423dcdafce1 /googletest/include/gtest/gtest.h | |
| parent | 0062e4869f07a3ef235703ddf63af604b712446c (diff) | |
| download | googletest-7990f56637d68573358c22369ec5f1f540cc9532.zip googletest-7990f56637d68573358c22369ec5f1f540cc9532.tar.gz googletest-7990f56637d68573358c22369ec5f1f540cc9532.tar.bz2 | |
Re-enable MSVC++ C4389 warning in CmdHelperEq()refs/pull/778/head
C4389 was inhibited in commit 4b83461 making behavior inconsistent with
other compilers.
Diffstat (limited to 'googletest/include/gtest/gtest.h')
| -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 1b55677..a19625f 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); } |