Mercurial > octave
changeset 21147:95feb42d7a97
* oct-stream.cc (OCTAVE_SCAN): Eliminate trivial macro.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 28 Jan 2016 14:37:54 -0500 |
parents | ea9c05014809 |
children | e8c3590da9ff |
files | libinterp/corefcn/oct-stream.cc |
diffstat | 1 files changed, 4 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/oct-stream.cc Thu Jan 28 00:15:33 2016 -0500 +++ b/libinterp/corefcn/oct-stream.cc Thu Jan 28 14:37:54 2016 -0500 @@ -1107,8 +1107,6 @@ return cnt; } -#define OCTAVE_SCAN(is, fmt, arg) octave_scan (is, fmt, arg) - template <typename T> std::istream& octave_scan_1 (std::istream& is, const scanf_format_elt& fmt, T* valptr) @@ -1256,7 +1254,7 @@ octave_idx_type& conversion_count, octave_idx_type nr, octave_idx_type max_size, bool discard) { - OCTAVE_SCAN (is, fmt, valptr); + octave_scan (is, fmt, valptr); if (! is) return; @@ -1970,7 +1968,7 @@ { int tmp; - if (OCTAVE_SCAN (is, *elt, &tmp)) + if (octave_scan (is, *elt, &tmp)) { if (! discard) retval = tmp; @@ -1984,7 +1982,7 @@ { long int tmp; - if (OCTAVE_SCAN (is, *elt, &tmp)) + if (octave_scan (is, *elt, &tmp)) { if (! discard) retval = tmp; @@ -1998,7 +1996,7 @@ { double tmp; - if (OCTAVE_SCAN (is, *elt, &tmp)) + if (octave_scan (is, *elt, &tmp)) { if (! discard) retval = tmp;