Merge pull request #42 from richfitz/cran-lto

More urgent cran demands
richfitz · Oct 2, 2023 · e587755 · e587755
2 parents 8cdb5ac + a75f3c0
commit e587755
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,5 +1,5 @@
 Package: diversitree
-Version: 0.9-19
+Version: 0.9-20
 Title: Comparative 'Phylogenetic' Analyses of Diversification
 Authors@R: c(person("Richard G.", "FitzJohn", role = c("aut", "cre"),
     email = "rich.fitzjohn@gmail.com"),

diff --git a/src/mkn-expokit.c b/src/mkn-expokit.c
@@ -10,6 +10,8 @@ SEXP r_branches_mkn_expokit(SEXP Q, SEXP ia, SEXP ja, SEXP qnorm,
   int lwsp = nmax*(mmax+1)+nmax+5*(mmax+2)*(mmax+2)+7,liwsp=nmax+2;
   double * wsp = (double*) R_alloc(lwsp,  sizeof(double));
   int    *iwsp = (int   *) R_alloc(liwsp, sizeof(int));
+  Rcomplex *cwsp = (Rcomplex*) R_alloc(lwsp, sizeof(Rcomplex));
+
   int nt = LENGTH(t), nz = LENGTH(ia), itrace = 0, iflag = 0;
   double *cvals, *cscal, *vals_i, tot;
   SEXP ret, vals, scal;
@@ -33,7 +35,7 @@ SEXP r_branches_mkn_expokit(SEXP Q, SEXP ia, SEXP ja, SEXP qnorm,
 		    cvals,
 		    REAL(tol), REAL(qnorm),
 		    INTEGER(ia), INTEGER(ja), REAL(Q), &nz,
-		    wsp, &lwsp, iwsp, &liwsp, &itrace, &iflag);
+		    wsp, &lwsp, iwsp, &liwsp, cwsp, &lwsp, &itrace, &iflag);
 
   if ( iflag != 0 ) {
     if ( iflag == -42 )

diff --git a/src/mkn-expokit.h b/src/mkn-expokit.h
@@ -14,5 +14,7 @@ extern void F77_NAME(dgexpvi)(const int *n,
 			      const int *lwsp,
 			      int *iwsp,
 			      const int *liwsp,
+			      Rcomplex * cwsp,
+			      const int *lcwsp,
 			      int *itrace,
 			      int *iflag);