diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-04-09 16:34:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-09 16:34:54 -0400 |
| commit | 7f03f7ceae05d4d45fc4b12b81736c55a13d872c (patch) | |
| tree | 4aafa6e3568f424a51b13a3cba452ed9f69dc731 /googlemock/include/gmock/gmock-more-matchers.h | |
| parent | 7529698fa378528ecc8415ac9ea0c04060281409 (diff) | |
| parent | 64d24b810f37681680a84d615f2601ac73dea78a (diff) | |
| download | googletest-7f03f7ceae05d4d45fc4b12b81736c55a13d872c.tar.gz googletest-7f03f7ceae05d4d45fc4b12b81736c55a13d872c.tar.bz2 googletest-7f03f7ceae05d4d45fc4b12b81736c55a13d872c.zip | |
Merge pull request #1551 from gennadiycivil/master
gmock actions 2
Diffstat (limited to 'googlemock/include/gmock/gmock-more-matchers.h')
| -rw-r--r-- | googlemock/include/gmock/gmock-more-matchers.h | 8 |
1 files changed, 8 insertions, 0 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_ |