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

[svn_grass at osgeo.org]

Author: glynn
Date: 2012-09-03 17:55:35 -0700 (Mon, 03 Sep 2012)
New Revision: 53077

Modified:
   grass/trunk/include/iostream/embuffer.h
   grass/trunk/include/iostream/minmaxheap.h
Log:
Fix iostream bugs (bug #1714)


Modified: grass/trunk/include/iostream/embuffer.h
===================================================================
--- grass/trunk/include/iostream/embuffer.h	2012-09-03 15:51:41 UTC (rev 53076)
+++ grass/trunk/include/iostream/embuffer.h	2012-09-04 00:55:35 UTC (rev 53077)
@@ -380,8 +380,7 @@
      
   // return the number of items actually inserted 
   long insert(AMI_STREAM<T>* str, 
-	      //long bos=0); 
-	      long bos); 
+	      long bos=0);
   
   //print range of elements in buffer
   void print_range();
@@ -1137,7 +1136,7 @@
    
    return the number of items actually inserted */
 template<class T, class Key>
-long em_buffer<T,Key>::insert(AMI_STREAM<T>* str, long bos=0) {
+long em_buffer<T,Key>::insert(AMI_STREAM<T>* str, long bos) {
 
   assert(str);
   

Modified: grass/trunk/include/iostream/minmaxheap.h
===================================================================
--- grass/trunk/include/iostream/minmaxheap.h	2012-09-03 15:51:41 UTC (rev 53076)
+++ grass/trunk/include/iostream/minmaxheap.h	2012-09-04 00:55:35 UTC (rev 53077)
@@ -509,7 +509,7 @@
   T a, b;
   min(a);
   max(b);
-  if (size) {
+  if (size()) {
     cout << a.getPriority() << ".."
 	 << b.getPriority();
   }