diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-04-11 10:22:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-11 10:22:10 -0400 |
| commit | d5988e7dd0b01c46a64c335b49bc2461f6219b1f (patch) | |
| tree | f7d4612dbdbe7edc06db82252ca5e8a1c0b3c948 /googlemock/test/gmock_output_test_.cc | |
| parent | 8fbb4194709cc9fd3de3deb2b406461a173bab15 (diff) | |
| parent | 5cd213ea5ed6de0ba2b79b9403a0b5ccf48f8984 (diff) | |
| download | googletest-d5988e7dd0b01c46a64c335b49bc2461f6219b1f.tar.gz googletest-d5988e7dd0b01c46a64c335b49bc2461f6219b1f.tar.bz2 googletest-d5988e7dd0b01c46a64c335b49bc2461f6219b1f.zip | |
Merge pull request #1558 from gennadiycivil/master
RE-Doing the merge, this time with gcc on mac in the PR
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 |