fix test to not spoil output with warnings

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

diff --git a/apt-pkg/indexrecords.h b/apt-pkg/indexrecords.h
index 88a06779c5292ab9b37063963465e45977c2ab96..35e534c12c0da9a6e582eb9d0d8dc8a9ab1e12fb 100644 (file)
--- a/apt-pkg/indexrecords.h
+++ b/apt-pkg/indexrecords.h
@@ -42,8 +42,12 @@ class indexRecords
    std::map<std::string,checkSum *> Entries;
 
    public:
-
+#if APT_PKG_ABI >= 413
    indexRecords(const std::string &ExpectedDist = "");
+#else
+   indexRecords();
+   indexRecords(const std::string ExpectedDist);
+#endif
 
    // Lookup function
    virtual checkSum *Lookup(const std::string MetaKey);
@@ -76,11 +80,7 @@ class indexRecords
    virtual ~indexRecords();
 };
 
-#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
 struct indexRecords::checkSum
 {
    std::string MetaKeyFilename;
@@ -89,8 +89,6 @@ struct indexRecords::checkSum
 
    APT_DEPRECATED HashString Hash;
 };
-#if __GNUC__ >= 4
-       #pragma GCC diagnostic pop
-#endif
+APT_IGNORE_DEPRECATED_POP
 
 #endif