Add more override keywords
Mark more functions with "override" keyword, just like
it was done in commit 2460f97152.
This should prevent compiler from complaining while compiling both
user code, and the googletest code itself with the -Wsuggest-override
option turned on; with the exception of:
* calls to new MOCK_METHOD() in test/gmock-function-mocker_test.cc
* calls to old MOCK_METHODx()/MOCK_CONST_METHODx() in other
unit test files.
Closes #2493
This commit is contained in:
@@ -6170,7 +6170,7 @@ TEST_F(ParseFlagsTest, WideStrings) {
|
||||
#if GTEST_USE_OWN_FLAGFILE_FLAG_
|
||||
class FlagfileTest : public ParseFlagsTest {
|
||||
public:
|
||||
virtual void SetUp() {
|
||||
void SetUp() override {
|
||||
ParseFlagsTest::SetUp();
|
||||
|
||||
testdata_path_.Set(internal::FilePath(
|
||||
@@ -6180,7 +6180,7 @@ class FlagfileTest : public ParseFlagsTest {
|
||||
EXPECT_TRUE(testdata_path_.CreateFolder());
|
||||
}
|
||||
|
||||
virtual void TearDown() {
|
||||
void TearDown() override {
|
||||
testing::internal::posix::RmDir(testdata_path_.c_str());
|
||||
ParseFlagsTest::TearDown();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user