From e60c573d4054a24518facc022d3c373739b4a112 Mon Sep 17 00:00:00 2001 From: Mauricio Vargas Date: Mon, 30 Jan 2023 02:30:10 -0500 Subject: [PATCH] use cpp11 and cpp11 only --- .Rbuildignore | 1 + DESCRIPTION | 12 ++++++------ src/Makevars.in | 2 ++ vscode-install.r | 4 ++++ 4 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 vscode-install.r diff --git a/.Rbuildignore b/.Rbuildignore index a6ebad59c..4a3ca304e 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -26,3 +26,4 @@ windows ^\.gitpod\.yml$ ^\.gitpod\.Dockerfile$ ^CMakeLists\.txt$ +^vscode-install\.r$ diff --git a/DESCRIPTION b/DESCRIPTION index 34eb61ccb..c78beb4c6 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: RPostgres Title: Rcpp Interface to PostgreSQL -Version: 1.4.5.9002 +Version: 1.4.5.9003 Date: 2023-01-24 Authors@R: c( person("Hadley", "Wickham", role = "aut"), @@ -36,9 +36,8 @@ Suggests: rmarkdown, testthat (>= 3.0.0) LinkingTo: - plogr (>= 0.2.0), - Rcpp, - cpp11 + cpp11, + plogr (>= 0.2.0) VignetteBuilder: knitr Config/autostyle/scope: line_breaks @@ -48,8 +47,9 @@ Encoding: UTF-8 LazyLoad: true Roxygen: list(markdown = TRUE) RoxygenNote: 7.2.3 -SystemRequirements: libpq >= 9.0: libpq-dev (deb) or postgresql-devel - (rpm), C++17 +SystemRequirements: + libpq >= 9.0: libpq-dev (deb) or postgresql-devel (rpm), + C++11 Collate: 'PqDriver.R' 'PqConnection.R' diff --git a/src/Makevars.in b/src/Makevars.in index 997f0450c..9ca38040e 100644 --- a/src/Makevars.in +++ b/src/Makevars.in @@ -4,3 +4,5 @@ PKG_CFLAGS=$(C_VISIBILITY) PKG_CXXFLAGS=$(CXX_VISIBILITY) PKG_LIBS=@libs@ + +CXX_STD = CXX11 diff --git a/vscode-install.r b/vscode-install.r new file mode 100644 index 000000000..5e8292dbe --- /dev/null +++ b/vscode-install.r @@ -0,0 +1,4 @@ +if (!require(covr)) install.packages("covr") +if (!require(DBItest)) install.packages("DBItest") +devtools::install(upgrade = "never") +devtools::check()