Mercurial > hg > octave-lojdl
changeset 12058:0cb90d7fe46a release-3-2-x
complete change d5570d4b1116
author | Jaroslav Hajek <highegg@gmail.com> |
---|---|
date | Fri, 07 Aug 2009 08:22:13 +0200 |
parents | 73ca5cee6bb6 |
children | 6ab2598a4ac2 |
files | src/ChangeLog src/OPERATORS/op-dm-template.cc src/OPERATORS/op-pm-template.cc |
diffstat | 3 files changed, 9 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2009-08-06 Jaroslav Hajek <highegg@gmail.com> + + * OPERATORS/op-dm-template.cc, OPERATORS/op-pm-template.cc: + Also define conversions for null string and null sq_string. + 2009-08-06 John W. Eaton <jwe@octave.org> * OPERATORS/op-cdm-m.cc, OPERATORS/op-dm-m.cc, OPERATORS/op-pm-m.cc:
--- a/src/OPERATORS/op-dm-template.cc +++ b/src/OPERATORS/op-dm-template.cc @@ -89,5 +89,7 @@ #endif #ifdef DEFINENULLASSIGNCONV INSTALL_ASSIGNCONV (OCTAVE_LMATRIX, octave_null_matrix, OCTAVE_LDMATRIX); + INSTALL_ASSIGNCONV (OCTAVE_LMATRIX, octave_null_str, OCTAVE_LDMATRIX); + INSTALL_ASSIGNCONV (OCTAVE_LMATRIX, octave_null_sq_str, OCTAVE_LDMATRIX); #endif }
--- a/src/OPERATORS/op-pm-template.cc +++ b/src/OPERATORS/op-pm-template.cc @@ -84,5 +84,7 @@ #endif #ifdef DEFINENULLASSIGNCONV INSTALL_ASSIGNCONV (OCTAVE_LMATRIX, octave_null_matrix, OCTAVE_LDMATRIX); + INSTALL_ASSIGNCONV (OCTAVE_LMATRIX, octave_null_str, OCTAVE_LDMATRIX); + INSTALL_ASSIGNCONV (OCTAVE_LMATRIX, octave_null_sq_str, OCTAVE_LDMATRIX); #endif }