Skip to content

Commit 150be95

Browse files
committed
some editing for stylistic consistency, nothing added or removed
1 parent a3f64d2 commit 150be95

File tree

2 files changed

+16
-17
lines changed

2 files changed

+16
-17
lines changed

ChangeLog

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
2015-02-12 JJ Allaire <[email protected]>
22

33
* DESCRIPTION: bump version
4-
* src/attributes.cpp: Add rng parameter to Rcpp::export to
4+
* src/attributes.cpp: Add rng parameter to Rcpp::export to
55
prevent inclusion of RNGScope in generated code; recognize
66
Rtools 3.2
77

inst/NEWS.Rd

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,25 @@
66
\itemize{
77
\item Changes in Rcpp API:
88
\itemize{
9-
\item Defining an error handler for tinyformat prevents \code{assert()}
10-
from spilling.
11-
\item Add Rcpp::warning function as wrapper for Rf_warning.
12-
\item Improvements to XPtr including new \code{checked_get} and
13-
\code{release} functions as well as improved behavior (throw an
14-
exception rather than crash) when a NULL external pointer is
15-
dereferenced.
16-
\item Evaluate R code within an \code{R_toplevelExec} block to prevent
9+
\item An error handler for tinyformat was defined to prevent the \code{assert()}
10+
macro from spilling.
11+
\item The \code{Rcpp::warning} function was added as a wrapper for \code{Rf_warning}.
12+
\item The \code{XPtr} class was extended with new \code{checked_get}
13+
and \code{release} functions as well as improved behavior (throw an
14+
exception rather than crash) when a NULL external pointer is dereferenced.
15+
\item R code is evaluated within an \code{R_toplevelExec} block to prevent
1716
user interrupts from bypassing C++ destructors on the stack.
1817
}
1918
\item Changes in Rcpp Attributes:
2019
\itemize{
21-
\item Include pkg_types.h file in RcppExports.cpp if it's present in
22-
inst/include or src.
23-
\item Simplify generated attributes code for \code{RNGScope} (use
24-
\code{RObject} and it's destructor rather than \code{SEXP}
25-
protect/unprotect).
26-
\item Add rng parameter to Rcpp::export to prevent inclusion of
27-
RNGScope in generated code.
28-
\item Correctly detect Rtools 3.2
20+
\item The \code{pkg_types.h} file is now included in \code{RcppExports.cpp}
21+
if it is present in either the \code{inst/include} or \code{src}.
22+
\item The generated attributes code was simplified with respect to
23+
\code{RNGScope} and now uses \code{RObject} and its destructor rather than \code{SEXP}
24+
protect/unprotect.
25+
\item Support addition of the \code{rng} parameter in \code{Rcpp::export}
26+
to suppress the otherwise automatic inclusion of \code{RNGScope} in generated code.
27+
\item Version 3.2 of the Rtools is now correctly detected as well.
2928
}
3029
}
3130
}

0 commit comments

Comments
 (0)