Merge branch 'debian/sid' into debian/experimental

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

diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index 4d3bfa81fe02086fef948714c387e88caba5f358..b6da1f2bf8f3f48e19821f3233c5cf6e5f4a89c8 100644 (file)
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -82,9 +82,9 @@ class pkgSimulate : public pkgPackageManager                          /*{{{*/
    virtual bool Remove(PkgIterator Pkg,bool Purge);
 
 private:
    virtual bool Remove(PkgIterator Pkg,bool Purge);
 
 private:

-   void ShortBreaks();
-   void Describe(PkgIterator iPkg,std::ostream &out,bool Current,bool Candidate);
-   
+   APT_HIDDEN void ShortBreaks();
+   APT_HIDDEN void Describe(PkgIterator iPkg,std::ostream &out,bool Current,bool Candidate);
+

    public:
 
    pkgSimulate(pkgDepCache *Cache);
    public:
 
    pkgSimulate(pkgDepCache *Cache);


@@ -114,7 +114,7 @@ class pkgProblemResolver                                            /*{{{*/
    
    // Sort stuff
    static pkgProblemResolver *This;
    
    // Sort stuff
    static pkgProblemResolver *This;

-   static int ScoreSort(const void *a,const void *b) APT_PURE;
+   APT_HIDDEN static int ScoreSort(const void *a,const void *b) APT_PURE;

 
    struct PackageKill
    {
 
    struct PackageKill
    {


@@ -122,12 +122,12 @@ class pkgProblemResolver                                          /*{{{*/
       DepIterator Dep;
    };
 
       DepIterator Dep;
    };
 

-   void MakeScores();
-   bool DoUpgrade(pkgCache::PkgIterator Pkg);
+   APT_HIDDEN void MakeScores();
+   APT_HIDDEN bool DoUpgrade(pkgCache::PkgIterator Pkg);
+
+   APT_HIDDEN bool ResolveInternal(bool const BrokenFix = false);
+   APT_HIDDEN bool ResolveByKeepInternal();

 
 

-   bool ResolveInternal(bool const BrokenFix = false);
-   bool ResolveByKeepInternal();
-   

    protected:
    bool InstOrNewPolicyBroken(pkgCache::PkgIterator Pkg);
 
    protected:
    bool InstOrNewPolicyBroken(pkgCache::PkgIterator Pkg);