Skip to content

Commit 27825e0

Browse files
committed
sourceCpp now correctly binds to Rtools 3.0 and 3.1
1 parent 00a4477 commit 27825e0

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2013-10-17 JJ Allaire <jj@rstudio.org>
2+
3+
* R/Attributes.R: sourceCpp now correctly binds to Rtools 3.0 and 3.1
4+
15
2013-10-16 Dirk Eddelbuettel <edd@debian.org>
26

37
* R/Rcpp.package.skeleton.R (Rcpp.package.skeleton): Deprecate

R/Attributes.R

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,8 @@ sourceCppFunction <- function(func, isVoid, dll, symbol) {
653653

654654
# Check version -- we only support 2.15 and 2.16 right now
655655
ver <- key$`Current Version`
656-
if (identical("2.15", ver) || identical("2.16", ver)) {
656+
if (identical("2.15", ver) || identical("2.16", ver) ||
657+
identical("3.0", ver) || identical("3.1", ver)) {
657658

658659
# See if the InstallPath leads to the expected directories
659660
rToolsPath <- key$`InstallPath`

inst/NEWS.Rd

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@
2828
\item Raise requirement for R itself to be version 3.0.0 or later
2929
as needed by the vignette processing
3030
}
31+
\item Changes in Rcpp attributes:
32+
\itemize{
33+
\item \code{sourceCpp} now correctly binds to Rtools 3.0 and 3.1
34+
}
3135
}
3236
}
3337

0 commit comments

Comments
 (0)