Mercurial > octave-nkf
changeset 3569:3796444c54a3
[project @ 2000-02-03 11:16:54 by jwe]
| author | jwe |
|---|---|
| date | Thu, 03 Feb 2000 11:16:55 +0000 |
| parents | 58549b931ad5 |
| children | f74d9dfec96f |
| files | liboctave/Array.h liboctave/ChangeLog src/file-io.cc |
| diffstat | 3 files changed, 11 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/Array.h Thu Feb 03 10:21:56 2000 +0000 +++ b/liboctave/Array.h Thu Feb 03 11:16:55 2000 +0000 @@ -83,7 +83,7 @@ void qsort (int (*compare) (const void *, const void *)) { - ::qsort (data, len, sizeof (T), compare); + ::qsort (data, static_cast<size_t> (len), sizeof (T), compare); } };
--- a/liboctave/ChangeLog Thu Feb 03 10:21:56 2000 +0000 +++ b/liboctave/ChangeLog Thu Feb 03 11:16:55 2000 +0000 @@ -1,3 +1,7 @@ +2000-02-03 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Array.h (Array::ArrayRep::qsort): Cast len to size_t. + 2000-02-01 John W. Eaton <jwe@bevo.che.wisc.edu> * oct-rl-edit.c, oct-rl-edit.h: New files for interface to GNU
--- a/src/file-io.cc Thu Feb 03 10:21:56 2000 +0000 +++ b/src/file-io.cc Thu Feb 03 11:16:55 2000 +0000 @@ -116,17 +116,17 @@ else if (mode == "a+") retval = std::ios::in | std::ios::out | std::ios::app; else if (mode == "rb") - retval = std::ios::in | std::ios::bin; + retval = std::ios::in | std::ios::binary; else if (mode == "wb") - retval = std::ios::out | std::ios::trunc | std::ios::bin; + retval = std::ios::out | std::ios::trunc | std::ios::binary; else if (mode == "ab") - retval = std::ios::out | std::ios::app | std::ios::bin; + retval = std::ios::out | std::ios::app | std::ios::binary; else if (mode == "r+b") - retval = std::ios::in | std::ios::out | std::ios::bin; + retval = std::ios::in | std::ios::out | std::ios::binary; else if (mode == "w+b") - retval = std::ios::in | std::ios::out | std::ios::trunc | std::ios::bin; + retval = std::ios::in | std::ios::out | std::ios::trunc | std::ios::binary; else if (mode == "a+b") - retval = std::ios::in | std::ios::out | std::ios::app | std::ios::bin; + retval = std::ios::in | std::ios::out | std::ios::app | std::ios::binary; else ::error ("invalid mode specified"); }