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. --- apt-pkg/acquire-item.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'apt-pkg/acquire-item.cc') diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 69644883b..afd81b944 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -727,8 +727,8 @@ class APT_HIDDEN NoActionItem final : public pkgAcquire::Item /*{{{*/ { IndexTarget const Target; public: - virtual std::string DescURI() const APT_OVERRIDE {return Target.URI;}; - virtual HashStringList GetExpectedHashes() const APT_OVERRIDE {return HashStringList();}; + [[nodiscard]] std::string DescURI() const override {return Target.URI;}; + [[nodiscard]] HashStringList GetExpectedHashes() const override {return {};}; NoActionItem(pkgAcquire * const Owner, IndexTarget const &Target) : pkgAcquire::Item(Owner), Target(Target) @@ -751,8 +751,8 @@ class APT_HIDDEN CleanupItem final : public pkgAcqTransactionItem /*{{{*/ even if the lists-cleanup is deactivated. */ { public: - virtual std::string DescURI() const APT_OVERRIDE {return Target.URI;}; - virtual HashStringList GetExpectedHashes() const APT_OVERRIDE {return HashStringList();}; + [[nodiscard]] std::string DescURI() const override {return Target.URI;}; + [[nodiscard]] HashStringList GetExpectedHashes() const override {return {};}; CleanupItem(pkgAcquire * const Owner, pkgAcqMetaClearSig * const TransactionManager, IndexTarget const &Target) : pkgAcqTransactionItem(Owner, TransactionManager, Target) @@ -760,7 +760,7 @@ class APT_HIDDEN CleanupItem final : public pkgAcqTransactionItem /*{{{*/ Status = StatDone; DestFile = GetFinalFileNameFromURI(Target.URI); } - bool TransactionState(TransactionStates const state) APT_OVERRIDE + bool TransactionState(TransactionStates const state) override { switch (state) { -- cgit v1.2.3-70-g09d2