Use CBDATA_CHILD() instead of CBDATA_CLASS() to mark overridden methods.

TODO: If this works across the build farm, convert other AsyncJob kids.

diff --git a/src/fs/rock/RockRebuild.h b/src/fs/rock/RockRebuild.h
index 56febd0507292a7de0c8f8d661184f441932e499..4e635e6de83f4c056da12d06f72d488388588a79 100644 (file)
--- a/src/fs/rock/RockRebuild.h
+++ b/src/fs/rock/RockRebuild.h
@@ -26,17 +26,17 @@ class LoadingParts;
 /// manages store rebuild process: loading meta information from db on disk
 class Rebuild: public AsyncJob
 {
-    CBDATA_CLASS(Rebuild);
+    CBDATA_CHILD(Rebuild);
 
 public:
     Rebuild(SwapDir *dir);
-    ~Rebuild();
+    virtual ~Rebuild() override;
 
 protected:
     /* AsyncJob API */
-    virtual void start();
-    virtual bool doneAll() const;
-    virtual void swanSong();
+    virtual void start() override;
+    virtual bool doneAll() const override;
+    virtual void swanSong() override;
 
     bool doneLoading() const;
     bool doneValidating() const;

diff --git a/src/servers/FtpServer.h b/src/servers/FtpServer.h
index 0ca4204f39d6ff3a730be3f6ded449a83c7ff50c..15fc37f6d8bb2bd60015be5de221030a9dbc531e 100644 (file)
--- a/src/servers/FtpServer.h
+++ b/src/servers/FtpServer.h
@@ -56,15 +56,14 @@ public:
 /// Manages a control connection from an FTP client.
 class Server: public ConnStateData
 {
-    CBDATA_CLASS(Server);
-    // XXX CBDATA_CLASS expands to nonvirtual toCbdata, AsyncJob::toCbdata
-    //     is pure virtual. breaks build on clang if override is used
+    CBDATA_CHILD(Server);
 
 public:
     explicit Server(const MasterXaction::Pointer &xact);
-    virtual ~Server();
+    virtual ~Server() override;
+
     /* AsyncJob API */
-    virtual void callException(const std::exception &e);
+    virtual void callException(const std::exception &e) override;
 
     /// Called by Ftp::Client class when it is done receiving or
     /// sending data. Waits for both agents to be done before
@@ -90,21 +89,21 @@ protected:
     };
 
     /* ConnStateData API */
-    virtual Http::Stream *parseOneRequest();
-    virtual void processParsedRequest(Http::Stream *context);
-    virtual void notePeerConnection(Comm::ConnectionPointer conn);
-    virtual void clientPinnedConnectionClosed(const CommCloseCbParams &io);
-    virtual void handleReply(HttpReply *header, StoreIOBuffer receivedData);
-    virtual int pipelinePrefetchMax() const;
-    virtual void writeControlMsgAndCall(HttpReply *rep, AsyncCall::Pointer &call);
-    virtual time_t idleTimeout() const;
+    virtual Http::Stream *parseOneRequest() override;
+    virtual void processParsedRequest(Http::Stream *context) override;
+    virtual void notePeerConnection(Comm::ConnectionPointer conn) override;
+    virtual void clientPinnedConnectionClosed(const CommCloseCbParams &io) override;
+    virtual void handleReply(HttpReply *header, StoreIOBuffer receivedData) override;
+    virtual int pipelinePrefetchMax() const override;
+    virtual void writeControlMsgAndCall(HttpReply *rep, AsyncCall::Pointer &call) override;
+    virtual time_t idleTimeout() const override;
 
     /* BodyPipe API */
-    virtual void noteMoreBodySpaceAvailable(BodyPipe::Pointer);
-    virtual void noteBodyConsumerAborted(BodyPipe::Pointer ptr);
+    virtual void noteMoreBodySpaceAvailable(BodyPipe::Pointer) override;
+    virtual void noteBodyConsumerAborted(BodyPipe::Pointer ptr) override;
 
     /* AsyncJob API */
-    virtual void start();
+    virtual void start() override;
 
     /* Comm callbacks */
     static void AcceptCtrlConnection(const CommAcceptCbParams &params);