diff options
| author | Robert Luberda <robert@debian.org> | 2019-10-09 19:48:00 (GMT) |
|---|---|---|
| committer | Robert Luberda <robert@debian.org> | 2019-10-11 21:45:31 (GMT) |
| commit | 3cddd56e195b516f449bea6dcd3edd4494195631 (patch) | |
| tree | 43d4759ae7f635c361ebc9262d26b7cdfd6cc529 /googlemock/include/gmock/gmock-generated-matchers.h.pump | |
| parent | ba513d2c9525a7c986c115ed5d603f2cf17c6016 (diff) | |
| download | googletest-3cddd56e195b516f449bea6dcd3edd4494195631.zip googletest-3cddd56e195b516f449bea6dcd3edd4494195631.tar.gz googletest-3cddd56e195b516f449bea6dcd3edd4494195631.tar.bz2 | |
Add more override keywordsrefs/pull/2507/head
Mark more functions with "override" keyword, just like
it was done in commit 2460f97152c.
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
Diffstat (limited to 'googlemock/include/gmock/gmock-generated-matchers.h.pump')
| -rw-r--r-- | googlemock/include/gmock/gmock-generated-matchers.h.pump | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/googlemock/include/gmock/gmock-generated-matchers.h.pump b/googlemock/include/gmock/gmock-generated-matchers.h.pump index ae90917..69d2ae4 100644 --- a/googlemock/include/gmock/gmock-generated-matchers.h.pump +++ b/googlemock/include/gmock/gmock-generated-matchers.h.pump @@ -302,13 +302,13 @@ $var param_field_decls2 = [[$for j public:\ [[$if i==1 [[explicit ]]]]gmock_Impl($impl_ctor_param_list)\ $impl_inits {}\ - virtual bool MatchAndExplain(\ + bool MatchAndExplain(\ GTEST_REFERENCE_TO_CONST_(arg_type) arg,\ - ::testing::MatchResultListener* result_listener) const;\ - virtual void DescribeTo(::std::ostream* gmock_os) const {\ + ::testing::MatchResultListener* result_listener) const override;\ + void DescribeTo(::std::ostream* gmock_os) const override {\ *gmock_os << FormatDescription(false);\ }\ - virtual void DescribeNegationTo(::std::ostream* gmock_os) const {\ + void DescribeNegationTo(::std::ostream* gmock_os) const override {\ *gmock_os << FormatDescription(true);\ }\$param_field_decls private:\ |