move ByHash into its own function

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

diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index a5c58e4a7e46702c55aeec71805903d9d8bc93d8..8a51a455c0263e9f93c6acd390a11c266b492697 100644 (file)
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -23,15 +23,17 @@
 #ifndef PKGLIB_PACKAGEMANAGER_H
 #define PKGLIB_PACKAGEMANAGER_H
 
-#include <apt-pkg/macros.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/install-progress.h>
 #include <apt-pkg/init.h>
+#include <apt-pkg/macros.h>
 
 #include <string>
-#include <iostream>
 #include <set>
 
+#ifndef APT_10_CLEANER_HEADERS
+#include <apt-pkg/install-progress.h>
+#include <iostream>
+#endif
 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/depcache.h>
 using std::string;
@@ -42,6 +44,11 @@ class pkgDepCache;
 class pkgSourceList;
 class pkgOrderList;
 class pkgRecords;
+namespace APT {
+   namespace Progress {
+      class PackageManager;
+   };
+};
 
 
 class pkgPackageManager : protected pkgCache::Namespace
@@ -73,7 +80,7 @@ class pkgPackageManager : protected pkgCache::Namespace
    bool CreateOrderList();
    
    // Analysis helpers
-   bool DepAlwaysTrue(DepIterator D);
+   bool DepAlwaysTrue(DepIterator D) APT_PURE;
    
    // Install helpers
    bool ConfigureAll();
@@ -89,9 +96,9 @@ class pkgPackageManager : protected pkgCache::Namespace
    virtual bool Configure(PkgIterator /*Pkg*/) {return false;};
    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(APT::Progress::PackageManager * /*progress*/) {return true;};
 #else
-   virtual bool Go(int StatusFd=-1) {return true;};
+   virtual bool Go(int /*statusFd*/=-1) {return true;};
 #endif
 
    virtual void Reset() {};
@@ -109,7 +116,7 @@ class pkgPackageManager : protected pkgCache::Namespace
 #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
    OrderResult DoInstall(APT::Progress::PackageManager *progress);
    // compat
-   __deprecated OrderResult DoInstall(int statusFd=-1);
+   APT_DEPRECATED OrderResult DoInstall(int statusFd=-1);
 #else
    OrderResult DoInstall(int statusFd=-1);
 #endif
@@ -124,7 +131,7 @@ class pkgPackageManager : protected pkgCache::Namespace
    // stuff that needs to be done after the fork
    OrderResult DoInstallPostFork(APT::Progress::PackageManager *progress);
    // compat
-   __deprecated OrderResult DoInstallPostFork(int statusFd=-1);
+   APT_DEPRECATED OrderResult DoInstallPostFork(int statusFd=-1);
 #else
    OrderResult DoInstallPostFork(int statusFd=-1);
 #endif