Mercurial > octave
changeset 3570:f74d9dfec96f
[project @ 2000-02-03 11:27:10 by jwe]
| author | jwe |
|---|---|
| date | Thu, 03 Feb 2000 11:27:11 +0000 |
| parents | 3796444c54a3 |
| children | f2e2faef1220 |
| files | src/ChangeLog src/oct-fstrm.cc src/oct-fstrm.h |
| diffstat | 3 files changed, 13 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Feb 03 11:16:55 2000 +0000 +++ b/src/ChangeLog Thu Feb 03 11:27:11 2000 +0000 @@ -1,5 +1,8 @@ 2000-02-03 John W. Eaton <jwe@bevo.che.wisc.edu> + * oct-fstrm.cc (octave_fstream::seek, octave_fstream::tell): + Call pubseekoff instead of seekoff. + * DLD-FUNCTIONS/dassl.cc (print_dassl_option_list): Use stream manipulators instead of GNU iostream-specific form function. * DLD-FUNCTIONS/fsolve.cc (print_fsolve_option_list): Ditto. @@ -51,7 +54,7 @@ * oct-procbuf.h: Include fstream, not streambuf.h. - * load-save.cc (Fsave): Call pubseekoff instead of seekoff. + * load-save.cc (Fsave): Call pubseekoff instead of seekoff. * oct-strstrm.cc (octave_base_strstream::tell): Likewise. (octave_base_strstream::seek): Likewise.
--- a/src/oct-fstrm.cc Thu Feb 03 11:16:55 2000 +0000 +++ b/src/oct-fstrm.cc Thu Feb 03 11:27:11 2000 +0000 @@ -31,21 +31,21 @@ #include "oct-fstrm.h" octave_stream -octave_fstream::create (const std::string& nm_arg, std::ios::openmode md, +octave_fstream::create (const std::string& nm_arg, std::ios::openmode arg_md, oct_mach_info::float_format flt_fmt) { - return octave_stream (new octave_fstream (nm_arg, md, flt_fmt)); + return octave_stream (new octave_fstream (nm_arg, arg_md, flt_fmt)); } octave_fstream::octave_fstream (const std::string& nm_arg, - std::ios::openmode md, + std::ios::openmode arg_md, oct_mach_info::float_format flt_fmt) - : octave_base_stream (md, flt_fmt), nm (nm_arg) + : octave_base_stream (arg_md, flt_fmt), nm (nm_arg) { // Override default protection of 0664 so that umask will appear to // do the right thing. - fs.open (nm.c_str (), md, 0666); + fs.open (nm.c_str (), arg_md, 0666); if (! fs) { @@ -70,7 +70,7 @@ if (fb) { - fb->seekoff (offset, origin); + fb->pubseekoff (offset, origin); retval = fs.bad () ? -1 : 0; } } @@ -88,7 +88,7 @@ if (fs) { std::filebuf *fb = fs.rdbuf (); - retval = static_cast<long> (fb->seekoff (0, std::ios::cur)); + retval = static_cast<long> (fb->pubseekoff (0, std::ios::cur)); } return retval;
--- a/src/oct-fstrm.h Thu Feb 03 11:16:55 2000 +0000 +++ b/src/oct-fstrm.h Thu Feb 03 11:27:11 2000 +0000 @@ -33,13 +33,13 @@ public: octave_fstream (const std::string& nm_arg, - std::ios::openmode md = std::ios::in|std::ios::out, + std::ios::openmode arg_md = std::ios::in|std::ios::out, oct_mach_info::float_format flt_fmt = oct_mach_info::native); static octave_stream create (const std::string& nm_arg, - std::ios::openmode md = std::ios::in|std::ios::out, + std::ios::openmode arg_md = std::ios::in|std::ios::out, oct_mach_info::float_format flt_fmt = oct_mach_info::native); // Position a stream at OFFSET relative to ORIGIN.