X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/b53c9cea2902572822bbbece5bac236c1bbf846e..9750213c8117312f9d7dc6d283a4005d14621ef6:/apt-pkg/algorithms.h diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h index aad261b63..1a9d5aefd 100644 --- a/apt-pkg/algorithms.h +++ b/apt-pkg/algorithms.h @@ -113,8 +113,7 @@ class pkgProblemResolver /*{{{*/ 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 { @@ -143,7 +142,7 @@ class pkgProblemResolver /*{{{*/ // 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();