Mercurial > hg > octave-jordi

changeset 21042:10071454a4ba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow assigment from "float complex matrix" to "complex matrix" (bug #46816) * libinterp/operators/op-fcm-fcm.cc (install_fcm_fcm_ops) : Added dbl_assign operator, and renamd existing dbl_assign to sgl_assign in keeping with the naming convention "dbl" is for a double destination, "sgl" for float dest.
author Lachlan Andrew <lachlanbis@gmail.com>
date Wed, 06 Jan 2016 15:37:51 +1100
parents 0967e2393386
children e2fdbdd00ef9
files libinterp/operators/op-fcm-fcm.cc
diffstat 1 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/operators/op-fcm-fcm.cc
+++ b/libinterp/operators/op-fcm-fcm.cc
@@ -214,10 +214,12 @@
 
 DEFNDASSIGNOP_FN (assign, float_complex_matrix, float_complex_matrix,
                   float_complex_array, assign)
-DEFNDASSIGNOP_FN (dbl_clx_assign, float_complex_matrix, complex_matrix,
+DEFNDASSIGNOP_FN (sgl_clx_assign, float_complex_matrix, complex_matrix,
                   float_complex_array, assign)
-DEFNDASSIGNOP_FN (dbl_assign, float_complex_matrix, matrix,
+DEFNDASSIGNOP_FN (sgl_assign, float_complex_matrix, matrix,
                   float_complex_array, assign)
+DEFNDASSIGNOP_FN (dbl_assign, complex_matrix, float_complex_matrix,
+                  complex_array, assign)
 
 DEFNULLASSIGNOP_FN (null_assign, float_complex_matrix, delete_elements)
 
@@ -311,9 +313,11 @@
   INSTALL_ASSIGNOP (op_asn_eq, octave_float_complex_matrix,
                     octave_float_complex_matrix, assign);
   INSTALL_ASSIGNOP (op_asn_eq, octave_float_complex_matrix,
-                    octave_complex_matrix, dbl_clx_assign);
+                    octave_complex_matrix, sgl_clx_assign);
   INSTALL_ASSIGNOP (op_asn_eq, octave_float_complex_matrix,
-                    octave_matrix, dbl_assign);
+                    octave_matrix, sgl_assign);
+  INSTALL_ASSIGNOP (op_asn_eq, octave_complex_matrix,
+                    octave_float_complex_matrix, dbl_assign);
 
   INSTALL_ASSIGNOP (op_asn_eq, octave_float_complex_matrix,
                     octave_null_matrix, null_assign);