Skip to content

Use -std=c++0x for cpp11 plugin on Windows when R <= 3.0 #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 5, 2014
Merged

Use -std=c++0x for cpp11 plugin on Windows when R <= 3.0 #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2014-06-05 JJ Allaire <jj@rstudio.org>

* R/Attributes.R: Use -std=c++0x for cpp11 plugin on Windows when R <= 3.0

2014-05-28 Kevin Ushey <kevinushey@gmail.com>

* inst/include/Rcpp/vector/vector_from_string.h: Protect result of
Expand Down
2 changes: 2 additions & 0 deletions R/Attributes.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,8 @@ compileAttributes <- function(pkgdir = ".", verbose = getOption("verbose")) {
.plugins[["cpp11"]] <- function() {
if (getRversion() >= "3.1")
list(env = list(USE_CXX1X = "yes"))
else if (.Platform$OS.type == "windows")
list(env = list(PKG_CXXFLAGS = "-std=c++0x"))
else
list(env = list(PKG_CXXFLAGS ="-std=c++11"))
}
Expand Down