Mercurial > octave-nkf

diff src/oct-stream.cc @ 10350:12884915a8e4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge MArray classes & improve Array interface
author Jaroslav Hajek <highegg@gmail.com>
date Sat, 23 Jan 2010 21:41:03 +0100
parents 57a59eae83cc
children da355a1a6d44
line wrap: on
line diff
--- a/src/oct-stream.cc	Mon Feb 22 23:07:21 2010 -0500
+++ b/src/oct-stream.cc	Sat Jan 23 21:41:03 2010 +0100
@@ -155,7 +155,7 @@
 }
 
 scanf_format_list::scanf_format_list (const std::string& s)
-  : nconv (0), curr_idx (0), list (16), buf (0)
+  : nconv (0), curr_idx (0), list (16, 1), buf (0)
 {
   octave_idx_type num_elts = 0;
 
@@ -228,7 +228,7 @@
   if (have_more)
     add_elt_to_list (width, discard, type, modifier, num_elts);
 
-  list.resize (num_elts);
+  list.resize (num_elts, 1);
 
   delete buf;
 }
@@ -260,7 +260,7 @@
                                     modifier, char_class);
 
           if (num_elts == list.length ())
-            list.resize (2 * num_elts);
+            list.resize (2 * num_elts, 1);
 
           list(num_elts++) = elt;
         }
@@ -575,7 +575,7 @@
 // Ugh again.
 
 printf_format_list::printf_format_list (const std::string& s)
-  : nconv (0), curr_idx (0), list (16), buf (0)
+  : nconv (0), curr_idx (0), list (16, 1), buf (0)
 {
   octave_idx_type num_elts = 0;
 
@@ -600,7 +600,7 @@
 
       list(num_elts++) = elt;
 
-      list.resize (num_elts);
+      list.resize (num_elts, 1);
     }
   else
     {
@@ -655,7 +655,7 @@
       if (have_more)
         add_elt_to_list (args, flags, fw, prec, type, modifier, num_elts);
 
-      list.resize (num_elts);
+      list.resize (num_elts, 1);
 
       delete buf;
     }
@@ -688,7 +688,7 @@
                                      type, modifier);
 
           if (num_elts == list.length ())
-            list.resize (2 * num_elts);
+            list.resize (2 * num_elts, 1);
 
           list(num_elts++) = elt;
         }