Attachment 600941 Details for Bug 843264 – patch to build with g++47

[patch] patch to build with g++47

ragel-6.6-gcc47-lookup.patch (text/plain), 4.43 KB, created by Mamoru TASAKA on 2012-07-28 17:36:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mamoru TASAKA

Created: 2012-07-28 17:36:56 UTC

Size: 4.43 KB

patch

obsolete

>--- ragel-6.6/aapl/avlcommon.h.gcc47	2008-10-08 04:36:00.000000000 +0900
>+++ ragel-6.6/aapl/avlcommon.h	2012-07-27 13:38:25.316949293 +0900
>@@ -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 )
>--- ragel-6.6/aapl/bstcommon.h.gcc47	2008-10-08 04:36:00.000000000 +0900
>+++ ragel-6.6/aapl/bstcommon.h	2012-07-27 13:38:25.317949416 +0900
>@@ -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;
>--- ragel-6.6/aapl/bubblesort.h.gcc47	2008-10-08 04:36:00.000000000 +0900
>+++ ragel-6.6/aapl/bubblesort.h	2012-07-27 13:38:25.322950031 +0900
>@@ -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. */
>--- ragel-6.6/aapl/mergesort.h.gcc47	2008-10-08 04:36:00.000000000 +0900
>+++ ragel-6.6/aapl/mergesort.h	2012-07-27 13:39:50.772464997 +0900
>@@ -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) );

Actions: View | Diff

Attachments on bug 843264: 600941