Use USE_CXX1X for cpp11 plugin when R >= 3.1

Author: jjallaire

ChangeLog

@@ -1,3 +1,7 @@
+2014-04-30  JJ Allaire <[email protected]>
+
+        * R/Attributes.R: Use USE_CXX1X for cpp11 plugin when R >= 3.1
+
 2014-04-02  Dirk Eddelbuettel  <[email protected]>
 
 	* tests/doRUnit.R: Better RUnit error report with thanks to Murray

R/Attributes.R

@@ -392,7 +392,10 @@ compileAttributes <- function(pkgdir = ".", verbose = getOption("verbose")) {
 
 # built-in C++11 plugin
 .plugins[["cpp11"]] <- function() {
-    list(env = list(PKG_CXXFLAGS ="-std=c++11"))
+    if (getRversion() >= "3.1")
+      list(env = list(USE_CXX1X = ""))
+    else
+      list(env = list(PKG_CXXFLAGS ="-std=c++11"))
 }
 
 ## built-in OpenMP++11 plugin

inst/NEWS.Rd

@@ -11,6 +11,8 @@
     \item Trailing line comments are now stripped by the attributes
     parser. This allows the parser to handle C++ source files
     containing comments inline with function arguments.
+    \item The \code{USE_CXX1X} environment variable is now defined by 
+    the cpp11 plugin when R >= 3.1
   }
 }