Remove virtual when override also present

Commit 8c8e96 has missed a few spots when removing redundant
`virtual` member function specifier where `override` is also
present.

Signed-off-by: Razvan Cojocaru <[email protected]>

Author: rzvncj

client/ovpncli.hpp

@@ -724,7 +724,7 @@ class OpenVPNClient : public TunBuilderBase,             // expose tun builder v
 
     // Callback for logging.
     // Will be called from the thread executing connect().
-    virtual void log(const LogInfo &) override = 0;
+    void log(const LogInfo &) override = 0;
 
     // External PKI callbacks
     // Will be called from the thread executing connect().

doc/developer_guide.md

@@ -38,10 +38,10 @@ implementations for callbacks including event and logging notifications:
     class Client : public ClientAPI::OpenVPNClient
     {
     public:
-        virtual void event(const Event&) override {  // events delivered here
+        void event(const Event&) override {  // events delivered here
           ...
         }
-        virtual void log(const LogInfo&) override {  // logging delivered here
+        void log(const LogInfo&) override {  // logging delivered here
           ...
         }
 

openvpn/asio/asioboundsock.hpp

@@ -125,7 +125,7 @@ class Socket : public SocketBase
         unsigned short port_;
     };
 
-    virtual void async_connect_post_open(const protocol_type &protocol, openvpn_io::error_code &ec) override
+    void async_connect_post_open(const protocol_type &protocol, openvpn_io::error_code &ec) override
     {
         if (protocol == openvpn_io::ip::tcp::v4())
             v4.post_open(this, ec);

openvpn/buffer/bufcomposed.hpp

@@ -49,7 +49,7 @@ class BufferComposed
             return iter != bc.bv.end();
         }
 
-        virtual void next_buffer() override
+        void next_buffer() override
         {
             next_buffer_impl();
         }

openvpn/client/cliconnect.hpp

@@ -309,7 +309,7 @@ class ClientConnect : ClientProto::NotifyCallback,
         }
     }
 
-    virtual void bulk_resolve_done() override
+    void bulk_resolve_done() override
     {
         if (!halt && generation == 0)
             new_client();
@@ -390,7 +390,7 @@ class ClientConnect : ClientProto::NotifyCallback,
         return true;
     }
 
-    virtual void client_proto_connected() override
+    void client_proto_connected() override
     {
         conn_timer.cancel();
         conn_timer_pending = false;
@@ -431,7 +431,7 @@ class ClientConnect : ClientProto::NotifyCallback,
                                       self->restart_wait_callback(gen, error); });
     }
 
-    virtual void client_proto_auth_pending_timeout(int timeout) override
+    void client_proto_auth_pending_timeout(int timeout) override
     {
         if (conn_timer_pending)
         {
@@ -490,7 +490,7 @@ class ClientConnect : ClientProto::NotifyCallback,
         queue_restart(delay);
     }
 
-    virtual void client_proto_terminate() override
+    void client_proto_terminate() override
     {
         if (!halt)
         {
@@ -698,22 +698,22 @@ class ClientConnect : ClientProto::NotifyCallback,
 
     // ClientLifeCycle::NotifyCallback callbacks
 
-    virtual void cln_stop() override
+    void cln_stop() override
     {
         thread_safe_stop();
     }
 
-    virtual void cln_pause(const std::string &reason) override
+    void cln_pause(const std::string &reason) override
     {
         thread_safe_pause(reason);
     }
 
-    virtual void cln_resume() override
+    void cln_resume() override
     {
         thread_safe_resume();
     }
 
-    virtual void cln_reconnect(int seconds) override
+    void cln_reconnect(int seconds) override
     {
         thread_safe_reconnect(seconds);
     }

openvpn/common/daemon.hpp

@@ -40,7 +40,7 @@ class LogReopen : public LogSetup
     {
     }
 
-    virtual void reopen() override
+    void reopen() override
     {
         try
         {

openvpn/common/logsetup.hpp

@@ -31,7 +31,7 @@ class MultiLogSetup : public std::vector<LogSetup::Ptr>,
   public:
     typedef RCPtr<MultiLogSetup> Ptr;
 
-    virtual void reopen() override
+    void reopen() override
     {
         for (const auto &e : *this)
             e->reopen();

openvpn/common/process.hpp

@@ -155,7 +155,7 @@ struct Command : public Action
         return ret;
     }
 
-    virtual void execute(std::ostream &os) override
+    void execute(std::ostream &os) override
     {
         if (!argv.empty())
         {
@@ -180,7 +180,7 @@ struct Command : public Action
             os << "Error: command called with empty argv\n";
     }
 
-    virtual std::string to_string() const override
+    std::string to_string() const override
     {
         return argv.to_string();
     }

openvpn/dco/ovpndcowincli.hpp

@@ -569,7 +569,7 @@ class OvpnDcoWinClient : public Client,
         return nullptr;
     }
 
-    virtual SessionStats::DCOTransportSource::Data dco_transport_stats_delta() override
+    SessionStats::DCOTransportSource::Data dco_transport_stats_delta() override
     {
         if (halt)
         {

openvpn/linux/procfs.hpp

@@ -33,7 +33,7 @@ class ProcFS : public Action
     {
     }
 
-    virtual void execute(std::ostream &os) override
+    void execute(std::ostream &os) override
     {
         os << to_string() << "\n";
         try
@@ -46,7 +46,7 @@ class ProcFS : public Action
         }
     }
 
-    virtual std::string to_string() const override
+    std::string to_string() const override
     {
         return to_string(fn, text);
     }