Mercurial > octave-nkf
diff src/oct-stdstrm.h @ 10288:5e972e2deffe
avoid some possible gnulib #defines
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 09 Feb 2010 20:10:35 -0500 |
| parents | cd96d29c5efa |
| children | f3b65e1ae355 |
line wrap: on
line diff
--- a/src/oct-stdstrm.h Tue Feb 09 17:44:22 2010 -0500 +++ b/src/oct-stdstrm.h Tue Feb 09 20:10:35 2010 -0500 @@ -37,7 +37,7 @@ std::ios::openmode m = std::ios::in|std::ios::out, oct_mach_info::float_format ff = oct_mach_info::native_float_format (), - typename BUF_T::close_fcn cf = BUF_T::fclose) + typename BUF_T::close_fcn cf = BUF_T::file_close) : octave_base_stream (m, ff), nm (n), md (m), s (f ? new STREAM_T (f, cf) : 0) { } @@ -47,7 +47,7 @@ std::ios::openmode m = std::ios::in|std::ios::out, oct_mach_info::float_format ff = oct_mach_info::native_float_format (), - typename BUF_T::close_fcn cf = BUF_T::fclose) + typename BUF_T::close_fcn cf = BUF_T::file_close) { return octave_stream (new octave_tstdiostream (n, f, m, ff, cf)); } @@ -81,7 +81,7 @@ void clear (void) { if (s) s->clear (); } - void do_close (void) { if (s) s->close (); } + void do_close (void) { if (s) s->stream_close (); } protected: