diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-09 16:24:30 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-09 16:24:30 -0400 |
| commit | 64d24b810f37681680a84d615f2601ac73dea78a (patch) | |
| tree | 4aafa6e3568f424a51b13a3cba452ed9f69dc731 | |
| parent | c1d4c34233e05bbcd4ba4abd72198327f550818f (diff) | |
| download | googletest-64d24b810f37681680a84d615f2601ac73dea78a.tar.gz googletest-64d24b810f37681680a84d615f2601ac73dea78a.tar.bz2 googletest-64d24b810f37681680a84d615f2601ac73dea78a.zip | |
... and this
| -rw-r--r-- | googlemock/test/gmock_output_test_.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/googlemock/test/gmock_output_test_.cc b/googlemock/test/gmock_output_test_.cc index a01b95e5..1b59eb3f 100644 --- a/googlemock/test/gmock_output_test_.cc +++ b/googlemock/test/gmock_output_test_.cc @@ -39,12 +39,10 @@ #include "gtest/gtest.h" -// Silence C4100 (unreferenced formal parameter) for MSVC 14 and 15 +// Silence C4100 (unreferenced formal parameter) #ifdef _MSC_VER -# if _MSC_VER <= 1900 -# pragma warning(push) -# pragma warning(disable:4100) -# endif +# pragma warning(push) +# pragma warning(disable:4100) #endif using testing::_; @@ -308,7 +306,5 @@ int main(int argc, char **argv) { } #ifdef _MSC_VER -# if _MSC_VER <= 1900 -# pragma warning(pop) -# endif +# pragma warning(pop) #endif |