Mercurial > octave-nkf
changeset 9795:3ccd3a03944c
Fix fourth argument from sscanf
| author | David Grundberg <davidg@cs.umu.se> |
|---|---|
| date | Tue, 10 Nov 2009 17:17:38 -0500 |
| parents | 0d4613a736e9 |
| children | 5f24df61667a |
| files | src/ChangeLog src/oct-strstrm.h |
| diffstat | 2 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue Nov 10 15:02:25 2009 -0500 +++ b/src/ChangeLog Tue Nov 10 17:17:38 2009 -0500 @@ -1,3 +1,8 @@ +2009-11-10 David Grundberg <davidg@cs.umu.se> + + * oct-strstrm.h (octave_base_strstream::tell): Declare virtual. + (octave_istrstream::tell): New method. + 2009-11-10 John W. Eaton <jwe@octave.org> * Makefile.am, OPERATORS/module.mk, TEMPLATE-INST/module.mk,
--- a/src/oct-strstrm.h Tue Nov 10 15:02:25 2009 -0500 +++ b/src/oct-strstrm.h Tue Nov 10 17:17:38 2009 -0500 @@ -45,7 +45,7 @@ // Return current stream position. - long tell (void); + virtual long tell (void); // The name of the file. @@ -105,6 +105,8 @@ std::ostream *output_stream (void) { return 0; } + long tell (void) { return is.tellg (); } + std::streambuf *rdbuf (void) { return is ? is.rdbuf () : 0; } bool bad (void) const { return is.bad (); }