* merged with mainline

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

diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index 00b7882e248eef893c295233b436b2e7ea6b1ccc..b95218061903e4ea84d2b08445a41eee3878eaaf 100644 (file)
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: algorithms.h,v 1.9 2001/02/20 07:03:17 jgg Exp $
+// $Id: algorithms.h,v 1.10 2001/05/22 04:17:41 jgg Exp $
 /* ######################################################################
 
    Algorithms - A set of misc algorithms
@@ -37,6 +37,10 @@
 #include <apt-pkg/packagemanager.h>
 #include <apt-pkg/depcache.h>
 
+#include <iostream>
+
+using std::ostream;
+
 class pkgSimulate : public pkgPackageManager
 {
    protected:
@@ -63,8 +67,10 @@ class pkgSimulate : public pkgPackageManager
    virtual bool Install(PkgIterator Pkg,string File);
    virtual bool Configure(PkgIterator Pkg);
    virtual bool Remove(PkgIterator Pkg,bool Purge);
+
+private:
    void ShortBreaks();
-   void Describe(PkgIterator iPkg,ostream &out,bool Now);
+   void Describe(PkgIterator iPkg,ostream &out,bool Current,bool Candidate);
    
    public:
 
@@ -112,7 +118,8 @@ class pkgProblemResolver
    
    // Try to resolve problems only by using keep
    bool ResolveByKeep();
-   
+
+   // Install all protected packages   
    void InstallProtect();   
    
    pkgProblemResolver(pkgDepCache *Cache);