diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-01-02 10:51:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-02 10:51:37 -0500 |
| commit | 1c2f1907047216654599b0057df49d21a2c1400a (patch) | |
| tree | 159686a6c48661aa570d356514e465c8628aa034 | |
| parent | 5490beb0602eab560fa3969a4410e11d94bf12af (diff) | |
| parent | bcd35523cd7cc376927173ce5621b544c122bacb (diff) | |
| download | googletest-1c2f1907047216654599b0057df49d21a2c1400a.tar.gz googletest-1c2f1907047216654599b0057df49d21a2c1400a.tar.bz2 googletest-1c2f1907047216654599b0057df49d21a2c1400a.zip | |
Merge pull request #1109 from davidben/vs2017
Avoid warning C4619 in MSVC 2017.
| -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 a19625f3..2ad5a0cb 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) { |