[Aptitude-svn-commit] r3664 - in branches/aptitude-0.3/aptitude: . src/generic

[Daniel Burrows]

Author: dburrows
Date: Sat Jul 23 19:28:44 2005
New Revision: 3664

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/matchers.cc
   branches/aptitude-0.3/aptitude/src/generic/matchers.h
Log:
Adjust some minor implementation stuff so it links.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Jul 23 19:28:44 2005
@@ -2,6 +2,13 @@
 
 	* src/generic/matchers.cc, src/generic/matchers.h:
 
+	  Move implementation of ~pkg_matcher to the .cc file,
+	  mark get_match in pkg_matcher as abstract; give get_match
+	  in pkg_task_matcher the correct signature to implement
+	  the abstract interface.
+
+	* src/generic/matchers.cc, src/generic/matchers.h:
+
 	  Add support for retrieving a string corresponding to a match.
 
 2005-07-22  Daniel Burrows  <dburrows at debian.org>

Modified: branches/aptitude-0.3/aptitude/src/generic/matchers.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/matchers.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/matchers.cc	Sat Jul 23 19:28:44 2005
@@ -81,6 +81,10 @@
 {
 }
 
+pkg_matcher::~pkg_matcher()
+{
+}
+
 /** A common class to use when there's no interesting result.  This is
  *  distinct from a match failure: an example would be the
  *  auto_matcher.
@@ -396,8 +400,8 @@
   }
 
   // Uses the fact that the result returns NULL <=> nothing matched
-  pkg_match_result *get_match(pkgCache::PkgIterator &pkg,
-			      pkgCache::VerIterator &ver)
+  pkg_match_result *get_match(const pkgCache::PkgIterator &pkg,
+			      const pkgCache::VerIterator &ver)
   {
     list<string> *l=get_tasks(pkg);
 

Modified: branches/aptitude-0.3/aptitude/src/generic/matchers.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/matchers.h	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/matchers.h	Sat Jul 23 19:28:44 2005
@@ -53,8 +53,8 @@
    *  the caller's responsibility to delete this.
    */
   virtual pkg_match_result *get_match(const pkgCache::PkgIterator &pkg,
-				      const pkgCache::VerIterator &ver);
-  virtual ~pkg_matcher() {}
+				      const pkgCache::VerIterator &ver)=0;
+  virtual ~pkg_matcher();
 };
 
 /** Parse the given pattern, returning a matcher.