Merge changelog entries from sid-gcc5

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

diff --git a/apt-pkg/srcrecords.h b/apt-pkg/srcrecords.h
index 99cbc6060221033f07ba6a1e94a944753759532f..f0a3c463acb9a081cecacf470666432e79fc2078 100644 (file)
--- a/apt-pkg/srcrecords.h
+++ b/apt-pkg/srcrecords.h
@@ -1,6 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: srcrecords.h,v 1.8.2.1 2003/12/26 16:27:34 mdz Exp $

 /* ######################################################################
    
    Source Package Records - Allows access to source package records
 /* ######################################################################
    
    Source Package Records - Allows access to source package records


@@ -13,12 +12,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,18 +29,26 @@ class pkgSrcRecords
 {
    public:
 
 {
    public:
 

+APT_IGNORE_DEPRECATED_PUSH

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

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

    };
    };

-   
+   struct File2 : public File
+   {
+      unsigned long long FileSize;
+      HashStringList Hashes;
+   };
+APT_IGNORE_DEPRECATED_POP
+

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

+      void * const d;

       protected:
       
       const pkgIndexFile *iIndex;
       protected:
       
       const pkgIndexFile *iIndex;


@@ -49,8 +60,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;
       };


@@ -59,41 +70,50 @@ class pkgSrcRecords
       
       virtual bool Restart() = 0;
       virtual bool Step() = 0;
       
       virtual bool Restart() = 0;
       virtual bool Step() = 0;

-      virtual bool Jump(unsigned long Off) = 0;
+      virtual bool Jump(unsigned long const &Off) = 0;

       virtual unsigned long Offset() = 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 ArchOnly) = 0;
-      static const char *BuildDepType(unsigned char 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;
-      
-      Parser(const pkgIndexFile *Index) : iIndex(Index) {};
-      virtual ~Parser() {};
+      virtual bool Files(std::vector<pkgSrcRecords::File> &F) = 0;
+      bool Files2(std::vector<pkgSrcRecords::File2> &F);
+
+      explicit Parser(const pkgIndexFile *Index);
+      virtual ~Parser();

    };
    
    private:
    };
    
    private:

+   /** \brief dpointer placeholder (for later in case we need it) */
+   void * const d;

    
    // The list of files and the current parser pointer
    
    // 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:
 
    // Reset the search
    bool Restart();
 
    
    public:
 
    // Reset the search
    bool Restart();
 

-   // Locate a package by name
-   Parser *Find(const char *Package,bool SrcOnly = false);
-   
-   pkgSrcRecords(pkgSourceList &List);
-   ~pkgSrcRecords();
+   // 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);
+
+   explicit pkgSrcRecords(pkgSourceList &List);
+   virtual ~pkgSrcRecords();

 };
 
 #endif
 };
 
 #endif