aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2018-04-06 11:17:45 -0400
committerGennadiy Civil <misterg@google.com>2018-04-06 11:17:45 -0400
commitd9f3611a227cf51eb8028b07e58ba330d3a04092 (patch)
treea72bcdf97491958277513e3b7ba5ca9e0429fc83
parentc75b76e20ae06e506ef72a3339208f14fd376493 (diff)
downloadgoogletest-d9f3611a227cf51eb8028b07e58ba330d3a04092.tar.gz
googletest-d9f3611a227cf51eb8028b07e58ba330d3a04092.tar.bz2
googletest-d9f3611a227cf51eb8028b07e58ba330d3a04092.zip
more MSVC warnings
-rw-r--r--googletest/include/gtest/gtest.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/googletest/include/gtest/gtest.h b/googletest/include/gtest/gtest.h
index 26e787d9..3de5fca4 100644
--- a/googletest/include/gtest/gtest.h
+++ b/googletest/include/gtest/gtest.h
@@ -82,6 +82,13 @@
namespace testing {
+// Silence C4100 (unreferenced formal parameter) for MSVC
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable:4100)
+#endif
+
+
// Declares the flags.
// This flag temporary enables the disabled tests.
@@ -2298,6 +2305,10 @@ bool StaticAssertTypeEq() {
// Tries to determine an appropriate directory for the platform.
GTEST_API_ std::string TempDir();
+#ifdef _MSC_VER
+# pragma warning(pop)
+#endif
+
} // namespace testing
// Use this function in main() to run all tests. It returns 0 if all