diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-06 14:15:00 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-06 14:15:00 (GMT) |
| commit | 50c0bcd7e36374d6c3d0359c2160d8493e67527e (patch) | |
| tree | cebd2caee101e3f1462c18619373a4b6a4379e04 /googlemock/include/gmock/gmock-more-matchers.h | |
| parent | b5c87fbcb6b708026bc83c01e38a43691c9064a0 (diff) | |
| download | googletest-50c0bcd7e36374d6c3d0359c2160d8493e67527e.zip googletest-50c0bcd7e36374d6c3d0359c2160d8493e67527e.tar.gz googletest-50c0bcd7e36374d6c3d0359c2160d8493e67527e.tar.bz2 | |
Cont. deal with MCVS warnings
Diffstat (limited to 'googlemock/include/gmock/gmock-more-matchers.h')
| -rw-r--r-- | googlemock/include/gmock/gmock-more-matchers.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/googlemock/include/gmock/gmock-more-matchers.h b/googlemock/include/gmock/gmock-more-matchers.h index 01298cf..4c24832 100644 --- a/googlemock/include/gmock/gmock-more-matchers.h +++ b/googlemock/include/gmock/gmock-more-matchers.h @@ -46,6 +46,7 @@ namespace testing { // Silence C4100 (unreferenced formal // parameter) for MSVC #ifdef _MSC_VER +# pragma warning(push) # pragma warning(disable:4100) #if (_MSC_VER == 1900) # pragma warning(disable:4800) @@ -78,6 +79,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_ |