aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/test/gmock_output_test_.cc
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2018-04-06 11:40:04 -0400
committerGennadiy Civil <misterg@google.com>2018-04-06 11:40:04 -0400
commit5fe8de5ded685541a63b0ac22b1cfb4c59406dfd (patch)
tree24344798f81e4bfc63854100285443dca8a78239 /googlemock/test/gmock_output_test_.cc
parentcb13dc759c4697becda3b2ede7f3ba3e5c2765f2 (diff)
downloadgoogletest-5fe8de5ded685541a63b0ac22b1cfb4c59406dfd.tar.gz
googletest-5fe8de5ded685541a63b0ac22b1cfb4c59406dfd.tar.bz2
googletest-5fe8de5ded685541a63b0ac22b1cfb4c59406dfd.zip
more warnings
Diffstat (limited to 'googlemock/test/gmock_output_test_.cc')
-rw-r--r--googlemock/test/gmock_output_test_.cc12
1 files changed, 12 insertions, 0 deletions
diff --git a/googlemock/test/gmock_output_test_.cc b/googlemock/test/gmock_output_test_.cc
index ca628df6..d5f909d9 100644
--- a/googlemock/test/gmock_output_test_.cc
+++ b/googlemock/test/gmock_output_test_.cc
@@ -39,6 +39,14 @@
#include "gtest/gtest.h"
+
+// 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;
@@ -298,3 +306,7 @@ int main(int argc, char **argv) {
TestCatchesLeakedMocksInAdHocTests();
return RUN_ALL_TESTS();
}
+
+#ifdef _MSC_VER
+# pragma warning(pop)
+#endif