Mercurial > octave-nkf

changeset 11602:3093cb640697 release-3-0-x

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[3-0-0-branch @ 2008-01-03 23:05:32 by jwe]
author jwe
date Thu, 03 Jan 2008 23:05:33 +0000
parents 3706ac0750f1
children 113fd59c0932
files liboctave/ChangeLog liboctave/MSparse.cc liboctave/Sparse-op-defs.h
diffstat 3 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/ChangeLog	Wed Jan 02 07:42:13 2008 +0000
+++ b/liboctave/ChangeLog	Thu Jan 03 23:05:33 2008 +0000
@@ -1,3 +1,9 @@
+2008-01-03  David Bateman  <dbateman@free.fr>
+
+	* MSparse.cc (SPARSE_A2A2_OP): If first arg is scalar zero, then
+	need unary operator on remaining argument
+	* Sparse-op-defs.h (SPARSE_SMSM_BIN_OP_1): ditto.
+
 2007-12-21  John W. Eaton  <jwe@octave.org>
 
 	Version 3.0.0 released.
--- a/liboctave/MSparse.cc	Wed Jan 02 07:42:13 2008 +0000
+++ b/liboctave/MSparse.cc	Thu Jan 03 23:05:33 2008 +0000
@@ -292,7 +292,7 @@
     if (a_nr == 1 && a_nc == 1) \
       { \
         if (a.elem(0,0) == 0.) \
-          r = MSparse<T> (b); \
+          r =  OP MSparse<T> (b); \
         else \
           { \
 	    r = MSparse<T> (b_nr, b_nc, a.data(0) OP 0.); \
--- a/liboctave/Sparse-op-defs.h	Wed Jan 02 07:42:13 2008 +0000
+++ b/liboctave/Sparse-op-defs.h	Thu Jan 03 23:05:33 2008 +0000
@@ -396,7 +396,7 @@
     if (m1_nr == 1 && m1_nc == 1) \
       { \
         if (m1.elem(0,0) == 0.) \
-          r = R (m2); \
+          r = OP R (m2); \
         else \
           { \
 	    r = R (m2_nr, m2_nc, m1.data(0) OP 0.); \