diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-04-12 11:45:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-12 11:45:40 -0400 |
| commit | 531e29485c3bd21a5f2fa846dfc62f9c38756033 (patch) | |
| tree | 22df7543be52bc1dc9fc503d81418f44aec86c09 | |
| parent | b640d8743d85f5e69c16679e7ead3f31d94e31ff (diff) | |
| parent | c67f51b5dc1a7e2b614d50b60061bb143be71d45 (diff) | |
| download | googletest-531e29485c3bd21a5f2fa846dfc62f9c38756033.tar.gz googletest-531e29485c3bd21a5f2fa846dfc62f9c38756033.tar.bz2 googletest-531e29485c3bd21a5f2fa846dfc62f9c38756033.zip | |
Merge pull request #1562 from gennadiycivil/master
small cleanup
| -rw-r--r-- | googlemock/include/gmock/gmock-more-matchers.h | 8 | ||||
| -rw-r--r-- | googlemock/test/gmock-matchers_test.cc | 10 |
2 files changed, 16 insertions, 2 deletions
diff --git a/googlemock/include/gmock/gmock-more-matchers.h b/googlemock/include/gmock/gmock-more-matchers.h index 01298cfa..6d810eb7 100644 --- a/googlemock/include/gmock/gmock-more-matchers.h +++ b/googlemock/include/gmock/gmock-more-matchers.h @@ -46,8 +46,11 @@ namespace testing { // Silence C4100 (unreferenced formal // parameter) for MSVC #ifdef _MSC_VER +# pragma warning(push) # pragma warning(disable:4100) #if (_MSC_VER == 1900) +// and silence C4800 (C4800: 'int *const ': forcing value +// to bool 'true' or 'false') for MSVC 14 # pragma warning(disable:4800) #endif #endif @@ -78,6 +81,11 @@ MATCHER(IsFalse, negation ? "is true" : "is false") { return !static_cast<bool>(arg); } +#ifdef _MSC_VER +# pragma warning(pop) +#endif + + } // namespace testing #endif // GMOCK_GMOCK_MORE_MATCHERS_H_ diff --git a/googlemock/test/gmock-matchers_test.cc b/googlemock/test/gmock-matchers_test.cc index 33be41a9..16116b5c 100644 --- a/googlemock/test/gmock-matchers_test.cc +++ b/googlemock/test/gmock-matchers_test.cc @@ -61,7 +61,8 @@ // Disable MSVC2015 warning for std::pair: // "decorated name length exceeded, name was truncated". -#if defined(_MSC_VER) && (_MSC_VER == 1900) +#if defined _MSC_VER +# pragma warning(push) # pragma warning(disable:4503) #endif @@ -6656,7 +6657,7 @@ TEST(AnyWithTest, TestUseInContainers) { AnyWith<std::string>("merhaba"), AnyWith<std::string>("salut")})); } -#endif // GTEST_LANG_CXX11 +#endif // GTEST_LANG_CXX11 TEST(AnyWithTest, TestCompare) { EXPECT_THAT(SampleAnyType(1), AnyWith<int>(Gt(0))); } @@ -6694,3 +6695,8 @@ TEST(NotTest, WorksOnMoveOnlyType) { } // namespace gmock_matchers_test } // namespace testing + +#if defined_MSC_VER +# pragma warning(pop) +#endif + |