Merge bitcoin#10701: Remove the virtual specifier for functions with the override specifier

MarcoFalke · MarcoFalke · commit 50fae68d416b · 2017-09-04T18:06:44.000-07:00
1bcd442 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
diff --git 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
@@ -97,14 +97,14 @@ class CBasicKeyStore : public CKeyStore
         }
         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;

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class CBitcoinLevelDBLogger : public leveldb::Logger {`
`19`	`19`	`public:`
`20`	`20`	`// This code is adapted from posix_logger.h, which is why it is using vsprintf.`
`21`	`21`	`// Please do not do this in normal code`
`22`		`- virtual void Logv(const char * format, va_list ap) override {`
	`22`	`+ void Logv(const char * format, va_list ap) override {`
`23`	`23`	`if (!LogAcceptCategory(BCLog::LEVELDB)) {`
`24`	`24`	`return;`
`25`	`25`	`}`