- re-enable hashmap usage (Ralf)
authorpmatilai <pmatilai>
Thu, 29 Jun 2006 16:10:00 +0000 (16:10 +0000)
committerpmatilai <pmatilai>
Thu, 29 Jun 2006 16:10:00 +0000 (16:10 +0000)
apt-pkg/rpm/rpmlistparser.cc
apt-pkg/rpm/rpmlistparser.h
apt-pkg/rpm/rpmpackagedata.cc
apt-pkg/rpm/rpmpackagedata.h

index 2ce0429..a67d9bc 100644 (file)
@@ -43,7 +43,7 @@ rpmListParser::rpmListParser(RPMHandler *Handler)
    Handler->Rewind();
    if (Handler->IsDatabase() == true)
    {
-#ifdef WITH_HASH_MAP
+#ifdef WITH_GNU_HASH_MAP
       SeenPackages = new SeenPackagesType(517);
 #else
       SeenPackages = new SeenPackagesType;
index 4a829fd..f2b5880 100644 (file)
@@ -36,7 +36,7 @@ class rpmListParser : public pkgCacheGenerator::ListParser
    string CurrentName;
    const pkgCache::VerIterator *VI;
    
-#ifdef WITH_HASH_MAP
+#ifdef WITH_GNU_HASH_MAP
    typedef hash_map<const char*,bool,
                    hash<const char*>,cstr_eq_pred> SeenPackagesType;
 #else
index 52bc36f..e5a7372 100644 (file)
 #include <rpm/rpmlib.h>
 
 RPMPackageData::RPMPackageData()
-   : MinArchScore(-1)
-#ifdef WITH_HASH_MAP
-   , ArchScores(31), VerMap(517)
+   :
+#ifdef WITH_GNU_HASH_MAP
+  VerMap(517),
+#endif
+  MinArchScore(-1)   
+#ifdef WITH_GNU_HASH_MAP
+   , ArchScores(31)
 #endif
 {
    BaseArch = _config->Find("APT::Architecture");
index 0977910..a673085 100644 (file)
@@ -21,7 +21,7 @@ class RPMPackageData
 {
    protected:
 
-#ifdef WITH_HASH_MAP
+#ifdef WITH_GNU_HASH_MAP
    hash_map<string,pkgCache::State::VerPriority,hash_string> Priorities;
    hash_map<string,pkgCache::Flag::PkgFlags,hash_string> Flags;
    hash_map<string,vector<string>*,hash_string> FakeProvides;