debian/NEWS: Mention new pinning algorithm added in 2.0~exp1

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

diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index 9c9ceead4f091d11fd8210ad55dcbb539cc4aa96..aad261b6334993c95fd6ffc946c7f7d571b424c7 100644 (file)
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -54,7 +54,7 @@ using std::ostream;
 
 class pkgSimulate : public pkgPackageManager                           /*{{{*/
 {
 
 class pkgSimulate : public pkgPackageManager                           /*{{{*/
 {

-   void *d;
+   void * const d;

    protected:
 
    class Policy : public pkgDepCache::Policy
    protected:
 
    class Policy : public pkgDepCache::Policy


@@ -62,7 +62,7 @@ class pkgSimulate : public pkgPackageManager                          /*{{{*/
       pkgDepCache *Cache;
       public:
       
       pkgDepCache *Cache;
       public:
       

-      virtual VerIterator GetCandidateVer(PkgIterator const &Pkg)
+      virtual VerIterator GetCandidateVer(PkgIterator const &Pkg) APT_OVERRIDE

       {
         return (*Cache)[Pkg].CandidateVerIter(*Cache);
       }
       {
         return (*Cache)[Pkg].CandidateVerIter(*Cache);
       }


@@ -77,9 +77,9 @@ class pkgSimulate : public pkgPackageManager                          /*{{{*/
    pkgDepCache::ActionGroup group;
    
    // The Actuall installation implementation
    pkgDepCache::ActionGroup group;
    
    // The Actuall installation implementation

-   virtual bool Install(PkgIterator Pkg,std::string File);
-   virtual bool Configure(PkgIterator Pkg);
-   virtual bool Remove(PkgIterator Pkg,bool Purge);
+   virtual bool Install(PkgIterator Pkg,std::string File) APT_OVERRIDE;
+   virtual bool Configure(PkgIterator Pkg) APT_OVERRIDE;
+   virtual bool Remove(PkgIterator Pkg,bool Purge) APT_OVERRIDE;

 
 private:
    APT_HIDDEN void ShortBreaks();
 
 private:
    APT_HIDDEN void ShortBreaks();


@@ -95,7 +95,7 @@ class pkgProblemResolver                                              /*{{{*/
 {
  private:
    /** \brief dpointer placeholder (for later in case we need it) */
 {
  private:
    /** \brief dpointer placeholder (for later in case we need it) */

-   void *d;
+   void * const d;

 
    pkgDepCache &Cache;
    typedef pkgCache::PkgIterator PkgIterator;
 
    pkgDepCache &Cache;
    typedef pkgCache::PkgIterator PkgIterator;


@@ -138,20 +138,10 @@ class pkgProblemResolver                                          /*{{{*/
    inline void Clear(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] &= ~(Protected | ToRemove);};
 
    // Try to intelligently resolve problems by installing and removing packages
    inline void Clear(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] &= ~(Protected | ToRemove);};
 
    // Try to intelligently resolve problems by installing and removing packages

-#if APT_PKG_ABI >= 413

    bool Resolve(bool BrokenFix = false, OpProgress * const Progress = NULL);
    bool Resolve(bool BrokenFix = false, OpProgress * const Progress = NULL);

-#else
-   bool Resolve(bool BrokenFix = false);
-   bool Resolve(bool BrokenFix, OpProgress * const Progress);
-#endif

 
    // Try to resolve problems only by using keep
 
    // Try to resolve problems only by using keep

-#if APT_PKG_ABI >= 413

    bool ResolveByKeep(OpProgress * const Progress = NULL);
    bool ResolveByKeep(OpProgress * const Progress = NULL);

-#else
-   bool ResolveByKeep();
-   bool ResolveByKeep(OpProgress * const Progress);
-#endif

 
    APT_DEPRECATED void InstallProtect();
 
 
    APT_DEPRECATED void InstallProtect();