Mercurial > hg > octave-nkf
changeset 5887:39cbf6a484bb
[project @ 2006-07-14 21:02:33 by jwe]
author | jwe |
---|---|
date | Fri, 14 Jul 2006 21:02:51 +0000 |
parents | b9676944b7a2 |
children | c5b54890f3d1 |
files | scripts/miscellaneous/orderfields.m src/ChangeLog src/oct-stream.cc |
diffstat | 3 files changed, 36 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/miscellaneous/orderfields.m +++ b/scripts/miscellaneous/orderfields.m @@ -54,14 +54,14 @@ ## Two structures: return the fields in the order of s2. names = fieldnames (s2); if (! isequal (sort (fieldnames (s1)), sort (names))) - error ("orderfields: s1 and s2 do not have same fields"); + error ("orderfields: structures do not have same fields"); endif elseif (iscellstr (s2)) ## A structure and a list of fields: order by the list of fields. t1 = sort (fieldnames (s1)); t2 = sort (s2(:)); if (! isequal (t1, t2)) - error ("orderfields: invalid cell array of field names"); + error ("orderfields: name list does not match structure fields"); endif names = s2; elseif (isvector (s2))
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2006-07-14 John W. Eaton <jwe@octave.org> + * oct-stream.cc (do_write): Include explicit instantiations. + * ov-str-mat.h (octave_char_matrix_sq_str::resize): Include fill arg to match base class.
--- a/src/oct-stream.cc +++ b/src/oct-stream.cc @@ -3448,6 +3448,38 @@ return retval; } +template bool +do_write (std::ostream&, const octave_int8&, oct_data_conv::data_type, + oct_mach_info::float_format, bool, bool); + +template bool +do_write (std::ostream&, const octave_uint8&, oct_data_conv::data_type, + oct_mach_info::float_format, bool, bool); + +template bool +do_write (std::ostream&, const octave_int16&, oct_data_conv::data_type, + oct_mach_info::float_format, bool, bool); + +template bool +do_write (std::ostream&, const octave_uint16&, oct_data_conv::data_type, + oct_mach_info::float_format, bool, bool); + +template bool +do_write (std::ostream&, const octave_int32&, oct_data_conv::data_type, + oct_mach_info::float_format, bool, bool); + +template bool +do_write (std::ostream&, const octave_uint32&, oct_data_conv::data_type, + oct_mach_info::float_format, bool, bool); + +template bool +do_write (std::ostream&, const octave_int64&, oct_data_conv::data_type, + oct_mach_info::float_format, bool, bool); + +template bool +do_write (std::ostream&, const octave_uint64&, oct_data_conv::data_type, + oct_mach_info::float_format, bool, bool); + template <class T> octave_idx_type octave_stream::write (const Array<T>& data, octave_idx_type block_size,