Merge branch 'debian/sid' into debian/experimental

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

diff --git a/apt-pkg/srcrecords.h b/apt-pkg/srcrecords.h
index a55bc74fa2cd2c94d63c2958a21bdb05d371514e..c68d374bb4fb44a4e3992a02f1d19013a340043f 100644 (file)
--- a/apt-pkg/srcrecords.h
+++ b/apt-pkg/srcrecords.h
@@ -13,25 +13,41 @@
 #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 <vector>
 
 
 #include <string>
 #include <vector>
 

+#ifndef APT_8_CLEANER_HEADERS
+using std::string;
+using std::vector;
+#endif
+

 class pkgSourceList;
 class pkgIndexFile;
 class pkgSrcRecords
 {
    public:
 
 class pkgSourceList;
 class pkgIndexFile;
 class pkgSrcRecords
 {
    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
    {

-      std::string MD5Hash;
-      unsigned long Size;

       std::string Path;
       std::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
    {


@@ -66,8 +82,9 @@ class pkgSrcRecords
       virtual std::string Section() const = 0;
       virtual const char **Binaries() = 0;   // Ownership does not transfer
 
       virtual std::string Section() const = 0;
       virtual const char **Binaries() = 0;   // Ownership does not transfer
 

+      //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;
       virtual bool BuildDepends(std::vector<BuildDepRec> &BuildDeps, bool const &ArchOnly, bool const &StripMultiArch = true) = 0;

-      static const char *BuildDepType(unsigned char const &Type);
+      static const char *BuildDepType(unsigned char const &Type) APT_PURE;

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


@@ -88,8 +105,13 @@ class pkgSrcRecords
    // Reset the search
    bool Restart();
 
    // Reset the search
    bool Restart();
 

-   // Locate a package by name
-   Parser *Find(const char *Package,bool const &SrcOnly = false);
+   // Step to the next SourcePackage and return pointer to the 
+   // next SourceRecord. The pointer is owned by libapt.
+   const Parser* Step();
+
+   // Locate a package by name and return pointer to the Parser.
+   // The pointer is owned by libapt.
+   Parser* Find(const char *Package,bool const &SrcOnly = false);

    
    pkgSrcRecords(pkgSourceList &List);
    virtual ~pkgSrcRecords();
    
    pkgSrcRecords(pkgSourceList &List);
    virtual ~pkgSrcRecords();