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
2460f971
Commit
2460f971
authored
Aug 16, 2019
by
Peter Barker
Browse files
Add many missing override keywords
This helps corrects builds with -Werror=suggest-overrides
parent
f2fb48c3
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
googletest/include/gtest/gtest-matchers.h
googletest/include/gtest/gtest-matchers.h
+3
-3
googletest/include/gtest/gtest-param-test.h
googletest/include/gtest/gtest-param-test.h
+1
-1
googletest/include/gtest/internal/gtest-internal.h
googletest/include/gtest/internal/gtest-internal.h
+1
-1
googletest/include/gtest/internal/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
)
{}
virtual
void
DescribeTo
(
::
std
::
ostream
*
os
)
const
{
impl_
.
DescribeTo
(
os
);
}
void
DescribeTo
(
::
std
::
ostream
*
os
)
const
override
{
impl_
.
DescribeTo
(
os
);
}
virtual
void
DescribeNegationTo
(
::
std
::
ostream
*
os
)
const
{
void
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)() {} \
virtual
void TestBody()
;
\
void 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: \
virtual
void TestBody()
;
\
void 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