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 82460d70f2a306b0ad6059ba883ed075664c1287..c68d374bb4fb44a4e3992a02f1d19013a340043f 100644 (file)
--- a/apt-pkg/srcrecords.h
+++ b/apt-pkg/srcrecords.h
@@ -14,6 +14,7 @@
 #define PKGLIB_SRCRECORDS_H
 
 #include <apt-pkg/macros.h>
 #define PKGLIB_SRCRECORDS_H
 
 #include <apt-pkg/macros.h>

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

 
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>


@@ -29,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
    {

-      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
    {


@@ -97,7 +107,7 @@ class pkgSrcRecords
 
    // Step to the next SourcePackage and return pointer to the 
    // next SourceRecord. The pointer is owned by libapt.
 
    // Step to the next SourcePackage and return pointer to the 
    // next SourceRecord. The pointer is owned by libapt.

-   const Parser* Next();
+   const Parser* Step();

 
    // Locate a package by name and return pointer to the Parser.
    // The pointer is owned by libapt.
 
    // Locate a package by name and return pointer to the Parser.
    // The pointer is owned by libapt.