Mercurial > hg > octave-nkf
diff src/ov-perm.cc @ 8960:93f18f166aba
remove float perm matrices
author | Jaroslav Hajek <highegg@gmail.com> |
---|---|
date | Thu, 12 Mar 2009 09:24:37 +0100 |
parents | eb63fbe60fab |
children | dfc68e6d8741 |
line wrap: on
line diff
--- a/src/ov-perm.cc +++ b/src/ov-perm.cc @@ -27,7 +27,6 @@ #include "byte-swap.h" #include "ov-perm.h" -#include "ov-flt-perm.h" #include "ov-re-mat.h" #include "ov-scalar.h" #include "error.h" @@ -98,7 +97,7 @@ p = PermMatrix (idx0, false) * p; if (right) p = p * PermMatrix (idx1, true); - retval = octave_value (p, is_single_type ()); + retval = p; } else { @@ -479,21 +478,6 @@ octave_matrix::static_type_id ()); } -static octave_base_value * -default_numeric_demotion_function (const octave_base_value& a) -{ - CAST_CONV_ARG (const octave_perm_matrix&); - - return new octave_float_perm_matrix (v.perm_matrix_value ()); -} - -octave_base_value::type_conv_info -octave_perm_matrix::numeric_demotion_function (void) const -{ - return octave_base_value::type_conv_info (default_numeric_demotion_function, - octave_float_perm_matrix::static_type_id ()); -} - octave_base_value * octave_perm_matrix::try_narrowing_conversion (void) {