pkgcachegen.h: Hack around unordered_map not existing before C++11

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

diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h
index c5527ff309f9f9f2b833fd58844ae8c8369214eb..21a4a6a096dfa0b2bfb408bec9bd605cb3d8447e 100644 (file)
--- a/apt-pkg/pkgcachegen.h
+++ b/apt-pkg/pkgcachegen.h
@@ -26,30 +26,35 @@
 
 #include <vector>
 #include <string>
-#include <map>
+#if __cplusplus >= 201103L
+#include <unordered_map>
+#endif
 
 class FileFd;
 class pkgSourceList;
 class OpProgress;
 class pkgIndexFile;
+class pkgCacheListParser;
 
 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_pointer_t AllocateInMap(const unsigned long &size);
 
-   std::map<std::string,map_stringitem_t> strMixed;
-   std::map<std::string,map_stringitem_t> strSections;
-   std::map<std::string,map_stringitem_t> strPkgNames;
-   std::map<std::string,map_stringitem_t> strVersions;
+   // Dirty hack for public users that do not use C++11 yet
+#if __cplusplus >= 201103L
+   std::unordered_map<std::string,map_stringitem_t> strMixed;
+   std::unordered_map<std::string,map_stringitem_t> strSections;
+   std::unordered_map<std::string,map_stringitem_t> strPkgNames;
+   std::unordered_map<std::string,map_stringitem_t> strVersions;
+#endif
+
+   friend class pkgCacheListParser;
+   typedef pkgCacheListParser ListParser;
 
    public:
-   
-   class ListParser;
-   friend class ListParser;
 
    template<typename Iter> class Dynamic {
       public:
@@ -74,16 +79,10 @@ class APT_HIDDEN pkgCacheGenerator                                  /*{{{*/
    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,
-                  std::string const &Version, uint8_t const Op,
-                  uint8_t const Type, map_pointer_t* &OldDepLast);
    bool NewDepends(pkgCache::PkgIterator &Pkg, pkgCache::VerIterator &Ver,
                   map_pointer_t const Version, uint8_t const Op,
                   uint8_t const Type, map_pointer_t* &OldDepLast);
@@ -93,6 +92,8 @@ class APT_HIDDEN pkgCacheGenerator                                    /*{{{*/
                            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:
 
@@ -105,19 +106,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;};
-   inline pkgCache::PkgFileIterator GetCurFile() 
+   inline pkgCache::PkgFileIterator GetCurFile()
          {return pkgCache::PkgFileIterator(Cache,CurrentFile);};
-   inline pkgCache::RlsFileIterator GetCurRlsFile() 
+   inline pkgCache::RlsFileIterator GetCurRlsFile()
          {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 DynamicMMap* CreateDynamicMMap(FileFd *CacheF, unsigned long Flags = 0);
 
    void ReMap(void const * const oldMap, void const * const newMap);
 
@@ -140,18 +136,15 @@ class APT_HIDDEN pkgCacheGenerator                                        /*{{{*/
 };
                                                                        /*}}}*/
 // This is the abstract package list parser class.                     /*{{{*/
-class APT_HIDDEN pkgCacheGenerator::ListParser
+class APT_HIDDEN pkgCacheListParser
 {
    pkgCacheGenerator *Owner;
    friend class pkgCacheGenerator;
-   
+
    // Some cache items
    pkgCache::VerIterator OldDepVer;
    map_pointer_t *OldDepLast;
 
-   // Flag file dependencies
-   bool FoundFileDeps;
-
    void * const d;
 
    protected:
@@ -167,6 +160,8 @@ class APT_HIDDEN pkgCacheGenerator::ListParser
    bool NewProvides(pkgCache::VerIterator &Ver,const std::string &PkgName,
                    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:
    
@@ -193,17 +188,16 @@ class APT_HIDDEN pkgCacheGenerator::ListParser
    
    virtual bool Step() = 0;
    
-   inline bool HasFileDeps() {return FoundFileDeps;};
    virtual bool CollectFileProvides(pkgCache &/*Cache*/,
                                    pkgCache::VerIterator &/*Ver*/) {return true;};
 
-   ListParser();
-   virtual ~ListParser();
+   pkgCacheListParser();
+   virtual ~pkgCacheListParser();
 };
                                                                        /*}}}*/
 
-bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
+APT_DEPRECATED_MSG("Use pkgCacheGenerator::MakeStatusCache instead") bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
                        MMap **OutMap = 0,bool AllowMem = false);
-bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap);
+APT_DEPRECATED_MSG("Use pkgCacheGenerator::MakeOnlyStatusCache instead") bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap);
 
 #endif