diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-10 16:22:50 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-10 16:22:50 -0400 |
| commit | 9bc82ce7251b01ac3abfb28efc9793b56fa835d6 (patch) | |
| tree | d98e7086c5178f838d473f7fe5028ad4911f5f87 /googlemock/test | |
| parent | 25d8176e4fc8988367fbe3ce1a8ca0b92b79bbfa (diff) | |
| download | googletest-9bc82ce7251b01ac3abfb28efc9793b56fa835d6.tar.gz googletest-9bc82ce7251b01ac3abfb28efc9793b56fa835d6.tar.bz2 googletest-9bc82ce7251b01ac3abfb28efc9793b56fa835d6.zip | |
merging
Diffstat (limited to 'googlemock/test')
| -rw-r--r-- | googlemock/test/gmock_output_test_.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/googlemock/test/gmock_output_test_.cc b/googlemock/test/gmock_output_test_.cc index 59ea51bd..1b59eb3f 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; @@ -306,3 +304,7 @@ int main(int argc, char **argv) { TestCatchesLeakedMocksInAdHocTests(); return RUN_ALL_TESTS(); } + +#ifdef _MSC_VER +# pragma warning(pop) +#endif |