tags 667348 + patch tags 667348 + pending thanks Dear maintainer,
I've prepared an NMU for ragel (versioned as 6.7-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: The Doors: Light My Fire
diff -u ragel-6.7/debian/changelog ragel-6.7/debian/changelog
--- ragel-6.7/debian/changelog
+++ ragel-6.7/debian/changelog
@@ -1,3 +1,12 @@
+ragel (6.7-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix "ftbfs with GCC-4.7": add this-> qualifiers to various .h files,
+ needed by gcc 4.7.
+ (Closes: #667348)
+
+ -- gregor herrmann <gre...@debian.org> Fri, 11 May 2012 01:38:35 +0200
+
ragel (6.7-1) unstable; urgency=low
* New upstream release (closes: #633488)
only in patch2:
unchanged:
--- ragel-6.7.orig/aapl/mergesort.h
+++ ragel-6.7/aapl/mergesort.h
@@ -110,7 +110,7 @@
}
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) );
only in patch2:
unchanged:
--- ragel-6.7.orig/aapl/avlcommon.h
+++ ragel-6.7/aapl/avlcommon.h
@@ -881,9 +881,9 @@
}
#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 @@
long keyRelation;
while (curEl) {
- keyRelation = compare( *element, *curEl );
+ keyRelation = this->compare( *element, *curEl );
/* Do we go left? */
if ( keyRelation < 0 )
@@ -969,7 +969,7 @@
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 @@
return element;
}
- keyRelation = compare(key, curEl->getKey());
+ keyRelation = this->compare(key, curEl->getKey());
/* Do we go left? */
if ( keyRelation < 0 ) {
@@ -1058,7 +1058,7 @@
long keyRelation;
while (curEl) {
- keyRelation = compare( key, curEl->BASEKEY(getKey()) );
+ keyRelation = this->compare( key, curEl->BASEKEY(getKey()) );
/* Do we go left? */
if ( keyRelation < 0 )
only in patch2:
unchanged:
--- ragel-6.7.orig/aapl/bubblesort.h
+++ ragel-6.7/aapl/bubblesort.h
@@ -72,7 +72,7 @@
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. */
only in patch2:
unchanged:
--- ragel-6.7.orig/aapl/bstcommon.h
+++ ragel-6.7/aapl/bstcommon.h
@@ -361,7 +361,7 @@
}
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 @@
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 @@
}
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 @@
}
mid = lower + ((upper-lower)>>1);
- keyRelation = compare(key, GET_KEY(*mid));
+ keyRelation = this->compare(key, GET_KEY(*mid));
if ( keyRelation < 0 )
upper = mid - 1;
@@ -662,7 +662,7 @@
}
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;
signature.asc
Description: Digital signature
