# HG changeset patch
# User jwe
# Date 953874928 0
# Node ID fed1847dfd6cad21cf34fe581c995786483eb349
# Parent  a76fa215a47665d907ef9ebbe84c0ec455474453
[project @ 2000-03-24 05:12:46 by jwe]

diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,13 @@
 2000-03-23  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* oct-stream.cc (OCTAVE_SCAN_0, OCTAVE_SCAN_1): New macros.
+	(do_scanf_conv, BEGIN_S_CONVERSION, BEGIN_CHAR_CLASS_CONVERSION,
+	do_scanf, scanf, do_oscanf, do_oscanf, oscanf): Use them instead
+	of calling istream::scan directly.
+	(octave_scan): New function.
+	(do_scanf_conv): Second arg is now scanf_format_elt instead of char*.
+	Change all callers.
+
 	* oct-procbuf.h, oct-procbuf.cc (octave_procbuf):
 	Derive from c_file_ptr_buf instead of filebuf.
 
diff --git a/src/oct-stream.cc b/src/oct-stream.cc
--- a/src/oct-stream.cc
+++ b/src/oct-stream.cc
@@ -1035,6 +1035,8 @@
 
   error ("formatted input only works when Octave is compiled with G++");
 
+  is.setstate (std::ios::failbit);
+
   return is;
 }