releasing 1.1~exp14

[apt.git] / apt-pkg / cacheiterators.h

diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h
index 886d84838ab7b8f99b1d3b03933b8611557e3028..887d2e691e6605e069f2f1480f4246ad0403d80f 100644 (file)
--- a/apt-pkg/cacheiterators.h
+++ b/apt-pkg/cacheiterators.h
@@ -29,7 +29,12 @@
                                                                        /*}}}*/
 #ifndef PKGLIB_CACHEITERATORS_H
 #define PKGLIB_CACHEITERATORS_H
                                                                        /*}}}*/
 #ifndef PKGLIB_CACHEITERATORS_H
 #define PKGLIB_CACHEITERATORS_H

+#include<apt-pkg/pkgcache.h>
+#include<apt-pkg/macros.h>
+

 #include<iterator>
 #include<iterator>

+#include <iosfwd>
+#include <string>

 
 #include<string.h>
 
 
 #include<string.h>
 


@@ -38,53 +43,50 @@
    need to have for doing some walk-over-the-cache magic */
 template<typename Str, typename Itr> class pkgCache::Iterator :
                        public std::iterator<std::forward_iterator_tag, Str> {
    need to have for doing some walk-over-the-cache magic */
 template<typename Str, typename Itr> class pkgCache::Iterator :
                        public std::iterator<std::forward_iterator_tag, Str> {

-       protected:
-       Str *S;
-       pkgCache *Owner;
-

        /** \brief Returns the Pointer for this struct in the owner
         *  The implementation of this method should be pretty short
         *  as it will only return the Pointer into the mmap stored
         *  in the owner but the name of this pointer is different for
        /** \brief Returns the Pointer for this struct in the owner
         *  The implementation of this method should be pretty short
         *  as it will only return the Pointer into the mmap stored
         *  in the owner but the name of this pointer is different for

-        *  each stucture and we want to abstract here at least for the
+        *  each structure and we want to abstract here at least for the

         *  basic methods from the actual structure.
         *  \return Pointer to the first structure of this type
         */
         *  basic methods from the actual structure.
         *  \return Pointer to the first structure of this type
         */

-       virtual Str* OwnerPointer() const = 0;
+       Str* OwnerPointer() const { return static_cast<Itr const*>(this)->OwnerPointer(); }
+
+       protected:
+       Str *S;
+       pkgCache *Owner;

 
        public:
        // Iteration
 
        public:
        // Iteration

-       virtual void operator ++(int) = 0;
-       virtual void operator ++() = 0; // Should be {operator ++(0);};
-       inline bool end() const {return Owner == 0 || S == OwnerPointer();};
+       inline bool end() const {return Owner == 0 || S == OwnerPointer();}

 
        // Comparison
 
        // Comparison

-       inline bool operator ==(const Itr &B) const {return S == B.S;};
-       inline bool operator !=(const Itr &B) const {return S != B.S;};
+       inline bool operator ==(const Itr &B) const {return S == B.S;}
+       inline bool operator !=(const Itr &B) const {return S != B.S;}

 
        // Accessors
 
        // Accessors

-       inline Str *operator ->() {return S;};
-       inline Str const *operator ->() const {return S;};
-       inline operator Str *() {return S == OwnerPointer() ? 0 : S;};
-       inline operator Str const *() const {return S == OwnerPointer() ? 0 : S;};
-       inline Str &operator *() {return *S;};
-       inline Str const &operator *() const {return *S;};
-       inline pkgCache *Cache() const {return Owner;};
+       inline Str *operator ->() {return S;}
+       inline Str const *operator ->() const {return S;}
+       inline operator Str *() {return S == OwnerPointer() ? 0 : S;}
+       inline operator Str const *() const {return S == OwnerPointer() ? 0 : S;}
+       inline Str &operator *() {return *S;}
+       inline Str const &operator *() const {return *S;}
+       inline pkgCache *Cache() const {return Owner;}

 
        // Mixed stuff
 
        // Mixed stuff

-       inline void operator =(const Itr &B) {S = B.S; Owner = B.Owner;};
-       inline bool IsGood() const { return S && Owner && ! end();};
-       inline unsigned long Index() const {return S - OwnerPointer();};
+       inline bool IsGood() const { return S && Owner && ! end();}
+       inline unsigned long Index() const {return S - OwnerPointer();}

 
        void ReMap(void const * const oldMap, void const * const newMap) {
                if (Owner == 0 || S == 0)
                        return;
 
        void ReMap(void const * const oldMap, void const * const newMap) {
                if (Owner == 0 || S == 0)
                        return;

-               S += (Str*)(newMap) - (Str*)(oldMap);
+               S += (Str const * const)(newMap) - (Str const * const)(oldMap);

        }
 
        // Constructors - look out for the variable assigning
        }
 
        // Constructors - look out for the variable assigning

-       inline Iterator() : S(0), Owner(0) {};
-       inline Iterator(pkgCache &Owner,Str *T = 0) : S(T), Owner(&Owner) {};
+       inline Iterator() : S(0), Owner(0) {}
+       inline Iterator(pkgCache &Owner,Str *T = 0) : S(T), Owner(&Owner) {}

 };
                                                                        /*}}}*/
 // Group Iterator                                                      /*{{{*/
 };
                                                                        /*}}}*/
 // Group Iterator                                                      /*{{{*/


@@ -95,22 +97,21 @@ template<typename Str, typename Itr> class pkgCache::Iterator :
 class pkgCache::GrpIterator: public Iterator<Group, GrpIterator> {
        long HashIndex;
 
 class pkgCache::GrpIterator: public Iterator<Group, GrpIterator> {
        long HashIndex;
 

-       protected:
+       public:

        inline Group* OwnerPointer() const {
                return (Owner != 0) ? Owner->GrpP : 0;
        inline Group* OwnerPointer() const {
                return (Owner != 0) ? Owner->GrpP : 0;

-       };
+       }

 
 

-       public:

        // This constructor is the 'begin' constructor, never use it.
        // This constructor is the 'begin' constructor, never use it.

-       inline GrpIterator(pkgCache &Owner) : Iterator<Group, GrpIterator>(Owner), HashIndex(-1) {
+       explicit inline GrpIterator(pkgCache &Owner) : Iterator<Group, GrpIterator>(Owner), HashIndex(-1) {

                S = OwnerPointer();
                S = OwnerPointer();

-               operator ++(0);
-       };
+               operator++();
+       }

 
 

-       virtual void operator ++(int);
-       virtual void operator ++() {operator ++(0);};
+       GrpIterator& operator++();
+       inline GrpIterator operator++(int) { GrpIterator const tmp(*this); operator++(); return tmp; }

 
 

-       inline const char *Name() const {return S->Name == 0?0:Owner->StrP + S->Name;};
+       inline const char *Name() const {return S->Name == 0?0:Owner->StrP + S->Name;}

        inline PkgIterator PackageList() const;
        PkgIterator FindPkg(std::string Arch = "any") const;
        /** \brief find the package with the "best" architecture
        inline PkgIterator PackageList() const;
        PkgIterator FindPkg(std::string Arch = "any") const;
        /** \brief find the package with the "best" architecture


@@ -127,8 +128,8 @@ class pkgCache::GrpIterator: public Iterator<Group, GrpIterator> {
        inline GrpIterator(pkgCache &Owner, Group *Trg) : Iterator<Group, GrpIterator>(Owner, Trg), HashIndex(0) {
                if (S == 0)
                        S = OwnerPointer();
        inline GrpIterator(pkgCache &Owner, Group *Trg) : Iterator<Group, GrpIterator>(Owner, Trg), HashIndex(0) {
                if (S == 0)
                        S = OwnerPointer();

-       };
-       inline GrpIterator() : Iterator<Group, GrpIterator>(), HashIndex(0) {};
+       }
+       inline GrpIterator() : Iterator<Group, GrpIterator>(), HashIndex(0) {}

 
 };
                                                                        /*}}}*/
 
 };
                                                                        /*}}}*/


@@ -136,38 +137,39 @@ class pkgCache::GrpIterator: public Iterator<Group, GrpIterator> {
 class pkgCache::PkgIterator: public Iterator<Package, PkgIterator> {
        long HashIndex;
 
 class pkgCache::PkgIterator: public Iterator<Package, PkgIterator> {
        long HashIndex;
 

-       protected:
+       public:

        inline Package* OwnerPointer() const {
                return (Owner != 0) ? Owner->PkgP : 0;
        inline Package* OwnerPointer() const {
                return (Owner != 0) ? Owner->PkgP : 0;

-       };
+       }

 
 

-       public:

        // This constructor is the 'begin' constructor, never use it.
        // This constructor is the 'begin' constructor, never use it.

-       inline PkgIterator(pkgCache &Owner) : Iterator<Package, PkgIterator>(Owner), HashIndex(-1) {
+       explicit inline PkgIterator(pkgCache &Owner) : Iterator<Package, PkgIterator>(Owner), HashIndex(-1) {

                S = OwnerPointer();
                S = OwnerPointer();

-               operator ++(0);
-       };
+               operator++();
+       }

 
 

-       virtual void operator ++(int);
-       virtual void operator ++() {operator ++(0);};
+       PkgIterator& operator++();
+       inline PkgIterator operator++(int) { PkgIterator const tmp(*this); operator++(); return tmp; }

 
        enum OkState {NeedsNothing,NeedsUnpack,NeedsConfigure};
 
        // Accessors
 
        enum OkState {NeedsNothing,NeedsUnpack,NeedsConfigure};
 
        // Accessors

-       inline const char *Name() const {return S->Name == 0?0:Owner->StrP + S->Name;};
-       inline const char *Section() const {return S->Section == 0?0:Owner->StrP + S->Section;};
+       inline const char *Name() const { return Group().Name(); }
+       // Versions have sections - and packages can have different versions with different sections
+       // so this interface is broken by design. Run as fast as you can to Version.Section().
+       APT_DEPRECATED inline const char *Section() const;

        inline bool Purge() const {return S->CurrentState == pkgCache::State::Purge ||
        inline bool Purge() const {return S->CurrentState == pkgCache::State::Purge ||

-               (S->CurrentVer == 0 && S->CurrentState == pkgCache::State::NotInstalled);};
-       inline const char *Arch() const {return S->Arch == 0?0:Owner->StrP + S->Arch;};
-       inline GrpIterator Group() const { return GrpIterator(*Owner, Owner->GrpP + S->Group);};
-
-       inline VerIterator VersionList() const;
-       inline VerIterator CurrentVer() const;
-       inline DepIterator RevDependsList() const;
-       inline PrvIterator ProvidesList() const;
-       OkState State() const;
-       const char *CandVersion() const;
-       const char *CurVersion() const;
+               (S->CurrentVer == 0 && S->CurrentState == pkgCache::State::NotInstalled);}
+       inline const char *Arch() const {return S->Arch == 0?0:Owner->StrP + S->Arch;}
+       inline APT_PURE GrpIterator Group() const { return GrpIterator(*Owner, Owner->GrpP + S->Group);}
+
+       inline VerIterator VersionList() const APT_PURE;
+       inline VerIterator CurrentVer() const APT_PURE;
+       inline DepIterator RevDependsList() const APT_PURE;
+       inline PrvIterator ProvidesList() const APT_PURE;
+       OkState State() const APT_PURE;
+       const char *CandVersion() const APT_PURE;
+       const char *CurVersion() const APT_PURE;

 
        //Nice printable representation
        friend std::ostream& operator <<(std::ostream& out, PkgIterator i);
 
        //Nice printable representation
        friend std::ostream& operator <<(std::ostream& out, PkgIterator i);


@@ -177,41 +179,46 @@ class pkgCache::PkgIterator: public Iterator<Package, PkgIterator> {
        inline PkgIterator(pkgCache &Owner,Package *Trg) : Iterator<Package, PkgIterator>(Owner, Trg), HashIndex(0) {
                if (S == 0)
                        S = OwnerPointer();
        inline PkgIterator(pkgCache &Owner,Package *Trg) : Iterator<Package, PkgIterator>(Owner, Trg), HashIndex(0) {
                if (S == 0)
                        S = OwnerPointer();

-       };
-       inline PkgIterator() : Iterator<Package, PkgIterator>(), HashIndex(0) {};
+       }
+       inline PkgIterator() : Iterator<Package, PkgIterator>(), HashIndex(0) {}

 };
                                                                        /*}}}*/
 // Version Iterator                                                    /*{{{*/
 class pkgCache::VerIterator : public Iterator<Version, VerIterator> {
 };
                                                                        /*}}}*/
 // Version Iterator                                                    /*{{{*/
 class pkgCache::VerIterator : public Iterator<Version, VerIterator> {

-       protected:
+       public:

        inline Version* OwnerPointer() const {
                return (Owner != 0) ? Owner->VerP : 0;
        inline Version* OwnerPointer() const {
                return (Owner != 0) ? Owner->VerP : 0;

-       };
+       }

 
 

-       public:

        // Iteration
        // Iteration

-       void operator ++(int) {if (S != Owner->VerP) S = Owner->VerP + S->NextVer;};
-       inline void operator ++() {operator ++(0);};
+       inline VerIterator& operator++() {if (S != Owner->VerP) S = Owner->VerP + S->NextVer; return *this;}
+       inline VerIterator operator++(int) { VerIterator const tmp(*this); operator++(); return tmp; }

 
        // Comparison
        int CompareVer(const VerIterator &B) const;
        /** \brief compares two version and returns if they are similar
 
            This method should be used to identify if two pseudo versions are
 
        // Comparison
        int CompareVer(const VerIterator &B) const;
        /** \brief compares two version and returns if they are similar
 
            This method should be used to identify if two pseudo versions are

-           refering to the same "real" version */
+           referring to the same "real" version */

        inline bool SimilarVer(const VerIterator &B) const {
                return (B.end() == false && S->Hash == B->Hash && strcmp(VerStr(), B.VerStr()) == 0);
        inline bool SimilarVer(const VerIterator &B) const {
                return (B.end() == false && S->Hash == B->Hash && strcmp(VerStr(), B.VerStr()) == 0);

-       };
+       }

 
        // Accessors
 
        // Accessors

-       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 *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;}
+       /** \brief source package name this version comes from
+          Always contains the name, even if it is the same as the binary name */
+       inline const char *SourcePkgName() const {return Owner->StrP + S->SourcePkgName;}
+       /** \brief source version this version comes from
+          Always contains the version string, even if it is the same as the binary version */
+       inline const char *SourceVerStr() const {return Owner->StrP + S->SourceVerStr;}

        inline const char *Arch() const {
                if ((S->MultiArch & pkgCache::Version::All) == pkgCache::Version::All)
                        return "all";
                return S->ParentPkg == 0?0:Owner->StrP + ParentPkg()->Arch;
        inline const char *Arch() const {
                if ((S->MultiArch & pkgCache::Version::All) == pkgCache::Version::All)
                        return "all";
                return S->ParentPkg == 0?0:Owner->StrP + ParentPkg()->Arch;

-       };
-       inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + S->ParentPkg);};
+       }
+       inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + S->ParentPkg);}

 
        inline DescIterator DescriptionList() const;
        DescIterator TranslatedDescription() const;
 
        inline DescIterator DescriptionList() const;
        DescIterator TranslatedDescription() const;


@@ -219,8 +226,8 @@ class pkgCache::VerIterator : public Iterator<Version, VerIterator> {
        inline PrvIterator ProvidesList() const;
        inline VerFileIterator FileList() const;
        bool Downloadable() const;
        inline PrvIterator ProvidesList() const;
        inline VerFileIterator FileList() const;
        bool Downloadable() const;

-       inline const char *PriorityType() const {return Owner->Priority(S->Priority);};
-       const char *MultiArchType() const;
+       inline const char *PriorityType() const {return Owner->Priority(S->Priority);}
+       const char *MultiArchType() const APT_PURE;

        std::string RelStr() const;
 
        bool Automatic() const;
        std::string RelStr() const;
 
        bool Automatic() const;


@@ -229,216 +236,285 @@ class pkgCache::VerIterator : public Iterator<Version, VerIterator> {
        inline VerIterator(pkgCache &Owner,Version *Trg = 0) : Iterator<Version, VerIterator>(Owner, Trg) {
                if (S == 0)
                        S = OwnerPointer();
        inline VerIterator(pkgCache &Owner,Version *Trg = 0) : Iterator<Version, VerIterator>(Owner, Trg) {
                if (S == 0)
                        S = OwnerPointer();

-       };
-       inline VerIterator() : Iterator<Version, VerIterator>() {};
+       }
+       inline VerIterator() : Iterator<Version, VerIterator>() {}

 };
                                                                        /*}}}*/
 // Description Iterator                                                        /*{{{*/
 class pkgCache::DescIterator : public Iterator<Description, DescIterator> {
 };
                                                                        /*}}}*/
 // Description Iterator                                                        /*{{{*/
 class pkgCache::DescIterator : public Iterator<Description, DescIterator> {

-       protected:
+       public:

        inline Description* OwnerPointer() const {
                return (Owner != 0) ? Owner->DescP : 0;
        inline Description* OwnerPointer() const {
                return (Owner != 0) ? Owner->DescP : 0;

-       };
+       }

 
 

-       public:

        // Iteration
        // Iteration

-       void operator ++(int) {if (S != Owner->DescP) S = Owner->DescP + S->NextDesc;};
-       inline void operator ++() {operator ++(0);};
+       inline DescIterator& operator++() {if (S != Owner->DescP) S = Owner->DescP + S->NextDesc; return *this;}
+       inline DescIterator operator++(int) { DescIterator const tmp(*this); operator++(); return tmp; }

 
        // Comparison
        int CompareDesc(const DescIterator &B) const;
 
        // Accessors
 
        // Comparison
        int CompareDesc(const DescIterator &B) const;
 
        // Accessors

-       inline const char *LanguageCode() const {return Owner->StrP + S->language_code;};
-       inline const char *md5() const {return Owner->StrP + S->md5sum;};
+       inline const char *LanguageCode() const {return Owner->StrP + S->language_code;}
+       inline const char *md5() const {return Owner->StrP + S->md5sum;}

        inline DescFileIterator FileList() const;
 
        inline DescFileIterator FileList() const;
 

-       inline DescIterator() : Iterator<Description, DescIterator>() {};
+       inline DescIterator() : Iterator<Description, DescIterator>() {}

        inline DescIterator(pkgCache &Owner,Description *Trg = 0) : Iterator<Description, DescIterator>(Owner, Trg) {
                if (S == 0)
                        S = Owner.DescP;
        inline DescIterator(pkgCache &Owner,Description *Trg = 0) : Iterator<Description, DescIterator>(Owner, Trg) {
                if (S == 0)
                        S = Owner.DescP;

-       };
+       }

 };
                                                                        /*}}}*/
 // Dependency iterator                                                 /*{{{*/
 class pkgCache::DepIterator : public Iterator<Dependency, DepIterator> {
        enum {DepVer, DepRev} Type;
 };
                                                                        /*}}}*/
 // Dependency iterator                                                 /*{{{*/
 class pkgCache::DepIterator : public Iterator<Dependency, DepIterator> {
        enum {DepVer, DepRev} Type;

+       DependencyData * S2;

 
 

-       protected:
+       public:

        inline Dependency* OwnerPointer() const {
                return (Owner != 0) ? Owner->DepP : 0;
        inline Dependency* OwnerPointer() const {
                return (Owner != 0) ? Owner->DepP : 0;

-       };
+       }

 
 

-       public:

        // Iteration
        // Iteration

-       void operator ++(int) {if (S != Owner->DepP) S = Owner->DepP +
-               (Type == DepVer ? S->NextDepends : S->NextRevDepends);};
-       inline void operator ++() {operator ++(0);};
+       DepIterator& operator++();
+       inline DepIterator operator++(int) { DepIterator const tmp(*this); operator++(); return tmp; }

 
        // Accessors
 
        // Accessors

-       inline const char *TargetVer() const {return S->Version == 0?0:Owner->StrP + S->Version;};
-       inline PkgIterator TargetPkg() const {return PkgIterator(*Owner,Owner->PkgP + S->Package);};
-       inline PkgIterator SmartTargetPkg() const {PkgIterator R(*Owner,0);SmartTargetPkg(R);return R;};
-       inline VerIterator ParentVer() const {return VerIterator(*Owner,Owner->VerP + S->ParentVer);};
-       inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[S->ParentVer].ParentPkg);};
-       inline bool Reverse() const {return Type == DepRev;};
-       bool IsCritical() const;
-       bool IsNegative() const;
-       bool IsIgnorable(PrvIterator const &Prv) const;
-       bool IsIgnorable(PkgIterator const &Pkg) const;
-       bool IsMultiArchImplicit() const;
-       bool IsSatisfied(VerIterator const &Ver) const;
-       bool IsSatisfied(PrvIterator const &Prv) const;
+       inline const char *TargetVer() const {return S2->Version == 0?0:Owner->StrP + S2->Version;}
+       inline PkgIterator TargetPkg() const {return PkgIterator(*Owner,Owner->PkgP + S2->Package);}
+       inline PkgIterator SmartTargetPkg() const {PkgIterator R(*Owner,0);SmartTargetPkg(R);return R;}
+       inline VerIterator ParentVer() const {return VerIterator(*Owner,Owner->VerP + S->ParentVer);}
+       inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[S->ParentVer].ParentPkg);}
+       inline bool Reverse() const {return Type == DepRev;}
+       bool IsCritical() const APT_PURE;
+       bool IsNegative() const APT_PURE;
+       bool IsIgnorable(PrvIterator const &Prv) const APT_PURE;
+       bool IsIgnorable(PkgIterator const &Pkg) const APT_PURE;
+       /* MultiArch can be translated to SingleArch for an resolver and we did so,
+          by adding dependencies to help the resolver understand the problem, but
+          sometimes it is needed to identify these to ignore them… */
+       inline bool IsMultiArchImplicit() const APT_PURE {
+               return (S2->CompareOp & pkgCache::Dep::MultiArchImplicit) == pkgCache::Dep::MultiArchImplicit;
+       }
+       /* This covers additionally negative dependencies, which aren't arch-specific,
+          but change architecture nonetheless as a Conflicts: foo does applies for all archs */
+       bool IsImplicit() const APT_PURE;
+
+       bool IsSatisfied(VerIterator const &Ver) const APT_PURE;
+       bool IsSatisfied(PrvIterator const &Prv) const APT_PURE;

        void GlobOr(DepIterator &Start,DepIterator &End);
        Version **AllTargets() const;
        bool SmartTargetPkg(PkgIterator &Result) const;
        void GlobOr(DepIterator &Start,DepIterator &End);
        Version **AllTargets() const;
        bool SmartTargetPkg(PkgIterator &Result) const;

-       inline const char *CompType() const {return Owner->CompType(S->CompareOp);};
-       inline const char *DepType() const {return Owner->DepType(S->Type);};
+       inline const char *CompType() const {return Owner->CompType(S2->CompareOp);}
+       inline const char *DepType() const {return Owner->DepType(S2->Type);}
+
+       // overrides because we are special
+       struct DependencyProxy
+       {
+          map_stringitem_t &Version;
+          map_pointer_t &Package;
+          map_id_t &ID;
+          unsigned char &Type;
+          unsigned char &CompareOp;
+          map_pointer_t &ParentVer;
+          map_pointer_t &DependencyData;
+          map_pointer_t &NextRevDepends;
+          map_pointer_t &NextDepends;
+          map_pointer_t &NextData;
+          DependencyProxy const * operator->() const { return this; }
+          DependencyProxy * operator->() { return this; }
+       };
+       inline DependencyProxy operator->() const {return (DependencyProxy) { S2->Version, S2->Package, S->ID, S2->Type, S2->CompareOp, S->ParentVer, S->DependencyData, S->NextRevDepends, S->NextDepends, S2->NextData };}
+       inline DependencyProxy operator->() {return (DependencyProxy) { S2->Version, S2->Package, S->ID, S2->Type, S2->CompareOp, S->ParentVer, S->DependencyData, S->NextRevDepends, S->NextDepends, S2->NextData };}
+       void ReMap(void const * const oldMap, void const * const newMap)
+       {
+               Iterator<Dependency, DepIterator>::ReMap(oldMap, newMap);
+               if (Owner == 0 || S == 0 || S2 == 0)
+                       return;
+               S2 += (DependencyData const * const)(newMap) - (DependencyData const * const)(oldMap);
+       }

 
        //Nice printable representation
        friend std::ostream& operator <<(std::ostream& out, DepIterator D);
 
        inline DepIterator(pkgCache &Owner, Dependency *Trg, Version* = 0) :
 
        //Nice printable representation
        friend std::ostream& operator <<(std::ostream& out, DepIterator D);
 
        inline DepIterator(pkgCache &Owner, Dependency *Trg, Version* = 0) :

-               Iterator<Dependency, DepIterator>(Owner, Trg), Type(DepVer) {
+               Iterator<Dependency, DepIterator>(Owner, Trg), Type(DepVer), S2(Trg == 0 ? Owner.DepDataP : (Owner.DepDataP + Trg->DependencyData)) {

                if (S == 0)
                        S = Owner.DepP;
                if (S == 0)
                        S = Owner.DepP;

-       };
+       }

        inline DepIterator(pkgCache &Owner, Dependency *Trg, Package*) :
        inline DepIterator(pkgCache &Owner, Dependency *Trg, Package*) :

-               Iterator<Dependency, DepIterator>(Owner, Trg), Type(DepRev) {
+               Iterator<Dependency, DepIterator>(Owner, Trg), Type(DepRev), S2(Trg == 0 ? Owner.DepDataP : (Owner.DepDataP + Trg->DependencyData)) {

                if (S == 0)
                        S = Owner.DepP;
                if (S == 0)
                        S = Owner.DepP;

-       };
-       inline DepIterator() : Iterator<Dependency, DepIterator>(), Type(DepVer) {};
+       }
+       inline DepIterator() : Iterator<Dependency, DepIterator>(), Type(DepVer), S2(0) {}

 };
                                                                        /*}}}*/
 // Provides iterator                                                   /*{{{*/
 class pkgCache::PrvIterator : public Iterator<Provides, PrvIterator> {
        enum {PrvVer, PrvPkg} Type;
 
 };
                                                                        /*}}}*/
 // Provides iterator                                                   /*{{{*/
 class pkgCache::PrvIterator : public Iterator<Provides, PrvIterator> {
        enum {PrvVer, PrvPkg} Type;
 

-       protected:
+       public:

        inline Provides* OwnerPointer() const {
                return (Owner != 0) ? Owner->ProvideP : 0;
        inline Provides* OwnerPointer() const {
                return (Owner != 0) ? Owner->ProvideP : 0;

-       };
+       }

 
 

-       public:

        // Iteration
        // Iteration

-       void operator ++(int) {if (S != Owner->ProvideP) S = Owner->ProvideP +
-               (Type == PrvVer?S->NextPkgProv:S->NextProvides);};
-       inline void operator ++() {operator ++(0);};
+       inline PrvIterator& operator ++() {if (S != Owner->ProvideP) S = Owner->ProvideP +
+          (Type == PrvVer?S->NextPkgProv:S->NextProvides); return *this;}
+       inline PrvIterator operator++(int) { PrvIterator const tmp(*this); operator++(); return tmp; }

 
        // Accessors
 
        // Accessors

-       inline const char *Name() const {return Owner->StrP + Owner->PkgP[S->ParentPkg].Name;};
-       inline const char *ProvideVersion() const {return S->ProvideVersion == 0?0:Owner->StrP + S->ProvideVersion;};
-       inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + S->ParentPkg);};
-       inline VerIterator OwnerVer() const {return VerIterator(*Owner,Owner->VerP + S->Version);};
-       inline PkgIterator OwnerPkg() const {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[S->Version].ParentPkg);};
+       inline const char *Name() const {return ParentPkg().Name();}
+       inline const char *ProvideVersion() const {return S->ProvideVersion == 0?0:Owner->StrP + S->ProvideVersion;}
+       inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + S->ParentPkg);}
+       inline VerIterator OwnerVer() const {return VerIterator(*Owner,Owner->VerP + S->Version);}
+       inline PkgIterator OwnerPkg() const {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[S->Version].ParentPkg);}

 
 

-       bool IsMultiArchImplicit() const;
+       /* MultiArch can be translated to SingleArch for an resolver and we did so,
+          by adding provides to help the resolver understand the problem, but
+          sometimes it is needed to identify these to ignore them… */
+       bool IsMultiArchImplicit() const APT_PURE
+       { return (S->Flags & pkgCache::Flag::MultiArchImplicit) == pkgCache::Flag::MultiArchImplicit; }

 
 

-       inline PrvIterator() : Iterator<Provides, PrvIterator>(), Type(PrvVer) {};
+
+       inline PrvIterator() : Iterator<Provides, PrvIterator>(), Type(PrvVer) {}

        inline PrvIterator(pkgCache &Owner, Provides *Trg, Version*) :
                Iterator<Provides, PrvIterator>(Owner, Trg), Type(PrvVer) {
                if (S == 0)
                        S = Owner.ProvideP;
        inline PrvIterator(pkgCache &Owner, Provides *Trg, Version*) :
                Iterator<Provides, PrvIterator>(Owner, Trg), Type(PrvVer) {
                if (S == 0)
                        S = Owner.ProvideP;

-       };
+       }

        inline PrvIterator(pkgCache &Owner, Provides *Trg, Package*) :
                Iterator<Provides, PrvIterator>(Owner, Trg), Type(PrvPkg) {
                if (S == 0)
                        S = Owner.ProvideP;
        inline PrvIterator(pkgCache &Owner, Provides *Trg, Package*) :
                Iterator<Provides, PrvIterator>(Owner, Trg), Type(PrvPkg) {
                if (S == 0)
                        S = Owner.ProvideP;

-       };
+       }
+};
+                                                                       /*}}}*/
+// Release file                                                                /*{{{*/
+class pkgCache::RlsFileIterator : public Iterator<ReleaseFile, RlsFileIterator> {
+       public:
+       inline ReleaseFile* OwnerPointer() const {
+               return (Owner != 0) ? Owner->RlsFileP : 0;
+       }
+
+       // Iteration
+       inline RlsFileIterator& operator++() {if (S != Owner->RlsFileP) S = Owner->RlsFileP + S->NextFile;return *this;}
+       inline RlsFileIterator operator++(int) { RlsFileIterator const tmp(*this); operator++(); return tmp; }
+
+       // Accessors
+       inline const char *FileName() const {return S->FileName == 0?0:Owner->StrP + S->FileName;}
+       inline const char *Archive() const {return S->Archive == 0?0:Owner->StrP + S->Archive;}
+       inline const char *Version() const {return S->Version == 0?0:Owner->StrP + S->Version;}
+       inline const char *Origin() const {return S->Origin == 0?0:Owner->StrP + S->Origin;}
+       inline const char *Codename() const {return S->Codename ==0?0:Owner->StrP + S->Codename;}
+       inline const char *Label() const {return S->Label == 0?0:Owner->StrP + S->Label;}
+       inline const char *Site() const {return S->Site == 0?0:Owner->StrP + S->Site;}
+       inline bool Flagged(pkgCache::Flag::ReleaseFileFlags const flag) const {return (S->Flags & flag) == flag; }
+
+       bool IsOk();
+       std::string RelStr();
+
+       // Constructors
+       inline RlsFileIterator() : Iterator<ReleaseFile, RlsFileIterator>() {}
+       explicit inline RlsFileIterator(pkgCache &Owner) : Iterator<ReleaseFile, RlsFileIterator>(Owner, Owner.RlsFileP) {}
+       inline RlsFileIterator(pkgCache &Owner,ReleaseFile *Trg) : Iterator<ReleaseFile, RlsFileIterator>(Owner, Trg) {}

 };
                                                                        /*}}}*/
 // Package file                                                                /*{{{*/
 class pkgCache::PkgFileIterator : public Iterator<PackageFile, PkgFileIterator> {
 };
                                                                        /*}}}*/
 // Package file                                                                /*{{{*/
 class pkgCache::PkgFileIterator : public Iterator<PackageFile, PkgFileIterator> {

-       protected:
+       public:

        inline PackageFile* OwnerPointer() const {
                return (Owner != 0) ? Owner->PkgFileP : 0;
        inline PackageFile* OwnerPointer() const {
                return (Owner != 0) ? Owner->PkgFileP : 0;

-       };
+       }

 
 

-       public:

        // Iteration
        // Iteration

-       void operator ++(int) {if (S != Owner->PkgFileP) S = Owner->PkgFileP + S->NextFile;};
-       inline void operator ++() {operator ++(0);};
+       inline PkgFileIterator& operator++() {if (S != Owner->PkgFileP) S = Owner->PkgFileP + S->NextFile; return *this;}
+       inline PkgFileIterator operator++(int) { PkgFileIterator const tmp(*this); operator++(); return tmp; }

 
        // Accessors
 
        // Accessors

-       inline const char *FileName() const {return S->FileName == 0?0:Owner->StrP + S->FileName;};
-       inline const char *Archive() const {return S->Archive == 0?0:Owner->StrP + S->Archive;};
-       inline const char *Component() const {return S->Component == 0?0:Owner->StrP + S->Component;};
-       inline const char *Version() const {return S->Version == 0?0:Owner->StrP + S->Version;};
-       inline const char *Origin() const {return S->Origin == 0?0:Owner->StrP + S->Origin;};
-       inline const char *Codename() const {return S->Codename ==0?0:Owner->StrP + S->Codename;};
-       inline const char *Label() const {return S->Label == 0?0:Owner->StrP + S->Label;};
-       inline const char *Site() const {return S->Site == 0?0:Owner->StrP + S->Site;};
-       inline const char *Architecture() const {return S->Architecture == 0?0:Owner->StrP + S->Architecture;};
-       inline const char *IndexType() const {return S->IndexType == 0?0:Owner->StrP + S->IndexType;};
+       inline const char *FileName() const {return S->FileName == 0?0:Owner->StrP + S->FileName;}
+       inline pkgCache::RlsFileIterator ReleaseFile() const {return RlsFileIterator(*Owner, Owner->RlsFileP + S->Release);}
+       inline const char *Archive() const {return S->Release == 0 ? Component() : ReleaseFile().Archive();}
+       inline const char *Version() const {return S->Release == 0 ? NULL : ReleaseFile().Version();}
+       inline const char *Origin() const {return S->Release == 0 ? NULL : ReleaseFile().Origin();}
+       inline const char *Codename() const {return S->Release == 0 ? NULL : ReleaseFile().Codename();}
+       inline const char *Label() const {return S->Release == 0 ? NULL : ReleaseFile().Label();}
+       inline const char *Site() const {return S->Release == 0 ? NULL : ReleaseFile().Site();}
+       inline bool Flagged(pkgCache::Flag::ReleaseFileFlags const flag) const {return S->Release== 0 ? false : ReleaseFile().Flagged(flag);}
+       inline bool Flagged(pkgCache::Flag::PkgFFlags const flag) const {return (S->Flags & flag) == flag;}
+       inline const char *Component() const {return S->Component == 0?0:Owner->StrP + S->Component;}
+       inline const char *Architecture() const {return S->Architecture == 0?0:Owner->StrP + S->Architecture;}
+       inline const char *IndexType() const {return S->IndexType == 0?0:Owner->StrP + S->IndexType;}

 
        bool IsOk();
        std::string RelStr();
 
        // Constructors
 
        bool IsOk();
        std::string RelStr();
 
        // Constructors

-       inline PkgFileIterator() : Iterator<PackageFile, PkgFileIterator>() {};
-       inline PkgFileIterator(pkgCache &Owner) : Iterator<PackageFile, PkgFileIterator>(Owner, Owner.PkgFileP) {};
-       inline PkgFileIterator(pkgCache &Owner,PackageFile *Trg) : Iterator<PackageFile, PkgFileIterator>(Owner, Trg) {};
+       inline PkgFileIterator() : Iterator<PackageFile, PkgFileIterator>() {}
+       explicit inline PkgFileIterator(pkgCache &Owner) : Iterator<PackageFile, PkgFileIterator>(Owner, Owner.PkgFileP) {}
+       inline PkgFileIterator(pkgCache &Owner,PackageFile *Trg) : Iterator<PackageFile, PkgFileIterator>(Owner, Trg) {}

 };
                                                                        /*}}}*/
 // Version File                                                                /*{{{*/
 class pkgCache::VerFileIterator : public pkgCache::Iterator<VerFile, VerFileIterator> {
 };
                                                                        /*}}}*/
 // Version File                                                                /*{{{*/
 class pkgCache::VerFileIterator : public pkgCache::Iterator<VerFile, VerFileIterator> {

-       protected:
+       public:

        inline VerFile* OwnerPointer() const {
                return (Owner != 0) ? Owner->VerFileP : 0;
        inline VerFile* OwnerPointer() const {
                return (Owner != 0) ? Owner->VerFileP : 0;

-       };
+       }

 
 

-       public:

        // Iteration
        // Iteration

-       void operator ++(int) {if (S != Owner->VerFileP) S = Owner->VerFileP + S->NextFile;};
-       inline void operator ++() {operator ++(0);};
+       inline VerFileIterator& operator++() {if (S != Owner->VerFileP) S = Owner->VerFileP + S->NextFile; return *this;}
+       inline VerFileIterator operator++(int) { VerFileIterator const tmp(*this); operator++(); return tmp; }

 
        // Accessors
 
        // Accessors

-       inline PkgFileIterator File() const {return PkgFileIterator(*Owner,S->File + Owner->PkgFileP);};
+       inline PkgFileIterator File() const {return PkgFileIterator(*Owner,S->File + Owner->PkgFileP);}

 
 

-       inline VerFileIterator() : Iterator<VerFile, VerFileIterator>() {};
-       inline VerFileIterator(pkgCache &Owner,VerFile *Trg) : Iterator<VerFile, VerFileIterator>(Owner, Trg) {};
+       inline VerFileIterator() : Iterator<VerFile, VerFileIterator>() {}
+       inline VerFileIterator(pkgCache &Owner,VerFile *Trg) : Iterator<VerFile, VerFileIterator>(Owner, Trg) {}

 };
                                                                        /*}}}*/
 // Description File                                                    /*{{{*/
 class pkgCache::DescFileIterator : public Iterator<DescFile, DescFileIterator> {
 };
                                                                        /*}}}*/
 // Description File                                                    /*{{{*/
 class pkgCache::DescFileIterator : public Iterator<DescFile, DescFileIterator> {

-       protected:
+       public:

        inline DescFile* OwnerPointer() const {
                return (Owner != 0) ? Owner->DescFileP : 0;
        inline DescFile* OwnerPointer() const {
                return (Owner != 0) ? Owner->DescFileP : 0;

-       };
+       }

 
 

-       public:

        // Iteration
        // Iteration

-       void operator ++(int) {if (S != Owner->DescFileP) S = Owner->DescFileP + S->NextFile;};
-       inline void operator ++() {operator ++(0);};
+       inline DescFileIterator& operator++() {if (S != Owner->DescFileP) S = Owner->DescFileP + S->NextFile; return *this;}
+       inline DescFileIterator operator++(int) { DescFileIterator const tmp(*this); operator++(); return tmp; }

 
        // Accessors
 
        // Accessors

-       inline PkgFileIterator File() const {return PkgFileIterator(*Owner,S->File + Owner->PkgFileP);};
+       inline PkgFileIterator File() const {return PkgFileIterator(*Owner,S->File + Owner->PkgFileP);}

 
 

-       inline DescFileIterator() : Iterator<DescFile, DescFileIterator>() {};
-       inline DescFileIterator(pkgCache &Owner,DescFile *Trg) : Iterator<DescFile, DescFileIterator>(Owner, Trg) {};
+       inline DescFileIterator() : Iterator<DescFile, DescFileIterator>() {}
+       inline DescFileIterator(pkgCache &Owner,DescFile *Trg) : Iterator<DescFile, DescFileIterator>(Owner, Trg) {}

 };
                                                                        /*}}}*/
 };
                                                                        /*}}}*/

-// Inlined Begin functions cant be in the class because of order problems /*{{{*/
+// Inlined Begin functions can't be in the class because of order problems /*{{{*/

 inline pkgCache::PkgIterator pkgCache::GrpIterator::PackageList() const
 inline pkgCache::PkgIterator pkgCache::GrpIterator::PackageList() const

-       {return PkgIterator(*Owner,Owner->PkgP + S->FirstPackage);};
+       {return PkgIterator(*Owner,Owner->PkgP + S->FirstPackage);}

 inline pkgCache::VerIterator pkgCache::PkgIterator::VersionList() const
 inline pkgCache::VerIterator pkgCache::PkgIterator::VersionList() const

-       {return VerIterator(*Owner,Owner->VerP + S->VersionList);};
+       {return VerIterator(*Owner,Owner->VerP + S->VersionList);}

 inline pkgCache::VerIterator pkgCache::PkgIterator::CurrentVer() const
 inline pkgCache::VerIterator pkgCache::PkgIterator::CurrentVer() const

-       {return VerIterator(*Owner,Owner->VerP + S->CurrentVer);};
+       {return VerIterator(*Owner,Owner->VerP + S->CurrentVer);}

 inline pkgCache::DepIterator pkgCache::PkgIterator::RevDependsList() const
 inline pkgCache::DepIterator pkgCache::PkgIterator::RevDependsList() const

-       {return DepIterator(*Owner,Owner->DepP + S->RevDepends,S);};
+       {return DepIterator(*Owner,Owner->DepP + S->RevDepends,S);}

 inline pkgCache::PrvIterator pkgCache::PkgIterator::ProvidesList() const
 inline pkgCache::PrvIterator pkgCache::PkgIterator::ProvidesList() const

-       {return PrvIterator(*Owner,Owner->ProvideP + S->ProvidesList,S);};
+       {return PrvIterator(*Owner,Owner->ProvideP + S->ProvidesList,S);}

 inline pkgCache::DescIterator pkgCache::VerIterator::DescriptionList() const
 inline pkgCache::DescIterator pkgCache::VerIterator::DescriptionList() const

-       {return DescIterator(*Owner,Owner->DescP + S->DescriptionList);};
+       {return DescIterator(*Owner,Owner->DescP + S->DescriptionList);}

 inline pkgCache::PrvIterator pkgCache::VerIterator::ProvidesList() const
 inline pkgCache::PrvIterator pkgCache::VerIterator::ProvidesList() const

-       {return PrvIterator(*Owner,Owner->ProvideP + S->ProvidesList,S);};
+       {return PrvIterator(*Owner,Owner->ProvideP + S->ProvidesList,S);}

 inline pkgCache::DepIterator pkgCache::VerIterator::DependsList() const
 inline pkgCache::DepIterator pkgCache::VerIterator::DependsList() const

-       {return DepIterator(*Owner,Owner->DepP + S->DependsList,S);};
+       {return DepIterator(*Owner,Owner->DepP + S->DependsList,S);}

 inline pkgCache::VerFileIterator pkgCache::VerIterator::FileList() const
 inline pkgCache::VerFileIterator pkgCache::VerIterator::FileList() const

-       {return VerFileIterator(*Owner,Owner->VerFileP + S->FileList);};
+       {return VerFileIterator(*Owner,Owner->VerFileP + S->FileList);}

 inline pkgCache::DescFileIterator pkgCache::DescIterator::FileList() const
 inline pkgCache::DescFileIterator pkgCache::DescIterator::FileList() const

-       {return DescFileIterator(*Owner,Owner->DescFileP + S->FileList);};
+       {return DescFileIterator(*Owner,Owner->DescFileP + S->FileList);}
+APT_DEPRECATED inline const char * pkgCache::PkgIterator::Section() const
+       {return S->VersionList == 0 ? 0 : VersionList().Section();}

                                                                        /*}}}*/
 #endif
                                                                        /*}}}*/
 #endif