diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-06-29 12:45:30 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-06-29 12:45:30 +0100 |
| commit | 9abccf4a63b6c887b213678d940fe912233f04c3 (patch) | |
| tree | 8a22c910a0c8258f29784614aca9c0ebd2cc32d6 /apt-pkg/algorithms.h | |
| parent | c56c4b82dd77258da5640bf9f63a8db10424b59a (diff) | |
| parent | 627e99b0328e05b13600134655253d36575f314d (diff) | |
merge lp:~mvo/apt/abi-break
Diffstat (limited to 'apt-pkg/algorithms.h')
| -rw-r--r-- | apt-pkg/algorithms.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h index ebe31cc10..050934bad 100644 --- a/apt-pkg/algorithms.h +++ b/apt-pkg/algorithms.h @@ -78,6 +78,9 @@ private: /*}}}*/ class pkgProblemResolver /*{{{*/ { + /** \brief dpointer placeholder (for later in case we need it) */ + void *d; + pkgDepCache &Cache; typedef pkgCache::PkgIterator PkgIterator; typedef pkgCache::VerIterator VerIterator; @@ -105,6 +108,9 @@ class pkgProblemResolver /*{{{*/ void MakeScores(); bool DoUpgrade(pkgCache::PkgIterator Pkg); + + bool ResolveInternal(bool const BrokenFix = false); + bool ResolveByKeepInternal(); public: |