merge with lp:~mvo/apt/debian-sid

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

diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h
index fae1a60a6d0ab153c3e946e8a269bf5bdad33c97..108b34207a1cbab0cecb18b73e4692f6ea7fc894 100644 (file)
--- a/apt-pkg/pkgcachegen.h
+++ b/apt-pkg/pkgcachegen.h
@@ -19,9 +19,6 @@
 #ifndef PKGLIB_PKGCACHEGEN_H
 #define PKGLIB_PKGCACHEGEN_H
 
 #ifndef PKGLIB_PKGCACHEGEN_H
 #define PKGLIB_PKGCACHEGEN_H
 

-#ifdef __GNUG__
-#pragma interface "apt-pkg/pkgcachegen.h"
-#endif 

 
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/md5.h>
 
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/md5.h>


@@ -31,7 +28,7 @@ class OpProgress;
 class MMap;
 class pkgIndexFile;
 
 class MMap;
 class pkgIndexFile;
 

-class pkgCacheGenerator
+class pkgCacheGenerator                                                        /*{{{*/

 {
    private:
    
 {
    private:
    


@@ -54,7 +51,7 @@ class pkgCacheGenerator
    // Flag file dependencies
    bool FoundFileDeps;
    
    // Flag file dependencies
    bool FoundFileDeps;
    

-   bool NewPackage(pkgCache::PkgIterator &Pkg,const string &Pkg);
+   bool NewPackage(pkgCache::PkgIterator &Pkg,const string &PkgName);

    bool NewFileVer(pkgCache::VerIterator &Ver,ListParser &List);
    bool NewFileDesc(pkgCache::DescIterator &Desc,ListParser &List);
    unsigned long NewVersion(pkgCache::VerIterator &Ver,const string &VerStr,unsigned long Next);
    bool NewFileVer(pkgCache::VerIterator &Ver,ListParser &List);
    bool NewFileDesc(pkgCache::DescIterator &Desc,ListParser &List);
    unsigned long NewVersion(pkgCache::VerIterator &Ver,const string &VerStr,unsigned long Next);


@@ -79,8 +76,8 @@ class pkgCacheGenerator
    pkgCacheGenerator(DynamicMMap *Map,OpProgress *Progress);
    ~pkgCacheGenerator();
 };
    pkgCacheGenerator(DynamicMMap *Map,OpProgress *Progress);
    ~pkgCacheGenerator();
 };

-
-// This is the abstract package list parser class.
+                                                                       /*}}}*/
+// This is the abstract package list parser class.                     /*{{{*/

 class pkgCacheGenerator::ListParser
 {
    pkgCacheGenerator *Owner;
 class pkgCacheGenerator::ListParser
 {
    pkgCacheGenerator *Owner;


@@ -129,7 +126,7 @@ class pkgCacheGenerator::ListParser
    ListParser() : FoundFileDeps(false) {};
    virtual ~ListParser() {};
 };
    ListParser() : FoundFileDeps(false) {};
    virtual ~ListParser() {};
 };

-
+                                                                       /*}}}*/

 bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
                        MMap **OutMap = 0,bool AllowMem = false);
 bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap);
 bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
                        MMap **OutMap = 0,bool AllowMem = false);
 bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap);