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.

1 files changed, 6 insertions, 6 deletions

diff --git a/apt-pkg/deb/debversion.h b/apt-pkg/deb/debversion.h
index 5c328a985..6d82e5889 100644
--- a/apt-pkg/deb/debversion.h
+++ b/apt-pkg/deb/debversion.h
@@ -23,15 +23,15 @@ class APT_PUBLIC debVersioningSystem : public pkgVersioningSystem
 			  const char *BEnd) APT_PURE;
 
    // Compare versions..
-   virtual int DoCmpVersion(const char *A,const char *Aend,
-			  const char *B,const char *Bend) APT_OVERRIDE APT_PURE;
-   virtual bool CheckDep(const char *PkgVer,int Op,const char *DepVer) APT_OVERRIDE APT_PURE;
-   virtual APT_PURE int DoCmpReleaseVer(const char *A,const char *Aend,
-			     const char *B,const char *Bend) APT_OVERRIDE
+   int DoCmpVersion(const char *A, const char *Aend,
+		    const char *B, const char *Bend) override APT_PURE;
+   bool CheckDep(const char *PkgVer, int Op, const char *DepVer) override APT_PURE;
+   int DoCmpReleaseVer(const char *A, const char *Aend,
+		       const char *B, const char *Bend) override APT_PURE
    {
       return DoCmpVersion(A,Aend,B,Bend);
    }
-   virtual std::string UpstreamVersion(const char *A) APT_OVERRIDE;
+   std::string UpstreamVersion(const char *A) override;
 
    debVersioningSystem();
 };