Check if the Apt::Sandbox::User exists in CheckDropPrivsMustBeDisabled()

[apt.git] / apt-inst / deb / debfile.h

diff --git a/apt-inst/deb/debfile.h b/apt-inst/deb/debfile.h
index 9d286716a4ed74f49ae7ccf710bf314692553290..02ebaae2e5481539270bc40bd96c31ffe503f5d6 100644 (file)
--- 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) {};