--- aapl/avlcommon.h.orig 2008-10-07 10:04:57.000000000 +1100 +++ aapl/avlcommon.h 2012-09-18 23:31:19.000000000 +1000 @@ -881,9 +881,9 @@ template 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 @@ -969,7 +969,7 @@ template 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 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 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 ) --- aapl/bstcommon.h.orig 2008-10-07 10:04:57.000000000 +1100 +++ aapl/bstcommon.h 2012-09-18 23:27:12.000000000 +1000 @@ -419,7 +419,7 @@ template 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 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 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;