Skip to content

Commit

Permalink
Merge pull request #1 from pachadotdev/cpp11
Browse files Browse the repository at this point in the history
use cpp11 and cpp11 only
  • Loading branch information
Antonov548 authored Jan 30, 2023
2 parents a67c4c2 + 92c27a5 commit 718db2c
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 9 deletions.
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ windows
^\.gitpod\.yml$
^\.gitpod\.Dockerfile$
^CMakeLists\.txt$
^vscode-install\.r$
14 changes: 7 additions & 7 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -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"),
Expand Down Expand Up @@ -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
Expand All @@ -48,15 +47,16 @@ 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'
'PqResult.R'
'RPostgres-pkg.R'
'cpp11.R'
'Redshift.R'
'cpp11.R'
'dbAppendTable_PqConnection.R'
'dbBegin_PqConnection.R'
'dbBind_PqResult.R'
Expand Down
1 change: 0 additions & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ exportMethods(show)
exportMethods(sqlData)
import(DBI)
import(methods)
importFrom(Rcpp,sourceCpp)
importFrom(bit64,integer64)
importFrom(blob,blob)
importFrom(hms,hms)
Expand Down
1 change: 0 additions & 1 deletion R/PqDriver.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
#'
#' @export
#' @useDynLib RPostgres, .registration = TRUE
#' @importFrom Rcpp sourceCpp
#' @import methods DBI
Postgres <- function() {
new("PqDriver")
Expand Down
2 changes: 2 additions & 0 deletions src/Makevars.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ PKG_CFLAGS=$(C_VISIBILITY)
PKG_CXXFLAGS=$(CXX_VISIBILITY)

PKG_LIBS=@libs@

CXX_STD = CXX11
4 changes: 4 additions & 0 deletions vscode-install.r
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
if (!require(covr)) install.packages("covr")
if (!require(DBItest)) install.packages("DBItest")
devtools::install(upgrade = "never")
devtools::check()

0 comments on commit 718db2c

Please sign in to comment.