diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-04-05 14:53:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-05 14:53:02 -0400 |
| commit | d0905653ed34e3ded601d38237be2eb1870e759f (patch) | |
| tree | 7b51a311fc4d10972440e98e883703eb48d627cf /googlemock/include | |
| parent | 2cf2a1f8ce9e25a2c0d053a51a3e67b3621f025b (diff) | |
| parent | 7e5f90d3780d553cb86771141fb81349f3a63508 (diff) | |
| download | googletest-d0905653ed34e3ded601d38237be2eb1870e759f.tar.gz googletest-d0905653ed34e3ded601d38237be2eb1870e759f.tar.bz2 googletest-d0905653ed34e3ded601d38237be2eb1870e759f.zip | |
Merge pull request #1547 from gennadiycivil/master
Matchers testing
Diffstat (limited to 'googlemock/include')
| -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") { |