[Debtags-commits] [svn] r1659 - in tagcoll/trunk: . tagcoll

[Peter Rockai]

Author: mornfall-guest
Date: Sat Mar 18 10:36:01 2006
New Revision: 1659

Modified:
   tagcoll/trunk/   (props changed)
   tagcoll/trunk/tagcoll/Patches.cc
Log:
 r9419 at lorien:  mornfall | 2006-03-18 11:34:37 +0100
 Compile fix with g++ 4.1 (strictness: template method access
 conflicting with global function: find).


Modified: tagcoll/trunk/tagcoll/Patches.cc
==============================================================================
--- tagcoll/trunk/tagcoll/Patches.cc	(original)
+++ tagcoll/trunk/tagcoll/Patches.cc	Sat Mar 18 10:36:01 2006
@@ -64,7 +64,7 @@
 	if (patch.getAdded().empty() && patch.getRemoved().empty())
 		return;
 
-	iterator i = find(patch.getItem());
+	iterator i = this->find(patch.getItem());
 	if (i == this->end())
 		insert(make_pair<ITEM, Patch<ITEM, TAG> >(patch.getItem(), patch));
 	else
@@ -91,7 +91,7 @@
 OpSet<TAG> PatchList<ITEM, TAG>::patch(const ITEM& item, const OpSet<TAG>& tagset) const throw ()
 {
 	// Find the patch record for this item
-	const_iterator p = find(item);
+	const_iterator p = this->find(item);
 	if (p == this->end())
 		// If there are no patches, return the tagset unchanged
 		return tagset;