Skip to content

Commit a3f64d2

Browse files
committed
Correctly detect Rtools 3.2
1 parent 64f327f commit a3f64d2

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

ChangeLog

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
* DESCRIPTION: bump version
44
* src/attributes.cpp: Add rng parameter to Rcpp::export to
5-
prevent inclusion of RNGScope in generated code.
5+
prevent inclusion of RNGScope in generated code; recognize
6+
Rtools 3.2
67

78
2015-02-06 Kevin Ushey <[email protected]>
89

R/Attributes.R

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,8 @@ sourceCppFunction <- function(func, isVoid, dll, symbol) {
685685
# Check version -- we only support 2.15 and 2.16 right now
686686
ver <- key$`Current Version`
687687
if (identical("2.15", ver) || identical("2.16", ver) ||
688-
identical("3.0", ver) || identical("3.1", ver)) {
688+
identical("3.0", ver) || identical("3.1", ver) ||
689+
identical("3.2", ver)) {
689690

690691
# See if the InstallPath leads to the expected directories
691692
rToolsPath <- key$`InstallPath`

inst/NEWS.Rd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
protect/unprotect).
2626
\item Add rng parameter to Rcpp::export to prevent inclusion of
2727
RNGScope in generated code.
28+
\item Correctly detect Rtools 3.2
2829
}
2930
}
3031
}

0 commit comments

Comments
 (0)