Mercurial > hg > octave-max
changeset 5136:100f9c190be4
[project @ 2005-02-09 08:02:58 by jwe]
| author | jwe |
|---|---|
| date | Wed, 09 Feb 2005 08:04:05 +0000 |
| parents | 8eaef366ab43 |
| children | 5ee7da8b8a4b |
| files | liboctave/Array-util.cc liboctave/ChangeLog src/ChangeLog src/symtab.h |
| diffstat | 4 files changed, 14 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/Array-util.cc +++ b/liboctave/Array-util.cc @@ -208,8 +208,11 @@ retval.resize (n); + static const char *tag[3] = { "row", "column", 0 }; + for (int i = 0; i < n; i++) - retval(i) = ra_idx(i).freeze (dimensions(i), "XXX FIXME XXX", resize_ok); + retval(i) = ra_idx(i).freeze (dimensions(i), tag[i < 2 ? i : 3], + resize_ok); return retval; }
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,3 +1,7 @@ +2005-02-08 John W. Eaton <jwe@octave.org> + + * Array-util.cc (freeze): Improve error message. + 2005-01-26 David Bateman <dbateman@free.fr> * Array.cc (Array<T>::insert): Handle generic case, not just
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2005-02-08 Walter Landry <landry@osc.edu> + + * symtab.h (symbol_record::mark_as_command): Avoid AIX compiler error. + 2005-02-07 John W. Eaton <jwe@octave.org> * DLD-FUNCTIONS/find.cc (find_nonzero_elem_idx): Return [] instead
--- a/src/symtab.h +++ b/src/symtab.h @@ -116,8 +116,9 @@ bool is_user_variable (void) const { return (symbol_type & symbol_record::USER_VARIABLE); } + // Don't use |= here to avoid error with AIX compiler. void mark_as_command (void) - { symbol_type |= symbol_record::COMMAND; } + { symbol_type = symbol_type | symbol_record::COMMAND; } void unmark_command (void) { symbol_type &= ~symbol_record::COMMAND; }