From 7d0b3d06dc8d3e702c072428e1646d89df7722d8 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Thu, 5 Jan 2006 17:12:35 +0000
Subject: Fix template referening for GCC 3.4+.

---
 comms/estic/distinfo         |  4 ++--
 comms/estic/patches/patch-am | 52 +++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 51 insertions(+), 5 deletions(-)

(limited to 'comms')

diff --git a/comms/estic/distinfo b/comms/estic/distinfo
index d962d84ffb8..36533c5a375 100644
--- a/comms/estic/distinfo
+++ b/comms/estic/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2005/02/23 16:05:29 agc Exp $
+$NetBSD: distinfo,v 1.8 2006/01/05 17:12:35 joerg Exp $
 
 SHA1 (estic-1.60-sources.zip) = ce66a6d52faaf6adba492bb3f74e49eab608d0c3
 RMD160 (estic-1.60-sources.zip) = be071c72ab881c815dc9a0847f2b09914bdeb2ed
@@ -18,7 +18,7 @@ SHA1 (patch-ai) = d7fdcc29f357a9a8b0790e2491f577160d05db34
 SHA1 (patch-aj) = afaa7e22e01fc698418fb6543fe8e7f81feab106
 SHA1 (patch-ak) = 197a2dccb3433c8d48e2eb3b9a846e3992cd6b7c
 SHA1 (patch-al) = 2d813b690b07e390f4ec6718ef6add7320800807
-SHA1 (patch-am) = 161784c9d60262f5ab34192471bc3c5e05849b2f
+SHA1 (patch-am) = 4ff962e488ac6bd45f55127a6d1b2488db82081e
 SHA1 (patch-an) = 087a21d344336e2190c3e76b16670551686cd7c0
 SHA1 (patch-ao) = a6385f7d356d1422695a382b33db4fb150e14d7a
 SHA1 (patch-ap) = 1aee1dead27df8b62ba560dad19fe083fe8d6204
diff --git a/comms/estic/patches/patch-am b/comms/estic/patches/patch-am
index c1343ce8a76..af4af0593b9 100644
--- a/comms/estic/patches/patch-am
+++ b/comms/estic/patches/patch-am
@@ -1,7 +1,7 @@
-$NetBSD: patch-am,v 1.1.1.1 2001/02/10 18:34:23 tron Exp $
+$NetBSD: patch-am,v 1.2 2006/01/05 17:12:35 joerg Exp $
 
---- ../spunk/coll.h.orig	Wed Dec 18 23:42:14 1996
-+++ ../spunk/coll.h	Sat Feb 10 18:38:35 2001
+--- ../spunk/coll.h.orig	1996-12-18 23:42:14.000000000 +0000
++++ ../spunk/coll.h
 @@ -33,8 +33,8 @@
  
  
@@ -13,3 +13,49 @@ $NetBSD: patch-am,v 1.1.1.1 2001/02/10 18:34:23 tron Exp $
  
  
  
+@@ -479,15 +479,15 @@ int SortedCollection<T, U>::IndexOf (con
+ 
+     // Duplicates allowed. Do a linear search.
+     // (Hint: Search returns the first of all entrys with the same key)
+-    Item2 = (T*) Items [Index];
++    Item2 = (T*) this->Items [Index];
+     do {
+ 	if (Item2 == Item) {
+ 	    // That's it !
+ 	    return Index;
+ 	}
+ 	// Get next
+-	Item2 = (T*) Items [++Index];
+-    } while (Index < Count && Compare (Key, KeyOf (Item2)) == 0);
++	Item2 = (T*) this->Items [++Index];
++    } while (Index < this->Count && Compare (Key, KeyOf (Item2)) == 0);
+ 
+     // Item not found
+     return -1;
+@@ -522,7 +522,7 @@ int SortedCollection<T, U>::Search (cons
+ {
+     // do a binary search
+     int First = 0;
+-    int Last = Count - 1;
++    int Last = this->Count - 1;
+     int Current;
+     int Result;
+     int S = 0;
+@@ -533,7 +533,7 @@ int SortedCollection<T, U>::Search (cons
+ 	Current = (Last + First) / 2;
+ 
+ 	// Do a compare
+-	Result = Compare (KeyOf ((T*) Items [Current]), Key);
++	Result = Compare (KeyOf ((T*) this->Items [Current]), Key);
+ 	if (Result < 0) {
+ 	    First = Current + 1;
+ 	} else {
+@@ -577,7 +577,7 @@ T* SortedCollection<T, U>::Find (const U
+     int I;
+     if (Search (Key, I) != 0) {
+ 	// We found the key, I is the index
+-	return At (I);
++	return this->At (I);
+     } else {
+ 	// We did not find the key
+ 	return 0;
-- 
cgit v1.2.3