diff options
| -rw-r--r-- | apt-pkg/cachefilter.h | 2 | ||||
| -rw-r--r-- | apt-pkg/contrib/sha2.h | 2 | ||||
| -rw-r--r-- | apt-pkg/deb/debindexfile.h | 18 | ||||
| -rw-r--r-- | apt-pkg/deb/debversion.h | 4 | ||||
| -rw-r--r-- | apt-pkg/edsp/edspindexfile.h | 2 | ||||
| -rw-r--r-- | apt-private/private-list.cc | 2 |
6 files changed, 15 insertions, 15 deletions
diff --git a/apt-pkg/cachefilter.h b/apt-pkg/cachefilter.h index 2719154c1..9970b5b22 100644 --- a/apt-pkg/cachefilter.h +++ b/apt-pkg/cachefilter.h @@ -29,7 +29,7 @@ public: class PackageMatcher : public Matcher { public: - virtual bool operator() (pkgCache::PkgIterator const &Pkg) = 0; + virtual bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE = 0; virtual bool operator() (pkgCache::VerIterator const &Ver) APT_OVERRIDE { return (*this)(Ver.ParentPkg()); } virtual bool operator() (pkgCache::GrpIterator const &/*Grp*/) APT_OVERRIDE { return false; } virtual ~PackageMatcher(); diff --git a/apt-pkg/contrib/sha2.h b/apt-pkg/contrib/sha2.h index 70e8384f2..8b4bdd439 100644 --- a/apt-pkg/contrib/sha2.h +++ b/apt-pkg/contrib/sha2.h @@ -34,7 +34,7 @@ class SHA2SummationBase : public SummationImplementation protected: bool Done; public: - bool Add(const unsigned char *inbuf, unsigned long long len) = 0; + bool Add(const unsigned char *inbuf, unsigned long long len) APT_OVERRIDE = 0; void Result(); }; diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h index 02708b558..dc75a01ab 100644 --- a/apt-pkg/deb/debindexfile.h +++ b/apt-pkg/deb/debindexfile.h @@ -36,7 +36,7 @@ protected: public: - virtual const Type *GetType() const APT_CONST; + virtual const Type *GetType() const APT_OVERRIDE APT_CONST; // Interface for the Cache Generator virtual bool HasPackages() const APT_OVERRIDE {return true;}; @@ -51,10 +51,10 @@ class debPackagesIndex : public pkgDebianIndexTargetFile { void * const d; protected: - virtual uint8_t GetIndexFlags() const; + virtual uint8_t GetIndexFlags() const APT_OVERRIDE; public: - virtual const Type *GetType() const APT_CONST; + virtual const Type *GetType() const APT_OVERRIDE APT_CONST; // Stuff for accessing files on remote items virtual std::string ArchiveInfo(pkgCache::VerIterator const &Ver) const APT_OVERRIDE; @@ -77,7 +77,7 @@ protected: public: - virtual const Type *GetType() const APT_CONST; + virtual const Type *GetType() const APT_OVERRIDE APT_CONST; // Interface for the Cache Generator virtual bool HasPackages() const APT_OVERRIDE; @@ -89,13 +89,13 @@ public: class debSourcesIndex : public pkgDebianIndexTargetFile { void * const d; - virtual uint8_t GetIndexFlags() const; + virtual uint8_t GetIndexFlags() const APT_OVERRIDE; virtual bool OpenListFile(FileFd &Pkg, std::string const &FileName) APT_OVERRIDE; APT_HIDDEN virtual pkgCacheListParser * CreateListParser(FileFd &Pkg) APT_OVERRIDE; public: - virtual const Type *GetType() const APT_CONST; + virtual const Type *GetType() const APT_OVERRIDE APT_CONST; // Stuff for accessing files on remote items virtual std::string SourceInfo(pkgSrcRecords::Parser const &Record, @@ -124,7 +124,7 @@ protected: APT_HIDDEN virtual pkgCacheListParser * CreateListParser(FileFd &Pkg) APT_OVERRIDE; public: - virtual const Type *GetType() const APT_CONST; + virtual const Type *GetType() const APT_OVERRIDE APT_CONST; /** get the control (file) content of the deb file * @@ -148,7 +148,7 @@ class debDscFileIndex : public pkgDebianIndexRealFile { void * const d; public: - virtual const Type *GetType() const APT_CONST; + virtual const Type *GetType() const APT_OVERRIDE APT_CONST; virtual pkgSrcRecords::Parser *CreateSrcParser() const APT_OVERRIDE; virtual bool HasPackages() const APT_OVERRIDE {return false;}; @@ -159,7 +159,7 @@ class debDscFileIndex : public pkgDebianIndexRealFile class debDebianSourceDirIndex : public debDscFileIndex { public: - virtual const Type *GetType() const APT_CONST; + virtual const Type *GetType() const APT_OVERRIDE APT_CONST; }; #endif diff --git a/apt-pkg/deb/debversion.h b/apt-pkg/deb/debversion.h index 6d7eca7c1..db70c8797 100644 --- a/apt-pkg/deb/debversion.h +++ b/apt-pkg/deb/debversion.h @@ -24,8 +24,8 @@ class debVersioningSystem : public pkgVersioningSystem // Compare versions.. virtual int DoCmpVersion(const char *A,const char *Aend, - const char *B,const char *Bend) APT_PURE; - virtual bool CheckDep(const char *PkgVer,int Op,const char *DepVer) APT_PURE; + 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 { diff --git a/apt-pkg/edsp/edspindexfile.h b/apt-pkg/edsp/edspindexfile.h index edf799023..4548bff3c 100644 --- a/apt-pkg/edsp/edspindexfile.h +++ b/apt-pkg/edsp/edspindexfile.h @@ -31,7 +31,7 @@ protected: virtual std::string GetArchitecture() const APT_OVERRIDE; public: - virtual const Type *GetType() const APT_CONST; + virtual const Type *GetType() const APT_OVERRIDE APT_CONST; virtual bool Exists() const APT_OVERRIDE; virtual bool HasPackages() const APT_OVERRIDE; diff --git a/apt-private/private-list.cc b/apt-private/private-list.cc index aa3a2c24b..c4d5e8bc3 100644 --- a/apt-private/private-list.cc +++ b/apt-private/private-list.cc @@ -59,7 +59,7 @@ class PackageNameMatcher : public Matcher for(J=filters.begin(); J != filters.end(); ++J) delete *J; } - virtual bool operator () (const pkgCache::PkgIterator &P) + virtual bool operator () (const pkgCache::PkgIterator &P) APT_OVERRIDE { for(J=filters.begin(); J != filters.end(); ++J) { |