clang-tidy modernize-use-override applied to layer-02-maximus.opts

... with options: AllowOverrideAndFinal=1 IgnoreDestructors=1 Needs cbdata fixes (or --fix-errors, etc. to ignore) clang-diagnostic-inconsistent-missing-override errors.
measurement-factory · Apr 20, 2020 · d00d0a8 · d00d0a8
1 parent dfd5ce0
commit d00d0a8
Show file tree

Hide file tree

Showing 258 changed files with 1,246 additions and 1,246 deletions.
diff --git a/lib/libTrie/TrieCharTransform.h b/lib/libTrie/TrieCharTransform.h
@@ -40,7 +40,7 @@ class TrieCharTransform
 
 class TrieCaseless : public TrieCharTransform
 {
-    virtual char operator () (char const aChar) const {return tolower(aChar);}
+    char operator () (char const aChar) const override {return tolower(aChar);}
 };
 
 #endif /* __cplusplus */

diff --git a/src/AccessLogEntry.h b/src/AccessLogEntry.h
@@ -46,8 +46,8 @@ class AccessLogEntry: public CodeContext
     virtual ~AccessLogEntry();
 
     /* CodeContext API */
-    virtual std::ostream &detailCodeContext(std::ostream &os) const override;
-    virtual ScopedId codeContextGist() const override;
+    std::ostream &detailCodeContext(std::ostream &os) const override;
+    ScopedId codeContextGist() const override;
 
     /// Fetch the client IP log string into the given buffer.
     /// Knows about several alternate locations of the IP

diff --git a/src/BodyPipe.cc b/src/BodyPipe.cc
@@ -19,19 +19,19 @@ class BodySink: public BodyConsumer
 
 public:
     BodySink(const BodyPipe::Pointer &bp): AsyncJob("BodySink"), body_pipe(bp) {}
-    virtual ~BodySink() { assert(!body_pipe); }
+    ~BodySink() override { assert(!body_pipe); }
 
-    virtual void noteMoreBodyDataAvailable(BodyPipe::Pointer bp) {
+    void noteMoreBodyDataAvailable(BodyPipe::Pointer bp) override {
         size_t contentSize = bp->buf().contentSize();
         bp->consume(contentSize);
     }
-    virtual void noteBodyProductionEnded(BodyPipe::Pointer) {
+    void noteBodyProductionEnded(BodyPipe::Pointer) override {
         stopConsumingFrom(body_pipe);
     }
-    virtual void noteBodyProducerAborted(BodyPipe::Pointer) {
+    void noteBodyProducerAborted(BodyPipe::Pointer) override {
         stopConsumingFrom(body_pipe);
     }
-    bool doneAll() const {return !body_pipe && AsyncJob::doneAll();}
+    bool doneAll() const override {return !body_pipe && AsyncJob::doneAll();}
 
 private:
     BodyPipe::Pointer body_pipe; ///< the pipe we are consuming from
@@ -51,7 +51,7 @@ class BodyProducerDialer: public UnaryMemFunT<BodyProducer, BodyPipe::Pointer>
                        Parent::Method aHandler, BodyPipe::Pointer bp):
         Parent(aProducer, aHandler, bp) {}
 
-    virtual bool canDial(AsyncCall &call);
+    bool canDial(AsyncCall &call) override;
 };
 
 // The BodyConsumerDialer is an AsyncCall class which used to schedule BodyConsumer calls.
@@ -66,7 +66,7 @@ class BodyConsumerDialer: public UnaryMemFunT<BodyConsumer, BodyPipe::Pointer>
                        Parent::Method aHandler, BodyPipe::Pointer bp):
         Parent(aConsumer, aHandler, bp) {}
 
-    virtual bool canDial(AsyncCall &call);
+    bool canDial(AsyncCall &call) override;
 };
 
 bool

diff --git a/src/ClientInfo.h b/src/ClientInfo.h
@@ -80,11 +80,11 @@ class ClientInfo : public hash_link
     void kickQuotaQueue(); ///< schedule commHandleWriteHelper call
 
     /* BandwidthBucket API */
-    virtual int quota() override; ///< allocate quota for a just dequeued client
-    virtual bool applyQuota(int &nleft, Comm::IoCallback *state) override;
-    virtual void scheduleWrite(Comm::IoCallback *state) override;
-    virtual void onFdClosed() override;
-    virtual void reduceBucket(int len) override;
+    int quota() override; ///< allocate quota for a just dequeued client
+    bool applyQuota(int &nleft, Comm::IoCallback *state) override;
+    void scheduleWrite(Comm::IoCallback *state) override;
+    void onFdClosed() override;
+    void reduceBucket(int len) override;
 
     void quotaDumpQueue(); ///< dumps quota queue for debugging
 

diff --git a/src/CollapsedForwarding.cc b/src/CollapsedForwarding.cc
@@ -143,11 +143,11 @@ class CollapsedForwardingRr: public Ipc::Mem::RegisteredRunner
 public:
     /* RegisteredRunner API */
     CollapsedForwardingRr(): owner(NULL) {}
-    virtual ~CollapsedForwardingRr();
+    ~CollapsedForwardingRr() override;
 
 protected:
-    virtual void create();
-    virtual void open();
+    void create() override;
+    void open() override;
 
 private:
     Ipc::MultiQueue::Owner *owner;

diff --git a/src/CommCalls.h b/src/CommCalls.h
@@ -187,12 +187,12 @@ class CommCbMemFunT: public JobDialer<C>, public CommDialerParamsT<Params_>
         CommDialerParamsT<Params_>(aJob->toCbdata()),
         method(aMeth) {}
 
-    virtual bool canDial(AsyncCall &c) {
+    bool canDial(AsyncCall &c) override {
         return JobDialer<C>::canDial(c) &&
                this->params.syncWithComm();
     }
 
-    virtual void print(std::ostream &os) const {
+    void print(std::ostream &os) const override {
         os << '(';
         this->params.print(os);
         os << ')';
@@ -202,7 +202,7 @@ class CommCbMemFunT: public JobDialer<C>, public CommDialerParamsT<Params_>
     Method method;
 
 protected:
-    virtual void doDial() { ((&(*this->job))->*method)(this->params); }
+    void doDial() override { ((&(*this->job))->*method)(this->params); }
 };
 
 // accept (IOACB) dialer
@@ -218,7 +218,7 @@ class CommAcceptCbPtrFun: public CallDialer,
 
     void dial();
 
-    virtual void print(std::ostream &os) const;
+    void print(std::ostream &os) const override;
 
 public:
     IOACB *handler;
@@ -234,7 +234,7 @@ class CommConnectCbPtrFun: public CallDialer,
     CommConnectCbPtrFun(CNCB *aHandler, const Params &aParams);
     void dial();
 
-    virtual void print(std::ostream &os) const;
+    void print(std::ostream &os) const override;
 
 public:
     CNCB *handler;
@@ -250,7 +250,7 @@ class CommIoCbPtrFun: public CallDialer,
     CommIoCbPtrFun(IOCB *aHandler, const Params &aParams);
     void dial();
 
-    virtual void print(std::ostream &os) const;
+    void print(std::ostream &os) const override;
 
 public:
     IOCB *handler;
@@ -266,7 +266,7 @@ class CommCloseCbPtrFun: public CallDialer,
     CommCloseCbPtrFun(CLCB *aHandler, const Params &aParams);
     void dial();
 
-    virtual void print(std::ostream &os) const;
+    void print(std::ostream &os) const override;
 
 public:
     CLCB *handler;
@@ -281,7 +281,7 @@ class CommTimeoutCbPtrFun:public CallDialer,
     CommTimeoutCbPtrFun(CTCB *aHandler, const Params &aParams);
     void dial();
 
-    virtual void print(std::ostream &os) const;
+    void print(std::ostream &os) const override;
 
 public:
     CTCB *handler;
@@ -296,7 +296,7 @@ class FdeCbPtrFun: public CallDialer,
 
     FdeCbPtrFun(FDECB *aHandler, const Params &aParams);
     void dial();
-    virtual void print(std::ostream &os) const;
+    void print(std::ostream &os) const override;
 
 public:
     FDECB *handler;
@@ -322,14 +322,14 @@ class CommCbFunPtrCallT: public AsyncCall
 
     ~CommCbFunPtrCallT() {}
 
-    virtual CallDialer* getDialer() { return &dialer; }
+    CallDialer* getDialer() override { return &dialer; }
 
 public:
     Dialer dialer;
 
 protected:
-    inline virtual bool canFire();
-    inline virtual void fire();
+    inline bool canFire() override;
+    inline void fire() override;
 
 private:
     CommCbFunPtrCallT & operator=(const CommCbFunPtrCallT &); // not defined. not permitted.

diff --git a/src/CompositePoolNode.h b/src/CompositePoolNode.h
@@ -32,7 +32,7 @@ class CompositePoolNode : public RefCountable, public Updateable
 
     virtual void stats(StoreEntry * sentry) =0;
     virtual void dump(StoreEntry *entry) const =0;
-    virtual void update(int incr) =0;
+    void update(int incr) override =0;
     virtual void parse() = 0;
 
     class CompositeSelectionDetails;

diff --git a/src/ConfigOption.h b/src/ConfigOption.h
@@ -30,8 +30,8 @@ class ConfigOptionVector : public ConfigOption
 
 public:
     virtual ~ConfigOptionVector();
-    virtual bool parse(char const *option, const char *value, int reconfiguring);
-    virtual void dump(StoreEntry * e) const;
+    bool parse(char const *option, const char *value, int reconfiguring) override;
+    void dump(StoreEntry * e) const override;
     std::vector<ConfigOption *>options;
 };
 
@@ -42,14 +42,14 @@ class ConfigOptionAdapter : public ConfigOption
 public:
     ConfigOptionAdapter(C& theObject, bool (C::*parseFP)(char const *option, const char *value, int reconfiguring), void (C::*dumpFP)(StoreEntry * e) const) : object(theObject), parser(parseFP), dumper(dumpFP) {}
 
-    bool parse(char const *option, const char *value, int isaReconf) {
+    bool parse(char const *option, const char *value, int isaReconf) override {
         if (parser)
             return (object.*parser)(option, value, isaReconf);
 
         return false;
     }
 
-    void dump(StoreEntry * e) const {
+    void dump(StoreEntry * e) const override {
         if (dumper)
             (object.*dumper)(e);
     }

diff --git a/src/DelayTagged.h b/src/DelayTagged.h
@@ -45,12 +45,12 @@ class DelayTagged : public CompositePoolNode
 
     DelayTagged();
     virtual ~DelayTagged();
-    virtual void stats(StoreEntry * sentry);
-    virtual void dump(StoreEntry *entry) const;
-    virtual void update(int incr);
-    virtual void parse();
+    void stats(StoreEntry * sentry) override;
+    void dump(StoreEntry *entry) const override;
+    void update(int incr) override;
+    void parse() override;
 
-    virtual DelayIdComposite::Pointer id(CompositeSelectionDetails &);
+    DelayIdComposite::Pointer id(CompositeSelectionDetails &) override;
 
 private:
 
@@ -62,9 +62,9 @@ class DelayTagged : public CompositePoolNode
     public:
         Id (RefCount<DelayTagged>, String &);
         ~Id();
-        virtual int bytesWanted (int min, int max) const;
-        virtual void bytesIn(int qty);
-        virtual void delayRead(DeferredRead const &);
+        int bytesWanted (int min, int max) const override;
+        void bytesIn(int qty) override;
+        void delayRead(DeferredRead const &) override;
 
     private:
         RefCount<DelayTagged> theTagged;

diff --git a/src/DelayUser.h b/src/DelayUser.h
@@ -45,12 +45,12 @@ class DelayUser : public CompositePoolNode
     typedef RefCount<DelayUser> Pointer;
     DelayUser();
     virtual ~DelayUser();
-    virtual void stats(StoreEntry * sentry);
-    virtual void dump(StoreEntry *entry) const;
-    virtual void update(int incr);
-    virtual void parse();
+    void stats(StoreEntry * sentry) override;
+    void dump(StoreEntry *entry) const override;
+    void update(int incr) override;
+    void parse() override;
 
-    virtual DelayIdComposite::Pointer id(CompositeSelectionDetails &);
+    DelayIdComposite::Pointer id(CompositeSelectionDetails &) override;
 
 private:
 
@@ -62,8 +62,8 @@ class DelayUser : public CompositePoolNode
     public:
         Id(RefCount<DelayUser>, Auth::User::Pointer);
         ~Id();
-        virtual int bytesWanted (int min, int max) const;
-        virtual void bytesIn(int qty);
+        int bytesWanted (int min, int max) const override;
+        void bytesIn(int qty) override;
 
     private:
         RefCount<DelayUser> theUser;

diff --git a/src/DelayVector.h b/src/DelayVector.h
@@ -22,12 +22,12 @@ class DelayVector : public CompositePoolNode
     typedef RefCount<DelayVector> Pointer;
     DelayVector();
     virtual ~DelayVector();
-    virtual void stats(StoreEntry * sentry);
-    virtual void dump(StoreEntry *entry) const;
-    virtual void update(int incr);
-    virtual void parse();
+    void stats(StoreEntry * sentry) override;
+    void dump(StoreEntry *entry) const override;
+    void update(int incr) override;
+    void parse() override;
 
-    virtual DelayIdComposite::Pointer id(CompositeSelectionDetails &);
+    DelayIdComposite::Pointer id(CompositeSelectionDetails &) override;
     void push_back (CompositePoolNode::Pointer);
 
 private:
@@ -40,9 +40,9 @@ class DelayVector : public CompositePoolNode
     public:
         Id (RefCount<DelayVector>,CompositeSelectionDetails &);
         ~Id();
-        virtual int bytesWanted (int min, int max) const;
-        virtual void bytesIn(int qty);
-        virtual void delayRead(DeferredRead const &);
+        int bytesWanted (int min, int max) const override;
+        void bytesIn(int qty) override;
+        void delayRead(DeferredRead const &) override;
 
     private:
         RefCount<DelayVector> theVector;

diff --git a/src/DiskIO/AIO/AIODiskFile.h b/src/DiskIO/AIO/AIODiskFile.h
@@ -29,22 +29,22 @@ class AIODiskFile : public DiskFile
     ~AIODiskFile();
 
     /// \bug the code has this as "IORequestor::Pointer callback"
-    virtual void open(int flags, mode_t mode, RefCount<IORequestor> callback);
+    void open(int flags, mode_t mode, RefCount<IORequestor> callback) override;
 
-    virtual void create (int, mode_t, RefCount<IORequestor>);
-    virtual void read(ReadRequest *);
-    virtual void write(WriteRequest *);
-    virtual void close ();
-    virtual bool canRead() const;
-    virtual bool canWrite() const;
+    void create (int, mode_t, RefCount<IORequestor>) override;
+    void read(ReadRequest *) override;
+    void write(WriteRequest *) override;
+    void close () override;
+    bool canRead() const override;
+    bool canWrite() const override;
 
     /* During migration only */
-    virtual int getFD() const;
+    int getFD() const override;
 
-    virtual bool error() const;
+    bool error() const override;
 
     /* Inform callers if there is IO in progress */
-    virtual bool ioInProgress() const;
+    bool ioInProgress() const override;
 
 private:
     void error(bool const &);

diff --git a/src/DiskIO/AIO/AIODiskIOModule.h b/src/DiskIO/AIO/AIODiskIOModule.h
@@ -19,10 +19,10 @@ class AIODiskIOModule : public DiskIOModule
 public:
     static AIODiskIOModule &GetInstance();
     AIODiskIOModule();
-    virtual void init();
-    virtual void gracefulShutdown();
-    virtual char const *type () const;
-    virtual DiskIOStrategy* createStrategy();
+    void init() override;
+    void gracefulShutdown() override;
+    char const *type () const override;
+    DiskIOStrategy* createStrategy() override;
 
 private:
     static AIODiskIOModule Instance;