Merge branch 'debian/sid' into debian/experimental

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

diff --git a/apt-pkg/cachefilter.h b/apt-pkg/cachefilter.h
index f55d5c7f7be27d5d9a2503d89fc46bd2b758f3d9..d9b957c674dbd628e46243a2e50e6b79f2890bb6 100644 (file)
--- a/apt-pkg/cachefilter.h
+++ b/apt-pkg/cachefilter.h
@@ -7,6 +7,7 @@
 #define APT_CACHEFILTER_H
 // Include Files                                                       /*{{{*/
 #include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
 
 #include <string>
 
@@ -17,9 +18,12 @@ namespace CacheFilter {
 
 class PackageMatcher {
  public:
-   virtual bool operator() (pkgCache::PkgIterator const &Pkg) { return false; };
-   virtual bool operator() (pkgCache::GrpIterator const &Grp) { return false; };
-   virtual bool operator() (pkgCache::VerIterator const &Ver) { return false; };
+   virtual bool operator() (pkgCache::PkgIterator const &/*Pkg*/) { 
+      return false; };
+   virtual bool operator() (pkgCache::GrpIterator const &/*Grp*/) { 
+      return false; };
+   virtual bool operator() (pkgCache::VerIterator const &/*Ver*/) {
+      return false; };
    
    virtual ~PackageMatcher() {};
 };
@@ -33,11 +37,11 @@ public:
        PackageNameMatchesRegEx(std::string const &Pattern);
        virtual bool operator() (pkgCache::PkgIterator const &Pkg);
        virtual bool operator() (pkgCache::GrpIterator const &Grp);
-       ~PackageNameMatchesRegEx();
+       virtual ~PackageNameMatchesRegEx();
 };
                                                                        /*}}}*/
 // PackageNameMatchesFnmatch                                           /*{{{*/
- class PackageNameMatchesFnmatch : public PackageMatcher{
+   class PackageNameMatchesFnmatch : public PackageMatcher{
          /** \brief dpointer placeholder (for later in case we need it) */
          void *d;
          const std::string Pattern;
@@ -46,7 +50,7 @@ public:
             : Pattern(Pattern) {};
         virtual bool operator() (pkgCache::PkgIterator const &Pkg);
        virtual bool operator() (pkgCache::GrpIterator const &Grp);
-       ~PackageNameMatchesFnmatch() {};
+       virtual ~PackageNameMatchesFnmatch() {};
 };
                                                                        /*}}}*/
 // PackageArchitectureMatchesSpecification                             /*{{{*/
@@ -76,7 +80,7 @@ public:
        bool operator() (char const * const &arch);
        virtual bool operator() (pkgCache::PkgIterator const &Pkg);
        virtual bool operator() (pkgCache::VerIterator const &Ver);
-       ~PackageArchitectureMatchesSpecification();
+       virtual ~PackageArchitectureMatchesSpecification();
 };
                                                                        /*}}}*/
 }