diff options
author | MarcoFalke <falke.marco@gmail.com> | 2017-09-04 18:06:09 -0700 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2017-09-04 18:06:44 -0700 |
commit | 50fae68d416b4b8ec4ca192923dfd5ae9ea42773 (patch) | |
tree | b934ad9d5d4340641147c7c88ef4083ed72792d6 /src/keystore.h | |
parent | ce665863b137ac4a7470cf006a92aa7694faca71 (diff) | |
parent | 1bcd44223cdc1b584c0cd0863fe9653f540cf856 (diff) | |
download | bitcoin-50fae68d416b4b8ec4ca192923dfd5ae9ea42773.tar.xz |
Merge #10701: Remove the virtual specifier for functions with the override specifier
1bcd44223 Remove the virtual specifier for functions with the override specifier (practicalswift)
Pull request description:
Remove the `virtual` specifier for functions with the `override` specifier.
`override` implies that the function is virtual (in addition - of course - to guaranteeing that the function is overriding a virtual function from a base class).
Tree-SHA512: 2e83e1b3651f55f8f2645282114ab087ad3a0be8826f26ee5c2064d0952f677290b97261398c1d524ec7f87bbbfdbeefc141180f6099c8bbfa4c59a14f7fa755
Diffstat (limited to 'src/keystore.h')
-rw-r--r-- | src/keystore.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/keystore.h b/src/keystore.h index 965ae0c79a..528b6e0834 100644 --- a/src/keystore.h +++ b/src/keystore.h @@ -97,14 +97,14 @@ public: } return false; } - virtual bool AddCScript(const CScript& redeemScript) override; - virtual bool HaveCScript(const CScriptID &hash) const override; - virtual bool GetCScript(const CScriptID &hash, CScript& redeemScriptOut) const override; + bool AddCScript(const CScript& redeemScript) override; + bool HaveCScript(const CScriptID &hash) const override; + bool GetCScript(const CScriptID &hash, CScript& redeemScriptOut) const override; - virtual bool AddWatchOnly(const CScript &dest) override; - virtual bool RemoveWatchOnly(const CScript &dest) override; - virtual bool HaveWatchOnly(const CScript &dest) const override; - virtual bool HaveWatchOnly() const override; + bool AddWatchOnly(const CScript &dest) override; + bool RemoveWatchOnly(const CScript &dest) override; + bool HaveWatchOnly(const CScript &dest) const override; + bool HaveWatchOnly() const override; }; typedef std::vector<unsigned char, secure_allocator<unsigned char> > CKeyingMaterial; |