redefine 'err' and 'warn' macros

kingaa · Apr 18, 2024 · 197da6d · 197da6d
1 parent f575667
commit 197da6d
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 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.7.0.3
-Date: 2024-04-01
+Version: 5.7.1.0
+Date: 2024-04-18
 Authors@R: c(person(given=c("Aaron","A."),family="King",role=c("aut","cre"),email="kingaa@umich.edu",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,6 +1,10 @@
 _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._7._0:
+_C_h_a_n_g_e_s _i_n '_p_o_m_p' _v_e_r_s_i_o_n _5._7._1:
+
+        • The ‘err()’ and ‘warn()’ C-level macros have been redefined
+          to forestall problems that would arise when these macros are
+          included in C++ code under forthcoming versions of R.
 
         • More changes in C codes to forestall issues detected by
           ‘rchk’.

diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd
@@ -1,7 +1,8 @@
 \name{NEWS}
 \title{News for package `pomp'}
-\section{Changes in \pkg{pomp} version 5.7.0}{
+\section{Changes in \pkg{pomp} version 5.7.1}{
   \itemize{
+    \item The \code{err()} and \code{warn()} C-level macros have been redefined to forestall problems that would arise when these macros are included in C++ code under forthcoming versions of \R.
     \item More changes in C codes to forestall issues detected by \pkg{rchk}.
     \item Minor corrections to documentation.
   }

diff --git a/inst/include/pomp.h b/inst/include/pomp.h
@@ -18,8 +18,8 @@
 #include <Rmath.h>
 #include <Rdefines.h>
 
-#define err(...) errorcall(R_NilValue,__VA_ARGS__)
-#define warn(...) warningcall(R_NilValue,__VA_ARGS__)
+#define err(...) Rf_errorcall(R_NilValue,__VA_ARGS__)
+#define warn(...) Rf_warningcall(R_NilValue,__VA_ARGS__)
 
 typedef
 void bspline_basis_eval_deriv_t

diff --git a/src/pomp.h b/src/pomp.h
@@ -18,8 +18,8 @@
 #include <Rmath.h>
 #include <Rdefines.h>
 
-#define err(...) errorcall(R_NilValue,__VA_ARGS__)
-#define warn(...) warningcall(R_NilValue,__VA_ARGS__)
+#define err(...) Rf_errorcall(R_NilValue,__VA_ARGS__)
+#define warn(...) Rf_warningcall(R_NilValue,__VA_ARGS__)
 
 typedef
 void bspline_basis_eval_deriv_t