Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
googletest
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
googletest
Commits
2460f971
Commit
2460f971
authored
Aug 16, 2019
by
Peter Barker
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add many missing override keywords
This helps corrects builds with -Werror=suggest-overrides
parent
f2fb48c3
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
gtest-matchers.h
googletest/include/gtest/gtest-matchers.h
+3
-3
gtest-param-test.h
googletest/include/gtest/gtest-param-test.h
+1
-1
gtest-internal.h
googletest/include/gtest/internal/gtest-internal.h
+1
-1
gtest-port.h
googletest/include/gtest/internal/gtest-port.h
+2
-2
No files found.
googletest/include/gtest/gtest-matchers.h
View file @
2460f971
...
...
@@ -474,13 +474,13 @@ class PolymorphicMatcher {
public
:
explicit
MonomorphicImpl
(
const
Impl
&
impl
)
:
impl_
(
impl
)
{}
v
irtual
void
DescribeTo
(
::
std
::
ostream
*
os
)
const
{
impl_
.
DescribeTo
(
os
);
}
v
oid
DescribeTo
(
::
std
::
ostream
*
os
)
const
override
{
impl_
.
DescribeTo
(
os
);
}
v
irtual
void
DescribeNegationTo
(
::
std
::
ostream
*
os
)
const
{
v
oid
DescribeNegationTo
(
::
std
::
ostream
*
os
)
const
override
{
impl_
.
DescribeNegationTo
(
os
);
}
virtual
bool
MatchAndExplain
(
T
x
,
MatchResultListener
*
listener
)
const
{
bool
MatchAndExplain
(
T
x
,
MatchResultListener
*
listener
)
const
override
{
return
impl_
.
MatchAndExplain
(
x
,
listener
);
}
...
...
googletest/include/gtest/gtest-param-test.h
View file @
2460f971
...
...
@@ -416,7 +416,7 @@ internal::CartesianProductHolder<Generator...> Combine(const Generator&... g) {
: public test_suite_name { \
public: \
GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)() {} \
v
irtual void TestBody();
\
v
oid TestBody() override;
\
\
private: \
static int AddToRegistry() { \
...
...
googletest/include/gtest/internal/gtest-internal.h
View file @
2460f971
...
...
@@ -1354,7 +1354,7 @@ constexpr bool InstantiateTypedTestCase_P_IsDeprecated() { return true; }
GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)() {} \
\
private: \
v
irtual void TestBody();
\
v
oid TestBody() override;
\
static ::testing::TestInfo* const test_info_ GTEST_ATTRIBUTE_UNUSED_; \
GTEST_DISALLOW_COPY_AND_ASSIGN_(GTEST_TEST_CLASS_NAME_(test_suite_name, \
test_name)); \
...
...
googletest/include/gtest/internal/gtest-port.h
View file @
2460f971
...
...
@@ -1808,7 +1808,7 @@ class GTEST_API_ ThreadLocal {
class
DefaultValueHolderFactory
:
public
ValueHolderFactory
{
public
:
DefaultValueHolderFactory
()
{}
virtual
ValueHolder
*
MakeNewHolder
()
const
{
return
new
ValueHolder
();
}
ValueHolder
*
MakeNewHolder
()
const
override
{
return
new
ValueHolder
();
}
private
:
GTEST_DISALLOW_COPY_AND_ASSIGN_
(
DefaultValueHolderFactory
);
...
...
@@ -1817,7 +1817,7 @@ class GTEST_API_ ThreadLocal {
class
InstanceValueHolderFactory
:
public
ValueHolderFactory
{
public
:
explicit
InstanceValueHolderFactory
(
const
T
&
value
)
:
value_
(
value
)
{}
virtual
ValueHolder
*
MakeNewHolder
()
const
{
ValueHolder
*
MakeNewHolder
()
const
override
{
return
new
ValueHolder
(
value_
);
}
...
...
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