Mercurial > octave
diff liboctave/numeric/sparse-chol.cc @ 29399:019130bd4a3d
eliminate last uses of BEGIN/END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE
These macros have been obsolete for years and the remaining uses
should have been removed long ago. Files affected: CSparse.cc,
dSparse.cc, sparse-chol.cc, sparse-qr.cc, and url-transfer.cc.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 01 Mar 2021 14:39:32 -0500 |
| parents | 7854d5752dd2 |
| children | bffdb54e78da |
line wrap: on
line diff
--- a/liboctave/numeric/sparse-chol.cc Mon Mar 01 09:46:19 2021 -0800 +++ b/liboctave/numeric/sparse-chol.cc Mon Mar 01 14:39:32 2021 -0500 @@ -293,26 +293,19 @@ cm->postorder = false; } - cholmod_factor *Lfactor; - BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; - Lfactor = CHOLMOD_NAME(analyze) (ac, cm); + cholmod_factor *Lfactor = CHOLMOD_NAME(analyze) (ac, cm); CHOLMOD_NAME(factorize) (ac, Lfactor, cm); - END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; is_pd = cm->status == CHOLMOD_OK; info = (is_pd ? 0 : cm->status); if (is_pd || force) { - BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; cond = CHOLMOD_NAME(rcond) (Lfactor, cm); - END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; minor_p = Lfactor->minor; - BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; Lsparse = CHOLMOD_NAME(factor_to_sparse) (Lfactor, cm); - END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; if (minor_p > 0 && minor_p < a_nr) { @@ -320,11 +313,10 @@ Lsparse->p = CHOLMOD_NAME(realloc) (minor_p+1, sizeof(octave_idx_type), Lsparse->p, &n1, cm); - BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; + CHOLMOD_NAME(reallocate_sparse) (static_cast<octave_idx_type *>(Lsparse->p)[minor_p], Lsparse, cm); - END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; Lsparse->ncol = minor_p; } @@ -342,10 +334,8 @@ // NAME used to prefix statistics report from print_common static char blank_name[] = " "; - BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; CHOLMOD_NAME(print_common) (blank_name, cm); CHOLMOD_NAME(free_factor) (&Lfactor, cm); - END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; return info;