Mercurial > octave-nkf
changeset 11079:dc4f8dfe5325
oct-stdstrm.h: avoid problems if fileno is a macro
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 05 Oct 2010 14:43:15 -0400 |
| parents | 2aec7e3b8553 |
| children | 36ceff79607b |
| files | src/ChangeLog src/oct-stdstrm.h |
| diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue Oct 05 03:29:43 2010 -0400 +++ b/src/ChangeLog Tue Oct 05 14:43:15 2010 -0400 @@ -1,3 +1,8 @@ +2010-10-05 John W. Eaton <jwe@octave.org> + + * oct-stdstrm.h (octave_stdiostream::octave_stdiostream): Use + fileno instead of ::fileno to avoid problems if fileno is a macro. + 2010-10-04 Shai Ayal <shaiay@users.sourceforge.net> * graphics.h.in (axis::properties::pixel_size): New function.
--- a/src/oct-stdstrm.h Tue Oct 05 03:29:43 2010 -0400 +++ b/src/oct-stdstrm.h Tue Oct 05 14:43:15 2010 -0400 @@ -108,7 +108,7 @@ oct_mach_info::float_format ff = oct_mach_info::native_float_format (), c_file_ptr_buf::close_fcn cf = c_file_ptr_buf::file_close) - : octave_tstdiostream<c_file_ptr_buf, io_c_file_ptr_stream, FILE *> (n, f, f ? ::fileno (f) : -1, m, ff, cf) { } + : octave_tstdiostream<c_file_ptr_buf, io_c_file_ptr_stream, FILE *> (n, f, f ? fileno (f) : -1, m, ff, cf) { } static octave_stream create (const std::string& n, FILE *f = 0,