Rebult with development version of Rcpp to remove CRAN's string liter…

…al error, tweak NEWS, and bump date/version.
aadler · Nov 28, 2023 · 8d910e8 · 8d910e8
1 parent e5a5cff
commit 8d910e8
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 12 deletions.
diff --git a/CITATION.cff b/CITATION.cff
@@ -8,7 +8,7 @@ message: 'To cite package "lamW" in publications use:'
 type: software
 license: BSD-2-Clause
 title: 'lamW: Lambert-W Function'
-version: 2.2.2
+version: 2.2.3
 doi: 10.5281/zenodo.5874874
 abstract: Implements both real-valued branches of the Lambert-W function (Corless
   et al, 1996) <doi:10.1007/BF02124750> without the need for installing the entire
@@ -29,11 +29,11 @@ preferred-citation:
   year: '2015'
   url: https://CRAN.R-project.org/package=lamW
   doi: 10.5281/zenodo.5874874
-  notes: R package version 2.2.2
+  notes: R package version 2.2.3
 repository: https://CRAN.R-project.org/package=lamW
 repository-code: https://github.com/aadler/lamW
 url: https://github.com/aadler/lamW
-date-released: '2023-11-04'
+date-released: '2023-11-28'
 contact:
 - family-names: Adler
   given-names: Avraham

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: lamW
 Type: Package
 Title: Lambert-W Function
-Version: 2.2.2
-Date: 2023-11-20
+Version: 2.2.3
+Date: 2023-11-28
 Authors@R: c(person(given="Avraham", family="Adler",role=c("aut", "cph", "cre"),
     email="Avraham.Adler@gmail.com", comment = c(ORCID = "0000-0002-3039-0703")))
 Description: Implements both real-valued branches of the Lambert-W function

diff --git a/inst/CITATION b/inst/CITATION
@@ -10,5 +10,5 @@ bibentry(bibtype     = "Manual",
          year         = "2015",
          url          = "https://CRAN.R-project.org/package=lamW",
          doi          = "10.5281/zenodo.5874874",
-         note         = "R package version 2.2.2"
+         note         = "R package version 2.2.3"
 )
diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd
@@ -6,11 +6,29 @@
 \title{NEWS file for the lamW package}
 \encoding{UTF-8}
 
-\section{Version 2.2.2 (2023-11-20)}{
+\section{Version 2.2.3 (2023-11-28)}{
+  \subsection{Fixed}{
+    \itemize{
+      \item Package built with development version of \pkg{Rcpp} to remove
+      \acronym{CRAN}'s \dQuote{string literal} errors.
+    }
+  }
   \subsection{Changed}{
+    \itemize{
+      \item Corrected some headers in \file{NEWS.Rd}
+    }
+  }
+}
+
+\section{Version 2.2.2 (2023-11-20)}{
+  \subsection{Fixed}{
     \itemize{
       \item \acronym{NEWS} was not rendering on \acronym{CRAN} because the file
       name used lowercase, \file{News.Rd}, and not \file{NEWS.Rd}.
+    }
+  }
+  \subsection{Changed}{
+    \itemize{
       \item Tweaked documentation.
     }
   }
@@ -30,6 +48,13 @@
 }
 
 \section{Version 2.2.0 (2023-08-07)}{
+  \subsection{Fixed}{
+    \itemize{
+      \item Corrected initial guess for Fritsch step for \eqn{6.4\times 10^{-3}
+      \lt x \le e}{6.4e-3 \lt x \le e}. Does not change results but may converge
+      in one fewer step.
+    }
+  }
   \subsection{Changed}{
     \itemize{
       \item Replaced Fritsch's \enc{Padé}{Pade} approximation with a degree-six
@@ -38,9 +63,6 @@
       on the non-underflowing Halley step. Should be faster than Halley
       iteration and more accurate than the Fritsch's \enc{Padé}{Pade}
       approximation.
-      \item Corrected initial guess for Fritsch step for \eqn{6.4\times 10^{-3}
-      \lt x \le e}{6.4e-3 \lt x \le e}. Does not change results but may converge
-      in one fewer step.
       \item Various grammar, linting, and unit test updates.
     }
   }

diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp
@@ -42,7 +42,7 @@ RcppExport SEXP _lamW_lambertW0_C(SEXP xSEXP) {
     if (rcpp_isError_gen) {
         SEXP rcpp_msgSEXP_gen = Rf_asChar(rcpp_result_gen);
         UNPROTECT(1);
-        Rf_error(CHAR(rcpp_msgSEXP_gen));
+        Rf_error("%s", CHAR(rcpp_msgSEXP_gen));
     }
     UNPROTECT(1);
     return rcpp_result_gen;
@@ -76,7 +76,7 @@ RcppExport SEXP _lamW_lambertWm1_C(SEXP xSEXP) {
     if (rcpp_isError_gen) {
         SEXP rcpp_msgSEXP_gen = Rf_asChar(rcpp_result_gen);
         UNPROTECT(1);
-        Rf_error(CHAR(rcpp_msgSEXP_gen));
+        Rf_error("%s", CHAR(rcpp_msgSEXP_gen));
     }
     UNPROTECT(1);
     return rcpp_result_gen;