debian/control: Set Standards-Version to 3.9.7

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

diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index aad261b6334993c95fd6ffc946c7f7d571b424c7..1a9d5aefd68bbda4beca7ad39c7717e987416739 100644 (file)
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -113,8 +113,7 @@ class pkgProblemResolver                                            /*{{{*/
    bool Debug;
    
    // Sort stuff
    bool Debug;
    
    // Sort stuff

-   static pkgProblemResolver *This;
-   APT_HIDDEN static int ScoreSort(const void *a,const void *b) APT_PURE;
+   APT_HIDDEN int ScoreSort(Package const *A, Package const *B) APT_PURE;

 
    struct PackageKill
    {
 
    struct PackageKill
    {


@@ -143,7 +142,7 @@ class pkgProblemResolver                                            /*{{{*/
    // Try to resolve problems only by using keep
    bool ResolveByKeep(OpProgress * const Progress = NULL);
 
    // Try to resolve problems only by using keep
    bool ResolveByKeep(OpProgress * const Progress = NULL);
 

-   APT_DEPRECATED void InstallProtect();
+   APT_DEPRECATED_MSG("NOOP as MarkInstall enforces not overriding FromUser markings") void InstallProtect();

 
    explicit pkgProblemResolver(pkgDepCache *Cache);
    virtual ~pkgProblemResolver();
 
    explicit pkgProblemResolver(pkgDepCache *Cache);
    virtual ~pkgProblemResolver();