diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-03-10 15:45:47 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-03-10 15:45:47 +0100 |
| commit | 67da93c38eb3904b36537e025e2f63f77d830e20 (patch) | |
| tree | 8ff57ccafb2f471fc97f97bfe8f0da11ca1eb7b1 /apt-pkg/cacheiterators.h | |
| parent | c9952021ba65db0581f6053cd6d6e8bf7d563e8f (diff) | |
| parent | a75b8cfeb6d7e2468b19534d5b5872c3885f0e1c (diff) | |
merged from debian-sid
Diffstat (limited to 'apt-pkg/cacheiterators.h')
| -rw-r--r-- | apt-pkg/cacheiterators.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index 449d4b441..31b3aced3 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -206,13 +206,9 @@ class pkgCache::VerIterator : public Iterator<Version, VerIterator> { inline const char *VerStr() const {return S->VerStr == 0?0:Owner->StrP + S->VerStr;}; inline const char *Section() const {return S->Section == 0?0:Owner->StrP + S->Section;}; inline const char *Arch() const { - if(S->MultiArch == pkgCache::Version::All) - return "all"; return S->ParentPkg == 0?0:Owner->StrP + ParentPkg()->Arch; }; - inline const char *Arch(bool const pseudo) const { - if(pseudo == false) - return Arch(); + __deprecated inline const char *Arch(bool const pseudo) const { return S->ParentPkg == 0?0:Owner->StrP + ParentPkg()->Arch; }; inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + S->ParentPkg);}; @@ -227,7 +223,7 @@ class pkgCache::VerIterator : public Iterator<Version, VerIterator> { string RelStr() const; bool Automatic() const; - bool Pseudo() const; + __deprecated bool Pseudo() const; VerFileIterator NewestFile() const; inline VerIterator(pkgCache &Owner,Version *Trg = 0) : Iterator<Version, VerIterator>(Owner, Trg) { |