From f73593a4034d9eec0ec4466b8e173d4a4daece1f Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 26 Dec 2024 19:41:53 +0000 Subject: Drop usage of macro APT_OVERRIDE for simple override We were rather inconsistent in using it and as our public headers contain deduction guides (a c++17 feature) it seems silly to try to hide a c++11 feature in a macro, so lets stop this charade and drop the macro and while we are changing all these lines lets apply [[nodiscard]] (another c++17 feature) and other suggestions from clang-tidy and formatting for a little more consistency. --- methods/mirror.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'methods/mirror.cc') diff --git a/methods/mirror.cc b/methods/mirror.cc index 5781ebcf0..dfdd550b7 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -89,12 +89,12 @@ class MirrorMethod : public aptMethod /*{{{*/ }; std::unordered_map mirrorfilestate; - virtual bool URIAcquire(std::string const &Message, FetchItem *Itm) APT_OVERRIDE; + bool URIAcquire(std::string const &Message, FetchItem *Itm) override; - void RedirectItem(MirrorListInfo const &info, FetchItem *const Itm, std::string const &Message); - bool MirrorListFileReceived(MirrorListInfo &info, FetchItem *const Itm); - std::string GetMirrorFileURI(std::string const &Message, FetchItem *const Itm); - void DealWithPendingItems(std::vector const &baseuris, MirrorListInfo const &info, FetchItem *const Itm, std::function handler); + void RedirectItem(MirrorListInfo const &info, FetchItem *Itm, std::string const &Message); + bool MirrorListFileReceived(MirrorListInfo &info, FetchItem *Itm); + std::string GetMirrorFileURI(std::string const &Message, FetchItem *Itm); + void DealWithPendingItems(std::vector const &baseuris, MirrorListInfo const &info, FetchItem *Itm, std::function handler); public: explicit MirrorMethod(std::string &&pProg) : aptMethod(std::move(pProg), "2.0", SingleInstance | Pipeline | SendConfig | AuxRequests | SendURIEncoded), genrng(clock()) -- cgit v1.2.3-70-g09d2