releasing version 0.8.16~exp5ubuntu13

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

diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index 0778ec72260b0b7047ffd3752a1700297a6a817e..86d5fbd5309d28439680524258fb0167b52aaf56 100644 (file)
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -78,6 +78,9 @@ private:
                                                                        /*}}}*/
 class pkgProblemResolver                                               /*{{{*/
 {
+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
+
    pkgDepCache &Cache;
    typedef pkgCache::PkgIterator PkgIterator;
    typedef pkgCache::VerIterator VerIterator;
@@ -107,7 +110,11 @@ class pkgProblemResolver                                           /*{{{*/
    bool DoUpgrade(pkgCache::PkgIterator Pkg);
 
    bool ResolveInternal(bool const BrokenFix = false);
+   bool ResolveByKeepInternal();
    
+   protected:
+   bool InstOrNewPolicyBroken(pkgCache::PkgIterator Pkg);
+
    public:
    
    inline void Protect(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] |= Protected; Cache.MarkProtected(Pkg);};