[GRASS-SVN] r39701 - grass/branches/develbranch_6/include/iostream

[svn_grass at osgeo.org]

Author: neteler
Date: 2009-11-11 08:57:32 -0500 (Wed, 11 Nov 2009)
New Revision: 39701

Modified:
   grass/branches/develbranch_6/include/iostream/ami_sort_impl.h
Log:
Fix from Glynn/Moritz applied (trac #775)

Modified: grass/branches/develbranch_6/include/iostream/ami_sort_impl.h
===================================================================
--- grass/branches/develbranch_6/include/iostream/ami_sort_impl.h	2009-11-11 13:56:00 UTC (rev 39700)
+++ grass/branches/develbranch_6/include/iostream/ami_sort_impl.h	2009-11-11 13:57:32 UTC (rev 39701)
@@ -204,18 +204,18 @@
   }
   SDEBUG MM_manager.print();
  
-  //for (size_t i=0; i< nb_runs; i++) {
-  while(!instream->eof()) {
-    //crt_run_size = (i == nb_runs-1) ? last_run_size: run_size;
+  for (size_t i=0; i< nb_runs; i++) {
+  //while(!instream->eof()) {
+    crt_run_size = (i == nb_runs-1) ? last_run_size: run_size;
     
-    //SDEBUG cout << "i=" << i << ":  runsize=" << crt_run_size << ", ";  
+    SDEBUG cout << "i=" << i << ":  runsize=" << crt_run_size << ", ";  
 
-    crt_run_size = makeRun_Block(instream, data, run_size, cmp);
-/* #ifdef BLOCKED_RUN */
-/*     makeRun(instream, data, crt_run_size, cmp); */
-/* #else         */
-/*     makeRun_Block(instream, data, crt_run_size, cmp); */
-/* #endif */
+    //crt_run_size = makeRun_Block(instream, data, run_size, cmp);
+#ifdef BLOCKED_RUN 
+    makeRun(instream, data, crt_run_size, cmp);
+#else        
+    makeRun_Block(instream, data, crt_run_size, cmp);
+#endif
 
     SDEBUG MM_manager.print();