diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-10 19:57:16 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-10 19:57:16 (GMT) |
| commit | e1071eb9497304a38e69737e90a88b4877b8b736 (patch) | |
| tree | a3f997e6412a22622588cb7e7468920678774054 /googlemock/test/gmock_output_test_.cc | |
| parent | d0de1180e44bb279361ebe3ce9ba3d860bdad4b2 (diff) | |
| download | googletest-e1071eb9497304a38e69737e90a88b4877b8b736.zip googletest-e1071eb9497304a38e69737e90a88b4877b8b736.tar.gz googletest-e1071eb9497304a38e69737e90a88b4877b8b736.tar.bz2 | |
RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors before merging the PR
Diffstat (limited to 'googlemock/test/gmock_output_test_.cc')
| -rw-r--r-- | googlemock/test/gmock_output_test_.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/googlemock/test/gmock_output_test_.cc b/googlemock/test/gmock_output_test_.cc index d5f909d..1b59eb3 100644 --- a/googlemock/test/gmock_output_test_.cc +++ b/googlemock/test/gmock_output_test_.cc @@ -39,14 +39,12 @@ #include "gtest/gtest.h" - -// Silence C4100 (unreferenced formal parameter) for MSVC +// Silence C4100 (unreferenced formal parameter) #ifdef _MSC_VER # pragma warning(push) # pragma warning(disable:4100) #endif - using testing::_; using testing::AnyNumber; using testing::Ge; |