Mercurial > octave-nkf
changeset 3517:ef5c83d6bffc
[project @ 2000-02-01 23:06:35 by jwe]
| author | jwe |
|---|---|
| date | Tue, 01 Feb 2000 23:06:35 +0000 |
| parents | 9118c2a3bc79 |
| children | 2dcc5f58ca0c |
| files | liboctave/ChangeLog liboctave/data-conv.cc |
| diffstat | 2 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/ChangeLog Tue Feb 01 23:01:08 2000 +0000 +++ b/liboctave/ChangeLog Tue Feb 01 23:06:35 2000 +0000 @@ -1,5 +1,8 @@ 2000-02-01 John W. Eaton <jwe@bevo.che.wisc.edu> + * data-conv.cc (LS_DO_WRITE): Cast arg to ostream::write to char*. + (LS_DO_READ): Likewise, for istream::read. + * oct-env.cc (octave_env::do_polite_directory_format): Use operator== and substr method to do limited-length string comparison.
--- a/liboctave/data-conv.cc Tue Feb 01 23:01:08 2000 +0000 +++ b/liboctave/data-conv.cc Tue Feb 01 23:06:35 2000 +0000 @@ -189,7 +189,7 @@ do \ { \ volatile TYPE *ptr = X_CAST (volatile TYPE *, data); \ - stream.read (X_CAST (TYPE *, ptr), size * len); \ + stream.read (X_CAST (char *, ptr), size * len); \ if (swap) \ swap_ ## size ## _bytes (ptr, len); \ TYPE tmp = ptr[0]; \ @@ -210,7 +210,7 @@ TYPE *ptr = new TYPE [len]; \ for (int i = 0; i < len; i++) \ ptr[i] = X_CAST (TYPE, data[i]); \ - stream.write (ptr, size * len); \ + stream.write (X_CAST (char *, ptr), size * len); \ delete [] ptr ; \ } \ while (0)