Mercurial > hg > octave-lyh
changeset 4835:66645e416d55
[project @ 2004-03-11 20:06:36 by jwe]
| author | jwe |
|---|---|
| date | Thu, 11 Mar 2004 20:06:36 +0000 |
| parents | 8f669cc5a901 |
| children | 518e495e489f |
| files | liboctave/ChangeLog liboctave/so-array.cc |
| diffstat | 2 files changed, 9 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,5 +1,8 @@ 2004-03-11 John W. Eaton <jwe@bevo.che.wisc.edu> + * so-array.cc (SND_CMP_OP, NDS_CMP_OP, NDND_CMP_OP): + Omit empty result args. + * Array.cc (Array<T>::Array (const Array<T>&, const dim_vector&)): Move here from Array.h, check that size of array arg is not smaller than the size defined by the new dimensions.
--- a/liboctave/so-array.cc +++ b/liboctave/so-array.cc @@ -106,14 +106,14 @@ return ::compute_index (ra_idx, dimensions); } -SND_CMP_OP (mx_el_eq, ==, std::streamoff, , streamoff_array, , FBM) -SND_CMP_OP (mx_el_ne, !=, std::streamoff, , streamoff_array, , TBM) +SND_CMP_OP (mx_el_eq, ==, std::streamoff, , streamoff_array, ) +SND_CMP_OP (mx_el_ne, !=, std::streamoff, , streamoff_array, ) -NDS_CMP_OP (mx_el_eq, ==, streamoff_array, , std::streamoff, , FBM) -NDS_CMP_OP (mx_el_ne, !=, streamoff_array, , std::streamoff, , TBM) +NDS_CMP_OP (mx_el_eq, ==, streamoff_array, , std::streamoff, ) +NDS_CMP_OP (mx_el_ne, !=, streamoff_array, , std::streamoff, ) -NDND_CMP_OP (mx_el_eq, ==, streamoff_array, , streamoff_array, , FBM, TBM) -NDND_CMP_OP (mx_el_ne, !=, streamoff_array, , streamoff_array, , TBM, FBM) +NDND_CMP_OP (mx_el_eq, ==, streamoff_array, , streamoff_array, ) +NDND_CMP_OP (mx_el_ne, !=, streamoff_array, , streamoff_array, ) NDND_BIN_OP (streamoff_array, operator +, streamoff_array, streamoff_array, mx_inline_add)