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/policy.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'apt-pkg/policy.h') diff --git a/apt-pkg/policy.h b/apt-pkg/policy.h index 589cebcde..3a377fe25 100644 --- a/apt-pkg/policy.h +++ b/apt-pkg/policy.h @@ -72,9 +72,9 @@ class APT_PUBLIC pkgPolicy : public pkgDepCache::Policy std::string Data,signed short Priority); // Things for the cache interface. - virtual pkgCache::VerIterator GetCandidateVer(pkgCache::PkgIterator const &Pkg) APT_OVERRIDE; - virtual signed short GetPriority(pkgCache::VerIterator const &Ver, bool ConsiderFiles = true) APT_OVERRIDE; - virtual signed short GetPriority(pkgCache::PkgFileIterator const &File) APT_OVERRIDE; + pkgCache::VerIterator GetCandidateVer(pkgCache::PkgIterator const &Pkg) override; + signed short GetPriority(pkgCache::VerIterator const &Ver, bool ConsiderFiles = true) override; + signed short GetPriority(pkgCache::PkgFileIterator const &File) override; void SetPriority(pkgCache::VerIterator const &Ver, signed short Priority); void SetPriority(pkgCache::PkgFileIterator const &File, signed short Priority); -- cgit v1.2.3-70-g09d2