Mercurial > hg > octave-lyh
changeset 5949:c7105ffca0b6
[project @ 2006-08-22 02:37:41 by jwe]
author | jwe |
---|---|
date | Tue, 22 Aug 2006 02:37:41 +0000 |
parents | 8b4d38c76bfa |
children | 2b2e5a937c59 |
files | src/ChangeLog src/ls-mat5.cc |
diffstat | 2 files changed, 4 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2006-08-21 John W. Eaton <jwe@octave.org> + * ls-mat5.cc (read_mat5_binary_data, read_mat5_integer_data, + write_mat5_array): Unconditionally enable code for 64-bit int types. + * ov-fcn-handle.cc (DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA): For compatibility, set class to function_handle.
--- a/src/ls-mat5.cc +++ b/src/ls-mat5.cc @@ -157,16 +157,13 @@ case miRESERVE3: break; + // FIXME -- how are the 64-bit cases supposed to work here? case miINT64: -#ifdef int64_t read_doubles (is, data, LS_LONG, count, swap, flt_fmt); -#endif break; case miUINT64: -#ifdef int64_t read_doubles (is, data, LS_U_LONG, count, swap, flt_fmt); -#endif break; case miMATRIX: @@ -230,15 +227,11 @@ break; case miINT64: -#ifdef int64_t READ_INTEGER_DATA (int64_t, swap, m, 8, count, is); -#endif break; case miUINT64: -#ifdef int64_t READ_INTEGER_DATA (uint64_t, swap, m, 8, count, is); -#endif break; case miMATRIX: @@ -1104,13 +1097,9 @@ MAT5_DO_WRITE (uint32_t, data, nel, os); break; - // provide for 64 bit ints, even though get_save_type does - // not yet implement them -#ifdef int64_t case LS_U_LONG: MAT5_DO_WRITE (uint64_t, data, nel, os); break; -#endif case LS_CHAR: MAT5_DO_WRITE (int8_t, data, nel, os); @@ -1124,11 +1113,9 @@ MAT5_DO_WRITE (int32_t, data, nel, os); break; -#ifdef int64_t case LS_LONG: MAT5_DO_WRITE (int64_t, data, nel, os); break; -#endif case LS_FLOAT: MAT5_DO_WRITE (float, data, nel, os);