rework dpkg-wrapping in test framework

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

diff --git a/apt-pkg/srcrecords.h b/apt-pkg/srcrecords.h
index 69b3cfd9996c1e34182f2feff57ba172485152a6..de2b6ff648987038ed175d0e75a90bc66e5a00e3 100644 (file)
--- a/apt-pkg/srcrecords.h
+++ b/apt-pkg/srcrecords.h
@@ -30,11 +30,7 @@ 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
+APT_IGNORE_DEPRECATED_PUSH
    // Describes a single file
    struct File
    {
@@ -44,9 +40,7 @@ class pkgSrcRecords
       HashStringList Hashes;
       APT_DEPRECATED std::string MD5Hash;
    };
-#if __GNUC__ >= 4
-       #pragma GCC diagnostic pop
-#endif
+APT_IGNORE_DEPRECATED_POP
 
    // Abstract parser for each source record
    class Parser
@@ -105,8 +99,13 @@ class pkgSrcRecords
    // 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();