diff options
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 1b59eb3f..59ea51bd 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 |