diff options
| author | Henry Schreiner <henryschreineriii@utexas.edu> | 2018-04-06 21:52:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-06 21:52:42 +0200 |
| commit | 4b6a7a49ab63f609630ce58c18a39c4048ab3ad5 (patch) | |
| tree | 94c682c872a8879cfe3a8a1abbb7f42395ca79a4 /googlemock/include/gmock/gmock-more-matchers.h | |
| parent | b22e8dec408935a7f76420026a738eeb61f8af38 (diff) | |
| parent | 82febb8eafc0425601b0d46567dc66c7750233ff (diff) | |
| download | googletest-4b6a7a49ab63f609630ce58c18a39c4048ab3ad5.tar.gz googletest-4b6a7a49ab63f609630ce58c18a39c4048ab3ad5.tar.bz2 googletest-4b6a7a49ab63f609630ce58c18a39c4048ab3ad5.zip | |
Merge branch 'master' into cleanup-cmake
Diffstat (limited to 'googlemock/include/gmock/gmock-more-matchers.h')
| -rw-r--r-- | googlemock/include/gmock/gmock-more-matchers.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/googlemock/include/gmock/gmock-more-matchers.h b/googlemock/include/gmock/gmock-more-matchers.h index a5a8bfa5..01298cfa 100644 --- a/googlemock/include/gmock/gmock-more-matchers.h +++ b/googlemock/include/gmock/gmock-more-matchers.h @@ -43,6 +43,15 @@ namespace testing { +// Silence C4100 (unreferenced formal +// parameter) for MSVC +#ifdef _MSC_VER +# 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 // support both size() and empty(), which all STL-like containers provide. MATCHER(IsEmpty, negation ? "isn't empty" : "is empty") { |