Mercurial > octave

changeset 22979:28cd5a239fda

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge stable to default.
author John W. Eaton <jwe@octave.org>
date Thu, 29 Dec 2016 13:39:03 -0500
parents 750c8b4b7164 (current diff) 03819d65cc1d (diff)
children b4346e1b5b45
files liboctave/array/CMatrix.cc liboctave/array/fCMatrix.cc
diffstat 2 files changed, 16 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/array/CMatrix.cc	Wed Dec 28 15:33:34 2016 -0800
+++ b/liboctave/array/CMatrix.cc	Thu Dec 29 13:39:03 2016 -0500
@@ -2807,8 +2807,8 @@
   octave_idx_type nr = rows ();
   octave_idx_type nc = cols ();
 
-  octave_idx_type a_nr = rows ();
-  octave_idx_type a_nc = cols ();
+  octave_idx_type a_nr = a.rows ();
+  octave_idx_type a_nc = a.cols ();
 
   if (nr != a_nr || nc != a_nc)
     octave::err_nonconformant ("operator +=", nr, nc, a_nr, a_nc);
@@ -2825,8 +2825,8 @@
   octave_idx_type nr = rows ();
   octave_idx_type nc = cols ();
 
-  octave_idx_type a_nr = rows ();
-  octave_idx_type a_nc = cols ();
+  octave_idx_type a_nr = a.rows ();
+  octave_idx_type a_nc = a.cols ();
 
   if (nr != a_nr || nc != a_nc)
     octave::err_nonconformant ("operator -=", nr, nc, a_nr, a_nc);
@@ -2843,8 +2843,8 @@
   octave_idx_type nr = rows ();
   octave_idx_type nc = cols ();
 
-  octave_idx_type a_nr = rows ();
-  octave_idx_type a_nc = cols ();
+  octave_idx_type a_nr = a.rows ();
+  octave_idx_type a_nc = a.cols ();
 
   if (nr != a_nr || nc != a_nc)
     octave::err_nonconformant ("operator +=", nr, nc, a_nr, a_nc);
@@ -2861,8 +2861,8 @@
   octave_idx_type nr = rows ();
   octave_idx_type nc = cols ();
 
-  octave_idx_type a_nr = rows ();
-  octave_idx_type a_nc = cols ();
+  octave_idx_type a_nr = a.rows ();
+  octave_idx_type a_nc = a.cols ();
 
   if (nr != a_nr || nc != a_nc)
     octave::err_nonconformant ("operator -=", nr, nc, a_nr, a_nc);
--- a/liboctave/array/fCMatrix.cc	Wed Dec 28 15:33:34 2016 -0800
+++ b/liboctave/array/fCMatrix.cc	Thu Dec 29 13:39:03 2016 -0500
@@ -2827,8 +2827,8 @@
   F77_INT nr = rows ();
   F77_INT nc = cols ();
 
-  octave_idx_type a_nr = rows ();
-  octave_idx_type a_nc = cols ();
+  octave_idx_type a_nr = a.rows ();
+  octave_idx_type a_nc = a.cols ();
 
   if (nr != a_nr || nc != a_nc)
     octave::err_nonconformant ("operator +=", nr, nc, a_nr, a_nc);
@@ -2845,8 +2845,8 @@
   octave_idx_type nr = rows ();
   octave_idx_type nc = cols ();
 
-  octave_idx_type a_nr = rows ();
-  octave_idx_type a_nc = cols ();
+  octave_idx_type a_nr = a.rows ();
+  octave_idx_type a_nc = a.cols ();
 
   if (nr != a_nr || nc != a_nc)
     octave::err_nonconformant ("operator -=", nr, nc, a_nr, a_nc);
@@ -2863,8 +2863,8 @@
   octave_idx_type nr = rows ();
   octave_idx_type nc = cols ();
 
-  octave_idx_type a_nr = rows ();
-  octave_idx_type a_nc = cols ();
+  octave_idx_type a_nr = a.rows ();
+  octave_idx_type a_nc = a.cols ();
 
   if (nr != a_nr || nc != a_nc)
     octave::err_nonconformant ("operator +=", nr, nc, a_nr, a_nc);
@@ -2881,8 +2881,8 @@
   octave_idx_type nr = rows ();
   octave_idx_type nc = cols ();
 
-  octave_idx_type a_nr = rows ();
-  octave_idx_type a_nc = cols ();
+  octave_idx_type a_nr = a.rows ();
+  octave_idx_type a_nc = a.cols ();
 
   if (nr != a_nr || nc != a_nc)
     octave::err_nonconformant ("operator -=", nr, nc, a_nr, a_nc);