Mercurial > hg > octave-max
changeset 3560:e3e8cfe73935
[project @ 2000-02-03 05:28:16 by jwe]
| author | jwe |
|---|---|
| date | Thu, 03 Feb 2000 05:28:17 +0000 |
| parents | 12d7ec415f35 |
| children | 0345dd2a826f |
| files | src/ChangeLog src/oct-fstrm.cc src/oct-procbuf.h |
| diffstat | 3 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2000-02-02 John W. Eaton <jwe@bevo.che.wisc.edu> + * oct-procbuf.h: Include fstream, not streambuf.h. + * 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 +++ b/src/oct-fstrm.cc @@ -66,7 +66,7 @@ { fs.clear (); - filebuf *fb = fs.rdbuf (); + std::filebuf *fb = fs.rdbuf (); if (fb) { @@ -87,7 +87,7 @@ if (fs) { - filebuf *fb = fs.rdbuf (); + std::filebuf *fb = fs.rdbuf (); retval = static_cast<long> (fb->seekoff (0, std::ios::cur)); }
--- a/src/oct-procbuf.h +++ b/src/oct-procbuf.h @@ -26,22 +26,22 @@ #if !defined (octave_octave_procbuf_h) #define octave_octave_procbuf_h 1 -#include <streambuf.h> +#include <fstream> #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif class -octave_procbuf : public filebuf +octave_procbuf : public std::filebuf { public: octave_procbuf (void) - : filebuf (), wstatus (-1), proc_pid (-1), next (0) { } + : std::filebuf (), wstatus (-1), proc_pid (-1), next (0) { } octave_procbuf (const char *command, int mode) - : filebuf (), wstatus (-1), proc_pid (-1), next (0) + : std::filebuf (), wstatus (-1), proc_pid (-1), next (0) { open (command, mode); } ~octave_procbuf (void) { close (); } @@ -49,7 +49,7 @@ octave_procbuf *open (const char *command, int mode); octave_procbuf *close (void) - { return static_cast<octave_procbuf *> (filebuf::close ()); } + { return static_cast<octave_procbuf *> (std::filebuf::close ()); } virtual int sys_close (void);