summaryrefslogtreecommitdiff
path: root/apt-pkg/deb/debrecords.h
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2015-07-09 00:35:40 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2015-08-10 17:27:17 +0200
commit3b3028467ceccca0b73a8f53051c0fa4de313111 (patch)
treeff51789a82630e3fb61a25f8b7c970854b753dc9 /apt-pkg/deb/debrecords.h
parent2893325927f6e4d55dc4bd148093351d4f8300f9 (diff)
add c++11 override marker to overridden methods
C++11 adds the 'override' specifier to mark that a method is overriding a base class method and error out if not. We hide it in the APT_OVERRIDE macro to ensure that we keep compiling in pre-c++11 standards. Reported-By: clang-modernize -add-override -override-macros Git-Dch: Ignore
Diffstat (limited to 'apt-pkg/deb/debrecords.h')
-rw-r--r--apt-pkg/deb/debrecords.h32
1 files changed, 16 insertions, 16 deletions
diff --git a/apt-pkg/deb/debrecords.h b/apt-pkg/deb/debrecords.h
index 4d0b713d4..7fc82a88d 100644
--- a/apt-pkg/deb/debrecords.h
+++ b/apt-pkg/deb/debrecords.h
@@ -33,23 +33,23 @@ class APT_HIDDEN debRecordParserBase : public pkgRecords::Parser
public:
// These refer to the archive file for the Version
- virtual std::string FileName();
- virtual std::string SourcePkg();
- virtual std::string SourceVer();
+ virtual std::string FileName() APT_OVERRIDE;
+ virtual std::string SourcePkg() APT_OVERRIDE;
+ virtual std::string SourceVer() APT_OVERRIDE;
- virtual HashStringList Hashes() const;
+ virtual HashStringList Hashes() const APT_OVERRIDE;
// These are some general stats about the package
- virtual std::string Maintainer();
- virtual std::string ShortDesc(std::string const &lang);
- virtual std::string LongDesc(std::string const &lang);
- virtual std::string Name();
- virtual std::string Homepage();
+ virtual std::string Maintainer() APT_OVERRIDE;
+ virtual std::string ShortDesc(std::string const &lang) APT_OVERRIDE;
+ virtual std::string LongDesc(std::string const &lang) APT_OVERRIDE;
+ virtual std::string Name() APT_OVERRIDE;
+ virtual std::string Homepage() APT_OVERRIDE;
// An arbitrary custom field
- virtual std::string RecordField(const char *fieldName);
+ virtual std::string RecordField(const char *fieldName) APT_OVERRIDE;
- virtual void GetRec(const char *&Start,const char *&Stop);
+ virtual void GetRec(const char *&Start,const char *&Stop) APT_OVERRIDE;
debRecordParserBase();
virtual ~debRecordParserBase();
@@ -62,8 +62,8 @@ class APT_HIDDEN debRecordParser : public debRecordParserBase
FileFd File;
pkgTagFile Tags;
- virtual bool Jump(pkgCache::VerFileIterator const &Ver);
- virtual bool Jump(pkgCache::DescFileIterator const &Desc);
+ virtual bool Jump(pkgCache::VerFileIterator const &Ver) APT_OVERRIDE;
+ virtual bool Jump(pkgCache::DescFileIterator const &Desc) APT_OVERRIDE;
public:
debRecordParser(std::string FileName,pkgCache &Cache);
@@ -80,11 +80,11 @@ class APT_HIDDEN debDebFileRecordParser : public debRecordParserBase
APT_HIDDEN bool LoadContent();
protected:
// single file files, so no jumping whatsoever
- bool Jump(pkgCache::VerFileIterator const &);
- bool Jump(pkgCache::DescFileIterator const &);
+ bool Jump(pkgCache::VerFileIterator const &) APT_OVERRIDE;
+ bool Jump(pkgCache::DescFileIterator const &) APT_OVERRIDE;
public:
- virtual std::string FileName();
+ virtual std::string FileName() APT_OVERRIDE;
debDebFileRecordParser(std::string FileName);
virtual ~debDebFileRecordParser();