Use CXX11_OVERRIDE

src/AbstractBtMessage.h

@@ -106,7 +106,7 @@ public:
 
   virtual ~AbstractBtMessage();
 
-  virtual bool isInvalidate() {
+  virtual bool isInvalidate() CXX11_OVERRIDE {
     return invalidate_;
   }
 
@@ -114,7 +114,7 @@ public:
     invalidate_ = invalidate;
   }
 
-  virtual bool isUploading() {
+  virtual bool isUploading() CXX11_OVERRIDE {
     return uploading_;
   }
 
@@ -137,19 +137,19 @@ public:
 
   void setPeer(const std::shared_ptr<Peer>& peer);
 
-  virtual void doReceivedAction() {}
+  virtual void doReceivedAction() CXX11_OVERRIDE {}
 
-  virtual void validate();
+  virtual void validate() CXX11_OVERRIDE;
 
-  virtual void onQueued() {}
+  virtual void onQueued() CXX11_OVERRIDE {}
 
   virtual void onAbortOutstandingRequestEvent
-  (const BtAbortOutstandingRequestEvent& event) {}
+  (const BtAbortOutstandingRequestEvent& event) CXX11_OVERRIDE {}
 
   virtual void onCancelSendingPieceEvent
-  (const BtCancelSendingPieceEvent& event) {}
+  (const BtCancelSendingPieceEvent& event) CXX11_OVERRIDE {}
 
-  virtual void onChokingEvent(const BtChokingEvent& event) {}
+  virtual void onChokingEvent(const BtChokingEvent& event) CXX11_OVERRIDE {}
 
   void setBtMessageValidator(std::unique_ptr<BtMessageValidator> validator);
 

src/AbstractCommand.h

@@ -244,7 +244,7 @@ public:
    bool incNumConnection = true);
 
   virtual ~AbstractCommand();
-  bool execute();
+  virtual bool execute() CXX11_OVERRIDE;
 };
 
 // Returns proxy URI for given protocol.  If no proxy URI is defined,

src/AbstractDiskWriter.h

@@ -71,28 +71,31 @@ public:
   AbstractDiskWriter(const std::string& filename);
   virtual ~AbstractDiskWriter();
 
-  virtual void openFile(int64_t totalLength = 0);
+  virtual void openFile(int64_t totalLength = 0) CXX11_OVERRIDE;
 
-  virtual void closeFile();
+  virtual void closeFile() CXX11_OVERRIDE;
 
-  virtual void openExistingFile(int64_t totalLength = 0);
+  virtual void openExistingFile(int64_t totalLength = 0) CXX11_OVERRIDE;
 
-  virtual void writeData(const unsigned char* data, size_t len, int64_t offset);
+  virtual void writeData(const unsigned char* data, size_t len, int64_t offset)
+    CXX11_OVERRIDE;
 
-  virtual ssize_t readData(unsigned char* data, size_t len, int64_t offset);
+  virtual ssize_t readData(unsigned char* data, size_t len, int64_t offset)
+    CXX11_OVERRIDE;
 
-  virtual void truncate(int64_t length);
+  virtual void truncate(int64_t length) CXX11_OVERRIDE;
 
   // File must be opened before calling this function.
-  virtual void allocate(int64_t offset, int64_t length, bool sparse);
+  virtual void allocate(int64_t offset, int64_t length, bool sparse)
+     CXX11_OVERRIDE;
 
-  virtual int64_t size();
+  virtual int64_t size() CXX11_OVERRIDE;
 
-  virtual void enableReadOnly();
+  virtual void enableReadOnly() CXX11_OVERRIDE;
 
-  virtual void disableReadOnly();
+  virtual void disableReadOnly() CXX11_OVERRIDE;
 
-  virtual void enableMmap();
+  virtual void enableMmap() CXX11_OVERRIDE;
 };
 
 } // namespace aria2

src/AbstractHttpServerResponseCommand.h

@@ -73,7 +73,7 @@ public:
 
   virtual ~AbstractHttpServerResponseCommand();
 
-  virtual bool execute();
+  virtual bool execute() CXX11_OVERRIDE;
 };
 
 } // namespace aria2

src/AbstractOptionHandler.h

@@ -64,66 +64,67 @@ public:
 
   virtual ~AbstractOptionHandler();
 
-  virtual void parse(Option& option, const std::string& arg) const;
+  virtual void parse(Option& option, const std::string& arg) const
+    CXX11_OVERRIDE;
 
-  virtual bool hasTag(uint32_t tag) const;
+  virtual bool hasTag(uint32_t tag) const CXX11_OVERRIDE;
 
-  virtual void addTag(uint32_t tag);
+  virtual void addTag(uint32_t tag) CXX11_OVERRIDE;
 
-  virtual std::string toTagString() const;
+  virtual std::string toTagString() const CXX11_OVERRIDE;
 
-  virtual const char* getName() const;
+  virtual const char* getName() const CXX11_OVERRIDE;
 
-  virtual const char* getDescription() const
+  virtual const char* getDescription() const CXX11_OVERRIDE
   {
     return description_;
   }
 
-  virtual const std::string& getDefaultValue() const
+  virtual const std::string& getDefaultValue() const CXX11_OVERRIDE
   {
     return defaultValue_;
   }
 
-  virtual const Pref* getPref() const
+  virtual const Pref* getPref() const CXX11_OVERRIDE
   {
     return pref_;
   }
 
-  virtual char getShortName() const
+  virtual char getShortName() const CXX11_OVERRIDE
   {
     return shortName_;
   }
 
-  virtual OptionHandler::ARG_TYPE getArgType() const
+  virtual OptionHandler::ARG_TYPE getArgType() const CXX11_OVERRIDE
   {
     return argType_;
   }
 
-  virtual bool isHidden() const;
+  virtual bool isHidden() const CXX11_OVERRIDE;
 
-  virtual void hide();
+  virtual void hide() CXX11_OVERRIDE;
 
-  virtual bool getEraseAfterParse() const;
+  virtual bool getEraseAfterParse() const CXX11_OVERRIDE;
 
-  virtual void setEraseAfterParse(bool f);
+  virtual void setEraseAfterParse(bool f) CXX11_OVERRIDE;
 
-  virtual bool getInitialOption() const;
+  virtual bool getInitialOption() const CXX11_OVERRIDE;
 
-  virtual void setInitialOption(bool f);
+  virtual void setInitialOption(bool f) CXX11_OVERRIDE;
 
-  virtual bool getChangeOption() const;
+  virtual bool getChangeOption() const CXX11_OVERRIDE;
 
-  virtual void setChangeOption(bool f);
+  virtual void setChangeOption(bool f) CXX11_OVERRIDE;
 
-  virtual bool getChangeOptionForReserved() const;
+  virtual bool getChangeOptionForReserved() const CXX11_OVERRIDE;
 
-  virtual void setChangeOptionForReserved(bool f);
+  virtual void setChangeOptionForReserved(bool f) CXX11_OVERRIDE;
 
-  virtual bool getChangeGlobalOption() const;
+  virtual bool getChangeGlobalOption() const CXX11_OVERRIDE;
 
-  virtual void setChangeGlobalOption(bool f);
+  virtual void setChangeGlobalOption(bool f) CXX11_OVERRIDE;
 
-  virtual bool getCumulative() const;
+  virtual bool getCumulative() const CXX11_OVERRIDE;
 
   virtual void setCumulative(bool f);
 

src/AbstractProxyRequestCommand.h

@@ -48,7 +48,7 @@ private:
 
   std::shared_ptr<HttpConnection> httpConnection_;
 protected:
-  virtual bool executeInternal();
+  virtual bool executeInternal() CXX11_OVERRIDE;
 
   const std::shared_ptr<HttpConnection>& getHttpConnection() const
   {

src/AbstractSingleDiskAdaptor.h

@@ -52,40 +52,42 @@ public:
 
   virtual ~AbstractSingleDiskAdaptor();
 
-  virtual void initAndOpenFile();
+  virtual void initAndOpenFile() CXX11_OVERRIDE;
 
-  virtual void openFile();
+  virtual void openFile() CXX11_OVERRIDE;
 
-  virtual void closeFile();
+  virtual void closeFile() CXX11_OVERRIDE;
 
-  virtual void openExistingFile();
+  virtual void openExistingFile() CXX11_OVERRIDE;
 
   virtual void writeData(const unsigned char* data, size_t len,
-                         int64_t offset);
+                         int64_t offset) CXX11_OVERRIDE;
 
-  virtual ssize_t readData(unsigned char* data, size_t len, int64_t offset);
+  virtual ssize_t readData(unsigned char* data, size_t len, int64_t offset)
+    CXX11_OVERRIDE;
 
-  virtual void writeCache(const WrDiskCacheEntry* entry);
+  virtual void writeCache(const WrDiskCacheEntry* entry) CXX11_OVERRIDE;
 
-  virtual bool fileExists();
+  virtual bool fileExists() CXX11_OVERRIDE;
 
-  virtual int64_t size();
+  virtual int64_t size() CXX11_OVERRIDE;
 
-  virtual void truncate(int64_t length);
+  virtual void truncate(int64_t length) CXX11_OVERRIDE;
 
-  virtual std::unique_ptr<FileAllocationIterator> fileAllocationIterator();
+  virtual std::unique_ptr<FileAllocationIterator> fileAllocationIterator()
+    CXX11_OVERRIDE;
 
   // Make sure that DiskWriter is set before calling this function.
-  virtual void enableReadOnly();
+  virtual void enableReadOnly() CXX11_OVERRIDE;
 
   // Make sure that DiskWriter is set before calling this function.
-  virtual void disableReadOnly();
+  virtual void disableReadOnly() CXX11_OVERRIDE;
 
-  virtual bool isReadOnlyEnabled() const { return readOnly_; }
+  virtual bool isReadOnlyEnabled() const CXX11_OVERRIDE { return readOnly_; }
 
-  virtual void enableMmap();
+  virtual void enableMmap() CXX11_OVERRIDE;
 
-  virtual void cutTrailingGarbage();
+  virtual void cutTrailingGarbage() CXX11_OVERRIDE;
 
   virtual const std::string& getFilePath() = 0;
 

src/ActivePeerConnectionCommand.h

@@ -71,7 +71,7 @@ public:
 
   virtual ~ActivePeerConnectionCommand();
 
-  virtual bool execute();
+  virtual bool execute() CXX11_OVERRIDE;
 
   void makeNewConnections(int num);
 

src/AdaptiveFileAllocationIterator.h

@@ -59,13 +59,13 @@ public:
 
   virtual ~AdaptiveFileAllocationIterator();
 
-  virtual void allocateChunk();
+  virtual void allocateChunk() CXX11_OVERRIDE;
 
-  virtual bool finished();
+  virtual bool finished() CXX11_OVERRIDE;
 
-  virtual int64_t getCurrentLength();
+  virtual int64_t getCurrentLength() CXX11_OVERRIDE;
 
-  virtual int64_t getTotalLength();
+  virtual int64_t getTotalLength() CXX11_OVERRIDE;
 };
 
 } // namespace aria2

src/AdaptiveURISelector.h

@@ -78,12 +78,14 @@ public:
 
   virtual std::string select
   (FileEntry* fileEntry,
-   const std::vector<std::pair<size_t, std::string> >& usedHosts);
+   const std::vector<std::pair<size_t, std::string> >& usedHosts)
+    CXX11_OVERRIDE;
 
   virtual void tuneDownloadCommand(const std::deque<std::string>& uris,
-                                   DownloadCommand* command);
+                                   DownloadCommand* command)
+    CXX11_OVERRIDE;
 
-  virtual void resetCounters();
+  virtual void resetCounters() CXX11_OVERRIDE;
 };
 
 } // namespace aria2

src/AnonDiskWriterFactory.h

@@ -49,6 +49,7 @@ public:
   virtual ~AnonDiskWriterFactory() {}
 
   virtual std::unique_ptr<DiskWriter> newDiskWriter(const std::string& filename)
+    CXX11_OVERRIDE
   {
     return make_unique<DiskWriterType>();
   }

src/ApiCallbackDownloadEventListener.h

@@ -45,7 +45,8 @@ public:
                                    DownloadEventCallback callback,
                                    void* userData);
   virtual ~ApiCallbackDownloadEventListener();
-  virtual void onEvent(DownloadEvent event, const RequestGroup* group);
+  virtual void onEvent(DownloadEvent event, const RequestGroup* group)
+    CXX11_OVERRIDE;
 private:
   Session* session_;
   DownloadEventCallback callback_;

src/AppleMessageDigestImpl.cc

@@ -51,20 +51,20 @@ public:
   MessageDigestBase() { reset(); }
   virtual ~MessageDigestBase() {}
 
-  virtual size_t getDigestLength() const {
+  virtual size_t getDigestLength() const CXX11_OVERRIDE {
     return dlen;
   }
-  virtual void reset() {
+  virtual void reset() CXX11_OVERRIDE {
     init_fn(&ctx_);
   }
-  virtual void update(const void* data, size_t length) {
+  virtual void update(const void* data, size_t length) CXX11_OVERRIDE {
     while (length) {
       CC_LONG l = std::min(length, (size_t)std::numeric_limits<uint32_t>::max());
       update_fn(&ctx_, data, l);
       length -= l;
     }
   }
-  virtual void digest(unsigned char* md) {
+  virtual void digest(unsigned char* md) CXX11_OVERRIDE {
     final_fn(md, &ctx_);
   }
 private:

src/AppleTLSContext.h

@@ -58,26 +58,27 @@ public:
 
   // private key `keyfile' must be decrypted.
   virtual bool addCredentialFile(const std::string& certfile,
-                                 const std::string& keyfile);
+                                 const std::string& keyfile) CXX11_OVERRIDE;
 
-  virtual bool addSystemTrustedCACerts() {
+  virtual bool addSystemTrustedCACerts() CXX11_OVERRIDE {
     return true;
   }
 
   // certfile can contain multiple certificates.
-  virtual bool addTrustedCACertFile(const std::string& certfile);
+  virtual bool addTrustedCACertFile(const std::string& certfile)
+    CXX11_OVERRIDE;
 
-  virtual bool good() const {
+  virtual bool good() const CXX11_OVERRIDE {
     return true;
   }
-  virtual TLSSessionSide getSide() const {
+  virtual TLSSessionSide getSide() const CXX11_OVERRIDE {
     return side_;
   }
 
-  virtual bool getVerifyPeer() const {
+  virtual bool getVerifyPeer() const CXX11_OVERRIDE {
     return verifyPeer_;
   }
-  virtual void setVerifyPeer(bool verify) {
+  virtual void setVerifyPeer(bool verify) CXX11_OVERRIDE {
     verifyPeer_ = verify;
   }
 

src/AppleTLSSession.h

@@ -58,34 +58,34 @@ public:
   // Initializes SSL/TLS session. The |sockfd| is the underlying
   // tranport socket. This function returns TLS_ERR_OK if it
   // succeeds, or TLS_ERR_ERROR.
-  virtual int init(sock_t sockfd);
+  virtual int init(sock_t sockfd) CXX11_OVERRIDE;
 
   // Sets |hostname| for TLS SNI extension. This is only meaningful for
   // client side session. This function returns TLS_ERR_OK if it
   // succeeds, or TLS_ERR_ERROR.
-  virtual int setSNIHostname(const std::string& hostname);
+  virtual int setSNIHostname(const std::string& hostname) CXX11_OVERRIDE;
 
   // Closes the SSL/TLS session. Don't close underlying transport
   // socket. This function returns TLS_ERR_OK if it succeeds, or
   // TLS_ERR_ERROR.
-  virtual int closeConnection();
+  virtual int closeConnection() CXX11_OVERRIDE;
 
   // Returns TLS_WANT_READ if SSL/TLS session needs more data from
   // remote endpoint to proceed, or TLS_WANT_WRITE if SSL/TLS session
   // needs to write more data to proceed. If SSL/TLS session needs
   // neither read nor write data at the moment, return value is
   // undefined.
-  virtual int checkDirection();
+  virtual int checkDirection() CXX11_OVERRIDE;
 
   // Sends |data| with length |len|. This function returns the number
   // of bytes sent if it succeeds, or TLS_ERR_WOULDBLOCK if the
   // underlying tranport blocks, or TLS_ERR_ERROR.
-  virtual ssize_t writeData(const void* data, size_t len);
+  virtual ssize_t writeData(const void* data, size_t len) CXX11_OVERRIDE;
 
   // Receives data into |data| with length |len|. This function returns
   // the number of bytes received if it succeeds, or TLS_ERR_WOULDBLOCK
   // if the underlying tranport blocks, or TLS_ERR_ERROR.
-  virtual ssize_t readData(void* data, size_t len);
+  virtual ssize_t readData(void* data, size_t len) CXX11_OVERRIDE;
 
   // Performs client side handshake. The |hostname| is the hostname of
   // the remote endpoint and is used to verify its certificate. This
@@ -93,15 +93,16 @@ public:
   // if the underlying transport blocks, or TLS_ERR_ERROR.
   // When returning TLS_ERR_ERROR, provide certificate validation error
   // in |handshakeErr|.
-  virtual int tlsConnect(const std::string& hostname, std::string& handshakeErr);
+  virtual int tlsConnect
+  (const std::string& hostname, std::string& handshakeErr) CXX11_OVERRIDE;
 
   // Performs server side handshake. This function returns TLS_ERR_OK
   // if it succeeds, or TLS_ERR_WOULDBLOCK if the underlying transport
   // blocks, or TLS_ERR_ERROR.
-  virtual int tlsAccept();
+  virtual int tlsAccept() CXX11_OVERRIDE;
 
   // Returns last error string
-  virtual std::string getLastErrorString();
+  virtual std::string getLastErrorString() CXX11_OVERRIDE;
 
 private:
   static OSStatus SocketWrite(SSLConnectionRef conn, const void* data, size_t* len) {

src/AutoSaveCommand.h

@@ -46,9 +46,9 @@ public:
 
   virtual ~AutoSaveCommand();
 
-  virtual void preProcess();
+  virtual void preProcess() CXX11_OVERRIDE;
 
-  virtual void process();
+  virtual void process() CXX11_OVERRIDE;
 };
 
 } // namespace aria2

src/BackupIPv4ConnectCommand.h

@@ -70,7 +70,7 @@ public:
                            Command* mainCommand,
                            RequestGroup* requestGroup, DownloadEngine* e);
   ~BackupIPv4ConnectCommand();
-  virtual bool execute();
+  virtual bool execute() CXX11_OVERRIDE;
 private:
   std::string ipaddr_;
   uint16_t port_;

src/BtAllowedFastMessage.cc

@@ -67,7 +67,7 @@ namespace {
 struct ThisProgressUpdate : public ProgressUpdate {
   ThisProgressUpdate(const std::shared_ptr<Peer>& peer, size_t index)
     : peer(peer), index(index) {}
-  virtual void update(size_t length, bool complete)
+  virtual void update(size_t length, bool complete) CXX11_OVERRIDE
   {
     if(complete) {
       peer->addAmAllowedIndex(index);

src/BtAllowedFastMessage.h

@@ -50,9 +50,9 @@ public:
   static std::unique_ptr<BtAllowedFastMessage> create
   (const unsigned char* data, size_t dataLength);
 
-  virtual void doReceivedAction();
+  virtual void doReceivedAction() CXX11_OVERRIDE;
 
-  virtual std::unique_ptr<ProgressUpdate> getProgressUpdate();
+  virtual std::unique_ptr<ProgressUpdate> getProgressUpdate() CXX11_OVERRIDE;
 };
 
 } // namespace aria2

src/BtBitfieldMessage.h

@@ -63,13 +63,13 @@ public:
   static std::unique_ptr<BtBitfieldMessage> create
   (const unsigned char* data, size_t dataLength);
 
-  virtual void doReceivedAction();
+  virtual void doReceivedAction() CXX11_OVERRIDE;
 
-  virtual unsigned char* createMessage();
+  virtual unsigned char* createMessage() CXX11_OVERRIDE;
 
-  virtual size_t getMessageLength();
+  virtual size_t getMessageLength() CXX11_OVERRIDE;
 
-  virtual std::string toString() const;
+  virtual std::string toString() const CXX11_OVERRIDE;
 };
 
 } // namespace aria2

src/BtBitfieldMessageValidator.h

@@ -50,7 +50,7 @@ public:
                              size_t numPiece);
   ~BtBitfieldMessageValidator();
 
-  virtual void validate();
+  virtual void validate() CXX11_OVERRIDE;
 };
 
 } // namespace aria2

src/BtCancelMessage.h

@@ -50,7 +50,7 @@ public:
   static std::unique_ptr<BtCancelMessage> create
   (const unsigned char* data, size_t dataLength);
 
-  virtual void doReceivedAction();
+  virtual void doReceivedAction() CXX11_OVERRIDE;
 };
 
 } // namespace aria2

src/BtCheckIntegrityEntry.h

@@ -46,10 +46,12 @@ public:
   virtual ~BtCheckIntegrityEntry();
 
   virtual void onDownloadFinished
-  (std::vector<std::unique_ptr<Command>>& commands, DownloadEngine* e);
+  (std::vector<std::unique_ptr<Command>>& commands, DownloadEngine* e)
+    CXX11_OVERRIDE;
 
   virtual void onDownloadIncomplete
-  (std::vector<std::unique_ptr<Command>>& commands, DownloadEngine* e);
+  (std::vector<std::unique_ptr<Command>>& commands, DownloadEngine* e)
+    CXX11_OVERRIDE;
 };
 
 } // namespace aria2

src/BtChokeMessage.cc

@@ -70,7 +70,7 @@ struct ThisProgressUpdate : public ProgressUpdate {
   ThisProgressUpdate(const std::shared_ptr<Peer>& peer,
                      BtMessageDispatcher* disp)
     : peer(peer), disp(disp) {}
-  virtual void update(size_t length, bool complete)
+  virtual void update(size_t length, bool complete) CXX11_OVERRIDE
   {
     if(complete) {
       peer->amChoking(true);

src/BtChokeMessage.h

@@ -47,14 +47,14 @@ public:
 
   static const char NAME[];
 
-  virtual void doReceivedAction();
+  virtual void doReceivedAction() CXX11_OVERRIDE;
 
   static std::unique_ptr<BtChokeMessage> create
   (const unsigned char* data, size_t dataLength);
 
-  virtual bool sendPredicate() const;
+  virtual bool sendPredicate() const CXX11_OVERRIDE;
 
-  virtual std::unique_ptr<ProgressUpdate> getProgressUpdate();
+  virtual std::unique_ptr<ProgressUpdate> getProgressUpdate() CXX11_OVERRIDE;
 };
 
 } // namespace aria2

src/BtDependency.h

@@ -55,7 +55,7 @@ public:
 
   virtual ~BtDependency();
 
-  virtual bool resolve();
+  virtual bool resolve() CXX11_OVERRIDE;
 };
 
 } // namespace aria2

src/BtExtendedMessage.h

@@ -61,15 +61,15 @@ public:
    const unsigned char* data,
    size_t dataLength);
 
-  virtual void doReceivedAction();
+  virtual void doReceivedAction() CXX11_OVERRIDE;
 
-  virtual unsigned char* createMessage();
+  virtual unsigned char* createMessage() CXX11_OVERRIDE;
 
-  virtual size_t getMessageLength();
+  virtual size_t getMessageLength() CXX11_OVERRIDE;
 
-  virtual bool sendPredicate() const;
+  virtual bool sendPredicate() const CXX11_OVERRIDE;
 
-  virtual std::string toString() const;
+  virtual std::string toString() const CXX11_OVERRIDE;
 
   const std::unique_ptr<ExtensionMessage>& getExtensionMessage() const;
 };

src/BtFileAllocationEntry.h

@@ -46,7 +46,8 @@ public:
   virtual ~BtFileAllocationEntry();
 
   virtual void prepareForNextAction
-  (std::vector<std::unique_ptr<Command>>& commands, DownloadEngine* e);
+  (std::vector<std::unique_ptr<Command>>& commands, DownloadEngine* e)
+    CXX11_OVERRIDE;
 };
 
 } // namespace aria2

src/BtHandshakeMessage.h

@@ -74,13 +74,13 @@ public:
 
   static const char NAME[];
 
-  virtual void doReceivedAction() {};
+  virtual void doReceivedAction() CXX11_OVERRIDE {};
 
-  virtual unsigned char* createMessage();
+  virtual unsigned char* createMessage() CXX11_OVERRIDE;
 
-  virtual size_t getMessageLength();
+  virtual size_t getMessageLength() CXX11_OVERRIDE;
 
-  virtual std::string toString() const;
+  virtual std::string toString() const CXX11_OVERRIDE;
 
   bool isFastExtensionSupported() const;
 

src/BtHandshakeMessageValidator.h

@@ -55,7 +55,7 @@ public:
 
   ~BtHandshakeMessageValidator();
 
-  virtual void validate();
+  virtual void validate() CXX11_OVERRIDE;
 };
 
 } // namespace aria2

src/BtHaveAllMessage.h

@@ -50,7 +50,7 @@ public:
   static std::unique_ptr<BtHaveAllMessage> create
   (const unsigned char* data, size_t dataLength);
 
-  virtual void doReceivedAction();
+  virtual void doReceivedAction() CXX11_OVERRIDE;
 };
 
 } // namespace aria2

src/BtHaveMessage.h

@@ -50,7 +50,7 @@ public:
   static std::unique_ptr<BtHaveMessage> create
   (const unsigned char* data, size_t dataLength);
 
-  virtual void doReceivedAction();
+  virtual void doReceivedAction() CXX11_OVERRIDE;
 };
 
 } // namespace aria2

src/BtHaveNoneMessage.h

@@ -50,7 +50,7 @@ public:
   static std::unique_ptr<BtHaveNoneMessage> create
   (const unsigned char* data, size_t dataLength);
 
-  virtual void doReceivedAction();
+  virtual void doReceivedAction() CXX11_OVERRIDE;
 };
 
 } // namespace aria2

src/BtInterestedMessage.cc

@@ -74,7 +74,7 @@ namespace {
 struct ThisProgressUpdate : public ProgressUpdate {
   ThisProgressUpdate(const std::shared_ptr<Peer>& peer)
     : peer(peer) {}
-  virtual void update(size_t length, bool complete)
+  virtual void update(size_t length, bool complete) CXX11_OVERRIDE
   {
     if(complete) {
       peer->amInterested(true);

src/BtInterestedMessage.h

@@ -56,11 +56,11 @@ public:
   static std::unique_ptr<BtInterestedMessage> create
   (const unsigned char* data, size_t dataLength);
 
-  virtual void doReceivedAction();
+  virtual void doReceivedAction() CXX11_OVERRIDE;
 
-  virtual bool sendPredicate() const;
+  virtual bool sendPredicate() const CXX11_OVERRIDE;
 
-  virtual std::unique_ptr<ProgressUpdate> getProgressUpdate();
+  virtual std::unique_ptr<ProgressUpdate> getProgressUpdate() CXX11_OVERRIDE;
 
   void setPeerStorage(PeerStorage* peerStorage);
 };

src/BtKeepAliveMessage.h

@@ -49,13 +49,13 @@ public:
 
   static const char NAME[];
 
-  virtual void doReceivedAction() {}
+  virtual void doReceivedAction() CXX11_OVERRIDE {}
 
-  virtual unsigned char* createMessage();
+  virtual unsigned char* createMessage() CXX11_OVERRIDE;
 
-  virtual size_t getMessageLength();
+  virtual size_t getMessageLength() CXX11_OVERRIDE;
 
-  virtual std::string toString() const
+  virtual std::string toString() const CXX11_OVERRIDE
   {
     return NAME;
   }

src/BtNotInterestedMessage.cc

@@ -74,7 +74,7 @@ namespace {
 struct ThisProgressUpdate : public ProgressUpdate {
   ThisProgressUpdate(const std::shared_ptr<Peer>& peer)
     : peer(peer) {}
-  virtual void update(size_t length, bool complete)
+  virtual void update(size_t length, bool complete) CXX11_OVERRIDE
   {
     if(complete) {
       peer->amInterested(false);

src/BtNotInterestedMessage.h

@@ -56,11 +56,11 @@ public:
   static std::unique_ptr<BtNotInterestedMessage> create
   (const unsigned char* data, size_t dataLength);
 
-  virtual void doReceivedAction();
+  virtual void doReceivedAction() CXX11_OVERRIDE;
 
-  virtual bool sendPredicate() const;
+  virtual bool sendPredicate() const CXX11_OVERRIDE;
 
-  virtual std::unique_ptr<ProgressUpdate> getProgressUpdate();
+  virtual std::unique_ptr<ProgressUpdate> getProgressUpdate() CXX11_OVERRIDE;
 
   void setPeerStorage(PeerStorage* peerStorage);
 };

src/BtPieceMessage.cc

@@ -182,7 +182,7 @@ namespace {
 struct PieceSendUpdate : public ProgressUpdate {
   PieceSendUpdate(const std::shared_ptr<Peer>& peer, size_t headerLength)
     : peer(peer), headerLength(headerLength) {}
-  virtual void update(size_t length, bool complete)
+  virtual void update(size_t length, bool complete) CXX11_OVERRIDE
   {
     if(headerLength > 0) {
       size_t m = std::min(headerLength, length);

src/BtPieceMessage.h

@@ -95,20 +95,20 @@ public:
   static std::unique_ptr<BtPieceMessage> create
   (const unsigned char* data, size_t dataLength);
 
-  virtual void doReceivedAction();
+  virtual void doReceivedAction() CXX11_OVERRIDE;
 
   void createMessageHeader(unsigned char* msgHeader) const;
 
   size_t getMessageHeaderLength();
 
-  virtual void send();
+  virtual void send() CXX11_OVERRIDE;
 
-  virtual std::string toString() const;
+  virtual std::string toString() const CXX11_OVERRIDE;
 
-  virtual void onChokingEvent(const BtChokingEvent& event);
+  virtual void onChokingEvent(const BtChokingEvent& event) CXX11_OVERRIDE;
 
   virtual void onCancelSendingPieceEvent
-  (const BtCancelSendingPieceEvent& event);
+  (const BtCancelSendingPieceEvent& event) CXX11_OVERRIDE;
 };
 
 } // namespace aria2

src/BtPieceMessageValidator.h

@@ -53,7 +53,7 @@ public:
 
   ~BtPieceMessageValidator();
 
-  virtual void validate();
+  virtual void validate() CXX11_OVERRIDE;
 };
 
 } // namespace aria2

src/BtPortMessage.h

@@ -68,13 +68,13 @@ public:
   static std::unique_ptr<BtPortMessage> create
   (const unsigned char* data, size_t dataLength);
 
-  virtual void doReceivedAction();
+  virtual void doReceivedAction() CXX11_OVERRIDE;
 
-  virtual unsigned char* createMessage();
+  virtual unsigned char* createMessage() CXX11_OVERRIDE;
 
-  virtual size_t getMessageLength();
+  virtual size_t getMessageLength() CXX11_OVERRIDE;
 
-  virtual std::string toString() const;
+  virtual std::string toString() const CXX11_OVERRIDE;
 
   void setLocalNode(DHTNode* localNode);
 

src/BtPostDownloadHandler.h

@@ -48,7 +48,7 @@ public:
 
   virtual void
   getNextRequestGroups(std::vector<std::shared_ptr<RequestGroup> >& groups,
-                       RequestGroup* requestGroup);
+                       RequestGroup* requestGroup) CXX11_OVERRIDE;
 };
 
 } // namespace aria2

src/BtRejectMessage.h

@@ -50,7 +50,7 @@ public:
   static std::unique_ptr<BtRejectMessage> create
   (const unsigned char* data, size_t dataLength);
 
-  virtual void doReceivedAction();
+  virtual void doReceivedAction() CXX11_OVERRIDE;
 };
 
 } // namespace aria2

src/BtRequestMessage.h

@@ -58,12 +58,12 @@ public:
   static std::unique_ptr<BtRequestMessage> create
   (const unsigned char* data, size_t dataLength);
 
-  virtual void doReceivedAction();
+  virtual void doReceivedAction() CXX11_OVERRIDE;
 
-  virtual void onQueued();
+  virtual void onQueued() CXX11_OVERRIDE;
 
   virtual void onAbortOutstandingRequestEvent
-  (const BtAbortOutstandingRequestEvent& event);
+  (const BtAbortOutstandingRequestEvent& event) CXX11_OVERRIDE;
 };
 
 } // namespace aria2

src/BtStopDownloadCommand.h

@@ -65,9 +65,9 @@ public:
    DownloadEngine* e,
    time_t timeout);
 
-  virtual void preProcess();
+  virtual void preProcess() CXX11_OVERRIDE;
 
-  virtual void process();
+  virtual void process() CXX11_OVERRIDE;
 
   void setBtRuntime(const std::shared_ptr<BtRuntime>& btRuntime)
   {

src/BtSuggestPieceMessage.h

@@ -50,7 +50,7 @@ public:
   static std::unique_ptr<BtSuggestPieceMessage> create
   (const unsigned char* data, size_t dataLength);
 
-  virtual void doReceivedAction() {
+  virtual void doReceivedAction() CXX11_OVERRIDE {
     // TODO Current implementation ignores this message.
   }
 };

src/BtUnchokeMessage.cc

@@ -65,7 +65,7 @@ namespace {
 struct ThisProgressUpdate : public ProgressUpdate {
   ThisProgressUpdate(const std::shared_ptr<Peer>& peer)
     : peer(peer) {}
-  virtual void update(size_t length, bool complete)
+  virtual void update(size_t length, bool complete) CXX11_OVERRIDE
   {
     if(complete) {
       peer->amChoking(false);

src/BtUnchokeMessage.h

@@ -52,11 +52,11 @@ public:
   static std::unique_ptr<BtUnchokeMessage> create
   (const unsigned char* data, size_t dataLength);
 
-  virtual void doReceivedAction();
+  virtual void doReceivedAction() CXX11_OVERRIDE;
 
-  virtual bool sendPredicate() const;
+  virtual bool sendPredicate() const CXX11_OVERRIDE;
 
-  virtual std::unique_ptr<ProgressUpdate> getProgressUpdate();
+  virtual std::unique_ptr<ProgressUpdate> getProgressUpdate() CXX11_OVERRIDE;
 };
 
 } // namespace aria2

src/BufferedFile.h

@@ -49,20 +49,20 @@ public:
   virtual ~BufferedFile();
 protected:
   // wrapper for fread. Using 1 for 2nd argument of fread.
-  virtual size_t onRead(void* ptr, size_t count);
+  virtual size_t onRead(void* ptr, size_t count) CXX11_OVERRIDE;
   // wrapper for fwrite. Using 1 for 2nd argument of fwrite.
-  virtual size_t onWrite(const void* ptr, size_t count);
+  virtual size_t onWrite(const void* ptr, size_t count) CXX11_OVERRIDE;
   // wrapper for fgets
-  virtual char* onGets(char* s, int size);
+  virtual char* onGets(char* s, int size) CXX11_OVERRIDE;
-  virtual int onVprintf(const char* format, va_list va);
+  virtual int onVprintf(const char* format, va_list va) CXX11_OVERRIDE;
   // wrapper for fflush
-  virtual int onFlush();
+  virtual int onFlush() CXX11_OVERRIDE;
   // wrapper for fclose
-  virtual int onClose();
+  virtual int onClose() CXX11_OVERRIDE;
-  virtual bool onSupportsColor();
+  virtual bool onSupportsColor() CXX11_OVERRIDE;
-  virtual bool isError() const;
+  virtual bool isError() const CXX11_OVERRIDE;
-  virtual bool isEOF() const;
+  virtual bool isEOF() const CXX11_OVERRIDE;
-  virtual bool isOpen() const;
+  virtual bool isOpen() const CXX11_OVERRIDE;
 private:
   // Don't allow copying;
   BufferedFile(const BufferedFile&);

src/ByteArrayDiskWriter.h

@@ -49,18 +49,20 @@ public:
   ByteArrayDiskWriter(size_t maxLength = 5*1024*1024);
   virtual ~ByteArrayDiskWriter();
 
-  virtual void initAndOpenFile(int64_t totalLength = 0);
+  virtual void initAndOpenFile(int64_t totalLength = 0) CXX11_OVERRIDE;
 
-  virtual void openFile(int64_t totalLength = 0);
+  virtual void openFile(int64_t totalLength = 0) CXX11_OVERRIDE;
 
-  virtual void closeFile();
+  virtual void closeFile() CXX11_OVERRIDE;
 
-  virtual void openExistingFile(int64_t totalLength = 0);
+  virtual void openExistingFile(int64_t totalLength = 0) CXX11_OVERRIDE;
 
-  virtual void writeData(const unsigned char* data, size_t len, int64_t offset);
+  virtual void writeData(const unsigned char* data, size_t len, int64_t offset)
-  virtual ssize_t readData(unsigned char* data, size_t len, int64_t offset);
+    CXX11_OVERRIDE;
+  virtual ssize_t readData(unsigned char* data, size_t len, int64_t offset)
+    CXX11_OVERRIDE;
 
-  virtual int64_t size();
+  virtual int64_t size() CXX11_OVERRIDE;
 
   void setString(const std::string& s);
 

src/CheckIntegrityCommand.h

@@ -54,9 +54,9 @@ public:
 
   virtual ~CheckIntegrityCommand();
 
-  virtual bool executeInternal();
+  virtual bool executeInternal() CXX11_OVERRIDE;
 
-  virtual bool handleException(Exception& e);
+  virtual bool handleException(Exception& e) CXX11_OVERRIDE;
 };
 
 } // namespace aria2

src/CheckIntegrityDispatcherCommand.h

@@ -50,7 +50,8 @@ public:
    CheckIntegrityMan* checkMan,
    DownloadEngine* e);
 protected:
-  virtual std::unique_ptr<Command> createCommand(CheckIntegrityEntry* entry);
+  virtual std::unique_ptr<Command> createCommand(CheckIntegrityEntry* entry)
+    CXX11_OVERRIDE;
 };
 
 } // namespace aria2

src/CheckIntegrityEntry.h

@@ -65,13 +65,13 @@ public:
 
   virtual ~CheckIntegrityEntry();
 
-  virtual int64_t getTotalLength();
+  virtual int64_t getTotalLength() CXX11_OVERRIDE;
 
-  virtual int64_t getCurrentLength();
+  virtual int64_t getCurrentLength() CXX11_OVERRIDE;
 
   virtual void validateChunk();
 
-  virtual bool finished();
+  virtual bool finished() CXX11_OVERRIDE;
 
   virtual bool isValidationReady() = 0;
 

src/ChecksumCheckIntegrityEntry.h

@@ -50,17 +50,17 @@ public:
 
   virtual ~ChecksumCheckIntegrityEntry();
 
-  virtual bool isValidationReady();
+  virtual bool isValidationReady() CXX11_OVERRIDE;
 
-  virtual void initValidator();
+  virtual void initValidator() CXX11_OVERRIDE;
 
   virtual void onDownloadFinished
   (std::vector<std::unique_ptr<Command>>& commands,
-   DownloadEngine* e);
+   DownloadEngine* e) CXX11_OVERRIDE;
 
   virtual void onDownloadIncomplete
   (std::vector<std::unique_ptr<Command>>& commands,
-   DownloadEngine* e);
+   DownloadEngine* e) CXX11_OVERRIDE;
 
   void setRedownload(bool redownload)
   {

src/ChunkedDecodingStreamFilter.h

@@ -51,20 +51,20 @@ public:
 
   virtual ~ChunkedDecodingStreamFilter();
 
-  virtual void init();
+  virtual void init() CXX11_OVERRIDE;
 
   virtual ssize_t transform
   (const std::shared_ptr<BinaryStream>& out,
    const std::shared_ptr<Segment>& segment,
-   const unsigned char* inbuf, size_t inlen);
+   const unsigned char* inbuf, size_t inlen) CXX11_OVERRIDE;
 
-  virtual bool finished();
+  virtual bool finished() CXX11_OVERRIDE;
 
-  virtual void release();
+  virtual void release() CXX11_OVERRIDE;
 
-  virtual const std::string& getName() const;
+  virtual const std::string& getName() const CXX11_OVERRIDE;
 
-  virtual size_t getBytesProcessed() const
+  virtual size_t getBytesProcessed() const CXX11_OVERRIDE
   {
     return bytesProcessed_;
   }

src/ConnectCommand.h

@@ -57,8 +57,8 @@ public:
   void setBackupConnectInfo(const std::shared_ptr<BackupConnectInfo>& info);
   const std::shared_ptr<Request>& getProxyRequest() const;
 protected:
-  virtual bool executeInternal();
+  virtual bool executeInternal() CXX11_OVERRIDE;
-  virtual bool noCheck();
+  virtual bool noCheck() CXX11_OVERRIDE;
 private:
   std::shared_ptr<Request> proxyRequest_;
   std::shared_ptr<BackupConnectInfo> backupConnectionInfo_;

src/ConsoleStatCalc.cc

@@ -78,7 +78,7 @@ std::string SizeFormatter::operator()(int64_t size) const
 namespace {
 class AbbrevSizeFormatter:public SizeFormatter {
 protected:
-  virtual std::string format(int64_t size) const
+  virtual std::string format(int64_t size) const CXX11_OVERRIDE
   {
     return util::abbrevSize(size);
   }
@@ -88,7 +88,7 @@ protected:
 namespace {
 class PlainSizeFormatter:public SizeFormatter {
 protected:
-  virtual std::string format(int64_t size) const
+  virtual std::string format(int64_t size) const CXX11_OVERRIDE
   {
     return util::itos(size);
   }

src/ConsoleStatCalc.h

@@ -72,7 +72,7 @@ public:
 
   virtual ~ConsoleStatCalc() {}
 
-  virtual void calculateStat(const DownloadEngine* e);
+  virtual void calculateStat(const DownloadEngine* e) CXX11_OVERRIDE;
 
   void setReadoutVisibility(bool visibility)
   {

src/ContentTypeRequestGroupCriteria.h

@@ -52,7 +52,7 @@ public:
 
   virtual ~ContentTypeRequestGroupCriteria();
 
-  virtual bool match(const RequestGroup* requestGroup) const;
+  virtual bool match(const RequestGroup* requestGroup) const CXX11_OVERRIDE;
 };
 
 } // namespace aria2

src/CreateRequestCommand.h

@@ -51,7 +51,7 @@ public:
                        RequestGroup* requestGroup,
                        DownloadEngine* e);
 protected:
-  virtual bool executeInternal();
+  virtual bool executeInternal() CXX11_OVERRIDE;
 };
 
 } // namespace aria2

src/DHTAbstractMessage.h

@@ -60,7 +60,7 @@ public:
                      const std::shared_ptr<DHTNode>& remoteNode,
                      const std::string& transactionID = A2STR::NIL);
 
-  virtual bool send();
+  virtual bool send() CXX11_OVERRIDE;
 
   virtual const std::string& getType() const = 0;
 

src/DHTAbstractNodeLookupTask.h

@@ -128,8 +128,7 @@ protected:
   (std::vector<std::shared_ptr<DHTNode>>& nodes,
    const ResponseMessage* message) = 0;
 
-  virtual void onReceivedInternal
+  virtual void onReceivedInternal(const ResponseMessage* message) {}
-  (const ResponseMessage* message) {}
 
   virtual bool needsAdditionalOutgoingMessage() { return true; }
 
@@ -148,7 +147,7 @@ public:
 
   static const size_t ALPHA = 3;
 
-  virtual void startup()
+  virtual void startup() CXX11_OVERRIDE
   {
     std::vector<std::shared_ptr<DHTNode>> nodes;
     getRoutingTable()->getClosestKNodes(nodes, targetID_);

src/DHTAbstractTask.h

@@ -71,7 +71,7 @@ protected:
 public:
   DHTAbstractTask();
 
-  virtual bool finished();
+  virtual bool finished() CXX11_OVERRIDE;
 
   DHTRoutingTable* getRoutingTable() const
   {

src/DHTAnnouncePeerMessage.h

@@ -56,7 +56,7 @@ private:
 
   DHTTokenTracker* tokenTracker_;
 protected:
-  virtual std::string toStringOptional() const;
+  virtual std::string toStringOptional() const CXX11_OVERRIDE;
 public:
   DHTAnnouncePeerMessage(const std::shared_ptr<DHTNode>& localNode,
                          const std::shared_ptr<DHTNode>& remoteNode,
@@ -65,13 +65,13 @@ public:
                          const std::string& token,
                          const std::string& transactionID = A2STR::NIL);
 
-  virtual void doReceivedAction();
+  virtual void doReceivedAction() CXX11_OVERRIDE;
 
-  virtual std::shared_ptr<Dict> getArgument();
+  virtual std::shared_ptr<Dict> getArgument() CXX11_OVERRIDE;
 
-  virtual const std::string& getMessageType() const;
+  virtual const std::string& getMessageType() const CXX11_OVERRIDE;
 
-  virtual void validate() const;
+  virtual void validate() const CXX11_OVERRIDE;
 
   const unsigned char* getInfoHash() const
   {

src/DHTAnnouncePeerReplyMessage.h

@@ -47,13 +47,13 @@ public:
 
   virtual ~DHTAnnouncePeerReplyMessage();
 
-  virtual void doReceivedAction();
+  virtual void doReceivedAction() CXX11_OVERRIDE;
 
-  virtual std::shared_ptr<Dict> getResponse();
+  virtual std::shared_ptr<Dict> getResponse() CXX11_OVERRIDE;
 
-  virtual const std::string& getMessageType() const;
+  virtual const std::string& getMessageType() const CXX11_OVERRIDE;
 
-  virtual void accept(DHTMessageCallback* callback);
+  virtual void accept(DHTMessageCallback* callback) CXX11_OVERRIDE;
 
   static const std::string ANNOUNCE_PEER;
 };

src/DHTAutoSaveCommand.h

@@ -60,9 +60,9 @@ public:
 
   virtual ~DHTAutoSaveCommand();
 
-  virtual void preProcess();
+  virtual void preProcess() CXX11_OVERRIDE;
 
-  virtual void process();
+  virtual void process() CXX11_OVERRIDE;
 
   void setLocalNode(const std::shared_ptr<DHTNode>& localNode);
 

src/DHTBucketRefreshCommand.h

@@ -57,9 +57,9 @@ public:
 
   virtual ~DHTBucketRefreshCommand();
 
-  virtual void preProcess();
+  virtual void preProcess() CXX11_OVERRIDE;
 
-  virtual void process();
+  virtual void process() CXX11_OVERRIDE;
 
   void setRoutingTable(DHTRoutingTable* routingTable);
 

src/DHTBucketRefreshTask.h

@@ -48,7 +48,7 @@ public:
 
   virtual ~DHTBucketRefreshTask();
 
-  virtual void startup();
+  virtual void startup() CXX11_OVERRIDE;
 
   void setForceRefresh(bool forceRefresh);
 };

src/DHTConnectionImpl.h

@@ -77,10 +77,12 @@ public:
   bool bind(uint16_t& port, const std::string& addr);
 
   virtual ssize_t receiveMessage(unsigned char* data, size_t len,
-                                 std::string& host, uint16_t& port);
+                                 std::string& host, uint16_t& port)
+    CXX11_OVERRIDE;
 
   virtual ssize_t sendMessage(const unsigned char* data, size_t len,
-                              const std::string& host, uint16_t port);
+                              const std::string& host, uint16_t port)
+    CXX11_OVERRIDE;
 
   const std::shared_ptr<SocketCore>& getSocket() const
   {

src/DHTEntryPointNameResolveCommand.h

@@ -90,7 +90,7 @@ public:
 
   virtual ~DHTEntryPointNameResolveCommand();
 
-  virtual bool execute();
+  virtual bool execute() CXX11_OVERRIDE;
 
   void setBootstrapEnabled(bool f);
 

src/DHTFindNodeMessage.h

@@ -44,18 +44,18 @@ class DHTFindNodeMessage:public DHTQueryMessage {
 private:
   unsigned char targetNodeID_[DHT_ID_LENGTH];
 protected:
-  virtual std::string toStringOptional() const;
+  virtual std::string toStringOptional() const CXX11_OVERRIDE;
 public:
   DHTFindNodeMessage(const std::shared_ptr<DHTNode>& localNode,
                      const std::shared_ptr<DHTNode>& remoteNode,
                      const unsigned char* targetNodeID,
                      const std::string& transactionID = A2STR::NIL);
 
-  virtual void doReceivedAction();
+  virtual void doReceivedAction() CXX11_OVERRIDE;
 
-  virtual std::shared_ptr<Dict> getArgument();
+  virtual std::shared_ptr<Dict> getArgument() CXX11_OVERRIDE;
 
-  virtual const std::string& getMessageType() const;
+  virtual const std::string& getMessageType() const CXX11_OVERRIDE;
 
   const unsigned char* getTargetNodeID() const
   {

src/DHTFindNodeReplyMessage.h

@@ -46,20 +46,20 @@ private:
 
   std::vector<std::shared_ptr<DHTNode>> closestKNodes_;
 protected:
-  virtual std::string toStringOptional() const;
+  virtual std::string toStringOptional() const CXX11_OVERRIDE;
 public:
   DHTFindNodeReplyMessage(int family,
                           const std::shared_ptr<DHTNode>& localNode,
                           const std::shared_ptr<DHTNode>& remoteNode,
                           const std::string& transactionID);
 
-  virtual void doReceivedAction();
+  virtual void doReceivedAction() CXX11_OVERRIDE;
 
-  virtual std::shared_ptr<Dict> getResponse();
+  virtual std::shared_ptr<Dict> getResponse() CXX11_OVERRIDE;
 
-  virtual const std::string& getMessageType() const;
+  virtual const std::string& getMessageType() const CXX11_OVERRIDE;
 
-  virtual void accept(DHTMessageCallback* callback);
+  virtual void accept(DHTMessageCallback* callback) CXX11_OVERRIDE;
 
   const std::vector<std::shared_ptr<DHTNode>>& getClosestKNodes() const
   {

src/DHTGetPeersCommand.h

@@ -77,7 +77,7 @@ public:
 
   virtual ~DHTGetPeersCommand();
 
-  virtual bool execute();
+  virtual bool execute() CXX11_OVERRIDE;
 
   void setTaskQueue(DHTTaskQueue* taskQueue);
 

src/DHTGetPeersMessage.h

@@ -52,18 +52,18 @@ private:
 
   DHTTokenTracker* tokenTracker_;
 protected:
-  virtual std::string toStringOptional() const;
+  virtual std::string toStringOptional() const CXX11_OVERRIDE;
 public:
   DHTGetPeersMessage(const std::shared_ptr<DHTNode>& localNode,
                      const std::shared_ptr<DHTNode>& remoteNode,
                      const unsigned char* infoHash,
                      const std::string& transactionID = A2STR::NIL);
 
-  virtual void doReceivedAction();
+  virtual void doReceivedAction() CXX11_OVERRIDE;
 
-  virtual std::shared_ptr<Dict> getArgument();
+  virtual std::shared_ptr<Dict> getArgument() CXX11_OVERRIDE;
 
-  virtual const std::string& getMessageType() const;
+  virtual const std::string& getMessageType() const CXX11_OVERRIDE;
 
   const unsigned char* getInfoHash() const
   {

src/DHTGetPeersReplyMessage.h

@@ -55,7 +55,7 @@ private:
 
   std::vector<std::shared_ptr<Peer>> values_;
 protected:
-  virtual std::string toStringOptional() const;
+  virtual std::string toStringOptional() const CXX11_OVERRIDE;
 public:
   DHTGetPeersReplyMessage(int family,
                           const std::shared_ptr<DHTNode>& localNode,
@@ -63,13 +63,13 @@ public:
                           const std::string& token,
                           const std::string& transactionID);
 
-  virtual void doReceivedAction();
+  virtual void doReceivedAction() CXX11_OVERRIDE;
 
-  virtual std::shared_ptr<Dict> getResponse();
+  virtual std::shared_ptr<Dict> getResponse() CXX11_OVERRIDE;
 
-  virtual const std::string& getMessageType() const;
+  virtual const std::string& getMessageType() const CXX11_OVERRIDE;
 
-  virtual void accept(DHTMessageCallback* callback);
+  virtual void accept(DHTMessageCallback* callback) CXX11_OVERRIDE;
 
   const std::vector<std::shared_ptr<DHTNode>>& getClosestKNodes() const
   {

src/DHTInteractionCommand.h

@@ -63,7 +63,7 @@ public:
 
   virtual ~DHTInteractionCommand();
 
-  virtual bool execute();
+  virtual bool execute() CXX11_OVERRIDE;
 
   void setReadCheckSocket(const std::shared_ptr<SocketCore>& socket);
 

src/DHTMessageDispatcherImpl.h

@@ -59,16 +59,18 @@ public:
   addMessageToQueue(std::unique_ptr<DHTMessage> message,
                     time_t timeout,
                     std::unique_ptr<DHTMessageCallback> callback =
-                    std::unique_ptr<DHTMessageCallback>{});
+                    std::unique_ptr<DHTMessageCallback>{})
+    CXX11_OVERRIDE;
 
   virtual void
   addMessageToQueue(std::unique_ptr<DHTMessage> message,
                     std::unique_ptr<DHTMessageCallback> callback =
-                    std::unique_ptr<DHTMessageCallback>{});
+                    std::unique_ptr<DHTMessageCallback>{})
+    CXX11_OVERRIDE;
 
-  virtual void sendMessages();
+  virtual void sendMessages() CXX11_OVERRIDE;
 
-  virtual size_t countMessageInQueue() const;
+  virtual size_t countMessageInQueue() const CXX11_OVERRIDE;
 
   void setTimeout(time_t timeout)
   {

src/DHTMessageFactoryImpl.h

@@ -83,43 +83,47 @@ public:
 
   virtual std::unique_ptr<DHTQueryMessage>
   createQueryMessage(const Dict* dict,
-                     const std::string& ipaddr, uint16_t port);
+                     const std::string& ipaddr, uint16_t port) CXX11_OVERRIDE;
 
   virtual std::unique_ptr<DHTResponseMessage>
   createResponseMessage(const std::string& messageType,
                         const Dict* dict,
-                        const std::string& ipaddr, uint16_t port);
+                        const std::string& ipaddr, uint16_t port)
+    CXX11_OVERRIDE;
 
   virtual std::unique_ptr<DHTPingMessage>
   createPingMessage(const std::shared_ptr<DHTNode>& remoteNode,
-                    const std::string& transactionID = A2STR::NIL);
+                    const std::string& transactionID = A2STR::NIL)
+    CXX11_OVERRIDE;
 
   virtual std::unique_ptr<DHTPingReplyMessage>
   createPingReplyMessage(const std::shared_ptr<DHTNode>& remoteNode,
                          const unsigned char* id,
-                         const std::string& transactionID);
+                         const std::string& transactionID)
+    CXX11_OVERRIDE;
 
   virtual std::unique_ptr<DHTFindNodeMessage>
   createFindNodeMessage(const std::shared_ptr<DHTNode>& remoteNode,
                         const unsigned char* targetNodeID,
-                        const std::string& transactionID = A2STR::NIL);
+                        const std::string& transactionID = A2STR::NIL)
+    CXX11_OVERRIDE;
 
   std::unique_ptr<DHTFindNodeReplyMessage>
   createFindNodeReplyMessage(const std::shared_ptr<DHTNode>& remoteNode,
                              const Dict* dict,
                              const std::string& transactionID);
 
-
   virtual std::unique_ptr<DHTFindNodeReplyMessage>
   createFindNodeReplyMessage
   (const std::shared_ptr<DHTNode>& remoteNode,
    std::vector<std::shared_ptr<DHTNode>> closestKNodes,
-   const std::string& transactionID);
+   const std::string& transactionID) CXX11_OVERRIDE;
 
   virtual std::unique_ptr<DHTGetPeersMessage>
   createGetPeersMessage(const std::shared_ptr<DHTNode>& remoteNode,
                         const unsigned char* infoHash,
-                        const std::string& transactionID = A2STR::NIL);
+                        const std::string& transactionID = A2STR::NIL)
+    CXX11_OVERRIDE;
 
   virtual std::unique_ptr<DHTGetPeersReplyMessage>
   createGetPeersReplyMessage
@@ -127,7 +131,7 @@ public:
    std::vector<std::shared_ptr<DHTNode>> closestKNodes,
    std::vector<std::shared_ptr<Peer>> peers,
    const std::string& token,
-   const std::string& transactionID);
+   const std::string& transactionID) CXX11_OVERRIDE;
 
   std::unique_ptr<DHTGetPeersReplyMessage>
   createGetPeersReplyMessage
@@ -140,15 +144,18 @@ public:
                             const unsigned char* infoHash,
                             uint16_t tcpPort,
                             const std::string& token,
-                            const std::string& transactionID = A2STR::NIL);
+                            const std::string& transactionID = A2STR::NIL)
+    CXX11_OVERRIDE;
 
   virtual std::unique_ptr<DHTAnnouncePeerReplyMessage>
   createAnnouncePeerReplyMessage(const std::shared_ptr<DHTNode>& remoteNode,
-                                 const std::string& transactionID);
+                                 const std::string& transactionID)
+    CXX11_OVERRIDE;
 
   virtual std::unique_ptr<DHTUnknownMessage>
   createUnknownMessage(const unsigned char* data, size_t length,
-                       const std::string& ipaddr, uint16_t port);
+                       const std::string& ipaddr, uint16_t port)
+    CXX11_OVERRIDE;
 
   void setRoutingTable(DHTRoutingTable* routingTable);
 

src/DHTNodeLookupTask.h

@@ -48,12 +48,12 @@ public:
 
   virtual void getNodesFromMessage
   (std::vector<std::shared_ptr<DHTNode> >& nodes,
-   const DHTFindNodeReplyMessage* message);
+   const DHTFindNodeReplyMessage* message) CXX11_OVERRIDE;
 
   virtual std::unique_ptr<DHTMessage> createMessage
-  (const std::shared_ptr<DHTNode>& remoteNode);
+  (const std::shared_ptr<DHTNode>& remoteNode) CXX11_OVERRIDE;
 
-  virtual std::unique_ptr<DHTMessageCallback> createCallback();
+  virtual std::unique_ptr<DHTMessageCallback> createCallback() CXX11_OVERRIDE;
 };
 
 } // namespace aria2

src/DHTNodeLookupTaskCallback.h

@@ -47,15 +47,17 @@ private:
 public:
   DHTNodeLookupTaskCallback(DHTNodeLookupTask* task);
 
-  virtual void visit(const DHTAnnouncePeerReplyMessage* message);
+  virtual void visit(const DHTAnnouncePeerReplyMessage* message)
+    CXX11_OVERRIDE;
 
-  virtual void visit(const DHTFindNodeReplyMessage* message);
+  virtual void visit(const DHTFindNodeReplyMessage* message) CXX11_OVERRIDE;
 
-  virtual void visit(const DHTGetPeersReplyMessage* message);
+  virtual void visit(const DHTGetPeersReplyMessage* message) CXX11_OVERRIDE;
 
-  virtual void visit(const DHTPingReplyMessage* message);
+  virtual void visit(const DHTPingReplyMessage* message) CXX11_OVERRIDE;
 
-  virtual void onTimeout(const std::shared_ptr<DHTNode>& remoteNode);
+  virtual void onTimeout(const std::shared_ptr<DHTNode>& remoteNode)
+    CXX11_OVERRIDE;
 };
 
 } // namespace aria2

src/DHTPeerAnnounceCommand.h

@@ -51,9 +51,9 @@ public:
 
   virtual ~DHTPeerAnnounceCommand();
 
-  virtual void preProcess();
+  virtual void preProcess() CXX11_OVERRIDE;
 
-  virtual void process();
+  virtual void process() CXX11_OVERRIDE;
 
   void setPeerAnnounceStorage(DHTPeerAnnounceStorage* storage);
 };

src/DHTPeerLookupTask.h

@@ -59,16 +59,18 @@ public:
 
   virtual void getNodesFromMessage
   (std::vector<std::shared_ptr<DHTNode>>& nodes,
-   const DHTGetPeersReplyMessage* message);
+   const DHTGetPeersReplyMessage* message) CXX11_OVERRIDE;
 
-  virtual void onReceivedInternal(const DHTGetPeersReplyMessage* message);
+  virtual void onReceivedInternal(const DHTGetPeersReplyMessage* message)
+    CXX11_OVERRIDE;
 
   virtual std::unique_ptr<DHTMessage> createMessage
-  (const std::shared_ptr<DHTNode>& remoteNode);
+  (const std::shared_ptr<DHTNode>& remoteNode) CXX11_OVERRIDE;
 
-  virtual std::unique_ptr<DHTMessageCallback> createCallback();
+  virtual std::unique_ptr<DHTMessageCallback> createCallback()
+    CXX11_OVERRIDE;
 
-  virtual void onFinish();
+  virtual void onFinish() CXX11_OVERRIDE;
 
   void setPeerStorage(const std::shared_ptr<PeerStorage>& peerStorage);
 };

src/DHTPeerLookupTaskCallback.h

@@ -47,15 +47,20 @@ private:
 public:
   DHTPeerLookupTaskCallback(DHTPeerLookupTask* task);
 
-  virtual void visit(const DHTAnnouncePeerReplyMessage* message);
+  virtual void visit(const DHTAnnouncePeerReplyMessage* message)
+    CXX11_OVERRIDE;
 
-  virtual void visit(const DHTFindNodeReplyMessage* message);
+  virtual void visit(const DHTFindNodeReplyMessage* message)
+    CXX11_OVERRIDE;
 
-  virtual void visit(const DHTGetPeersReplyMessage* message);
+  virtual void visit(const DHTGetPeersReplyMessage* message)
+    CXX11_OVERRIDE;
 
-  virtual void visit(const DHTPingReplyMessage* message);
+  virtual void visit(const DHTPingReplyMessage* message)
+    CXX11_OVERRIDE;
 
-  virtual void onTimeout(const std::shared_ptr<DHTNode>& remoteNode);
+  virtual void onTimeout(const std::shared_ptr<DHTNode>& remoteNode)
+    CXX11_OVERRIDE;
 };
 
 } // namespace aria2

src/DHTPingMessage.h

@@ -46,11 +46,11 @@ public:
                  const std::shared_ptr<DHTNode>& remoteNode,
                  const std::string& transactionID = A2STR::NIL);
 
-  virtual void doReceivedAction();
+  virtual void doReceivedAction() CXX11_OVERRIDE;
 
-  virtual std::shared_ptr<Dict> getArgument();
+  virtual std::shared_ptr<Dict> getArgument() CXX11_OVERRIDE;
 
-  virtual const std::string& getMessageType() const;
+  virtual const std::string& getMessageType() const CXX11_OVERRIDE;
 
   static const std::string PING;
 };

src/DHTPingReplyMessage.h

@@ -49,13 +49,13 @@ public:
                       const unsigned char* id,
                       const std::string& transactionID);
 
-  virtual void doReceivedAction();
+  virtual void doReceivedAction() CXX11_OVERRIDE;
 
-  virtual std::shared_ptr<Dict> getResponse();
+  virtual std::shared_ptr<Dict> getResponse() CXX11_OVERRIDE;
 
-  virtual const std::string& getMessageType() const;
+  virtual const std::string& getMessageType() const CXX11_OVERRIDE;
 
-  virtual void accept(DHTMessageCallback* callback);
+  virtual void accept(DHTMessageCallback* callback) CXX11_OVERRIDE;
 
   const unsigned char* getRemoteID()
   {

src/DHTPingReplyMessageCallback.h

@@ -50,27 +50,28 @@ private:
 public:
   DHTPingReplyMessageCallback(Task* task):task_(task) {}
 
-  virtual void visit(const DHTAnnouncePeerReplyMessage* message)
+  virtual void visit(const DHTAnnouncePeerReplyMessage* message) CXX11_OVERRIDE
   {
     onTimeout(message->getRemoteNode());
   }
 
-  virtual void visit(const DHTFindNodeReplyMessage* message)
+  virtual void visit(const DHTFindNodeReplyMessage* message) CXX11_OVERRIDE
   {
     onTimeout(message->getRemoteNode());
   }
 
-  virtual void visit(const DHTGetPeersReplyMessage* message)
+  virtual void visit(const DHTGetPeersReplyMessage* message) CXX11_OVERRIDE
   {
     onTimeout(message->getRemoteNode());
   }
 
-  virtual void visit(const DHTPingReplyMessage* message)
+  virtual void visit(const DHTPingReplyMessage* message) CXX11_OVERRIDE
   {
     task_->onReceived(message);
   }
 
   virtual void onTimeout(const std::shared_ptr<DHTNode>& remoteNode)
+    CXX11_OVERRIDE
   {
     task_->onTimeout(remoteNode);
   }

src/DHTPingTask.h

@@ -60,7 +60,7 @@ public:
 
   virtual ~DHTPingTask();
 
-  virtual void startup();
+  virtual void startup() CXX11_OVERRIDE;
 
   void onReceived(const DHTPingReplyMessage* message);
 

src/DHTQueryMessage.h

@@ -51,15 +51,15 @@ public:
 
   virtual ~DHTQueryMessage();
 
-  virtual const std::string& getType() const;
+  virtual const std::string& getType() const CXX11_OVERRIDE;
 
-  virtual void fillMessage(Dict* msgDict);
+  virtual void fillMessage(Dict* msgDict) CXX11_OVERRIDE;
 
   virtual std::shared_ptr<Dict> getArgument() = 0;
 
-  virtual bool isReply() const;
+  virtual bool isReply() const CXX11_OVERRIDE;
 
-  virtual std::string toString() const;
+  virtual std::string toString() const CXX11_OVERRIDE;
 
   static const std::string Q;
 

src/DHTReplaceNodeTask.h

@@ -60,7 +60,7 @@ public:
 
   virtual ~DHTReplaceNodeTask();
 
-  virtual void startup();
+  virtual void startup() CXX11_OVERRIDE;
 
   void onReceived(const DHTPingReplyMessage* message);
 

src/DHTResponseMessage.h

@@ -53,15 +53,15 @@ public:
 
   virtual ~DHTResponseMessage();
 
-  virtual const std::string& getType() const;
+  virtual const std::string& getType() const CXX11_OVERRIDE;
 
-  virtual void fillMessage(Dict* msgDict);
+  virtual void fillMessage(Dict* msgDict) CXX11_OVERRIDE;
 
   virtual std::shared_ptr<Dict> getResponse() = 0;
 
-  virtual bool isReply() const;
+  virtual bool isReply() const CXX11_OVERRIDE;
 
-  virtual std::string toString() const;
+  virtual std::string toString() const CXX11_OVERRIDE;
 
   virtual void accept(DHTMessageCallback* callback) = 0;
 

src/DHTTaskFactoryImpl.h

@@ -69,24 +69,26 @@ public:
 
   virtual std::shared_ptr<DHTTask>
   createPingTask(const std::shared_ptr<DHTNode>& remoteNode,
-                 int numRetry = 0);
+                 int numRetry = 0) CXX11_OVERRIDE;
 
   virtual std::shared_ptr<DHTTask>
-  createNodeLookupTask(const unsigned char* targetID);
+  createNodeLookupTask(const unsigned char* targetID) CXX11_OVERRIDE;
 
-  virtual std::shared_ptr<DHTTask> createBucketRefreshTask();
+  virtual std::shared_ptr<DHTTask> createBucketRefreshTask() CXX11_OVERRIDE;
 
   virtual std::shared_ptr<DHTTask>
   createPeerLookupTask(const std::shared_ptr<DownloadContext>& ctx,
                        uint16_t tcpPort,
-                       const std::shared_ptr<PeerStorage>& peerStorage);
+                       const std::shared_ptr<PeerStorage>& peerStorage)
+    CXX11_OVERRIDE;
 
   virtual std::shared_ptr<DHTTask>
-  createPeerAnnounceTask(const unsigned char* infoHash);
+  createPeerAnnounceTask(const unsigned char* infoHash) CXX11_OVERRIDE;
 
   virtual std::shared_ptr<DHTTask>
   createReplaceNodeTask(const std::shared_ptr<DHTBucket>& bucket,
-                        const std::shared_ptr<DHTNode>& newNode);
+                        const std::shared_ptr<DHTNode>& newNode)
+    CXX11_OVERRIDE;
 
   void setRoutingTable(DHTRoutingTable* routingTable);
 

src/DHTTaskQueueImpl.h

@@ -52,13 +52,16 @@ public:
 
   virtual ~DHTTaskQueueImpl();
 
-  virtual void executeTask();
+  virtual void executeTask() CXX11_OVERRIDE;
 
-  virtual void addPeriodicTask1(const std::shared_ptr<DHTTask>& task);
+  virtual void addPeriodicTask1(const std::shared_ptr<DHTTask>& task)
+    CXX11_OVERRIDE;
 
-  virtual void addPeriodicTask2(const std::shared_ptr<DHTTask>& task);
+  virtual void addPeriodicTask2(const std::shared_ptr<DHTTask>& task)
+    CXX11_OVERRIDE;
 
-  virtual void addImmediateTask(const std::shared_ptr<DHTTask>& task);
+  virtual void addImmediateTask(const std::shared_ptr<DHTTask>& task)
+    CXX11_OVERRIDE;
 };
 
 } // namespace aria2

src/DHTTokenUpdateCommand.h

@@ -51,9 +51,9 @@ public:
 
   virtual ~DHTTokenUpdateCommand();
 
-  virtual void preProcess();
+  virtual void preProcess() CXX11_OVERRIDE;
 
-  virtual void process();
+  virtual void process() CXX11_OVERRIDE;
 
   void setTokenTracker(DHTTokenTracker* tokenTracker);
 };

src/DHTUnknownMessage.h

@@ -54,19 +54,19 @@ public:
   virtual ~DHTUnknownMessage();
 
   // do nothing
-  virtual void doReceivedAction();
+  virtual void doReceivedAction() CXX11_OVERRIDE;
 
   // do nothing; we don't use this message as outgoing message.
-  virtual bool send();
+  virtual bool send() CXX11_OVERRIDE;
 
   // always return false
-  virtual bool isReply() const;
+  virtual bool isReply() const CXX11_OVERRIDE;
 
   // returns "unknown"
-  virtual const std::string& getMessageType() const;
+  virtual const std::string& getMessageType() const CXX11_OVERRIDE;
 
   // show some sample bytes
-  virtual std::string toString() const;
+  virtual std::string toString() const CXX11_OVERRIDE;
 
   static const std::string E;
 

src/DefaultAuthResolver.h

@@ -42,7 +42,7 @@ namespace aria2 {
 class DefaultAuthResolver : public AbstractAuthResolver {
 public:
   virtual std::unique_ptr<AuthConfig> resolveAuthConfig
-  (const std::string& hostname);
+  (const std::string& hostname) CXX11_OVERRIDE;
 };
 
 } // namespace aria2

src/DefaultBtAnnounce.h

@@ -100,37 +100,38 @@ public:
 
   bool isCompletedAnnounceReady();
 
-  virtual bool isAnnounceReady();
+  virtual bool isAnnounceReady() CXX11_OVERRIDE;
 
-  virtual std::string getAnnounceUrl();
+  virtual std::string getAnnounceUrl() CXX11_OVERRIDE;
 
   virtual std::shared_ptr<UDPTrackerRequest>
   createUDPTrackerRequest(const std::string& remoteAddr, uint16_t remotePort,
-                          uint16_t localPort);
+                          uint16_t localPort) CXX11_OVERRIDE;
 
-  virtual void announceStart();
+  virtual void announceStart() CXX11_OVERRIDE;
 
-  virtual void announceSuccess();
+  virtual void announceSuccess() CXX11_OVERRIDE;
 
-  virtual void announceFailure();
+  virtual void announceFailure() CXX11_OVERRIDE;
 
-  virtual bool isAllAnnounceFailed();
+  virtual bool isAllAnnounceFailed() CXX11_OVERRIDE;
 
-  virtual void resetAnnounce();
+  virtual void resetAnnounce() CXX11_OVERRIDE;
 
   virtual void processAnnounceResponse(const unsigned char* trackerResponse,
-                                       size_t trackerResponseLength);
+                                       size_t trackerResponseLength)
+    CXX11_OVERRIDE;
 
   virtual void processUDPTrackerResponse
-  (const std::shared_ptr<UDPTrackerRequest>& req);
+  (const std::shared_ptr<UDPTrackerRequest>& req) CXX11_OVERRIDE;
 
-  virtual bool noMoreAnnounce();
+  virtual bool noMoreAnnounce() CXX11_OVERRIDE;
 
-  virtual void shuffleAnnounce();
+  virtual void shuffleAnnounce() CXX11_OVERRIDE;
 
-  virtual void overrideMinInterval(time_t interval);
+  virtual void overrideMinInterval(time_t interval) CXX11_OVERRIDE;
 
-  virtual void setTcpPort(uint16_t port)
+  virtual void setTcpPort(uint16_t port) CXX11_OVERRIDE
   {
     tcpPort_ = port;
   }

src/DefaultBtInteractive.h

@@ -171,30 +171,31 @@ public:
 
   virtual ~DefaultBtInteractive();
 
-  virtual void initiateHandshake();
+  virtual void initiateHandshake() CXX11_OVERRIDE;
 
   virtual std::unique_ptr<BtHandshakeMessage> receiveHandshake
-  (bool quickReply = false);
+  (bool quickReply = false) CXX11_OVERRIDE;
 
-  virtual std::unique_ptr<BtHandshakeMessage> receiveAndSendHandshake();
+  virtual std::unique_ptr<BtHandshakeMessage> receiveAndSendHandshake()
+    CXX11_OVERRIDE;
 
-  virtual void doPostHandshakeProcessing();
+  virtual void doPostHandshakeProcessing() CXX11_OVERRIDE;
 
-  virtual void doInteractionProcessing();
+  virtual void doInteractionProcessing() CXX11_OVERRIDE;
 
-  virtual void cancelAllPiece();
+  virtual void cancelAllPiece() CXX11_OVERRIDE;
 
-  virtual void sendPendingMessage();
+  virtual void sendPendingMessage() CXX11_OVERRIDE;
 
   size_t receiveMessages();
 
-  virtual size_t countPendingMessage();
+  virtual size_t countPendingMessage() CXX11_OVERRIDE;
 
-  virtual bool isSendingMessageInProgress();
+  virtual bool isSendingMessageInProgress() CXX11_OVERRIDE;
 
-  virtual size_t countReceivedMessageInIteration() const;
+  virtual size_t countReceivedMessageInIteration() const CXX11_OVERRIDE;
 
-  virtual size_t countOutstandingRequest();
+  virtual size_t countOutstandingRequest() CXX11_OVERRIDE;
 
   void setCuid(cuid_t cuid)
   {

src/DefaultBtMessageDispatcher.h

@@ -72,47 +72,54 @@ public:
 
   virtual ~DefaultBtMessageDispatcher();
 
-  virtual void addMessageToQueue(std::unique_ptr<BtMessage> btMessage);
+  virtual void addMessageToQueue(std::unique_ptr<BtMessage> btMessage)
+    CXX11_OVERRIDE;
 
-  virtual void sendMessages();
+  virtual void sendMessages() CXX11_OVERRIDE;
 
   // For unit tests without PeerConnection
   void sendMessagesInternal();
 
   virtual void doCancelSendingPieceAction
-  (size_t index, int32_t begin, int32_t length);
+  (size_t index, int32_t begin, int32_t length) CXX11_OVERRIDE;
 
-  virtual void doCancelSendingPieceAction(const std::shared_ptr<Piece>& piece);
+  virtual void doCancelSendingPieceAction(const std::shared_ptr<Piece>& piece)
+    CXX11_OVERRIDE;
 
-  virtual void doAbortOutstandingRequestAction(const std::shared_ptr<Piece>& piece);
+  virtual void doAbortOutstandingRequestAction
+  (const std::shared_ptr<Piece>& piece) CXX11_OVERRIDE;
 
-  virtual void doChokedAction();
+  virtual void doChokedAction() CXX11_OVERRIDE;
 
-  virtual void doChokingAction();
+  virtual void doChokingAction() CXX11_OVERRIDE;
 
-  virtual void checkRequestSlotAndDoNecessaryThing();
+  virtual void checkRequestSlotAndDoNecessaryThing() CXX11_OVERRIDE;
 
-  virtual bool isSendingInProgress();
+  virtual bool isSendingInProgress() CXX11_OVERRIDE;
 
-  virtual size_t countMessageInQueue() {
+  virtual size_t countMessageInQueue() CXX11_OVERRIDE
+  {
     return messageQueue_.size();
   }
 
-  virtual size_t countOutstandingRequest()
+  virtual size_t countOutstandingRequest() CXX11_OVERRIDE
   {
     return requestSlots_.size();
   }
 
-  virtual bool isOutstandingRequest(size_t index, size_t blockIndex);
+  virtual bool isOutstandingRequest(size_t index, size_t blockIndex)
+    CXX11_OVERRIDE;
 
   virtual const RequestSlot* getOutstandingRequest
-  (size_t index, int32_t begin, int32_t length);
+  (size_t index, int32_t begin, int32_t length) CXX11_OVERRIDE;
 
-  virtual void removeOutstandingRequest(const RequestSlot* slot);
+  virtual void removeOutstandingRequest(const RequestSlot* slot)
+    CXX11_OVERRIDE;
 
-  virtual void addOutstandingRequest(std::unique_ptr<RequestSlot> requestSlot);
+  virtual void addOutstandingRequest(std::unique_ptr<RequestSlot> requestSlot)
+    CXX11_OVERRIDE;
 
-  virtual size_t countOutstandingUpload();
+  virtual size_t countOutstandingUpload() CXX11_OVERRIDE;
 
   const std::deque<std::unique_ptr<BtMessage>>& getMessageQueue() const
   {

src/DefaultBtMessageFactory.h

@@ -87,53 +87,67 @@ public:
   DefaultBtMessageFactory();
 
   virtual std::unique_ptr<BtMessage>
-  createBtMessage(const unsigned char* msg, size_t msgLength);
+  createBtMessage(const unsigned char* msg, size_t msgLength) CXX11_OVERRIDE;
 
   virtual std::unique_ptr<BtHandshakeMessage>
-  createHandshakeMessage(const unsigned char* msg, size_t msgLength);
+  createHandshakeMessage(const unsigned char* msg, size_t msgLength)
+    CXX11_OVERRIDE;
 
   virtual std::unique_ptr<BtHandshakeMessage>
   createHandshakeMessage(const unsigned char* infoHash,
-                         const unsigned char* peerId);
+                         const unsigned char* peerId) CXX11_OVERRIDE;
 
   virtual std::unique_ptr<BtRequestMessage>
   createRequestMessage(const std::shared_ptr<Piece>& piece,
-                       size_t blockIndex);
+                       size_t blockIndex) CXX11_OVERRIDE;
 
   virtual std::unique_ptr<BtCancelMessage>
-  createCancelMessage(size_t index, int32_t begin, int32_t length);
+  createCancelMessage(size_t index, int32_t begin, int32_t length)
+    CXX11_OVERRIDE;
 
   virtual std::unique_ptr<BtPieceMessage>
-  createPieceMessage(size_t index, int32_t begin, int32_t length);
+  createPieceMessage(size_t index, int32_t begin, int32_t length)
+    CXX11_OVERRIDE;
 
-  virtual std::unique_ptr<BtHaveMessage> createHaveMessage(size_t index);
+  virtual std::unique_ptr<BtHaveMessage> createHaveMessage(size_t index)
+    CXX11_OVERRIDE;
 
-  virtual std::unique_ptr<BtChokeMessage> createChokeMessage();
+  virtual std::unique_ptr<BtChokeMessage> createChokeMessage() CXX11_OVERRIDE;
 
-  virtual std::unique_ptr<BtUnchokeMessage> createUnchokeMessage();
+  virtual std::unique_ptr<BtUnchokeMessage> createUnchokeMessage()
+    CXX11_OVERRIDE;
 
-  virtual std::unique_ptr<BtInterestedMessage> createInterestedMessage();
+  virtual std::unique_ptr<BtInterestedMessage> createInterestedMessage()
+    CXX11_OVERRIDE;
 
-  virtual std::unique_ptr<BtNotInterestedMessage> createNotInterestedMessage();
+  virtual std::unique_ptr<BtNotInterestedMessage> createNotInterestedMessage()
+    CXX11_OVERRIDE;
 
-  virtual std::unique_ptr<BtBitfieldMessage> createBitfieldMessage();
+  virtual std::unique_ptr<BtBitfieldMessage> createBitfieldMessage()
+    CXX11_OVERRIDE;
 
-  virtual std::unique_ptr<BtKeepAliveMessage> createKeepAliveMessage();
+  virtual std::unique_ptr<BtKeepAliveMessage> createKeepAliveMessage()
+    CXX11_OVERRIDE;
 
-  virtual std::unique_ptr<BtHaveAllMessage> createHaveAllMessage();
+  virtual std::unique_ptr<BtHaveAllMessage> createHaveAllMessage()
+    CXX11_OVERRIDE;
 
-  virtual std::unique_ptr<BtHaveNoneMessage> createHaveNoneMessage();
+  virtual std::unique_ptr<BtHaveNoneMessage> createHaveNoneMessage()
+    CXX11_OVERRIDE;
 
   virtual std::unique_ptr<BtRejectMessage>
-  createRejectMessage(size_t index, int32_t begin, int32_t length);
+  createRejectMessage(size_t index, int32_t begin, int32_t length)
+    CXX11_OVERRIDE;
 
   virtual std::unique_ptr<BtAllowedFastMessage> createAllowedFastMessage
-  (size_t index);
+  (size_t index) CXX11_OVERRIDE;
 
-  virtual std::unique_ptr<BtPortMessage> createPortMessage(uint16_t port);
+  virtual std::unique_ptr<BtPortMessage> createPortMessage(uint16_t port)
+    CXX11_OVERRIDE;
 
   virtual std::unique_ptr<BtExtendedMessage>
-  createBtExtendedMessage(std::unique_ptr<ExtensionMessage> msg);
+  createBtExtendedMessage(std::unique_ptr<ExtensionMessage> msg)
+    CXX11_OVERRIDE;
 
   void setPeer(const std::shared_ptr<Peer>& peer);