Merge remote-tracking branch 'upstream/debian/sid' into debian/experimental

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

diff --git a/apt-pkg/srcrecords.h b/apt-pkg/srcrecords.h
index 8a78d77112258eaddf567ab45c377973313d67ae..69b3cfd9996c1e34182f2feff57ba172485152a6 100644 (file)
--- a/apt-pkg/srcrecords.h
+++ b/apt-pkg/srcrecords.h
@@ -13,12 +13,16 @@
 #ifndef PKGLIB_SRCRECORDS_H
 #define PKGLIB_SRCRECORDS_H
 
 #ifndef PKGLIB_SRCRECORDS_H
 #define PKGLIB_SRCRECORDS_H
 

+#include <apt-pkg/macros.h>
+#include <apt-pkg/hashes.h>

 
 #include <string>
 
 #include <string>

-#include <vector>    
+#include <vector>

 
 

+#ifndef APT_8_CLEANER_HEADERS

 using std::string;
 using std::vector;
 using std::string;
 using std::vector;

+#endif

 
 class pkgSourceList;
 class pkgIndexFile;
 
 class pkgSourceList;
 class pkgIndexFile;


@@ -26,15 +30,24 @@ class pkgSrcRecords
 {
    public:
 
 {
    public:
 

+#if __GNUC__ >= 4
+       // ensure that con- & de-structor don't trigger this warning
+       #pragma GCC diagnostic push
+       #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif

    // Describes a single file
    struct File
    {
    // Describes a single file
    struct File
    {

-      string MD5Hash;
-      unsigned long Size;
-      string Path;
-      string Type;
+      std::string Path;
+      std::string Type;
+      unsigned long long Size;
+      HashStringList Hashes;
+      APT_DEPRECATED std::string MD5Hash;

    };
    };

-   
+#if __GNUC__ >= 4
+       #pragma GCC diagnostic pop
+#endif
+

    // Abstract parser for each source record
    class Parser
    {
    // Abstract parser for each source record
    class Parser
    {


@@ -49,8 +62,8 @@ class pkgSrcRecords
 
       struct BuildDepRec 
       {
 
       struct BuildDepRec 
       {

-         string Package;
-        string Version;
+        std::string Package;
+        std::string Version;

         unsigned int Op;
         unsigned char Type;
       };
         unsigned int Op;
         unsigned char Type;
       };


@@ -61,18 +74,19 @@ class pkgSrcRecords
       virtual bool Step() = 0;
       virtual bool Jump(unsigned long const &Off) = 0;
       virtual unsigned long Offset() = 0;
       virtual bool Step() = 0;
       virtual bool Jump(unsigned long const &Off) = 0;
       virtual unsigned long Offset() = 0;

-      virtual string AsStr() = 0;
+      virtual std::string AsStr() = 0;

       
       

-      virtual string Package() const = 0;
-      virtual string Version() const = 0;
-      virtual string Maintainer() const = 0;
-      virtual string Section() const = 0;
+      virtual std::string Package() const = 0;
+      virtual std::string Version() const = 0;
+      virtual std::string Maintainer() const = 0;
+      virtual std::string Section() const = 0;

       virtual const char **Binaries() = 0;   // Ownership does not transfer
 
       virtual const char **Binaries() = 0;   // Ownership does not transfer
 

-      virtual bool BuildDepends(vector<BuildDepRec> &BuildDeps, bool const &ArchOnly, bool const &StripMultiArch = true) = 0;
-      static const char *BuildDepType(unsigned char const &Type);
+      //FIXME: Add a parameter to specify which architecture to use for [wildcard] matching
+      virtual bool BuildDepends(std::vector<BuildDepRec> &BuildDeps, bool const &ArchOnly, bool const &StripMultiArch = true) = 0;
+      static const char *BuildDepType(unsigned char const &Type) APT_PURE;

 
 

-      virtual bool Files(vector<pkgSrcRecords::File> &F) = 0;
+      virtual bool Files(std::vector<pkgSrcRecords::File> &F) = 0;

       
       Parser(const pkgIndexFile *Index) : iIndex(Index) {};
       virtual ~Parser() {};
       
       Parser(const pkgIndexFile *Index) : iIndex(Index) {};
       virtual ~Parser() {};


@@ -83,8 +97,8 @@ class pkgSrcRecords
    void *d;
    
    // The list of files and the current parser pointer
    void *d;
    
    // The list of files and the current parser pointer

-   vector<Parser*> Files;
-   vector<Parser *>::iterator Current;
+   std::vector<Parser*> Files;
+   std::vector<Parser *>::iterator Current;

    
    public:
 
    
    public: