Mercurial > octave
diff libinterp/operators/op-b-b.cc @ 18213:cda4bd2fd0c0
fix null matrix assignment to indexed integer and logical values (bug #35921)
* op-int.h (OCTAVE_INSTALL_INT_NULL_ASSIGN_OPS): Install asignment
conversions for null matrix assignments to scalars.
* op-b-b.cc (install_b_b_ops): Likewise.
* null-assign.tst: New test.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 03 Jan 2014 20:55:33 -0500 |
| parents | d63878346099 |
| children | 4197fc428c7d |
line wrap: on
line diff
--- a/libinterp/operators/op-b-b.cc Fri Jan 03 17:33:46 2014 -0500 +++ b/libinterp/operators/op-b-b.cc Fri Jan 03 20:55:33 2014 -0500 @@ -33,6 +33,7 @@ #include "ov-float.h" #include "ov-re-mat.h" #include "ov-typeinfo.h" +#include "ov-null-mat.h" #include "ops.h" #include "xdiv.h" #include "xpow.h" @@ -92,4 +93,8 @@ INSTALL_CATOP (octave_float_scalar, octave_bool, f_b); INSTALL_ASSIGNCONV (octave_bool, octave_bool, octave_bool_matrix); + + INSTALL_ASSIGNCONV (octave_bool, octave_null_matrix, octave_bool_matrix); + INSTALL_ASSIGNCONV (octave_bool, octave_null_str, octave_bool_matrix); + INSTALL_ASSIGNCONV (octave_bool, octave_null_sq_str, octave_bool_matrix); }