Mercurial > hg > octave-nkf
diff src/oct-stream.cc @ 2600:c454cd888ada
[project @ 1996-12-19 22:35:54 by jwe]
| author | jwe |
|---|---|
| date | Thu, 19 Dec 1996 22:35:55 +0000 |
| parents | 5c2be7c820ed |
| children | 3723512a827a |
line wrap: on
line diff
--- a/src/oct-stream.cc +++ b/src/oct-stream.cc @@ -887,9 +887,11 @@ do_scanf_conv (istream&, const char*, int*, Matrix&, double*, int&, int, int, bool); +#if 0 template void do_scanf_conv (istream&, const char*, float*, Matrix&, double*, int&, int, int, bool); +#endif template void do_scanf_conv (istream&, const char*, double*, Matrix&, double*, int&, @@ -982,20 +984,10 @@ case 'e': case 'f': case 'g': { - if (elt->modifier == 'l') - { - double tmp; - - do_scanf_conv (is, fmt, &tmp, mval, data, - count, nr, max_size, discard); - } - else - { - float tmp; - - do_scanf_conv (is, fmt, &tmp, mval, data, - count, nr, max_size, discard); - } + double tmp; + + do_scanf_conv (is, fmt, &tmp, mval, data, count, + nr, max_size, discard); } break; @@ -1231,8 +1223,10 @@ template octave_value do_oscanf_num_conv (istream&, const char*, int*, bool); +#if 0 template octave_value do_oscanf_num_conv (istream&, const char*, float*, bool); +#endif template octave_value do_oscanf_num_conv (istream&, const char*, double*, bool); @@ -1298,18 +1292,9 @@ case 'e': case 'f': case 'g': { - if (elt->modifier == 'l') - { - double tmp; - - retval = do_oscanf_num_conv (is, fmt, &tmp, discard); - } - else - { - float tmp; - - retval = do_oscanf_num_conv (is, fmt, &tmp, discard); - } + double tmp; + + retval = do_oscanf_num_conv (is, fmt, &tmp, discard); } break;