Fix template look up.

5 files changed, 156 insertions, 1 deletions

diff --git a/devel/ragel/distinfo b/devel/ragel/distinfo
index 2f45536e6f1..8b8006c0d98 100644
--- a/devel/ragel/distinfo
+++ b/devel/ragel/distinfo
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.5 2011/09/12 16:19:45 taca Exp $
+$NetBSD: distinfo,v 1.6 2012/11/19 02:53:27 joerg Exp $
 
 SHA1 (ragel-6.7.tar.gz) = bf12b634f5a25e5ba305edfee59a455069ed3b0a
 RMD160 (ragel-6.7.tar.gz) = 003a29121bd44cdcdddd0721524fe90cf421c05d
 Size (ragel-6.7.tar.gz) = 1182734 bytes
+SHA1 (patch-aapl_avlcommon.h) = b0023b24e2ead4e196f2cacb58b9cd5b0b02b655
+SHA1 (patch-aapl_bstcommon.h) = 2d672f350c72a332de62396ef05cd05482a82b31
+SHA1 (patch-aapl_bubblesort.h) = 05233121bf82b91c4fdb65a2a2b7589ff27b820e
+SHA1 (patch-aapl_mergesort.h) = 42fc0fa8eadd476f599ee05b83f150a04993ad76
diff --git a/devel/ragel/patches/patch-aapl_avlcommon.h b/devel/ragel/patches/patch-aapl_avlcommon.h
new file mode 100644
index 00000000000..472b5b6480a
--- /dev/null
+++ b/devel/ragel/patches/patch-aapl_avlcommon.h
@@ -0,0 +1,52 @@
+$NetBSD: patch-aapl_avlcommon.h,v 1.1 2012/11/19 02:53:28 joerg Exp $
+
+--- aapl/avlcommon.h.orig	2012-11-19 02:08:19.000000000 +0000
++++ aapl/avlcommon.h
+@@ -881,9 +881,9 @@ template <AVLMEL_TEMPDEF> Element *AvlTr
+ 		}
+ 
+ #ifdef AVL_BASIC
+-		keyRelation = compare( *element, *curEl );
++		keyRelation = this->compare( *element, *curEl );
+ #else
+-		keyRelation = compare( element->BASEKEY(getKey()), 
++		keyRelation = this->compare( element->BASEKEY(getKey()), 
+ 				curEl->BASEKEY(getKey()) );
+ #endif
+ 
+@@ -920,7 +920,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTr
+ 	long keyRelation;
+ 
+ 	while (curEl) {
+-		keyRelation = compare( *element, *curEl );
++		keyRelation = this->compare( *element, *curEl );
+ 
+ 		/* Do we go left? */
+ 		if ( keyRelation < 0 )
+@@ -969,7 +969,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTr
+ 			return element;
+ 		}
+ 
+-		keyRelation = compare( key, curEl->BASEKEY(getKey()) );
++		keyRelation = this->compare( key, curEl->BASEKEY(getKey()) );
+ 
+ 		/* Do we go left? */
+ 		if ( keyRelation < 0 ) {
+@@ -1023,7 +1023,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTr
+ 			return element;
+ 		}
+ 
+-		keyRelation = compare(key, curEl->getKey());
++		keyRelation = this->compare(key, curEl->getKey());
+ 
+ 		/* Do we go left? */
+ 		if ( keyRelation < 0 ) {
+@@ -1058,7 +1058,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTr
+ 	long keyRelation;
+ 
+ 	while (curEl) {
+-		keyRelation = compare( key, curEl->BASEKEY(getKey()) );
++		keyRelation = this->compare( key, curEl->BASEKEY(getKey()) );
+ 
+ 		/* Do we go left? */
+ 		if ( keyRelation < 0 )
diff --git a/devel/ragel/patches/patch-aapl_bstcommon.h b/devel/ragel/patches/patch-aapl_bstcommon.h
new file mode 100644
index 00000000000..e268ec1ca37
--- /dev/null
+++ b/devel/ragel/patches/patch-aapl_bstcommon.h
@@ -0,0 +1,73 @@
+$NetBSD: patch-aapl_bstcommon.h,v 1.1 2012/11/19 02:53:28 joerg Exp $
+
+--- aapl/bstcommon.h.orig	2012-11-19 02:08:41.000000000 +0000
++++ aapl/bstcommon.h
+@@ -361,7 +361,7 @@ template <BST_TEMPL_DEF> bool BstTable<B
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(key, GET_KEY(*mid));
++		keyRelation = this->compare(key, GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+@@ -373,12 +373,12 @@ template <BST_TEMPL_DEF> bool BstTable<B
+ 
+ 			lower = mid - 1;
+ 			while ( lower != lowEnd && 
+-					compare(key, GET_KEY(*lower)) == 0 )
++					this->compare(key, GET_KEY(*lower)) == 0 )
+ 				lower--;
+ 
+ 			upper = mid + 1;
+ 			while ( upper != highEnd && 
+-					compare(key, GET_KEY(*upper)) == 0 )
++					this->compare(key, GET_KEY(*upper)) == 0 )
+ 				upper++;
+ 			
+ 			low = (Element*)lower + 1;
+@@ -419,7 +419,7 @@ template <BST_TEMPL_DEF> Element *BstTab
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(key, GET_KEY(*mid));
++		keyRelation = this->compare(key, GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+@@ -457,7 +457,7 @@ template <BST_TEMPL_DEF> Element *BstTab
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(key, GET_KEY(*mid));
++		keyRelation = this->compare(key, GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+@@ -508,7 +508,7 @@ template <BST_TEMPL_DEF> Element *BstTab
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(key, GET_KEY(*mid));
++		keyRelation = this->compare(key, GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+@@ -603,7 +603,7 @@ template <BST_TEMPL_DEF> Element *BstTab
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(GET_KEY(el), GET_KEY(*mid));
++		keyRelation = this->compare(GET_KEY(el), GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+@@ -662,7 +662,7 @@ template <BST_TEMPL_DEF> Element *BstTab
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(GET_KEY(el), GET_KEY(*mid));
++		keyRelation = this->compare(GET_KEY(el), GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
diff --git a/devel/ragel/patches/patch-aapl_bubblesort.h b/devel/ragel/patches/patch-aapl_bubblesort.h
new file mode 100644
index 00000000000..a986be830c0
--- /dev/null
+++ b/devel/ragel/patches/patch-aapl_bubblesort.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-aapl_bubblesort.h,v 1.1 2012/11/19 02:53:28 joerg Exp $
+
+--- aapl/bubblesort.h.orig	2012-11-19 02:09:50.000000000 +0000
++++ aapl/bubblesort.h
+@@ -72,7 +72,7 @@ template <class T, class Compare> void B
+ 		changed = false;
+ 		for ( long i = 0; i < len-pass; i++ ) {
+ 			/* Do we swap pos with the next one? */
+-			if ( compare( data[i], data[i+1] ) > 0 ) {
++			if ( this->compare( data[i], data[i+1] ) > 0 ) {
+ 				char tmp[sizeof(T)];
+ 
+ 				/* Swap the two items. */
diff --git a/devel/ragel/patches/patch-aapl_mergesort.h b/devel/ragel/patches/patch-aapl_mergesort.h
new file mode 100644
index 00000000000..ee5e237634b
--- /dev/null
+++ b/devel/ragel/patches/patch-aapl_mergesort.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-aapl_mergesort.h,v 1.1 2012/11/19 02:53:28 joerg Exp $
+
+--- aapl/mergesort.h.orig	2012-11-19 02:09:32.000000000 +0000
++++ aapl/mergesort.h
+@@ -110,7 +110,7 @@ template< class T, class Compare> void M
+ 		}
+ 		else {
+ 			/* Both upper and lower left. */
+-			if ( compare(*lower, *upper) <= 0 )
++			if ( this->compare(*lower, *upper) <= 0 )
+ 				memcpy( dest++, lower++, sizeof(T) );
+ 			else
+ 				memcpy( dest++, upper++, sizeof(T) );