Skip to content

Commit c5d9b00

Browse files
authored
Merge pull request #100 from andrjohns/cpp17-std
Update C++ Standard to C++17
2 parents a86140f + b25e872 commit c5d9b00

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

.github/workflows/check-standard.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,20 @@ jobs:
3232
steps:
3333
- uses: actions/checkout@v2
3434

35-
- uses: r-lib/actions/setup-pandoc@v1
35+
- uses: r-lib/actions/setup-pandoc@v2
3636

37-
- uses: r-lib/actions/setup-r@v1
37+
- uses: r-lib/actions/setup-r@v2
3838
with:
3939
r-version: ${{ matrix.config.r }}
4040
http-user-agent: ${{ matrix.config.http-user-agent }}
4141
use-public-rspm: true
4242

43-
- uses: r-lib/actions/setup-r-dependencies@v1
43+
- uses: r-lib/actions/setup-r-dependencies@v2
4444
with:
4545
extra-packages: rcmdcheck BH RcppParallel RcppEigen Rcpp rstan StanHeaders
4646

4747
- name: Check against CRAN StanHeaders and CRAN RStan
48-
uses: r-lib/actions/check-r-package@v1
48+
uses: r-lib/actions/check-r-package@v2
4949

5050
- name: Install Development StanHeaders and CRAN RStan
5151
run: |
@@ -55,7 +55,7 @@ jobs:
5555
shell: Rscript {0}
5656

5757
- name: Check against Development StanHeaders and CRAN RStan
58-
uses: r-lib/actions/check-r-package@v1
58+
uses: r-lib/actions/check-r-package@v2
5959

6060
- name: Install Development StanHeaders and Development RStan
6161
run: |
@@ -65,7 +65,7 @@ jobs:
6565
shell: Rscript {0}
6666

6767
- name: Check against Development StanHeaders and Development RStan
68-
uses: r-lib/actions/check-r-package@v1
68+
uses: r-lib/actions/check-r-package@v2
6969

7070
- name: Show testthat output
7171
if: always()

DESCRIPTION

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Type: Package
33
Title: Tools for Developing R Packages Interfacing with 'Stan'
44
Version: 2.2.0.9000
55
Date: 2022-04-05
6-
Authors@R:
6+
Authors@R:
77
c(person(given = "Jonah",
88
family = "Gabry",
99
role = c("aut", "cre"),
@@ -18,7 +18,7 @@ Authors@R:
1818
email = "[email protected]"),
1919
person(given = "Andrew",
2020
family = "Johnson",
21-
role = "ctb"),
21+
role = "aut"),
2222
person(given = "Hamada S.",
2323
family = "Badr",
2424
role = "ctb"),
@@ -32,9 +32,9 @@ Authors@R:
3232
family = "Columbia University",
3333
role = "cph"))
3434
Description: Provides various tools for developers of R packages interfacing
35-
with 'Stan' <https://mc-stan.org>, including functions to set up the required
36-
package structure, S3 generics and default methods to unify function naming
37-
across 'Stan'-based R packages, and vignettes with recommendations for
35+
with 'Stan' <https://mc-stan.org>, including functions to set up the required
36+
package structure, S3 generics and default methods to unify function naming
37+
across 'Stan'-based R packages, and vignettes with recommendations for
3838
developers.
3939
License: GPL (>=3)
4040
URL: https://mc-stan.org/rstantools/, https://discourse.mc-stan.org/

inst/include/sys/Makevars

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
STANHEADERS_SRC = $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "message()" -e "cat(system.file('include', 'src', package = 'StanHeaders', mustWork = TRUE))" -e "message()" | grep "StanHeaders")
22

33
STANC_FLAGS = $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "cat(ifelse(utils::packageVersion('rstan') >= 2.26, '-DUSE_STANC3',''))")
4-
PKG_CPPFLAGS = -I"../inst/include" -I"$(STANHEADERS_SRC)" -DBOOST_DISABLE_ASSERTS -DEIGEN_NO_DEBUG -DBOOST_MATH_OVERFLOW_ERROR_POLICY=errno_on_error $(STANC_FLAGS)
4+
PKG_CPPFLAGS = -I"../inst/include" -I"$(STANHEADERS_SRC)" -DBOOST_DISABLE_ASSERTS -DEIGEN_NO_DEBUG -DBOOST_MATH_OVERFLOW_ERROR_POLICY=errno_on_error $(STANC_FLAGS) -D_HAS_AUTO_PTR_ETC=0
55
PKG_CXXFLAGS = $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "RcppParallel::CxxFlags()") $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "StanHeaders:::CxxFlags()")
66
PKG_LIBS = $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "RcppParallel::RcppParallelLibs()") $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "StanHeaders:::LdFlags()")
77

8-
CXX_STD = CXX14
8+
CXX_STD = CXX17

inst/include/sys/Makevars.win

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
STANHEADERS_SRC = $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "message()" -e "cat(system.file('include', 'src', package = 'StanHeaders', mustWork = TRUE))" -e "message()" | grep "StanHeaders")
22

33
STANC_FLAGS = $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "cat(ifelse(utils::packageVersion('rstan') >= 2.26, '-DUSE_STANC3',''))")
4-
PKG_CPPFLAGS = -I"../inst/include" -I"$(STANHEADERS_SRC)" -DBOOST_DISABLE_ASSERTS -DEIGEN_NO_DEBUG -DRCPP_PARALLEL_USE_TBB=1 $(STANC_FLAGS)
4+
PKG_CPPFLAGS = -I"../inst/include" -I"$(STANHEADERS_SRC)" -DBOOST_DISABLE_ASSERTS -DEIGEN_NO_DEBUG -DRCPP_PARALLEL_USE_TBB=1 $(STANC_FLAGS) -D_HAS_AUTO_PTR_ETC=0
55
PKG_CXXFLAGS = $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "RcppParallel::CxxFlags()") $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "StanHeaders:::CxxFlags()")
66
PKG_LIBS = $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "RcppParallel::RcppParallelLibs()") $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "StanHeaders:::LdFlags()")
77

8-
CXX_STD = CXX14
8+
CXX_STD = CXX17

0 commit comments

Comments
 (0)