diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-12 09:12:02 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-12 09:12:02 -0400 |
| commit | e77deb29a65444247343c3ace800782de3706fd1 (patch) | |
| tree | 9067d792431da495f7d4fbb14a0e08aab949606a /googlemock | |
| parent | 373481c5a9b9bf08c158703d6dc5ab58d4dee0cc (diff) | |
| download | googletest-e77deb29a65444247343c3ace800782de3706fd1.tar.gz googletest-e77deb29a65444247343c3ace800782de3706fd1.tar.bz2 googletest-e77deb29a65444247343c3ace800782de3706fd1.zip | |
small cleanup
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/include/gmock/gmock-more-matchers.h | 8 | ||||
| -rw-r--r-- | googlemock/test/gmock-matchers_test.cc | 8 |
2 files changed, 15 insertions, 1 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..4f7d0ec0 100644 --- a/googlemock/test/gmock-matchers_test.cc +++ b/googlemock/test/gmock-matchers_test.cc @@ -62,6 +62,7 @@ // Disable MSVC2015 warning for std::pair: // "decorated name length exceeded, name was truncated". #if defined(_MSC_VER) && (_MSC_VER == 1900) +# 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) && (_MSC_VER == 1900) +# pragma warning(pop) +#endif + |