* apt-pkg/acquire*.cc:

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

diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index 87912aead18ee59ad8114793c819a3dfdd5bc3d1..1a7013551a5c9c57ae7a7733277e076042ba017e 100644 (file)
--- a/apt-pkg/pkgcache.h
+++ b/apt-pkg/pkgcache.h
@@ -74,13 +74,14 @@
 #ifndef PKGLIB_PKGCACHE_H
 #define PKGLIB_PKGCACHE_H
 
 #ifndef PKGLIB_PKGCACHE_H
 #define PKGLIB_PKGCACHE_H
 

-

 #include <string>
 #include <time.h>
 #include <apt-pkg/mmap.h>
 
 #include <string>
 #include <time.h>
 #include <apt-pkg/mmap.h>
 

+#ifndef APT_8_CLEANER_HEADERS

 using std::string;
 using std::string;

-    
+#endif
+

 class pkgVersioningSystem;
 class pkgCache                                                         /*{{{*/
 {
 class pkgVersioningSystem;
 class pkgCache                                                         /*{{{*/
 {


@@ -152,10 +153,10 @@ class pkgCache                                                            /*{{{*/
    protected:
    
    // Memory mapped cache file
    protected:
    
    // Memory mapped cache file

-   string CacheFile;
+   std::string CacheFile;

    MMap &Map;
 
    MMap &Map;
 

-   unsigned long sHash(const string &S) const;
+   unsigned long sHash(const std::string &S) const;

    unsigned long sHash(const char *S) const;
    
    public:
    unsigned long sHash(const char *S) const;
    
    public:


@@ -180,16 +181,16 @@ class pkgCache                                                            /*{{{*/
    inline void *DataEnd() {return ((unsigned char *)Map.Data()) + Map.Size();};
       
    // String hashing function (512 range)
    inline void *DataEnd() {return ((unsigned char *)Map.Data()) + Map.Size();};
       
    // String hashing function (512 range)

-   inline unsigned long Hash(const string &S) const {return sHash(S);};
+   inline unsigned long Hash(const std::string &S) const {return sHash(S);};

    inline unsigned long Hash(const char *S) const {return sHash(S);};
 
    // Useful transformation things
    const char *Priority(unsigned char Priority);
    
    // Accessors
    inline unsigned long Hash(const char *S) const {return sHash(S);};
 
    // Useful transformation things
    const char *Priority(unsigned char Priority);
    
    // Accessors

-   GrpIterator FindGrp(const string &Name);
-   PkgIterator FindPkg(const string &Name);
-   PkgIterator FindPkg(const string &Name, const string &Arch);
+   GrpIterator FindGrp(const std::string &Name);
+   PkgIterator FindPkg(const std::string &Name);
+   PkgIterator FindPkg(const std::string &Name, const std::string &Arch);

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


@@ -200,6 +201,7 @@ class pkgCache                                                              /*{{{*/
    inline PkgFileIterator FileEnd();
 
    inline bool MultiArchCache() const { return MultiArchEnabled; };
    inline PkgFileIterator FileEnd();
 
    inline bool MultiArchCache() const { return MultiArchEnabled; };

+   inline char const * const NativeArch() const;

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


@@ -214,8 +216,7 @@ class pkgCache                                                              /*{{{*/
 
 private:
    bool MultiArchEnabled;
 
 private:
    bool MultiArchEnabled;

-   PkgIterator SingleArchFindPkg(const string &Name);
-   inline char const * const NativeArch() const;
+   PkgIterator SingleArchFindPkg(const std::string &Name);

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