Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
12d740fa
Commit
12d740fa
authored
Sep 17, 2009
by
zhanyong.wan
Browse files
Makes gtest compile clean with MSVC's warning 4100 (unused formal parameter) enabled.
parent
f07dc6b1
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
21 deletions
+19
-21
include/gtest/internal/gtest-internal.h
include/gtest/internal/gtest-internal.h
+2
-2
scons/SConstruct.common
scons/SConstruct.common
+0
-4
src/gtest.cc
src/gtest.cc
+2
-1
test/gtest-death-test_test.cc
test/gtest-death-test_test.cc
+4
-3
test/gtest-listener_test.cc
test/gtest-listener_test.cc
+11
-11
No files found.
include/gtest/internal/gtest-internal.h
View file @
12d740fa
...
...
@@ -725,8 +725,8 @@ class TypeParameterizedTestCase {
template
<
GTEST_TEMPLATE_
Fixture
,
typename
Types
>
class
TypeParameterizedTestCase
<
Fixture
,
Templates0
,
Types
>
{
public:
static
bool
Register
(
const
char
*
prefix
,
const
char
*
case_name
,
const
char
*
test_names
)
{
static
bool
Register
(
const
char
*
/*
prefix
*/
,
const
char
*
/*
case_name
*/
,
const
char
*
/*
test_names
*/
)
{
return
true
;
}
};
...
...
scons/SConstruct.common
View file @
12d740fa
...
...
@@ -99,10 +99,6 @@ class SConstructHelper:
# Disables warnings that are either uninteresting or
# hard to fix.
'/wd4100',
# unreferenced formal parameter. The violation is in
# gcc's TR1 tuple and hard to fix.
'/wd4127',
# constant conditional expression. The macro
# GTEST_IS_NULL_LITERAL_() triggers it and I cannot find
...
...
src/gtest.cc
View file @
12d740fa
...
...
@@ -4134,7 +4134,8 @@ TestInfoImpl::~TestInfoImpl() {
// For example, if Foo() calls Bar(), which in turn calls
// GetCurrentOsStackTraceExceptTop(..., 1), Foo() will be included in
// the trace but Bar() and GetCurrentOsStackTraceExceptTop() won't.
String
GetCurrentOsStackTraceExceptTop
(
UnitTest
*
unit_test
,
int
skip_count
)
{
String
GetCurrentOsStackTraceExceptTop
(
UnitTest
*
/*unit_test*/
,
int
skip_count
)
{
// We pass skip_count + 1 to skip this wrapper function in addition
// to what the user really wants to skip.
return
GetUnitTestImpl
()
->
CurrentOsStackTraceExceptTop
(
skip_count
+
1
);
...
...
test/gtest-death-test_test.cc
View file @
12d740fa
...
...
@@ -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_
)
{
...
...
test/gtest-listener_test.cc
View file @
12d740fa
...
...
@@ -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"
));
}
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment