do not include Rinternals.h

kingaa · May 22, 2024 · 563af2c · 563af2c
1 parent 5ca52ea
commit 563af2c
Show file tree

Hide file tree

Showing 23 changed files with 30 additions and 29 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: pomp
 Type: Package
 Title: Statistical Inference for Partially Observed Markov Processes
-Version: 5.8.2.1
-Date: 2024-05-14
+Version: 5.8.3.0
+Date: 2024-05-22
 Authors@R: c(person(given=c("Aaron","A."),family="King",role=c("aut","cre"),email="[email protected]",comment=c(ORCID="0000-0001-6159-3207")),
 	  person(given=c("Edward","L."),family="Ionides",role="aut",comment=c(ORCID="0000-0002-4190-0174"))	,
 	  person(given="Carles",family="Bretó",role="aut",comment=c(ORCID="0000-0003-4695-4902")),

diff --git a/inst/NEWS b/inst/NEWS
@@ -1,5 +1,9 @@
 _N_e_w_s _f_o_r _p_a_c_k_a_g_e '_p_o_m_p'
 
+_C_h_a_n_g_e_s _i_n '_p_o_m_p' _v_e_r_s_i_o_n _5._8._3:
+
+        • Internally, ‘pomp’ codes no longer include ‘Rinternal.h’.
+
 _C_h_a_n_g_e_s _i_n '_p_o_m_p' _v_e_r_s_i_o_n _5._8._2:
 
         • A bug in covariate-table extrapolation for the case

diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd
@@ -1,5 +1,10 @@
 \name{NEWS}
 \title{News for package `pomp'}
+\section{Changes in \pkg{pomp} version 5.8.3}{
+  \itemize{
+    \item Internally, \pkg{pomp} codes no longer include \file{Rinternal.h}.
+  }
+}
 \section{Changes in \pkg{pomp} version 5.8.2}{
   \itemize{
     \item A bug in covariate-table extrapolation for the case \code{order="constant"} has been fixed.

diff --git a/inst/include/pomp.h b/inst/include/pomp.h
@@ -2,14 +2,6 @@
 // Header for the C API for pomp.
 // Documentation: https://kingaa.github.io/pomp/C_API.html
 
-//! \mainpage C source codes for **pomp**
-//!
-//! These codes are part of **pomp**, an **R** package for partially observed Markov processes, described in a [2016 *Journal of Statistical Software* paper](https://doi.org/10.18637/jss.v069.i12).
-//!
-//! See the [package homepage](https://kingaa.github.io/pomp/) and the [manual](https://kingaa.github.io/manuals/pomp/) for more information.
-//!
-//! The **pomp** C API is [documented here](https://kingaa.github.io/pomp/C_API.html).
-//!
 
 #ifndef _POMP_H_
 #define _POMP_H_

diff --git a/inst/include/pomp_defines.h b/inst/include/pomp_defines.h
@@ -6,7 +6,7 @@
 #include <R.h>
 #include <Rmath.h>
 #include <Rdefines.h>
-#include <Rinternals.h>
+
 
 #include "pomp.h"
 

diff --git a/rules.mk b/rules.mk
@@ -181,7 +181,7 @@ tests: .tests
 install: .install
 
 inst/include/%.h: src/%.h
-	$(CP) $^ $@
+	perl -ne 'print if not /^\/\/\!/' $^ > $@
 
 %.tex: %.Rnw
 	$(REXE) -e "library(knitr); knit(\"$*.Rnw\")"

diff --git a/src/dinit.c b/src/dinit.c
@@ -3,7 +3,7 @@
 #include <R.h>
 #include <Rmath.h>
 #include <Rdefines.h>
-#include <Rinternals.h>
+
 
 #include "internal.h"
 

diff --git a/src/dmeasure.c b/src/dmeasure.c
@@ -3,7 +3,7 @@
 #include <R.h>
 #include <Rmath.h>
 #include <Rdefines.h>
-#include <Rinternals.h>
+
 
 #include "internal.h"
 

diff --git a/src/dprior.c b/src/dprior.c
@@ -3,7 +3,7 @@
 #include <R.h>
 #include <Rmath.h>
 #include <Rdefines.h>
-#include <Rinternals.h>
+
 
 #include "internal.h"
 

diff --git a/src/dprocess.c b/src/dprocess.c
@@ -3,7 +3,7 @@
 #include <R.h>
 #include <Rmath.h>
 #include <Rdefines.h>
-#include <Rinternals.h>
+
 
 #include "internal.h"
 

diff --git a/src/emeasure.c b/src/emeasure.c
@@ -3,7 +3,7 @@
 #include <R.h>
 #include <Rmath.h>
 #include <Rdefines.h>
-#include <Rinternals.h>
+
 
 #include "internal.h"
 

diff --git a/src/euler.c b/src/euler.c
@@ -3,7 +3,7 @@
 #include <R.h>
 #include <Rmath.h>
 #include <Rdefines.h>
-#include <Rinternals.h>
+
 
 #include "internal.h"
 

diff --git a/src/internal.h b/src/internal.h
@@ -6,7 +6,7 @@
 #include <R.h>
 #include <Rmath.h>
 #include <Rdefines.h>
-#include <Rinternals.h>
+
 
 #include "pomp_defines.h"
 #include "decls.h"

diff --git a/src/partrans.c b/src/partrans.c
@@ -3,7 +3,7 @@
 #include <R.h>
 #include <Rmath.h>
 #include <Rdefines.h>
-#include <Rinternals.h>
+
 
 #include "internal.h"
 

diff --git a/src/pomp_defines.h b/src/pomp_defines.h
@@ -6,7 +6,7 @@
 #include <R.h>
 #include <Rmath.h>
 #include <Rdefines.h>
-#include <Rinternals.h>
+
 
 #include "pomp.h"
 

diff --git a/src/pomp_fun.c b/src/pomp_fun.c
@@ -2,7 +2,7 @@
 
 #include <R.h>
 #include <Rdefines.h>
-#include <Rinternals.h>
+
 #include <R_ext/Rdynload.h>
 
 #include "internal.h"

diff --git a/src/rinit.c b/src/rinit.c
@@ -3,7 +3,7 @@
 #include <R.h>
 #include <Rmath.h>
 #include <Rdefines.h>
-#include <Rinternals.h>
+
 
 #include "internal.h"
 

diff --git a/src/rmeasure.c b/src/rmeasure.c
@@ -3,7 +3,7 @@
 #include <R.h>
 #include <Rmath.h>
 #include <Rdefines.h>
-#include <Rinternals.h>
+
 
 #include "internal.h"
 

diff --git a/src/rprior.c b/src/rprior.c
@@ -3,7 +3,7 @@
 #include <R.h>
 #include <Rmath.h>
 #include <Rdefines.h>
-#include <Rinternals.h>
+
 
 #include "internal.h"
 

diff --git a/src/rprocess.c b/src/rprocess.c
@@ -3,7 +3,7 @@
 #include <R.h>
 #include <Rmath.h>
 #include <Rdefines.h>
-#include <Rinternals.h>
+
 
 #include "internal.h"
 

diff --git a/src/skeleton.c b/src/skeleton.c
@@ -3,7 +3,7 @@
 #include <R.h>
 #include <Rmath.h>
 #include <Rdefines.h>
-#include <Rinternals.h>
+
 
 #include "internal.h"
 

diff --git a/src/ssa.c b/src/ssa.c
@@ -3,7 +3,7 @@
 #include <R.h>
 #include <Rmath.h>
 #include <Rdefines.h>
-#include <Rinternals.h>
+
 
 #include "internal.h"
 

diff --git a/src/vmeasure.c b/src/vmeasure.c
@@ -3,7 +3,7 @@
 #include <R.h>
 #include <Rmath.h>
 #include <Rdefines.h>
-#include <Rinternals.h>
+
 
 #include "internal.h"