Mercurial > hg > octave-nkf
changeset 3624:770e36505264
[project @ 2000-03-23 06:39:16 by jwe]
author | jwe |
---|---|
date | Thu, 23 Mar 2000 06:40:21 +0000 |
parents | 35070534ea95 |
children | fa811b863d07 |
files | src/c_file_ptr_stream.cc src/c_file_ptr_stream.h |
diffstat | 2 files changed, 11 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/c_file_ptr_stream.cc +++ b/src/c_file_ptr_stream.cc @@ -85,9 +85,9 @@ static inline int seekdir_to_whence (std::ios::seekdir dir) { - return ((dir == ios::beg) ? SEEK_SET : - (dir == ios::cur) ? SEEK_CUR : - (dir == ios::end) ? SEEK_END : + return ((dir == std::ios::beg) ? SEEK_SET : + (dir == std::ios::cur) ? SEEK_CUR : + (dir == std::ios::end) ? SEEK_END : dir); }
--- a/src/c_file_ptr_stream.h +++ b/src/c_file_ptr_stream.h @@ -58,16 +58,16 @@ std::streamsize xsgetn (char *, std::streamsize); std::streampos seekoff (std::streamoff, std::ios::seekdir, - std::ios::openmode = ios::in | ios::out); + std::ios::openmode = std::ios::in | std::ios::out); std::streampos seekpos (std::streampos, - std::ios::openmode = ios::in | ios::out); + std::ios::openmode = std::ios::in | std::ios::out); int sync (void); }; class -i_c_file_ptr_stream : public istream +i_c_file_ptr_stream : public std::istream { private: @@ -75,13 +75,14 @@ public: - i_c_file_ptr_stream (FILE* f_arg) : istream (), f (f_arg) { init (&f); } + i_c_file_ptr_stream (FILE* f_arg) + : std::istream (), f (f_arg) { init (&f); } c_file_ptr_buf *rdbuf (void) { return &f; } }; class -o_c_file_ptr_stream : public ostream +o_c_file_ptr_stream : public std::ostream { private: @@ -89,7 +90,8 @@ public: - o_c_file_ptr_stream (FILE* f_arg) : ostream (), f (f_arg) { init (&f); } + o_c_file_ptr_stream (FILE* f_arg) + : std::ostream (), f (f_arg) { init (&f); } c_file_ptr_buf *rdbuf (void) { return &f; } };