diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-10 16:10:34 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-10 16:10:34 -0400 |
| commit | 39c58da187c9cd54e54560601be4b7ceef320da4 (patch) | |
| tree | f74c36bfff352cf49eb110b3f2f6ff57d18dc37f /googlemock/include/gmock/gmock-more-matchers.h | |
| parent | e1071eb9497304a38e69737e90a88b4877b8b736 (diff) | |
| parent | 8fbb4194709cc9fd3de3deb2b406461a173bab15 (diff) | |
| download | googletest-39c58da187c9cd54e54560601be4b7ceef320da4.tar.gz googletest-39c58da187c9cd54e54560601be4b7ceef320da4.tar.bz2 googletest-39c58da187c9cd54e54560601be4b7ceef320da4.zip | |
merge
Diffstat (limited to 'googlemock/include/gmock/gmock-more-matchers.h')
| -rw-r--r-- | googlemock/include/gmock/gmock-more-matchers.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/googlemock/include/gmock/gmock-more-matchers.h b/googlemock/include/gmock/gmock-more-matchers.h index 6d810eb7..01298cfa 100644 --- a/googlemock/include/gmock/gmock-more-matchers.h +++ b/googlemock/include/gmock/gmock-more-matchers.h @@ -46,11 +46,8 @@ 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 @@ -81,11 +78,6 @@ 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_ |