Mercurial > octave-nkf
changeset 8855:a909d8c01adf
remove duplicate conversions in OPERATORS
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Tue, 24 Feb 2009 11:12:38 +0100 |
| parents | 97d146d1648b |
| children | ab4db66e286f |
| files | src/ChangeLog src/OPERATORS/op-range.cc src/OPERATORS/op-s-s.cc |
| diffstat | 3 files changed, 3 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue Feb 24 11:11:40 2009 +0100 +++ b/src/ChangeLog Tue Feb 24 11:12:38 2009 +0100 @@ -20,6 +20,9 @@ (octave_float_scalar::uint32_scalar_value): New method. (octave_float_scalar::uint64_scalar_value): New method. + * OPERATORS/op-s-s.cc (scalar_to_float): Remove duplicate conversion. + * OPERATORS/op-range.cc (range_to_float_matrix): Ditto. + 2009-02-24 John W. Eaton <jwe@octave.org> * OPERATORS/op-float-conv.cc: New file.
--- a/src/OPERATORS/op-range.cc Tue Feb 24 11:11:40 2009 +0100 +++ b/src/OPERATORS/op-range.cc Tue Feb 24 11:12:38 2009 +0100 @@ -83,13 +83,6 @@ DEFNDCATOP_FN (bm_r, bool_matrix, range, array, array, concat) DEFNDCATOP_FN (chm_r, char_matrix, range, char_array, array, concat) -CONVDECL (range_to_float_matrix) -{ - CAST_CONV_ARG (const octave_range&); - - return new octave_float_matrix (FloatNDArray (v.array_value ())); -} - CONVDECL (range_to_matrix) { CAST_CONV_ARG (const octave_range&); @@ -129,8 +122,6 @@ INSTALL_CATOP (octave_bool_matrix, octave_range, bm_r); INSTALL_CATOP (octave_char_matrix, octave_range, chm_r); - INSTALL_CONVOP (octave_range, octave_float_matrix, range_to_float_matrix); - // FIXME -- this would be unneccessary if // octave_base_value::numeric_assign always tried converting lhs // before rhs.
--- a/src/OPERATORS/op-s-s.cc Tue Feb 24 11:11:40 2009 +0100 +++ b/src/OPERATORS/op-s-s.cc Tue Feb 24 11:12:38 2009 +0100 @@ -121,13 +121,6 @@ DEFNDCATOP_FN (s_s, scalar, scalar, array, array, concat) -CONVDECL (scalar_to_float) -{ - CAST_CONV_ARG (const octave_scalar&); - - return new octave_float_matrix (FloatMatrix (1, 1, static_cast<float>(v.double_value ()))); -} - void install_s_s_ops (void) { @@ -167,8 +160,6 @@ INSTALL_ASSIGNCONV (octave_scalar, octave_null_matrix, octave_matrix); INSTALL_ASSIGNCONV (octave_scalar, octave_null_str, octave_matrix); INSTALL_ASSIGNCONV (octave_scalar, octave_null_sq_str, octave_matrix); - - INSTALL_CONVOP (octave_scalar, octave_float_matrix, scalar_to_float); } /*