Set USE_CXX1X to more reasonable non-empty value

kevinushey · kevinushey · commit fefc11231696 · 2014-05-07T08:46:01.000-07:00
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-07  Kevin Ushey  <kevinushey@gmail.com>
+
+	* R/Attributes.R (.plugins[["cpp11"]]): Set USE_CXX1X to more
+	reasonable non-empty value
+
 2014-05-06  Kevin Ushey  <kevinushey@gmail.com>
 
 	* R/Attributes.R (.plugins[["cpp11"]]): Set USE_CXX1X to non-empty
diff --git a/R/Attributes.R b/R/Attributes.R
@@ -393,7 +393,7 @@ compileAttributes <- function(pkgdir = ".", verbose = getOption("verbose")) {
 # built-in C++11 plugin
 .plugins[["cpp11"]] <- function() {
     if (getRversion() >= "3.1")
-        list(env = list(USE_CXX1X = "0"))
+        list(env = list(USE_CXX1X = "yes"))
     else
         list(env = list(PKG_CXXFLAGS ="-std=c++11"))
 }
@@ -926,4 +926,3 @@ sourceCppFunction <- function(func, isVoid, dll, symbol) {
     }
     .hasDevelTools
 }
-

-Original file line number
+Diff line change
@@ @@ -1,3 +1,8 @@ @@
 +2014-05-07  Kevin Ushey  <[email protected]>
++
 +	* R/Attributes.R (.plugins[["cpp11"]]): Set USE_CXX1X to more
 +	reasonable non-empty value
++
 -05-06  Kevin Ushey  <[email protected]>
 	* R/Attributes.R (.plugins[["cpp11"]]): Set USE_CXX1X to non-empty
Original file line number	Diff line number	Diff line change
`@@ -393,7 +393,7 @@ compileAttributes <- function(pkgdir = ".", verbose = getOption("verbose")) {`
`393`	`393`	`# built-in C++11 plugin`
`394`	`394`	`.plugins[["cpp11"]] <- function() {`
`395`	`395`	`if (getRversion() >= "3.1")`
`396`		`- list(env = list(USE_CXX1X = "0"))`
	`396`	`+ list(env = list(USE_CXX1X = "yes"))`
`397`	`397`	`else`
`398`	`398`	`list(env = list(PKG_CXXFLAGS ="-std=c++11"))`
`399`	`399`	`}`
`@@ -926,4 +926,3 @@ sourceCppFunction <- function(func, isVoid, dll, symbol) {`
`926`	`926`	`}`
`927`	`927`	`.hasDevelTools`
`928`	`928`	`}`
`929`		`-`