Skip to content

G
googletest
Commit 64d24b81 by Gennadiy Civil
Options

... and this

parent c1d4c342
Showing with 4 additions and 8 deletions
googlemock/test/gmock_output_test_.cc
...@@ -39,12 +39,10 @@ ...@@ -39,12 +39,10 @@
#include "gtest/gtest.h" #include "gtest/gtest.h"
// Silence C4100 (unreferenced formal parameter) for MSVC 14 and 15 // Silence C4100 (unreferenced formal parameter)
#ifdef _MSC_VER #ifdef _MSC_VER
# if _MSC_VER <= 1900 # pragma warning(push)
# pragma warning(push) # pragma warning(disable:4100)
# pragma warning(disable:4100)
# endif
#endif #endif
using testing::_; using testing::_;
...@@ -308,7 +306,5 @@ int main(int argc, char **argv) { ...@@ -308,7 +306,5 @@ int main(int argc, char **argv) {
} }
#ifdef _MSC_VER #ifdef _MSC_VER
# if _MSC_VER <= 1900 # pragma warning(pop)
# pragma warning(pop)
# endif
#endif #endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment