Mercurial > octave-nkf
diff src/oct-map.cc @ 14569:3a9a56999ce5
maint: periodic merge from stable to default
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 17 Apr 2012 13:18:56 -0400 |
parents | eff4a5933e28 82449d607d20 |
children | 13cc11418393 |
line wrap: on
line diff
--- a/src/oct-map.cc Fri Mar 30 18:44:01 2012 +0200 +++ b/src/oct-map.cc Tue Apr 17 13:18:56 2012 -0400 @@ -971,7 +971,7 @@ octave_idx_type nf = nfields (); for (octave_idx_type k = 0; k < nf; k++) - xvals[k].assign (i, rhs.xvals[k]); + xvals[k].assign (i, rhs.xvals[k], Matrix ()); if (nf > 0) dimensions = xvals[0].dims (); @@ -1014,7 +1014,7 @@ octave_idx_type nf = nfields (); for (octave_idx_type k = 0; k < nf; k++) - xvals[k].assign (i, j, rhs.xvals[k]); + xvals[k].assign (i, j, rhs.xvals[k], Matrix ()); if (nf > 0) dimensions = xvals[0].dims (); @@ -1057,7 +1057,7 @@ octave_idx_type nf = nfields (); for (octave_idx_type k = 0; k < nf; k++) - xvals[k].assign (ia, rhs.xvals[k]); + xvals[k].assign (ia, rhs.xvals[k], Matrix ()); if (nf > 0) dimensions = xvals[0].dims (); @@ -1170,6 +1170,13 @@ setfield (k, tmp); } +/* +%!test +%! rhs.b = 1; +%! a(3) = rhs; +%! assert ({a.b}, {[], [], 1}) +*/ + void octave_map::delete_elements (const idx_vector& i) {