changeset 8178:af41e2094993

fix assignN still calling maybe_delete_elements
author Jaroslav Hajek <highegg@gmail.com>
date Fri, 03 Oct 2008 13:03:34 +0200
parents 65c4ac814082
children 6c08e3921d3e
files liboctave/Array.cc liboctave/ChangeLog
diffstat 2 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/Array.cc	Fri Oct 03 12:18:33 2008 +0200
+++ b/liboctave/Array.cc	Fri Oct 03 13:03:34 2008 +0200
@@ -3374,11 +3374,7 @@
 
   Array<idx_vector> idx = conv_to_array (idx_vex, n_idx);
 
-  if (rhs_dims_len == 2 && rhs_dims(0) == 0 && rhs_dims(1) == 0)
-    {
-      lhs.maybe_delete_elements (idx, rfv);
-    }
-  else if (n_idx == 0)
+  if (n_idx == 0)
     {
       lhs.clear_index ();
 
--- a/liboctave/ChangeLog	Fri Oct 03 12:18:33 2008 +0200
+++ b/liboctave/ChangeLog	Fri Oct 03 13:03:34 2008 +0200
@@ -1,3 +1,8 @@
+2008-10-03  Jaroslav Hajek  <highegg@gmail.com>
+
+	* Array.cc (assignN): Do not call maybe_delete_elements when
+	for empty matrix.
+
 2008-09-30  Jaroslav Hajek <highegg@gmail.com>
 
 	* oct-inttypes.h: Mostly rewrite.