Mercurial > octave
changeset 27084:df9e3cb79379
Reverse fix from cset 4283c4c2fcb6 that is no longer required (bug #52365).
* dSparse.cc, CSparse.cc (fsolve): Remove code to verify that sparse matrix
data pointer is not null (Octave guarantees space for 1 element now).
| author | Rik <rik@octave.org> |
|---|---|
| date | Wed, 08 May 2019 18:45:34 -0700 |
| parents | 23761e83756f |
| children | 007fcab79721 |
| files | liboctave/array/CSparse.cc liboctave/array/dSparse.cc |
| diffstat | 2 files changed, 0 insertions(+), 40 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/array/CSparse.cc Wed May 08 18:28:05 2019 -0700 +++ b/liboctave/array/CSparse.cc Wed May 08 18:45:34 2019 -0700 @@ -5707,7 +5707,6 @@ cholmod_sparse Astore; cholmod_sparse *A = &Astore; - double dummy; A->nrow = nr; A->ncol = nc; @@ -5727,8 +5726,6 @@ A->xtype = CHOLMOD_COMPLEX; A->x = data (); - if (A->x == nullptr) - A->x = &dummy; cholmod_dense Bstore; cholmod_dense *B = &Bstore; @@ -5740,8 +5737,6 @@ B->xtype = CHOLMOD_REAL; B->x = const_cast<double *>(b.fortran_vec ()); - if (B->x == nullptr) - B->x = &dummy; cholmod_factor *L; BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -5959,7 +5954,6 @@ cholmod_sparse Astore; cholmod_sparse *A = &Astore; - double dummy; A->nrow = nr; A->ncol = nc; @@ -5979,8 +5973,6 @@ A->xtype = CHOLMOD_COMPLEX; A->x = data (); - if (A->x == nullptr) - A->x = &dummy; cholmod_sparse Bstore; cholmod_sparse *B = &Bstore; @@ -6002,8 +5994,6 @@ B->xtype = CHOLMOD_REAL; B->x = b.data (); - if (B->x == nullptr) - B->x = &dummy; cholmod_factor *L; BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -6262,7 +6252,6 @@ cholmod_sparse Astore; cholmod_sparse *A = &Astore; - double dummy; A->nrow = nr; A->ncol = nc; @@ -6282,8 +6271,6 @@ A->xtype = CHOLMOD_COMPLEX; A->x = data (); - if (A->x == nullptr) - A->x = &dummy; cholmod_dense Bstore; cholmod_dense *B = &Bstore; @@ -6295,8 +6282,6 @@ B->xtype = CHOLMOD_COMPLEX; B->x = const_cast<Complex *>(b.fortran_vec ()); - if (B->x == nullptr) - B->x = &dummy; cholmod_factor *L; BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -6493,7 +6478,6 @@ cholmod_sparse Astore; cholmod_sparse *A = &Astore; - double dummy; A->nrow = nr; A->ncol = nc; @@ -6513,8 +6497,6 @@ A->xtype = CHOLMOD_COMPLEX; A->x = data (); - if (A->x == nullptr) - A->x = &dummy; cholmod_sparse Bstore; cholmod_sparse *B = &Bstore; @@ -6536,8 +6518,6 @@ B->xtype = CHOLMOD_COMPLEX; B->x = b.data (); - if (B->x == nullptr) - B->x = &dummy; cholmod_factor *L; BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
--- a/liboctave/array/dSparse.cc Wed May 08 18:28:05 2019 -0700 +++ b/liboctave/array/dSparse.cc Wed May 08 18:45:34 2019 -0700 @@ -5751,7 +5751,6 @@ cholmod_sparse Astore; cholmod_sparse *A = &Astore; - double dummy; A->nrow = nr; A->ncol = nc; @@ -5771,8 +5770,6 @@ A->xtype = CHOLMOD_REAL; A->x = data (); - if (A->x == nullptr) - A->x = &dummy; cholmod_dense Bstore; cholmod_dense *B = &Bstore; @@ -5784,8 +5781,6 @@ B->xtype = CHOLMOD_REAL; B->x = const_cast<double *>(b.fortran_vec ()); - if (B->x == nullptr) - B->x = &dummy; cholmod_factor *L; BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -5976,7 +5971,6 @@ cholmod_sparse Astore; cholmod_sparse *A = &Astore; - double dummy; A->nrow = nr; A->ncol = nc; @@ -5996,8 +5990,6 @@ A->xtype = CHOLMOD_REAL; A->x = data (); - if (A->x == nullptr) - A->x = &dummy; cholmod_sparse Bstore; cholmod_sparse *B = &Bstore; @@ -6019,8 +6011,6 @@ B->xtype = CHOLMOD_REAL; B->x = b.data (); - if (B->x == nullptr) - B->x = &dummy; cholmod_factor *L; BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -6249,7 +6239,6 @@ cholmod_sparse Astore; cholmod_sparse *A = &Astore; - double dummy; A->nrow = nr; A->ncol = nc; @@ -6269,8 +6258,6 @@ A->xtype = CHOLMOD_REAL; A->x = data (); - if (A->x == nullptr) - A->x = &dummy; cholmod_dense Bstore; cholmod_dense *B = &Bstore; @@ -6282,8 +6269,6 @@ B->xtype = CHOLMOD_COMPLEX; B->x = const_cast<Complex *>(b.fortran_vec ()); - if (B->x == nullptr) - B->x = &dummy; cholmod_factor *L; BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -6494,7 +6479,6 @@ cholmod_sparse Astore; cholmod_sparse *A = &Astore; - double dummy; A->nrow = nr; A->ncol = nc; @@ -6514,8 +6498,6 @@ A->xtype = CHOLMOD_REAL; A->x = data (); - if (A->x == nullptr) - A->x = &dummy; cholmod_sparse Bstore; cholmod_sparse *B = &Bstore; @@ -6537,8 +6519,6 @@ B->xtype = CHOLMOD_COMPLEX; B->x = b.data (); - if (B->x == nullptr) - B->x = &dummy; cholmod_factor *L; BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;