[GRASS5] PATCH: r.terraflow

[Brad Douglas]

I've also had trouble compiling r.terraflow for some time.
Investigation proved to show C++ templates to be the culprit.

Any objections to the attached patch?  I'm no C++ expert (read: avoided
like plague :), so I would appreciate it if some of the more experienced
programmers looked over the patch.

Thanks!


-- 
Brad Douglas <rez at touchofmadness.com>
-------------- next part --------------
? OBJ.x86_64-unknown-linux-gnu
? IOStream/lib/src/ami_stream.d
? IOStream/lib/src/mm.d
? IOStream/lib/src/mm_utils.d
? IOStream/lib/src/rtimer.d
Index: IOStream/include/replacementHeap.h
===================================================================
RCS file: /grassrepository/grass6/raster/r.terraflow/IOStream/include/replacementHeap.h,v
retrieving revision 2.0
diff -u -r2.0 replacementHeap.h
--- IOStream/include/replacementHeap.h	9 Nov 2004 13:30:48 -0000	2.0
+++ IOStream/include/replacementHeap.h	15 Jun 2005 12:18:41 -0000
@@ -152,7 +152,7 @@
 
 /*****************************************************************/
 template<class T,class Compare>
-ReplacementHeap<T,Compare>::ReplacementHeap<T,Compare>(size_t g_arity, 
+ReplacementHeap<T,Compare>::ReplacementHeap(size_t g_arity, 
 						       queue<char*>* runList) {
   char* name;
   
Index: IOStream/include/replacementHeapBlock.h
===================================================================
RCS file: /grassrepository/grass6/raster/r.terraflow/IOStream/include/replacementHeapBlock.h,v
retrieving revision 2.0
diff -u -r2.0 replacementHeapBlock.h
--- IOStream/include/replacementHeapBlock.h	9 Nov 2004 13:30:45 -0000	2.0
+++ IOStream/include/replacementHeapBlock.h	15 Jun 2005 12:18:41 -0000
@@ -157,8 +157,8 @@
 /*****************************************************************/
 //allocate array mergeHeap, where the streams are stored in runList
 template<class T,class Compare>
-ReplacementHeapBlock<T,Compare>
-::ReplacementHeapBlock<T,Compare>(queue <MEM_STREAM<T>*> *runList) {
+ReplacementHeapBlock<T,Compare>::ReplacementHeapBlock(queue <MEM_STREAM<T>*> *runList)
+{
   
   RBHEAP_DEBUG cerr << "ReplacementHeapBlock " << endl;