reenable gcc warnings for deprecated functions

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

diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h
index c7b6de1b6b5a62f6f3a22a43ef52a3474a2bd796..46fccdaa5eecd6d5f39048d9bbd7a83dfbf6b996 100644 (file)
--- a/apt-pkg/pkgcachegen.h
+++ b/apt-pkg/pkgcachegen.h
@@ -32,10 +32,10 @@ class FileFd;
 class pkgSourceList;
 class OpProgress;
 class pkgIndexFile;
 class pkgSourceList;
 class OpProgress;
 class pkgIndexFile;

+class pkgCacheListParser;

 
 class APT_HIDDEN pkgCacheGenerator                                     /*{{{*/
 {
 
 class APT_HIDDEN pkgCacheGenerator                                     /*{{{*/
 {

-   private:

    APT_HIDDEN map_stringitem_t WriteStringInMap(std::string const &String) { return WriteStringInMap(String.c_str()); };
    APT_HIDDEN map_stringitem_t WriteStringInMap(const char *String);
    APT_HIDDEN map_stringitem_t WriteStringInMap(const char *String, const unsigned long &Len);
    APT_HIDDEN map_stringitem_t WriteStringInMap(std::string const &String) { return WriteStringInMap(String.c_str()); };
    APT_HIDDEN map_stringitem_t WriteStringInMap(const char *String);
    APT_HIDDEN map_stringitem_t WriteStringInMap(const char *String, const unsigned long &Len);


@@ -46,10 +46,10 @@ class APT_HIDDEN pkgCacheGenerator                                  /*{{{*/
    std::map<std::string,map_stringitem_t> strPkgNames;
    std::map<std::string,map_stringitem_t> strVersions;
 
    std::map<std::string,map_stringitem_t> strPkgNames;
    std::map<std::string,map_stringitem_t> strVersions;
 

+   friend class pkgCacheListParser;
+   typedef pkgCacheListParser ListParser;
+

    public:
    public:

-   
-   class ListParser;
-   friend class ListParser;

 
    template<typename Iter> class Dynamic {
       public:
 
    template<typename Iter> class Dynamic {
       public:


@@ -74,25 +74,21 @@ class APT_HIDDEN pkgCacheGenerator                                  /*{{{*/
    std::string PkgFileName;
    pkgCache::PackageFile *CurrentFile;
 
    std::string PkgFileName;
    pkgCache::PackageFile *CurrentFile;
 

-   // Flag file dependencies
-   bool FoundFileDeps;
-   

    bool NewGroup(pkgCache::GrpIterator &Grp,const std::string &Name);
    bool NewPackage(pkgCache::PkgIterator &Pkg,const std::string &Name, const std::string &Arch);
    bool NewFileVer(pkgCache::VerIterator &Ver,ListParser &List);
    bool NewFileDesc(pkgCache::DescIterator &Desc,ListParser &List);
    bool NewDepends(pkgCache::PkgIterator &Pkg, pkgCache::VerIterator &Ver,
    bool NewGroup(pkgCache::GrpIterator &Grp,const std::string &Name);
    bool NewPackage(pkgCache::PkgIterator &Pkg,const std::string &Name, const std::string &Arch);
    bool NewFileVer(pkgCache::VerIterator &Ver,ListParser &List);
    bool NewFileDesc(pkgCache::DescIterator &Desc,ListParser &List);
    bool NewDepends(pkgCache::PkgIterator &Pkg, pkgCache::VerIterator &Ver,

-                  std::string const &Version, unsigned int const &Op,
-                  unsigned int const &Type, map_pointer_t* &OldDepLast);
-   bool NewDepends(pkgCache::PkgIterator &Pkg, pkgCache::VerIterator &Ver,
-                  map_pointer_t const Version, unsigned int const &Op,
-                  unsigned int const &Type, map_pointer_t* &OldDepLast);
+                  map_pointer_t const Version, uint8_t const Op,
+                  uint8_t const Type, map_pointer_t* &OldDepLast);

    map_pointer_t NewVersion(pkgCache::VerIterator &Ver,const std::string &VerStr,map_pointer_t const Next) APT_DEPRECATED
    { return NewVersion(Ver, VerStr, 0, 0, Next); }
    map_pointer_t NewVersion(pkgCache::VerIterator &Ver,const std::string &VerStr,
                            map_pointer_t const ParentPkg, unsigned short const Hash,
                            map_pointer_t const Next);
    map_pointer_t NewDescription(pkgCache::DescIterator &Desc,const std::string &Lang,const MD5SumValue &md5sum,map_stringitem_t const idxmd5str);
    map_pointer_t NewVersion(pkgCache::VerIterator &Ver,const std::string &VerStr,map_pointer_t const Next) APT_DEPRECATED
    { return NewVersion(Ver, VerStr, 0, 0, Next); }
    map_pointer_t NewVersion(pkgCache::VerIterator &Ver,const std::string &VerStr,
                            map_pointer_t const ParentPkg, unsigned short const Hash,
                            map_pointer_t const Next);
    map_pointer_t NewDescription(pkgCache::DescIterator &Desc,const std::string &Lang,const MD5SumValue &md5sum,map_stringitem_t const idxmd5str);

+   bool NewProvides(pkgCache::VerIterator &Ver, pkgCache::PkgIterator &Pkg,
+                   map_stringitem_t const ProvidesVersion, uint8_t const Flags);

 
    public:
 
 
    public:
 


@@ -105,19 +101,14 @@ class APT_HIDDEN pkgCacheGenerator                                        /*{{{*/
    bool SelectReleaseFile(const std::string &File, const std::string &Site, unsigned long Flags = 0);
    bool MergeList(ListParser &List,pkgCache::VerIterator *Ver = 0);
    inline pkgCache &GetCache() {return Cache;};
    bool SelectReleaseFile(const std::string &File, const std::string &Site, unsigned long Flags = 0);
    bool MergeList(ListParser &List,pkgCache::VerIterator *Ver = 0);
    inline pkgCache &GetCache() {return Cache;};

-   inline pkgCache::PkgFileIterator GetCurFile() 
+   inline pkgCache::PkgFileIterator GetCurFile()

          {return pkgCache::PkgFileIterator(Cache,CurrentFile);};
          {return pkgCache::PkgFileIterator(Cache,CurrentFile);};

-   inline pkgCache::RlsFileIterator GetCurRlsFile() 
+   inline pkgCache::RlsFileIterator GetCurRlsFile()

          {return pkgCache::RlsFileIterator(Cache,CurrentRlsFile);};
 
          {return pkgCache::RlsFileIterator(Cache,CurrentRlsFile);};
 

-   bool HasFileDeps() {return FoundFileDeps;};
-   bool MergeFileProvides(ListParser &List);
-   bool FinishCache(OpProgress *Progress) APT_DEPRECATED APT_CONST;
-

    APT_PUBLIC static bool MakeStatusCache(pkgSourceList &List,OpProgress *Progress,
                        MMap **OutMap = 0,bool AllowMem = false);
    APT_PUBLIC static bool MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **OutMap);
    APT_PUBLIC static bool MakeStatusCache(pkgSourceList &List,OpProgress *Progress,
                        MMap **OutMap = 0,bool AllowMem = false);
    APT_PUBLIC static bool MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **OutMap);

-   APT_PUBLIC static DynamicMMap* CreateDynamicMMap(FileFd *CacheF, unsigned long Flags = 0);

 
    void ReMap(void const * const oldMap, void const * const newMap);
 
 
    void ReMap(void const * const oldMap, void const * const newMap);
 


@@ -125,7 +116,7 @@ class APT_HIDDEN pkgCacheGenerator                                  /*{{{*/
    virtual ~pkgCacheGenerator();
 
    private:
    virtual ~pkgCacheGenerator();
 
    private:

-   void *d;
+   void * const d;

    APT_HIDDEN bool MergeListGroup(ListParser &List, std::string const &GrpName);
    APT_HIDDEN bool MergeListPackage(ListParser &List, pkgCache::PkgIterator &Pkg);
    APT_HIDDEN bool MergeListVersion(ListParser &List, pkgCache::PkgIterator &Pkg,
    APT_HIDDEN bool MergeListGroup(ListParser &List, std::string const &GrpName);
    APT_HIDDEN bool MergeListPackage(ListParser &List, pkgCache::PkgIterator &Pkg);
    APT_HIDDEN bool MergeListVersion(ListParser &List, pkgCache::PkgIterator &Pkg,


@@ -140,19 +131,16 @@ class APT_HIDDEN pkgCacheGenerator                                        /*{{{*/
 };
                                                                        /*}}}*/
 // This is the abstract package list parser class.                     /*{{{*/
 };
                                                                        /*}}}*/
 // This is the abstract package list parser class.                     /*{{{*/

-class APT_HIDDEN pkgCacheGenerator::ListParser
+class APT_HIDDEN pkgCacheListParser

 {
    pkgCacheGenerator *Owner;
    friend class pkgCacheGenerator;
 {
    pkgCacheGenerator *Owner;
    friend class pkgCacheGenerator;

-   
+

    // Some cache items
    pkgCache::VerIterator OldDepVer;
    map_pointer_t *OldDepLast;
 
    // Some cache items
    pkgCache::VerIterator OldDepVer;
    map_pointer_t *OldDepLast;
 

-   // Flag file dependencies
-   bool FoundFileDeps;
-
-   void *d;
+   void * const d;

 
    protected:
 
 
    protected:
 


@@ -162,10 +150,13 @@ class APT_HIDDEN pkgCacheGenerator::ListParser
    inline map_stringitem_t WriteString(const std::string &S) {return Owner->WriteStringInMap(S);};
    inline map_stringitem_t WriteString(const char *S,unsigned int Size) {return Owner->WriteStringInMap(S,Size);};
    bool NewDepends(pkgCache::VerIterator &Ver,const std::string &Package, const std::string &Arch,
    inline map_stringitem_t WriteString(const std::string &S) {return Owner->WriteStringInMap(S);};
    inline map_stringitem_t WriteString(const char *S,unsigned int Size) {return Owner->WriteStringInMap(S,Size);};
    bool NewDepends(pkgCache::VerIterator &Ver,const std::string &Package, const std::string &Arch,

-                  const std::string &Version,unsigned int Op,
-                  unsigned int Type);
+                  const std::string &Version,uint8_t const Op,
+                  uint8_t const Type);

    bool NewProvides(pkgCache::VerIterator &Ver,const std::string &PkgName,
    bool NewProvides(pkgCache::VerIterator &Ver,const std::string &PkgName,

-                   const std::string &PkgArch, const std::string &Version);
+                   const std::string &PkgArch, const std::string &Version,
+                   uint8_t const Flags);
+   bool NewProvidesAllArch(pkgCache::VerIterator &Ver, std::string const &Package,
+                          std::string const &Version, uint8_t const Flags);

    
    public:
    
    
    public:
    


@@ -192,12 +183,11 @@ class APT_HIDDEN pkgCacheGenerator::ListParser
    
    virtual bool Step() = 0;
    
    
    virtual bool Step() = 0;
    

-   inline bool HasFileDeps() {return FoundFileDeps;};

    virtual bool CollectFileProvides(pkgCache &/*Cache*/,
                                    pkgCache::VerIterator &/*Ver*/) {return true;};
 
    virtual bool CollectFileProvides(pkgCache &/*Cache*/,
                                    pkgCache::VerIterator &/*Ver*/) {return true;};
 

-   ListParser();
-   virtual ~ListParser();
+   pkgCacheListParser();
+   virtual ~pkgCacheListParser();

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