diff options
author | Michael Vogt <mvo@debian.org> | 2013-07-24 22:06:18 +0200 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2013-07-24 22:06:18 +0200 |
commit | f39daeb1f66b8910f91274055bf07c3d008cdc50 (patch) | |
tree | 9283950ebf8a3089b8b16b1d09c3aec8ecc5eb07 /apt-pkg/algorithms.h | |
parent | 267275c59cc35704789a228c6e9b1464c4cabd74 (diff) | |
parent | c7a629dd114c41a1244744e2f5085df2f505dc90 (diff) |
Merge remote-tracking branch 'upstream/debian/sid'
Diffstat (limited to 'apt-pkg/algorithms.h')
-rw-r--r-- | apt-pkg/algorithms.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h index aff8a68f2..7f58c8eed 100644 --- a/apt-pkg/algorithms.h +++ b/apt-pkg/algorithms.h @@ -36,6 +36,8 @@ #include <iostream> +#include <apt-pkg/macros.h> + #ifndef APT_8_CLEANER_HEADERS #include <apt-pkg/acquire.h> using std::ostream; @@ -132,9 +134,8 @@ class pkgProblemResolver /*{{{*/ // Try to resolve problems only by using keep bool ResolveByKeep(); - // Install all protected packages - void InstallProtect(); - + __deprecated void InstallProtect(); + pkgProblemResolver(pkgDepCache *Cache); ~pkgProblemResolver(); }; |