Merge pull request #148 from RcppCore/feature/windows-c++0x

eddelbuettel · eddelbuettel · commit a05138678ccd · 2014-06-05T05:47:44.000-05:00
Use -std=c++0x for cpp11 plugin on Windows when R &lt;= 3.0
diff --git a/ChangeLog b/ChangeLog
@@ -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
diff --git a/R/Attributes.R b/R/Attributes.R
@@ -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"))
 }

-Original file line number
+Diff line change
@@ @@ -1,3 +1,7 @@ @@
 +2014-06-05  JJ Allaire <[email protected]>
++
 +        * R/Attributes.R: Use -std=c++0x for cpp11 plugin on Windows when R <= 3.0
++
 -05-28  Kevin Ushey  <[email protected]>
         * inst/include/Rcpp/vector/vector_from_string.h: Protect result of
Original file line number	Diff line number	Diff line change
`@@ -395,6 +395,8 @@ compileAttributes <- function(pkgdir = ".", verbose = getOption("verbose")) {`
`395`	`395`	`.plugins[["cpp11"]] <- function() {`
`396`	`396`	`if (getRversion() >= "3.1")`
`397`	`397`	`list(env = list(USE_CXX1X = "yes"))`
	`398`	`+ else if (.Platform$OS.type == "windows")`
	`399`	`+ list(env = list(PKG_CXXFLAGS = "-std=c++0x"))`
`398`	`400`	`else`
`399`	`401`	`list(env = list(PKG_CXXFLAGS ="-std=c++11"))`
`400`	`402`	`}`