Merge branch 'debian/sid' into debian/experimental

[apt.git] / apt-pkg / packagemanager.h

diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index 558132ceb2a42eb7073db4f06195a014f31a5bbe..5bcd2045d26b6a1afcf972afde9756a387fe355a 100644 (file)
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -47,8 +47,8 @@ class pkgRecords;
 namespace APT {
    namespace Progress {
       class PackageManager;
 namespace APT {
    namespace Progress {
       class PackageManager;

-   };
-};
+   }
+}

 
 
 class pkgPackageManager : protected pkgCache::Namespace
 
 
 class pkgPackageManager : protected pkgCache::Namespace


@@ -98,6 +98,7 @@ class pkgPackageManager : protected pkgCache::Namespace
    virtual bool Remove(PkgIterator /*Pkg*/,bool /*Purge*/=false) {return false;};
 #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
    virtual bool Go(APT::Progress::PackageManager * /*progress*/) {return true;};
    virtual bool Remove(PkgIterator /*Pkg*/,bool /*Purge*/=false) {return false;};
 #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
    virtual bool Go(APT::Progress::PackageManager * /*progress*/) {return true;};

+   virtual bool Go(int /*statusFd*/=-1) {return true;};

 #else
    virtual bool Go(int /*statusFd*/=-1) {return true;};
 #endif
 #else
    virtual bool Go(int /*statusFd*/=-1) {return true;};
 #endif