add override in fnet module

23 files changed, 67 insertions, 71 deletions

diff --git a/fnet/src/examples/frt/rpc/echo_client.cpp b/fnet/src/examples/frt/rpc/echo_client.cpp
index f34f4c65111..b5fabb32363 100644
--- a/fnet/src/examples/frt/rpc/echo_client.cpp
+++ b/fnet/src/examples/frt/rpc/echo_client.cpp
@@ -7,7 +7,7 @@ LOG_SETUP("echo_client");
 class EchoClient : public FastOS_Application
 {
 public:
-    virtual int Main();
+    virtual int Main() override;
 };
 
 int
diff --git a/fnet/src/examples/frt/rpc/rpc_callback_client.cpp b/fnet/src/examples/frt/rpc/rpc_callback_client.cpp
index 479eb13fd43..3dd936f7fea 100644
--- a/fnet/src/examples/frt/rpc/rpc_callback_client.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_callback_client.cpp
@@ -34,7 +34,7 @@ RPC::Init(FRT_Supervisor *s)
 class MyApp : public FastOS_Application
 {
 public:
-    virtual int Main();
+    virtual int Main() override;
 };
 
 int
diff --git a/fnet/src/examples/frt/rpc/rpc_callback_server.cpp b/fnet/src/examples/frt/rpc/rpc_callback_server.cpp
index 05d3a205a29..419b1266d23 100644
--- a/fnet/src/examples/frt/rpc/rpc_callback_server.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_callback_server.cpp
@@ -40,7 +40,7 @@ RPC::Init(FRT_Supervisor *s)
 class MyApp : public FastOS_Application
 {
 public:
-    virtual int Main();
+    virtual int Main() override;
 };
 
 int
diff --git a/fnet/src/examples/frt/rpc/rpc_client.cpp b/fnet/src/examples/frt/rpc/rpc_client.cpp
index cde39270698..f5e5a9fe1e2 100644
--- a/fnet/src/examples/frt/rpc/rpc_client.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_client.cpp
@@ -8,7 +8,7 @@ LOG_SETUP("rpc_client");
 class RPCClient : public FastOS_Application
 {
 public:
-    virtual int Main();
+    virtual int Main() override;
 };
 
 int
diff --git a/fnet/src/examples/frt/rpc/rpc_info.cpp b/fnet/src/examples/frt/rpc/rpc_info.cpp
index 600af612b40..5b7aebd6bdd 100644
--- a/fnet/src/examples/frt/rpc/rpc_info.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_info.cpp
@@ -64,7 +64,7 @@ public:
         printf("\n");
     }
 
-    virtual int Main();
+    virtual int Main() override;
 };
 
 
diff --git a/fnet/src/examples/frt/rpc/rpc_invoke.cpp b/fnet/src/examples/frt/rpc/rpc_invoke.cpp
index 0295e7ea7a9..0f64ef9b539 100644
--- a/fnet/src/examples/frt/rpc/rpc_invoke.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_invoke.cpp
@@ -43,7 +43,7 @@ private:
     int run();
 
 public:
-    virtual int Main();
+    virtual int Main() override;
 };
 
 int
diff --git a/fnet/src/examples/frt/rpc/rpc_proxy.cpp b/fnet/src/examples/frt/rpc/rpc_proxy.cpp
index af01ac60d26..6c805d6a173 100644
--- a/fnet/src/examples/frt/rpc/rpc_proxy.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_proxy.cpp
@@ -68,7 +68,7 @@ private:
 
 public:
     ReqDone(RPCProxy &proxy) : _proxy(proxy) {}
-    virtual void RequestDone(FRT_RPCRequest *req);
+    virtual void RequestDone(FRT_RPCRequest *req) override;
 };
 
 void
@@ -209,7 +209,7 @@ RPCProxy::HOOK_Fini(FRT_RPCRequest *req)
 class App : public FastOS_Application
 {
 public:
-    virtual int Main();
+    virtual int Main() override;
 };
 
 int
diff --git a/fnet/src/examples/frt/rpc/rpc_server.cpp b/fnet/src/examples/frt/rpc/rpc_server.cpp
index 4da65ddfe2b..823d3c893b1 100644
--- a/fnet/src/examples/frt/rpc/rpc_server.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_server.cpp
@@ -107,7 +107,7 @@ private:
 
 public:
     App() : _server() {}
-    virtual int Main();
+    virtual int Main() override;
 };
 
 int
diff --git a/fnet/src/examples/ping/packets.h b/fnet/src/examples/ping/packets.h
index 39dae75a16f..68cc27ccb5b 100644
--- a/fnet/src/examples/ping/packets.h
+++ b/fnet/src/examples/ping/packets.h
@@ -11,26 +11,26 @@ enum {
 class PingRequest : public FNET_Packet
 {
 public:
-    virtual uint32_t GetPCODE();
-    virtual uint32_t GetLength();
-    virtual void Encode(FNET_DataBuffer *);
-    virtual bool Decode(FNET_DataBuffer *src, uint32_t len);
+    virtual uint32_t GetPCODE() override;
+    virtual uint32_t GetLength() override;
+    virtual void Encode(FNET_DataBuffer *) override;
+    virtual bool Decode(FNET_DataBuffer *src, uint32_t len) override;
 };
 
 
 class PingReply : public FNET_Packet
 {
 public:
-    virtual uint32_t GetPCODE();
-    virtual uint32_t GetLength();
-    virtual void Encode(FNET_DataBuffer *);
-    virtual bool Decode(FNET_DataBuffer *src, uint32_t len);
+    virtual uint32_t GetPCODE() override;
+    virtual uint32_t GetLength() override;
+    virtual void Encode(FNET_DataBuffer *) override;
+    virtual bool Decode(FNET_DataBuffer *src, uint32_t len) override;
 };
 
 
 class PingPacketFactory : public FNET_IPacketFactory
 {
 public:
-    virtual FNET_Packet *CreatePacket(uint32_t pcode, FNET_Context);
+    virtual FNET_Packet *CreatePacket(uint32_t pcode, FNET_Context) override;
 };
 
diff --git a/fnet/src/examples/ping/pingclient.cpp b/fnet/src/examples/ping/pingclient.cpp
index 2f11adb73e5..fb834b9108b 100644
--- a/fnet/src/examples/ping/pingclient.cpp
+++ b/fnet/src/examples/ping/pingclient.cpp
@@ -9,7 +9,7 @@ LOG_SETUP("pingclient");
 class PingClient : public FastOS_Application
 {
 public:
-    int  Main();
+    int  Main() override;
 };
 
 
diff --git a/fnet/src/examples/ping/pingserver.cpp b/fnet/src/examples/ping/pingserver.cpp
index 905a1dc656d..173e627ac23 100644
--- a/fnet/src/examples/ping/pingserver.cpp
+++ b/fnet/src/examples/ping/pingserver.cpp
@@ -11,15 +11,15 @@ class PingServer : public FNET_IServerAdapter,
                    public FastOS_Application
 {
 public:
-    bool InitAdminChannel(FNET_Channel *) { return false; }
-    bool InitChannel(FNET_Channel *channel, uint32_t)
+    bool InitAdminChannel(FNET_Channel *) override { return false; }
+    bool InitChannel(FNET_Channel *channel, uint32_t) override
     {
         channel->SetContext(FNET_Context(channel));
         channel->SetHandler(this);
         return true;
     }
 
-    HP_RetCode HandlePacket(FNET_Packet *packet, FNET_Context context)
+    HP_RetCode HandlePacket(FNET_Packet *packet, FNET_Context context) override
     {
         if (packet->GetPCODE() == PCODE_PING_REQUEST) {
             fprintf(stderr, "Got ping request, sending ping reply\n");
@@ -29,7 +29,7 @@ public:
         return FNET_FREE_CHANNEL;
     }
 
-    int  Main();
+    int  Main() override;
 };
 
 
diff --git a/fnet/src/examples/proxy/proxy.cpp b/fnet/src/examples/proxy/proxy.cpp
index 243c1e764c1..40d7a44c7f6 100644
--- a/fnet/src/examples/proxy/proxy.cpp
+++ b/fnet/src/examples/proxy/proxy.cpp
@@ -12,10 +12,10 @@ private:
 
 public:
     RawPacket() : _data() {}
-    virtual uint32_t GetPCODE();
-    virtual uint32_t GetLength();
-    virtual void Encode(FNET_DataBuffer *);
-    virtual bool Decode(FNET_DataBuffer *src, uint32_t len);
+    virtual uint32_t GetPCODE() override;
+    virtual uint32_t GetLength() override;
+    virtual void Encode(FNET_DataBuffer *) override;
+    virtual bool Decode(FNET_DataBuffer *src, uint32_t len) override;
 };
 
 uint32_t
@@ -69,8 +69,7 @@ public:
         _server = server;
     }
 
-    virtual HP_RetCode HandlePacket(FNET_Packet *packet,
-                                    FNET_Context context);
+    virtual HP_RetCode HandlePacket(FNET_Packet *packet, FNET_Context context) override;
 };
 
 
@@ -140,17 +139,14 @@ private:
 
 public:
     Proxy() : _transport() {}
-    virtual bool GetPacketInfo(FNET_DataBuffer *src, uint32_t *plen,
-                               uint32_t *pcode, uint32_t *chid, bool *);
-    virtual FNET_Packet *Decode(FNET_DataBuffer *src, uint32_t plen,
-                                uint32_t pcode, FNET_Context);
-    virtual void Encode(FNET_Packet *packet, uint32_t chid,
-                        FNET_DataBuffer *dst);
+    virtual bool GetPacketInfo(FNET_DataBuffer *src, uint32_t *plen, uint32_t *pcode, uint32_t *chid, bool *) override;
+    virtual FNET_Packet *Decode(FNET_DataBuffer *src, uint32_t plen, uint32_t pcode, FNET_Context) override;
+    virtual void Encode(FNET_Packet *packet, uint32_t chid, FNET_DataBuffer *dst) override;
     // ---------------------------------------------
-    virtual bool InitAdminChannel(FNET_Channel *channel);
-    virtual bool InitChannel(FNET_Channel *, uint32_t);
+    virtual bool InitAdminChannel(FNET_Channel *channel) override;
+    virtual bool InitChannel(FNET_Channel *, uint32_t) override;
     // ---------------------------------------------
-    virtual int Main();
+    virtual int Main() override;
 };
 
 
diff --git a/fnet/src/examples/timeout/timeout.cpp b/fnet/src/examples/timeout/timeout.cpp
index 39bfb96eb0f..8a52d769282 100644
--- a/fnet/src/examples/timeout/timeout.cpp
+++ b/fnet/src/examples/timeout/timeout.cpp
@@ -20,7 +20,7 @@ public:
       _queue(queue)
   {}
 
-    virtual void PerformTask();
+    virtual void PerformTask() override;
 };
 
 
@@ -34,7 +34,7 @@ Timeout::PerformTask()
 class MyApp : public FastOS_Application
 {
 public:
-  int Main();
+  int Main() override;
 };
 
 
diff --git a/fnet/src/tests/fdselector/fdselector.cpp b/fnet/src/tests/fdselector/fdselector.cpp
index 61c204aded7..0097334a9ce 100644
--- a/fnet/src/tests/fdselector/fdselector.cpp
+++ b/fnet/src/tests/fdselector/fdselector.cpp
@@ -14,11 +14,11 @@ struct Handler : public FNET_IFDSelectorHandler
     {
         reset();
     }
-    void readEvent(FNET_FDSelector *src)
+    void readEvent(FNET_FDSelector *src) override
     {
         readEventCnt[src->getContext()._value.INT]++;
     }
-    void writeEvent(FNET_FDSelector *src)
+    void writeEvent(FNET_FDSelector *src) override
     {
         writeEventCnt[src->getContext()._value.INT]++;
     }
diff --git a/fnet/src/tests/frt/method_pt/method_pt.cpp b/fnet/src/tests/frt/method_pt/method_pt.cpp
index 33cd6e5218b..4b869f6ba9f 100644
--- a/fnet/src/tests/frt/method_pt/method_pt.cpp
+++ b/fnet/src/tests/frt/method_pt/method_pt.cpp
@@ -112,8 +112,8 @@ class MediumHandler1 : public FRT_Invokable,
                        public MediumB
 {
 public:
-  virtual void foo() {}
-  virtual void bar() {}
+  virtual void foo() override {}
+  virtual void bar() override {}
   void RPC_Method(FRT_RPCRequest *req);
 };
 
@@ -123,8 +123,8 @@ class MediumHandler2 : public MediumA,
                        public MediumB
 {
 public:
-  virtual void foo() {}
-  virtual void bar() {}
+  virtual void foo() override {}
+  virtual void bar() override {}
   void RPC_Method(FRT_RPCRequest *req);
 };
 
@@ -134,8 +134,8 @@ class MediumHandler3 : public MediumA,
                        public FRT_Invokable
 {
 public:
-  virtual void foo() {}
-  virtual void bar() {}
+  virtual void foo() override {}
+  virtual void bar() override {}
   void RPC_Method(FRT_RPCRequest *req);
 };
 
@@ -146,8 +146,8 @@ class ComplexHandler1 : public FRT_Invokable,
                         public ComplexB
 {
 public:
-  virtual void foo() {}
-  virtual void bar() {}
+  virtual void foo() override {}
+  virtual void bar() override {}
   void RPC_Method(FRT_RPCRequest *req);
 };
 
@@ -157,8 +157,8 @@ class ComplexHandler2 : public ComplexA,
                         public ComplexB
 {
 public:
-  virtual void foo() {}
-  virtual void bar() {}
+  virtual void foo() override {}
+  virtual void bar() override {}
   void RPC_Method(FRT_RPCRequest *req);
 };
 
@@ -168,8 +168,8 @@ class ComplexHandler3 : public ComplexA,
                         public FRT_Invokable
 {
 public:
-  virtual void foo() {}
-  virtual void bar() {}
+  virtual void foo() override {}
+  virtual void bar() override {}
   void RPC_Method(FRT_RPCRequest *req);
 };
 
diff --git a/fnet/src/tests/frt/rpc/detach_return_invoke.cpp b/fnet/src/tests/frt/rpc/detach_return_invoke.cpp
index b689671372b..44f484cf064 100644
--- a/fnet/src/tests/frt/rpc/detach_return_invoke.cpp
+++ b/fnet/src/tests/frt/rpc/detach_return_invoke.cpp
@@ -8,7 +8,7 @@ struct Receptor : public FRT_IRequestWait
     FRT_RPCRequest *req;
 
     Receptor() : req(0) {}
-    void RequestDone(FRT_RPCRequest *r) {
+    void RequestDone(FRT_RPCRequest *r) override {
         req = r;
     }
 };
diff --git a/fnet/src/tests/frt/rpc/invoke.cpp b/fnet/src/tests/frt/rpc/invoke.cpp
index 77ded20acf4..7853c473f5e 100644
--- a/fnet/src/tests/frt/rpc/invoke.cpp
+++ b/fnet/src/tests/frt/rpc/invoke.cpp
@@ -48,7 +48,7 @@ struct LockedReqWait : public FRT_IRequestWait
         return ret;
     }
 
-    virtual void RequestDone(FRT_RPCRequest *)
+    virtual void RequestDone(FRT_RPCRequest *) override
     {
         _wasLocked = isLocked();
         _cond.Lock();
@@ -90,7 +90,7 @@ public:
         Schedule(delay);
     }
 
-    void PerformTask()
+    void PerformTask() override
     {
         _req->Return();
         _delayedReturnCntLock.Lock();
diff --git a/fnet/src/tests/frt/rpc/sharedblob.cpp b/fnet/src/tests/frt/rpc/sharedblob.cpp
index 29a229a1a89..a086584b36a 100644
--- a/fnet/src/tests/frt/rpc/sharedblob.cpp
+++ b/fnet/src/tests/frt/rpc/sharedblob.cpp
@@ -10,10 +10,10 @@ struct MyBlob : FRT_ISharedBlob
 {
     int refcnt;
     MyBlob() : refcnt(1) {}
-    virtual uint32_t getLen() { return (strlen("blob_test") + 1); }
-    virtual const char *getData() { return "blob_test"; }
-    virtual void addRef() { ++refcnt; }
-    virtual void subRef() { --refcnt; }
+    virtual uint32_t getLen() override { return (strlen("blob_test") + 1); }
+    virtual const char *getData() override { return "blob_test"; }
+    virtual void addRef() override { ++refcnt; }
+    virtual void subRef() override { --refcnt; }
 };
 
 struct Data
diff --git a/fnet/src/tests/locking/castspeed.cpp b/fnet/src/tests/locking/castspeed.cpp
index 7fe360b3caf..1f57bc4757c 100644
--- a/fnet/src/tests/locking/castspeed.cpp
+++ b/fnet/src/tests/locking/castspeed.cpp
@@ -18,14 +18,14 @@ class C: public A
 {
 public:
     B *otherB;
-    virtual B* asB() { return otherB; }
+    virtual B* asB() override { return otherB; }
     C() : otherB(nullptr) {}
 };
 
 class B: public C
 {
 public:
-    virtual B* asB() { return this; }
+    virtual B* asB() override { return this; }
 };
 
 
diff --git a/fnet/src/tests/locking/drainpackets.cpp b/fnet/src/tests/locking/drainpackets.cpp
index 5fedea4790f..fb86371c9ec 100644
--- a/fnet/src/tests/locking/drainpackets.cpp
+++ b/fnet/src/tests/locking/drainpackets.cpp
@@ -6,10 +6,10 @@
 class MyPacket : public FNET_Packet
 {
 public:
-  uint32_t GetPCODE()  { return 0; }
-  uint32_t GetLength() { return 0; }
-  void Encode(FNET_DataBuffer *) {}
-  bool Decode(FNET_DataBuffer *, uint32_t)
+  uint32_t GetPCODE()  override { return 0; }
+  uint32_t GetLength() override { return 0; }
+  void Encode(FNET_DataBuffer *) override {}
+  bool Decode(FNET_DataBuffer *, uint32_t) override
   { return true; }
 };
 
diff --git a/fnet/src/tests/scheduling/schedule.cpp b/fnet/src/tests/scheduling/schedule.cpp
index 1b72b514d46..6fb928f7aeb 100644
--- a/fnet/src/tests/scheduling/schedule.cpp
+++ b/fnet/src/tests/scheduling/schedule.cpp
@@ -38,7 +38,7 @@ public:
     return true;
   }
 
-  void PerformTask()
+  void PerformTask() override
   {
     _time = ::_time;
     _done = true;
@@ -57,7 +57,7 @@ public:
 
   uint32_t GetCnt() { return _cnt; }
 
-  void PerformTask()
+  void PerformTask() override
   {
     _cnt++;
     ScheduleNow(); // re-schedule as fast as possible
diff --git a/fnet/src/tests/scheduling/sloweventloop.cpp b/fnet/src/tests/scheduling/sloweventloop.cpp
index 3e27bfef131..a4b57cfd218 100644
--- a/fnet/src/tests/scheduling/sloweventloop.cpp
+++ b/fnet/src/tests/scheduling/sloweventloop.cpp
@@ -13,7 +13,7 @@ public:
       _done(false) {}
 
   bool done() const { return _done; }
-  void PerformTask() { _done = true; }
+  void PerformTask() override { _done = true; }
 };
 
 
diff --git a/fnet/src/tests/sync_execute/sync_execute.cpp b/fnet/src/tests/sync_execute/sync_execute.cpp
index e24d63effd5..c832ef0330d 100644
--- a/fnet/src/tests/sync_execute/sync_execute.cpp
+++ b/fnet/src/tests/sync_execute/sync_execute.cpp
@@ -5,7 +5,7 @@
 
 struct DoIt : public FNET_IExecutable {
     vespalib::Gate gate;
-    virtual void execute() {
+    virtual void execute() override {
         gate.countDown();
     }
 };