summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2009-09-17 05:04:08 (GMT)
committerzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2009-09-17 05:04:08 (GMT)
commit12d740faef11779b27b17c558ca92622bc0d2b54 (patch)
tree6e6dc642541619e5761cde41c28b5870360f91de /test
parentf07dc6b1b1bb16a4956e9880eb081fb01f1c186a (diff)
downloadgoogletest-12d740faef11779b27b17c558ca92622bc0d2b54.zip
googletest-12d740faef11779b27b17c558ca92622bc0d2b54.tar.gz
googletest-12d740faef11779b27b17c558ca92622bc0d2b54.tar.bz2
Makes gtest compile clean with MSVC's warning 4100 (unused formal parameter) enabled.
Diffstat (limited to 'test')
-rw-r--r--test/gtest-death-test_test.cc7
-rw-r--r--test/gtest-listener_test.cc22
2 files changed, 15 insertions, 14 deletions
diff --git a/test/gtest-death-test_test.cc b/test/gtest-death-test_test.cc
index 1b0061a..7cc4caf 100644
--- a/test/gtest-death-test_test.cc
+++ b/test/gtest-death-test_test.cc
@@ -824,9 +824,10 @@ void MockDeathTestFactory::SetParameters(bool create,
// Sets test to NULL (if create_ is false) or to the address of a new
// MockDeathTest object with parameters taken from the last call
// to SetParameters (if create_ is true). Always returns true.
-bool MockDeathTestFactory::Create(const char* statement,
- const ::testing::internal::RE* regex,
- const char* file, int line,
+bool MockDeathTestFactory::Create(const char* /*statement*/,
+ const ::testing::internal::RE* /*regex*/,
+ const char* /*file*/,
+ int /*line*/,
DeathTest** test) {
test_deleted_ = false;
if (create_) {
diff --git a/test/gtest-listener_test.cc b/test/gtest-listener_test.cc
index fb6fcf4..75c2c18 100644
--- a/test/gtest-listener_test.cc
+++ b/test/gtest-listener_test.cc
@@ -74,47 +74,47 @@ class UnitTestAccessor {
class EventRecordingListener : public UnitTestEventListenerInterface {
protected:
- virtual void OnUnitTestStart(const UnitTest& unit_test) {
+ virtual void OnUnitTestStart(const UnitTest& /*unit_test*/) {
g_events->PushBack(String("TestEventListener::OnUnitTestStart"));
}
- virtual void OnGlobalSetUpStart(const UnitTest& unit_test) {
+ virtual void OnGlobalSetUpStart(const UnitTest& /*unit_test*/) {
g_events->PushBack(String("TestEventListener::OnGlobalSetUpStart"));
}
- virtual void OnGlobalSetUpEnd(const UnitTest& unit_test) {
+ virtual void OnGlobalSetUpEnd(const UnitTest& /*unit_test*/) {
g_events->PushBack(String("TestEventListener::OnGlobalSetUpEnd"));
}
- virtual void OnTestCaseStart(const TestCase& test_case) {
+ virtual void OnTestCaseStart(const TestCase& /*test_case*/) {
g_events->PushBack(String("TestEventListener::OnTestCaseStart"));
}
- virtual void OnTestStart(const TestInfo& test_info) {
+ virtual void OnTestStart(const TestInfo& /*test_info*/) {
g_events->PushBack(String("TestEventListener::OnTestStart"));
}
- virtual void OnNewTestPartResult(const TestPartResult& test_part_result) {
+ virtual void OnNewTestPartResult(const TestPartResult& /*test_part_result*/) {
g_events->PushBack(String("TestEventListener::OnNewTestPartResult"));
}
- virtual void OnTestEnd(const TestInfo& test_info) {
+ virtual void OnTestEnd(const TestInfo& /*test_info*/) {
g_events->PushBack(String("TestEventListener::OnTestEnd"));
}
- virtual void OnTestCaseEnd(const TestCase& test_case) {
+ virtual void OnTestCaseEnd(const TestCase& /*test_case*/) {
g_events->PushBack(String("TestEventListener::OnTestCaseEnd"));
}
- virtual void OnGlobalTearDownStart(const UnitTest& unit_test) {
+ virtual void OnGlobalTearDownStart(const UnitTest& /*unit_test*/) {
g_events->PushBack(String("TestEventListener::OnGlobalTearDownStart"));
}
- virtual void OnGlobalTearDownEnd(const UnitTest& unit_test) {
+ virtual void OnGlobalTearDownEnd(const UnitTest& /*unit_test*/) {
g_events->PushBack(String("TestEventListener::OnGlobalTearDownEnd"));
}
- virtual void OnUnitTestEnd(const UnitTest& unit_test) {
+ virtual void OnUnitTestEnd(const UnitTest& /*unit_test*/) {
g_events->PushBack(String("TestEventListener::OnUnitTestEnd"));
}
};