Merge branch 'fix/cleanup' into 'main'

Drop unused and obsolete macros as well as documentation

See merge request apt-team/apt!428

1 files changed, 3 insertions, 3 deletions

diff --git a/methods/basehttp.h b/methods/basehttp.h
index c077ea384..1d3ed1ace 100644
--- a/methods/basehttp.h
+++ b/methods/basehttp.h
@@ -126,7 +126,7 @@ struct ServerState
 class BaseHttpMethod : public aptAuthConfMethod
 {
    protected:
-   virtual bool Fetch(FetchItem *) APT_OVERRIDE;
+   bool Fetch(FetchItem *) override;
 
    std::unique_ptr<ServerState> Server;
    std::string NextURI;
@@ -163,14 +163,14 @@ class BaseHttpMethod : public aptAuthConfMethod
    static std::string FailFile;
    static int FailFd;
    static time_t FailTime;
-   static APT_NORETURN void SigTerm(int);
+   [[noreturn]] static void SigTerm(int);
 
    int Loop();
 
    virtual void SendReq(FetchItem *Itm) = 0;
    virtual std::unique_ptr<ServerState> CreateServerState(URI const &uri) = 0;
    virtual void RotateDNS() = 0;
-   virtual bool Configuration(std::string Message) APT_OVERRIDE;
+   bool Configuration(std::string Message) override;
 
    bool AddProxyAuth(URI &Proxy, URI const &Server);