Browse Source

fix compiler warnings

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@49482 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Metz 13 years ago
parent
commit
2dd4c0fa53
2 changed files with 3 additions and 2 deletions
  1. 2 2
      include/iostream/ami_stream.h
  2. 1 0
      include/iostream/replacementHeapBlock.h

+ 2 - 2
include/iostream/ami_stream.h

@@ -420,8 +420,8 @@ off_t AMI_STREAM<T>::stream_len(void) {
   }
 
   //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

+ 1 - 0
include/iostream/replacementHeapBlock.h

@@ -165,6 +165,7 @@ ReplacementHeapBlock<T,Compare>
   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);