* apt-pkg/deb/dpkgpm.cc:

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

diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index 5f50001d0cce1cc6bb9735057a308bd1af90e711..577eebad9c58474c33560f8ded120f57f7389215 100644 (file)
--- a/apt-pkg/pkgcache.h
+++ b/apt-pkg/pkgcache.h
@@ -126,7 +126,7 @@ class pkgCache                                                              /*{{{*/
    // Accessors
    GrpIterator FindGrp(const string &Name);
    PkgIterator FindPkg(const string &Name);
    // Accessors
    GrpIterator FindGrp(const string &Name);
    PkgIterator FindPkg(const string &Name);

-   PkgIterator FindPkg(const string &Name, string Arch);
+   PkgIterator FindPkg(const string &Name, const string &Arch);

 
    Header &Head() {return *HeaderP;};
    inline GrpIterator GrpBegin();
 
    Header &Head() {return *HeaderP;};
    inline GrpIterator GrpBegin();


@@ -136,6 +136,8 @@ class pkgCache                                                              /*{{{*/
    inline PkgFileIterator FileBegin();
    inline PkgFileIterator FileEnd();
 
    inline PkgFileIterator FileBegin();
    inline PkgFileIterator FileEnd();
 

+   inline bool MultiArchCache() const { return MultiArchEnabled; };
+

    // Make me a function
    pkgVersioningSystem *VS;
    
    // Make me a function
    pkgVersioningSystem *VS;
    


@@ -146,6 +148,10 @@ class pkgCache                                                             /*{{{*/
    
    pkgCache(MMap *Map,bool DoMap = true);
    virtual ~pkgCache() {};
    
    pkgCache(MMap *Map,bool DoMap = true);
    virtual ~pkgCache() {};

+
+private:
+   bool MultiArchEnabled;
+   PkgIterator SingleArchFindPkg(const string &Name);

 };
                                                                        /*}}}*/
 // Header structure                                                    /*{{{*/
 };
                                                                        /*}}}*/
 // Header structure                                                    /*{{{*/


@@ -276,7 +282,6 @@ struct pkgCache::Version                                            /*{{{*/
 {
    map_ptrloc VerStr;            // Stringtable
    map_ptrloc Section;           // StringTable (StringItem)
 {
    map_ptrloc VerStr;            // Stringtable
    map_ptrloc Section;           // StringTable (StringItem)

-   map_ptrloc Arch;              // StringTable

    enum {None, All, Foreign, Same, Allowed} MultiArch;
 
    // Lists
    enum {None, All, Foreign, Same, Allowed} MultiArch;
 
    // Lists


@@ -358,7 +363,7 @@ inline pkgCache::PkgFileIterator pkgCache::FileEnd()
 class pkgCache::Namespace                                              /*{{{*/
 {   
    public:
 class pkgCache::Namespace                                              /*{{{*/
 {   
    public:

-
+   typedef pkgCache::GrpIterator GrpIterator;

    typedef pkgCache::PkgIterator PkgIterator;
    typedef pkgCache::VerIterator VerIterator;
    typedef pkgCache::DescIterator DescIterator;
    typedef pkgCache::PkgIterator PkgIterator;
    typedef pkgCache::VerIterator VerIterator;
    typedef pkgCache::DescIterator DescIterator;