Sophie

Sophie

distrib > Mageia > 7 > x86_64 > by-pkgid > 133738fd1ec1a496d35c2af5039a0eb4 > files > 7

apt-0.5.15lorg3.94-32.mga7.src.rpm

diff -up apt-0.5.15lorg3.94pt/apt-pkg/rpm/rpmlistparser.h.gcc7 apt-0.5.15lorg3.94pt/apt-pkg/rpm/rpmlistparser.h
--- apt-0.5.15lorg3.94pt/apt-pkg/rpm/rpmlistparser.h.gcc7	2009-02-24 11:46:07.000000000 +0100
+++ apt-0.5.15lorg3.94pt/apt-pkg/rpm/rpmlistparser.h	2017-09-26 02:33:11.620083425 +0200
@@ -41,7 +41,7 @@ class rpmListParser : public pkgCacheGen
    const pkgCache::VerIterator *VI;
    
 #ifdef APT_WITH_GNU_HASH_MAP
-   typedef hash_map<const char*,bool,
+   typedef unordered_map<const char*,bool,
    		    hash<const char*>,cstr_eq_pred> SeenPackagesType;
 #else
    typedef map<const char*,bool,cstr_lt_pred> SeenPackagesType;
diff -up apt-0.5.15lorg3.94pt/apt-pkg/rpm/rpmmisc.h.gcc7 apt-0.5.15lorg3.94pt/apt-pkg/rpm/rpmmisc.h
--- apt-0.5.15lorg3.94pt/apt-pkg/rpm/rpmmisc.h.gcc7	2017-09-26 01:55:41.916946756 +0200
+++ apt-0.5.15lorg3.94pt/apt-pkg/rpm/rpmmisc.h	2017-09-26 02:31:27.905812094 +0200
@@ -7,9 +7,7 @@
 
 #ifdef APT_WITH_GNU_HASH_MAP
 
-#include <ext/hash_map> 
-
-using namespace __gnu_cxx;
+#include <unordered_map> 
 
 struct hash_string
 {
diff -up apt-0.5.15lorg3.94pt/apt-pkg/rpm/rpmpackagedata.h.gcc7 apt-0.5.15lorg3.94pt/apt-pkg/rpm/rpmpackagedata.h
--- apt-0.5.15lorg3.94pt/apt-pkg/rpm/rpmpackagedata.h.gcc7	2017-09-26 01:55:41.933946636 +0200
+++ apt-0.5.15lorg3.94pt/apt-pkg/rpm/rpmpackagedata.h	2017-09-26 02:28:29.740063802 +0200
@@ -26,15 +26,15 @@ class RPMPackageData
    protected:
 
 #ifdef APT_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;
-   hash_map<string,int,hash_string> IgnorePackages;
-   hash_map<string,int,hash_string> DuplicatedPackages;
-   hash_map<string,bool,hash_string> CompatArch;
+   unordered_map<string,pkgCache::State::VerPriority,hash_string> Priorities;
+   unordered_map<string,pkgCache::Flag::PkgFlags,hash_string> Flags;
+   unordered_map<string,vector<string>*,hash_string> FakeProvides;
+   unordered_map<string,int,hash_string> IgnorePackages;
+   unordered_map<string,int,hash_string> DuplicatedPackages;
+   unordered_map<string,bool,hash_string> CompatArch;
    typedef map<string,pkgCache::VerIterator> VerMapValueType;
-   typedef hash_map<unsigned long,VerMapValueType> VerMapType;
-   typedef hash_map<const char*,int,
+   typedef unordered_map<unsigned long,VerMapValueType> VerMapType;
+   typedef unordered_map<const char*,int,
 		    hash<const char*>,cstr_eq_pred> ArchScoresType;
 #else
    map<string,pkgCache::State::VerPriority> Priorities;