Skip to content

Commit 630615b

Browse files
committed
simplified as the test for CXX0X is no longer needed
1 parent 3644cd2 commit 630615b

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2021-11-14 Dirk Eddelbuettel <[email protected]>
2+
3+
* R/RcppLdpath.R: Simplified as we no longer need to worry about CXX0X
4+
15
2021-11-11 Kevin Ushey <[email protected]>
26

37
* R/RcppLdpath.R: CxxFlags() now quotes its include path

R/RcppLdpath.R

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,11 @@ canUseCXX0X <- function() { TRUE } # .Call( "canUseCXX0X", PACKAGE = "Rcpp" )
4747

4848
## Provide compiler flags -- i.e. -I/path/to/Rcpp.h
4949
RcppCxxFlags <- function(cxx0x=FALSE) {
50-
5150
path <- Rcpp.system.file( "include" )
5251
if (.Platform$OS.type=="windows") {
5352
path <- asBuildPath(path) # #nocov
5453
}
55-
56-
paste0(
57-
'-I"', path, '"',
58-
if (cxx0x && canUseCXX0X()) ' -std=c++0x' else ''
59-
)
54+
paste0('-I"', path, '"')
6055
}
6156

6257
## Shorter names, and call cat() directly
@@ -86,5 +81,5 @@ RcppCxx0xFlags <- function() {
8681
}
8782

8883
Cxx0xFlags <- function() {
89-
cat( RcppCxx0xFlags() ) # #nocov end
84+
cat(RcppCxx0xFlags()) # #nocov end
9085
}

0 commit comments

Comments
 (0)