Merge a46acb7 into 346bbcb

nlmixr2 · Feb 13, 2023 · 20a9665 · 20a9665
2 parents 346bbcb + a46acb7
commit 20a9665
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -38,7 +38,8 @@ LinkingTo:
     dparser (>= 1.3.1-10),
     Rcpp (>= 1.0.8),
     RcppEigen (>= 0.3.3.9.2),
-    StanHeaders (>= 2.21.0.7)
+    StanHeaders (>= 2.21.0.7),
+    RcppParallel (>= 2.21.0.7)
 Biarch: true
 Config/testthat/edition: 3
 Encoding: UTF-8

diff --git a/inst/tools/workaround.R b/inst/tools/workaround.R
@@ -17,14 +17,13 @@ unlink("src/tran.g.d_parser.c")
 
 .badStan <- ""
 .in <- gsub("@SH@", gsub("-I", "-@ISYSTEM@",
-                         paste(## capture.output(StanHeaders:::CxxFlags()),
-                               ## capture.output(RcppParallel:::CxxFlags()),
+                         paste(capture.output(StanHeaders:::CxxFlags()),  # nolint
+                               capture.output(RcppParallel:::CxxFlags()),  # nolint
                                paste0("-@ISYSTEM@'", system.file('include', 'src', package = 'StanHeaders', mustWork = TRUE), "'"),
                                .badStan)),
             .in)
 
-.in <- gsub("@SL@", "", ##paste(capture.output(StanHeaders:::LdFlags()), capture.output(RcppParallel:::RcppParallelLibs())),
-            .in)
+.in <- gsub("@SL@", paste(capture.output(StanHeaders:::LdFlags()), capture.output(RcppParallel:::RcppParallelLibs())), .in)  # nolint
 
 if (.Platform$OS.type == "windows" && !file.exists("src/Makevars.win")) {
   .in <- gsub("@CXX14STD@", "-std=c++1y", .in)