merged lp:~mvo/apt/conflicts-on-virtuals to better deal with

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

diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h
index 1dcc345329aa3a88922ee657019a039db0ee42f6..26070636e33ddbfc72af418d0e064bde06f99aeb 100644 (file)
--- a/apt-pkg/cacheiterators.h
+++ b/apt-pkg/cacheiterators.h
@@ -115,8 +115,11 @@ class pkgCache::GrpIterator: public Iterator<Group, GrpIterator> {
        /** \brief find the package with the "best" architecture
 
            The best architecture is either the "native" or the first
-           in the list of Architectures which is not an end-Pointer */
-       PkgIterator FindPreferredPkg() const;
+           in the list of Architectures which is not an end-Pointer
+
+           \param PreferNonVirtual tries to respond with a non-virtual package
+                  and only if this fails returns the best virtual package */
+       PkgIterator FindPreferredPkg(bool const &PreferNonVirtual = true) const;
        PkgIterator NextPkg(PkgIterator const &Pkg) const;
 
        // Constructors
@@ -290,6 +293,9 @@ class pkgCache::DepIterator : public Iterator<Dependency, DepIterator> {
        inline const char *CompType() const {return Owner->CompType(S->CompareOp);};
        inline const char *DepType() const {return Owner->DepType(S->Type);};
 
+       //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) {
                if (S == 0)