From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Thu, 20 Aug 2015 09:55:56 +0000 (+0200)
Subject: Revert override keyword in Ftp::Server::callException
X-Git-Tag: SQUID_4_0_1~124
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4d0ce2255aa15996bf37e1ba7cc1c4ec68e0dfdb;p=thirdparty%2Fsquid.git

Revert override keyword in Ftp::Server::callException

If even one only method is marked override in a class, then clang
requires all overriding methods in the class to be marked as such.
This uncovers a problem where toCbdata is defined virtual in
AsyncJob (which Ftp::Server inherits from) and implemented nonvirtual
in the CBDATA_CLASS macro. Fixing this will be the result of a sepearate
effort, for now covering up by removing keyword and marking XXX.
---

diff --git a/src/servers/FtpServer.h b/src/servers/FtpServer.h
index 2ddaecbf49..8aa40606de 100644
--- a/src/servers/FtpServer.h
+++ b/src/servers/FtpServer.h
@@ -53,12 +53,14 @@ public:
 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
 
 public:
     explicit Server(const MasterXaction::Pointer &xact);
     virtual ~Server();
     /* AsyncJob API */
-    virtual void callException(const std::exception &e) override;
+    virtual void callException(const std::exception &e);
 
     // This is a pointer in hope to minimize future changes when MasterState
     // becomes a part of MasterXaction. Guaranteed not to be nil.