Skip to content

Commit 81ee5c1

Browse files
committed
Not longer set C++11 in plugin
1 parent 160e2e1 commit 81ee5c1

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

ChangeLog

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2024-05-03 Dirk Eddelbuettel <[email protected]>
2+
3+
* R/inline.R (inlineCxxPlugin): No longer set C++11 for the plugin as
4+
this choice has long been obsoleted by what R does for us
5+
6+
2024-04-15 Dirk Eddelbuettel <[email protected]>
7+
8+
* DESCRIPTION (Version, Date): RcppArmadillo 0.12.8.2.1
9+
* inst/NEWS.Rd: Idem
10+
111
2024-04-10 Tomasz Kalinowski <[email protected]>
212

313
* inst/tinytest/test_scipy2r.R: Update for reticulate v1.36;

R/inline.R

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Copyright (C) 2010 - 2017 Dirk Eddelbuettel, Romain Francois and Douglas Bates
1+
## Copyright (C) 2010 - 2024 Dirk Eddelbuettel, Romain Francois and Douglas Bates
22
##
33
## This file is part of RcppArmadillo.
44
##
@@ -18,15 +18,10 @@
1818
inlineCxxPlugin <- function(...) {
1919
ismacos <- Sys.info()[["sysname"]] == "Darwin"
2020
openmpflag <- if (ismacos) "" else "$(SHLIB_OPENMP_CFLAGS)"
21-
plugin <-
22-
Rcpp::Rcpp.plugin.maker(
23-
include.before = "#include <RcppArmadillo.h>",
24-
libs = paste(openmpflag, "$(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)"),
25-
package = "RcppArmadillo"
26-
)
21+
plugin <- Rcpp::Rcpp.plugin.maker(include.before = "#include <RcppArmadillo.h>",
22+
libs = paste(openmpflag, "$(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)"),
23+
package = "RcppArmadillo")
2724
settings <- plugin()
2825
settings$env$PKG_CPPFLAGS <- paste("-I../inst/include", openmpflag)
29-
if (!ismacos) settings$env$USE_CXX11 <- "yes"
3026
settings
3127
}
32-

0 commit comments

Comments
 (0)