Skip to content

Commit 9932ca3

Browse files
committed
Set USE_CXX1X to non-empty value
1 parent a8e1920 commit 9932ca3

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

ChangeLog

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1+
2014-05-06 Kevin Ushey <[email protected]>
2+
3+
* R/Attributes.R (.plugins[["cpp11"]]): Set USE_CXX1X to non-empty
4+
value
5+
16
2014-04-30 Dirk Eddelbuettel <[email protected]>
27

3-
* R/Attributes.R: Add plugins for C++0x and C++1y
8+
* R/Attributes.R: Add plugins for C++0x and C++1y
49

510
2014-04-30 JJ Allaire <[email protected]>
611

@@ -5817,4 +5822,3 @@
58175822

58185823
* inst/doc/RcppAPI.{Rnw,pdf}: Added footnote onto titlepage about how
58195824
this document has not (yet) been updated along with the channges made
5820-

R/Attributes.R

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ sourceCpp <- function(file = "",
2828
# resolve code into a file if necessary. also track the working
2929
# directory to source the R embedded code chunk within
3030
if (!missing(code)) {
31-
rWorkingDir <- getwd()
31+
rWorkingDir <- getwd()
3232
file <- tempfile(fileext = ".cpp")
3333
con <- file(file, open = "w")
3434
writeLines(code, con)
@@ -270,7 +270,7 @@ cppFunction <- function(code,
270270
manipulate_this_type <- do.call( cppFunction, dots )
271271
res <- manipulate_this_type()
272272
if( ! is.null(class) ){
273-
class(res) <- class
273+
class(res) <- class
274274
}
275275
res
276276
}
@@ -281,7 +281,7 @@ sizeof <- .type_manipulate( "sizeof", "bytes" )
281281

282282
print.bytes <- function( x, ...){
283283
writeLines( sprintf( "%d bytes (%d bits)", x, 8 * x ) )
284-
invisible( x )
284+
invisible( x )
285285
}
286286

287287
# Evaluate a simple c++ expression
@@ -393,7 +393,7 @@ compileAttributes <- function(pkgdir = ".", verbose = getOption("verbose")) {
393393
# built-in C++11 plugin
394394
.plugins[["cpp11"]] <- function() {
395395
if (getRversion() >= "3.1")
396-
list(env = list(USE_CXX1X = ""))
396+
list(env = list(USE_CXX1X = "0"))
397397
else
398398
list(env = list(PKG_CXXFLAGS ="-std=c++11"))
399399
}
@@ -521,7 +521,7 @@ sourceCppFunction <- function(func, isVoid, dll, symbol) {
521521

522522
# Lookup a plugin
523523
.findPlugin <- function(pluginName) {
524-
524+
525525
plugin <- .plugins[[pluginName]]
526526
if (is.null(plugin))
527527
stop("Inline plugin '", pluginName, "' could not be found ",
@@ -600,7 +600,7 @@ sourceCppFunction <- function(func, isVoid, dll, symbol) {
600600
# if there is no buildEnv from a plugin then use the Rcpp plugin
601601
if (length(buildEnv) == 0) {
602602
buildEnv <- inlineCxxPlugin()$env
603-
}
603+
}
604604

605605
# set CLINK_CPPFLAGS based on the LinkingTo dependencies
606606
buildEnv$CLINK_CPPFLAGS <- .buildClinkCppFlags(linkingToPackages)

0 commit comments

Comments
 (0)