diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-05 14:24:12 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-05 14:24:12 -0400 |
| commit | 928636135b28d05f8f6a90cc8c015b01d8c63e30 (patch) | |
| tree | 852e1244cd8c92a0d30333d16fc9e672d3597e44 /googlemock/include/gmock | |
| parent | e0f4cf05614a90133b5912f149c1f59fdaf3aff6 (diff) | |
| download | googletest-928636135b28d05f8f6a90cc8c015b01d8c63e30.tar.gz googletest-928636135b28d05f8f6a90cc8c015b01d8c63e30.zip | |
And more MCVS warnings
Diffstat (limited to 'googlemock/include/gmock')
| -rw-r--r-- | googlemock/include/gmock/gmock-more-matchers.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/googlemock/include/gmock/gmock-more-matchers.h b/googlemock/include/gmock/gmock-more-matchers.h index 85bc3c02..bbfac0de 100644 --- a/googlemock/include/gmock/gmock-more-matchers.h +++ b/googlemock/include/gmock/gmock-more-matchers.h @@ -44,13 +44,12 @@ namespace testing { // The macros trigger warning C4100 (unreferenced formal -// parameter) in MSVC with -W4. Unfortunately they cannot be fixed in -// the macro definition, as the warnings are generated when the macro -// is expanded and macro expansion cannot contain #pragma. Therefore -// we suppress them here. +// parameter) in MSVC with -W4. #ifdef _MSC_VER -# pragma warning(push) # pragma warning(disable:4100) +#if (_MSC_VER == 1900) +# pragma warning(disable:4800) + #endif #endif // Defines a matcher that matches an empty container. The container must |
