diff options
| author | Robert Luberda <robert@debian.org> | 2019-10-09 21:48:00 +0200 |
|---|---|---|
| committer | Robert Luberda <robert@debian.org> | 2019-10-11 23:45:31 +0200 |
| commit | 3cddd56e195b516f449bea6dcd3edd4494195631 (patch) | |
| tree | 43d4759ae7f635c361ebc9262d26b7cdfd6cc529 /googlemock/include/gmock/gmock-generated-actions.h.pump | |
| parent | ba513d2c9525a7c986c115ed5d603f2cf17c6016 (diff) | |
| download | googletest-3cddd56e195b516f449bea6dcd3edd4494195631.tar.gz googletest-3cddd56e195b516f449bea6dcd3edd4494195631.tar.bz2 googletest-3cddd56e195b516f449bea6dcd3edd4494195631.zip | |
Add more override keywords
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-actions.h.pump')
| -rw-r--r-- | googlemock/include/gmock/gmock-generated-actions.h.pump | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/googlemock/include/gmock/gmock-generated-actions.h.pump b/googlemock/include/gmock/gmock-generated-actions.h.pump index 209603c5..283abcdc 100644 --- a/googlemock/include/gmock/gmock-generated-actions.h.pump +++ b/googlemock/include/gmock/gmock-generated-actions.h.pump @@ -395,7 +395,7 @@ $range k 0..n-1 typedef typename ::testing::internal::Function<F>::ArgumentTuple\ args_type;\ explicit gmock_Impl GMOCK_INTERNAL_INIT_##value_params {}\ - virtual return_type Perform(const args_type& args) {\ + return_type Perform(const args_type& args) override {\ return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\ Perform(this, args);\ }\ @@ -482,7 +482,7 @@ $var macro_name = [[$if i==0 [[ACTION]] $elif i==1 [[ACTION_P]] typedef typename ::testing::internal::Function<F>::ArgumentTuple\ args_type;\ [[$if i==1 [[explicit ]]]]gmock_Impl($ctor_param_list)$inits {}\ - virtual return_type Perform(const args_type& args) {\ + return_type Perform(const args_type& args) override {\ return ::testing::internal::ActionHelper<return_type, gmock_Impl>::\ Perform(this, args);\ }\ |