add a few gcc helpers, including [un]likely() and __deprecated

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

diff --git a/apt-pkg/metaindex.h b/apt-pkg/metaindex.h
index 8ebf23541e0470d55565c802b9fe53cd653cdfee..779b6ab141e8cc8fdb3faff8f73c6917ff3977e5 100644 (file)
--- a/apt-pkg/metaindex.h
+++ b/apt-pkg/metaindex.h
@@ -1,9 +1,6 @@
 #ifndef PKGLIB_METAINDEX_H
 #define PKGLIB_METAINDEX_H
 
 #ifndef PKGLIB_METAINDEX_H
 #define PKGLIB_METAINDEX_H
 

-/* #ifdef __GNUG__ */
-/* #pragma interface "apt-pkg/metaindex.h" */
-/* #endif */

 
 #include <string>
 #include <apt-pkg/pkgcache.h>
 
 #include <string>
 #include <apt-pkg/pkgcache.h>


@@ -42,7 +39,13 @@ class metaIndex
    virtual vector<pkgIndexFile *> *GetIndexFiles() = 0; 
    virtual bool IsTrusted() const = 0;
 
    virtual vector<pkgIndexFile *> *GetIndexFiles() = 0; 
    virtual bool IsTrusted() const = 0;
 

-   virtual ~metaIndex() {};
+   virtual ~metaIndex() {
+      if (Indexes == 0)
+        return;
+      for (vector<pkgIndexFile *>::iterator I = (*Indexes).begin(); I != (*Indexes).end(); ++I)
+        delete *I;
+      delete Indexes;
+   }

 };
 
 #endif
 };
 
 #endif