Mercurial > hg > octave-nkf

changeset 3704:aef06675c94d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2000-07-20 19:21:23 by jwe]
author jwe
date Thu, 20 Jul 2000 19:21:24 +0000
parents ab42a049fc9d
children 7e90f4e9a4d5
files liboctave/oct-time.cc src/ChangeLog src/oct-stream.cc
diffstat 3 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/oct-time.cc
+++ b/liboctave/oct-time.cc
@@ -24,12 +24,12 @@
 #include <config.h>
 #endif
 
+#if 0
+
 // The following definitions are commented out because they cause
 // trouble on some systems.  What is really needed is a feature test
 // in the configure script.
 
-#if 0
-
 // I am told that without _BSD_SOURCE, tm_zone won't be declared on
 // some systems.  Defining _XOPEN_SOURCE provides the declaration for
 // strptime on some others.
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-20  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* oct-stream.cc (octave_base_stream::oscanf): Advance to next
+	format element before attempting to pick up any trailing stuff.
+
 2000-07-17  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* lex.l (next_token_is_bin_op): Don't recognize `..' as a binary op.
--- a/src/oct-stream.cc
+++ b/src/oct-stream.cc
@@ -1897,6 +1897,9 @@
 	      if (ok () && len > nconv)
 		{
 		  octave_value tmp;
+
+		  elt = fmt_list.next ();
+
 		  do_oscanf (elt, tmp);
 		}
 	    }