diff options
| author | David Benjamin <davidben@google.com> | 2017-05-06 14:22:12 (GMT) |
|---|---|---|
| committer | David Benjamin <davidben@google.com> | 2017-12-25 16:02:02 (GMT) |
| commit | bcd35523cd7cc376927173ce5621b544c122bacb (patch) | |
| tree | 159686a6c48661aa570d356514e465c8628aa034 /googletest | |
| parent | 5490beb0602eab560fa3969a4410e11d94bf12af (diff) | |
| download | googletest-bcd35523cd7cc376927173ce5621b544c122bacb.zip googletest-bcd35523cd7cc376927173ce5621b544c122bacb.tar.gz googletest-bcd35523cd7cc376927173ce5621b544c122bacb.tar.bz2 | |
Avoid warning C4619 in MSVC 2017.refs/pull/1109/head
C4800 has since been removed in MSVC 2017, so trying to silence it
throws warning C4619 when enabled.
Diffstat (limited to 'googletest')
| -rw-r--r-- | googletest/include/gtest/gtest.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/googletest/include/gtest/gtest.h b/googletest/include/gtest/gtest.h index a19625f..2ad5a0c 100644 --- a/googletest/include/gtest/gtest.h +++ b/googletest/include/gtest/gtest.h @@ -259,7 +259,9 @@ class GTEST_API_ AssertionResult { // Used in EXPECT_TRUE/FALSE(assertion_result). AssertionResult(const AssertionResult& other); +#if defined(_MSC_VER) && _MSC_VER < 1910 GTEST_DISABLE_MSC_WARNINGS_PUSH_(4800 /* forcing value to bool */) +#endif // Used in the EXPECT_TRUE/FALSE(bool_expression). // @@ -276,7 +278,9 @@ class GTEST_API_ AssertionResult { /*enabler*/ = NULL) : success_(success) {} +#if defined(_MSC_VER) && _MSC_VER < 1910 GTEST_DISABLE_MSC_WARNINGS_POP_() +#endif // Assignment operator. AssertionResult& operator=(AssertionResult other) { |