diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-10 20:10:34 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-10 20:10:34 (GMT) |
| commit | 39c58da187c9cd54e54560601be4b7ceef320da4 (patch) | |
| tree | f74c36bfff352cf49eb110b3f2f6ff57d18dc37f /googlemock/test/gmock_output_test_.cc | |
| parent | e1071eb9497304a38e69737e90a88b4877b8b736 (diff) | |
| parent | 8fbb4194709cc9fd3de3deb2b406461a173bab15 (diff) | |
| download | googletest-39c58da187c9cd54e54560601be4b7ceef320da4.zip googletest-39c58da187c9cd54e54560601be4b7ceef320da4.tar.gz googletest-39c58da187c9cd54e54560601be4b7ceef320da4.tar.bz2 | |
merge
Diffstat (limited to 'googlemock/test/gmock_output_test_.cc')
| -rw-r--r-- | googlemock/test/gmock_output_test_.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/googlemock/test/gmock_output_test_.cc b/googlemock/test/gmock_output_test_.cc index 1b59eb3..59ea51b 100644 --- a/googlemock/test/gmock_output_test_.cc +++ b/googlemock/test/gmock_output_test_.cc @@ -39,12 +39,14 @@ #include "gtest/gtest.h" -// Silence C4100 (unreferenced formal parameter) + +// Silence C4100 (unreferenced formal parameter) for MSVC #ifdef _MSC_VER # pragma warning(push) # pragma warning(disable:4100) #endif + using testing::_; using testing::AnyNumber; using testing::Ge; @@ -304,7 +306,3 @@ int main(int argc, char **argv) { TestCatchesLeakedMocksInAdHocTests(); return RUN_ALL_TESTS(); } - -#ifdef _MSC_VER -# pragma warning(pop) -#endif |