aptconfiguration: Set default compression level to 6

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

diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h
index 46fccdaa5eecd6d5f39048d9bbd7a83dfbf6b996..21a4a6a096dfa0b2bfb408bec9bd605cb3d8447e 100644 (file)
--- a/apt-pkg/pkgcachegen.h
+++ b/apt-pkg/pkgcachegen.h
@@ -26,7 +26,9 @@
 
 #include <vector>
 #include <string>
 
 #include <vector>
 #include <string>

-#include <map>
+#if __cplusplus >= 201103L
+#include <unordered_map>
+#endif

 
 class FileFd;
 class pkgSourceList;
 
 class FileFd;
 class pkgSourceList;


@@ -41,10 +43,13 @@ class APT_HIDDEN pkgCacheGenerator                                  /*{{{*/
    APT_HIDDEN map_stringitem_t WriteStringInMap(const char *String, const unsigned long &Len);
    APT_HIDDEN map_pointer_t AllocateInMap(const unsigned long &size);
 
    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;
 
    friend class pkgCacheListParser;
    typedef pkgCacheListParser ListParser;


@@ -191,8 +196,8 @@ class APT_HIDDEN 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);
                        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
 
 #endif