summaryrefslogtreecommitdiff
path: root/apt-inst/deb/debfile.h
diff options
context:
space:
mode:
Diffstat (limited to 'apt-inst/deb/debfile.h')
-rw-r--r--apt-inst/deb/debfile.h14
1 files changed, 3 insertions, 11 deletions
diff --git a/apt-inst/deb/debfile.h b/apt-inst/deb/debfile.h
index 9d286716a..02ebaae2e 100644
--- a/apt-inst/deb/debfile.h
+++ b/apt-inst/deb/debfile.h
@@ -65,7 +65,7 @@ class debDebFile::ControlExtract : public pkgDirStream
{
public:
- virtual bool DoItem(Item &Itm,int &Fd);
+ virtual bool DoItem(Item &Itm,int &Fd) APT_OVERRIDE;
};
class debDebFile::MemControlExtract : public pkgDirStream
@@ -80,21 +80,13 @@ class debDebFile::MemControlExtract : public pkgDirStream
std::string Member;
// Members from DirStream
- virtual bool DoItem(Item &Itm,int &Fd);
+ virtual bool DoItem(Item &Itm,int &Fd) APT_OVERRIDE;
virtual bool Process(Item &Itm,const unsigned char *Data,
-#if APT_PKG_ABI >= 413
- unsigned long long Size,unsigned long long Pos);
-#else
- unsigned long Size,unsigned long Pos);
-#endif
+ unsigned long long Size,unsigned long long Pos) APT_OVERRIDE;
// Helpers
bool Read(debDebFile &Deb);
-#if APT_PKG_ABI >= 413
bool TakeControl(const void *Data,unsigned long long Size);
-#else
- bool TakeControl(const void *Data,unsigned long Size);
-#endif
MemControlExtract() : IsControl(false), Control(0), Length(0), Member("control") {};
MemControlExtract(std::string Member) : IsControl(false), Control(0), Length(0), Member(Member) {};