diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-04-09 16:34:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-09 16:34:54 -0400 |
| commit | 7f03f7ceae05d4d45fc4b12b81736c55a13d872c (patch) | |
| tree | 4aafa6e3568f424a51b13a3cba452ed9f69dc731 /googlemock/test/gmock_output_test_.cc | |
| parent | 7529698fa378528ecc8415ac9ea0c04060281409 (diff) | |
| parent | 64d24b810f37681680a84d615f2601ac73dea78a (diff) | |
| download | googletest-7f03f7ceae05d4d45fc4b12b81736c55a13d872c.tar.gz googletest-7f03f7ceae05d4d45fc4b12b81736c55a13d872c.tar.bz2 googletest-7f03f7ceae05d4d45fc4b12b81736c55a13d872c.zip | |
Merge pull request #1551 from gennadiycivil/master
gmock actions 2
Diffstat (limited to 'googlemock/test/gmock_output_test_.cc')
| -rw-r--r-- | googlemock/test/gmock_output_test_.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/googlemock/test/gmock_output_test_.cc b/googlemock/test/gmock_output_test_.cc index ca628df6..1b59eb3f 100644 --- a/googlemock/test/gmock_output_test_.cc +++ b/googlemock/test/gmock_output_test_.cc @@ -39,6 +39,12 @@ #include "gtest/gtest.h" +// Silence C4100 (unreferenced formal parameter) +#ifdef _MSC_VER +# pragma warning(push) +# pragma warning(disable:4100) +#endif + using testing::_; using testing::AnyNumber; using testing::Ge; @@ -298,3 +304,7 @@ int main(int argc, char **argv) { TestCatchesLeakedMocksInAdHocTests(); return RUN_ALL_TESTS(); } + +#ifdef _MSC_VER +# pragma warning(pop) +#endif |