head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.4 pkgsrc-2013Q2-base:1.4 pkgsrc-2012Q4:1.4.0.2 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.3.0.8 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.6 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.4 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.2 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.2.0.50 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.48 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.46 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.44 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.42 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.40 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.38 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.36 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.34 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.32 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.30 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.28 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.26 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.24 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.22 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.20 pkgsrc-2008Q1:1.2.0.18 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.16 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.14 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.12 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.10 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.8 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.6 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.4 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.2 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.1.1.1.0.26 pkgsrc-2005Q4-base:1.1.1.1 pkgsrc-2005Q3:1.1.1.1.0.24 pkgsrc-2005Q3-base:1.1.1.1 pkgsrc-2005Q2:1.1.1.1.0.22 pkgsrc-2005Q2-base:1.1.1.1 pkgsrc-2005Q1:1.1.1.1.0.20 pkgsrc-2005Q1-base:1.1.1.1 pkgsrc-2004Q4:1.1.1.1.0.18 pkgsrc-2004Q4-base:1.1.1.1 pkgsrc-2004Q3:1.1.1.1.0.16 pkgsrc-2004Q3-base:1.1.1.1 pkgsrc-2004Q2:1.1.1.1.0.14 pkgsrc-2004Q2-base:1.1.1.1 pkgsrc-2004Q1:1.1.1.1.0.12 pkgsrc-2004Q1-base:1.1.1.1 pkgsrc-2003Q4:1.1.1.1.0.10 pkgsrc-2003Q4-base:1.1.1.1 netbsd-1-6-1:1.1.1.1.0.6 netbsd-1-6-1-base:1.1.1.1 netbsd-1-6:1.1.1.1.0.8 netbsd-1-6-RELEASE-base:1.1.1.1 pkgviews:1.1.1.1.0.4 pkgviews-base:1.1.1.1 buildlink2:1.1.1.1.0.2 buildlink2-base:1.1.1.1 netbsd-1-5-PATCH003:1.1.1.1 netbsd-1-5-PATCH001:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.4 date 2012.11.16.00.37.08; author joerg; state dead; branches; next 1.3; 1.3 date 2011.11.27.19.36.09; author joerg; state Exp; branches; next 1.2; 1.2 date 2006.01.05.17.12.35; author joerg; state Exp; branches; next 1.1; 1.1 date 2001.02.10.18.34.23; author tron; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2001.02.10.18.34.23; author tron; state Exp; branches; next ; desc @@ 1.4 log @Ensure that operator look up works with standard compliant compilers. Redo patches to be relative to WRKDIR. @ text @$NetBSD: patch-am,v 1.3 2011/11/27 19:36:09 joerg Exp $ --- ../spunk/coll.h.orig 1996-12-18 23:42:14.000000000 +0000 +++ ../spunk/coll.h @@@@ -24,7 +24,7 @@@@ #include -#include +#include #include "check.h" #include "object.h" @@@@ -33,8 +33,8 @@@@ -static const coIndexError = 1; // Index out of range -static const coOverflowError = 2; // Collection overflow +static const int coIndexError = 1; // Index out of range +static const int coOverflowError = 2; // Collection overflow @@@@ -479,15 +479,15 @@@@ int SortedCollection::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::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::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::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; @ 1.3 log @Fix build with newer GCC @ text @d1 1 a1 1 $NetBSD: patch-am,v 1.2 2006/01/05 17:12:35 joerg Exp $ @ 1.2 log @Fix template referening for GCC 3.4+. @ text @d1 1 a1 1 $NetBSD$ d5 9 @ 1.1 log @Initial revision @ text @d3 2 a4 2 --- ../spunk/coll.h.orig Wed Dec 18 23:42:14 1996 +++ ../spunk/coll.h Sat Feb 10 18:38:35 2001 d16 46 @ 1.1.1.1 log @Import new "estic" package: German language configuration tool for ISTEC 1003/1008 ISDN systems @ text @@