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

svn_grass at osgeo.org svn_grass at osgeo.org
Fri Dec 2 04:30:54 EST 2011


Author: mmetz
Date: 2011-12-02 01:30:54 -0800 (Fri, 02 Dec 2011)
New Revision: 49482

Modified:
   grass/trunk/include/iostream/ami_stream.h
   grass/trunk/include/iostream/replacementHeapBlock.h
Log:
fix compiler warnings

Modified: grass/trunk/include/iostream/ami_stream.h
===================================================================
--- grass/trunk/include/iostream/ami_stream.h	2011-12-02 04:34:57 UTC (rev 49481)
+++ grass/trunk/include/iostream/ami_stream.h	2011-12-02 09:30:54 UTC (rev 49482)
@@ -420,8 +420,8 @@
   }
 
   //debug stream_len:
-  DEBUG_STREAM_LEN fprintf(stderr, "%s: length = %lld   sizeof(T)=%d\n",
-	  path, buf.st_size, sizeof(T));
+  DEBUG_STREAM_LEN fprintf(stderr, "%s: length = %lld   sizeof(T)=%lud\n",
+	  path, (long long int)buf.st_size, sizeof(T));
 
   return (buf.st_size / sizeof(T));
 #endif

Modified: grass/trunk/include/iostream/replacementHeapBlock.h
===================================================================
--- grass/trunk/include/iostream/replacementHeapBlock.h	2011-12-02 04:34:57 UTC (rev 49481)
+++ grass/trunk/include/iostream/replacementHeapBlock.h	2011-12-02 09:30:54 UTC (rev 49482)
@@ -165,6 +165,7 @@
   mergeHeap = new BlockHeapElement<T>[arity];
   for (unsigned int i=0; i< arity; i++) {
     //pop a stream from the list  and add it to heap
+    str = NULL;
     runList->dequeue(&str);
     assert(str);
     addRun(str);



More information about the grass-commit mailing list