浏览代码

Fix iostream bugs (bug https://trac.osgeo.org/grass/ticket/1714)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@53077 15284696-431f-4ddb-bdfa-cd5b030d7da7
Glynn Clements 12 年之前
父节点
当前提交
ca1ac8fd2c
共有 2 个文件被更改,包括 3 次插入4 次删除
  1. 2 3
      include/iostream/embuffer.h
  2. 1 1
      include/iostream/minmaxheap.h

+ 2 - 3
include/iostream/embuffer.h

@@ -380,8 +380,7 @@ public:
      
   // 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 @@ long em_buffer<T,Key>::insert(T* a, long n) {
    
    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);
   

+ 1 - 1
include/iostream/minmaxheap.h

@@ -509,7 +509,7 @@ void BasicMinMaxHeap<T>::print_range() const {
   T a, b;
   min(a);
   max(b);
-  if (size) {
+  if (size()) {
     cout << a.getPriority() << ".."
 	 << b.getPriority();
   }