summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2005-08-31 14:56:06 +0000
committerMichael Vogt <michael.vogt@ubuntu.com>2005-08-31 14:56:06 +0000
commitc320a1e61a5911fb7fdc67914e95a6fd66950ee4 (patch)
tree83c3ea221bf7501eefd75ba9dd431d214dc8da14 /apt-pkg
parent13e8426f800dd5e21e78fa6488b860e3f0467984 (diff)
* README.arch updates, comment in apt-pkg/algorithm.h added, apt-pkg/cacheiterators.h order in initlist changed to remove warning
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/algorithms.h3
-rw-r--r--apt-pkg/cacheiterators.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index 174a7f58d..b95218061 100644
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -118,7 +118,8 @@ class pkgProblemResolver
// Try to resolve problems only by using keep
bool ResolveByKeep();
-
+
+ // Install all protected packages
void InstallProtect();
pkgProblemResolver(pkgDepCache *Cache);
diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h
index ce3c4165e..c3a0d0a5a 100644
--- a/apt-pkg/cacheiterators.h
+++ b/apt-pkg/cacheiterators.h
@@ -244,7 +244,7 @@ class pkgCache::PrvIterator
inline PkgIterator OwnerPkg() {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[Prv->Version].ParentPkg);};
inline unsigned long Index() const {return Prv - Owner->ProvideP;};
- inline PrvIterator() : Owner(0), Prv(0), Type(PrvVer) {};
+ inline PrvIterator() : Prv(0), Type(PrvVer), Owner(0) {};
inline PrvIterator(pkgCache &Owner,Provides *Trg,Version *) :
Prv(Trg), Type(PrvVer), Owner(&Owner)