[GRASS-SVN] r51633 - grass/trunk/include/iostream

[svn_grass at osgeo.org]

Author: hamish
Date: 2012-05-16 12:51:41 -0700 (Wed, 16 May 2012)
New Revision: 51633

Modified:
   grass/trunk/include/iostream/minmaxheap.h
Log:
declare scope for fns, making g++ 4.7 happy (#1655)

Modified: grass/trunk/include/iostream/minmaxheap.h
===================================================================
--- grass/trunk/include/iostream/minmaxheap.h	2012-05-16 15:48:08 UTC (rev 51632)
+++ grass/trunk/include/iostream/minmaxheap.h	2012-05-16 19:51:41 UTC (rev 51633)
@@ -762,7 +762,7 @@
   //heap must be empty
   assert(this->size()==0);
   for (i = 0; !full() && i<n; i++) {
-    insert(arr[i]);
+    this->insert(arr[i]);
   }
   if (i < n) {
     assert(i == this->maxsize);
@@ -795,13 +795,13 @@
 
   if(old) {
 	HeapIndex n = this->size();
-	this->A = allocateHeap(this->maxsize);	/* allocate a new array */
+	this->A = this->allocateHeap(this->maxsize);  /* allocate a new array */
 	/* copy over the old values */
 	assert(this->maxsize > n);
 	for(HeapIndex i=0; i<=n; i++) {	/* why extra value? -RW */
 	  this->A[i] = old[i];
 	}	
-	freeHeap(old);				/* free up old storage */
+	this->freeHeap(old);			/* free up old storage */
   }
 
 }