diff options
| author | practicalswift <[email protected]> | 2017-06-29 12:57:45 +0200 |
|---|---|---|
| committer | practicalswift <[email protected]> | 2017-08-09 10:44:59 +0200 |
| commit | 1bcd44223cdc1b584c0cd0863fe9653f540cf856 (patch) | |
| tree | 6b8b20abb3a7678c66f5cd68d6a0f075623c2d75 /src | |
| parent | Merge #10695: [qa] Rewrite BIP65/BIP66 functional tests (diff) | |
| download | discoin-1bcd44223cdc1b584c0cd0863fe9653f540cf856.tar.xz discoin-1bcd44223cdc1b584c0cd0863fe9653f540cf856.zip | |
Remove the virtual specifier for functions with the override specifier
`override` guarantees that the function is virtual (in addition
to that the function is overriding a virtual function from a base
class).
Diffstat (limited to 'src')
| -rw-r--r-- | src/dbwrapper.cpp | 2 | ||||
| -rw-r--r-- | src/keystore.h | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/dbwrapper.cpp b/src/dbwrapper.cpp index 3626e0177..750966fd3 100644 --- a/src/dbwrapper.cpp +++ b/src/dbwrapper.cpp @@ -19,7 +19,7 @@ class CBitcoinLevelDBLogger : public leveldb::Logger { public: // This code is adapted from posix_logger.h, which is why it is using vsprintf. // Please do not do this in normal code - virtual void Logv(const char * format, va_list ap) override { + void Logv(const char * format, va_list ap) override { if (!LogAcceptCategory(BCLog::LEVELDB)) { return; } diff --git a/src/keystore.h b/src/keystore.h index 965ae0c79..528b6e083 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; |