Skip to content

Commit 5d0f365

Browse files
committed
ptr --> xptr
1 parent 5414097 commit 5d0f365

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed

NAMESPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Generated by roxygen2: do not edit by hand
22

3-
export(ts_num_individuals_ptr2)
3+
export(ts_xptr_num_individuals2)
44
import(RcppTskit)
55
importFrom(methods,is)
66
useDynLib(RcppTskitTestLinking, .registration = TRUE)

R/RcppExports.R

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#' ts_file <- system.file("examples", "test.trees", package = "RcppTskit")
99
#' ts <- RcppTskit::ts_load(ts_file)
1010
#' ts$num_individuals()
11-
#' ts_num_individuals_ptr2(ts$pointer)
11+
#' ts_xptr_num_individuals2(ts$pointer)
1212
#' @export
13-
ts_num_individuals_ptr2 <- function(ts) {
14-
.Call(`_RcppTskitTestLinking_ts_num_individuals_ptr2`, ts)
13+
ts_xptr_num_individuals2 <- function(ts) {
14+
.Call(`_RcppTskitTestLinking_ts_xptr_num_individuals2`, ts)
1515
}
1616

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ remotes::install_github("HighlanderLab/RcppTskitTestLinking")
3737
library(RcppTskitTestLinking)
3838
3939
# Check the help page for one implemented function
40-
?ts_num_individuals_ptr2
40+
?ts_xptr_num_individuals2
4141
```
4242

4343
Now run the example from the help page.
@@ -87,7 +87,7 @@ $tables
8787
# focus just on C++ code, we have to work with the
8888
# pointer object (externalptr) `ts$pointer` and
8989
# not with the tree sequence object (TreeSequence) `ts`
90-
> ts_num_individuals_ptr2(ts$pointer)
90+
> ts_xptr_num_individuals2(ts$pointer)
9191
[1] 8
9292
```
9393

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/RcppExports.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ Rcpp::Rostream<true>& Rcpp::Rcout = Rcpp::Rcpp_cout_get();
1010
Rcpp::Rostream<false>& Rcpp::Rcerr = Rcpp::Rcpp_cerr_get();
1111
#endif
1212

13-
// ts_num_individuals_ptr2
14-
int ts_num_individuals_ptr2(const SEXP ts);
15-
RcppExport SEXP _RcppTskitTestLinking_ts_num_individuals_ptr2(SEXP tsSEXP) {
13+
// ts_xptr_num_individuals2
14+
int ts_xptr_num_individuals2(const SEXP ts);
15+
RcppExport SEXP _RcppTskitTestLinking_ts_xptr_num_individuals2(SEXP tsSEXP) {
1616
BEGIN_RCPP
1717
Rcpp::RObject rcpp_result_gen;
1818
Rcpp::RNGScope rcpp_rngScope_gen;
1919
Rcpp::traits::input_parameter< const SEXP >::type ts(tsSEXP);
20-
rcpp_result_gen = Rcpp::wrap(ts_num_individuals_ptr2(ts));
20+
rcpp_result_gen = Rcpp::wrap(ts_xptr_num_individuals2(ts));
2121
return rcpp_result_gen;
2222
END_RCPP
2323
}
2424

2525
static const R_CallMethodDef CallEntries[] = {
26-
{"_RcppTskitTestLinking_ts_num_individuals_ptr2", (DL_FUNC) &_RcppTskitTestLinking_ts_num_individuals_ptr2, 1},
26+
{"_RcppTskitTestLinking_ts_xptr_num_individuals2", (DL_FUNC) &_RcppTskitTestLinking_ts_xptr_num_individuals2, 1},
2727
{NULL, NULL, 0}
2828
};
2929

src/test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
//' ts_file <- system.file("examples", "test.trees", package = "RcppTskit")
1010
//' ts <- RcppTskit::ts_load(ts_file)
1111
//' ts$num_individuals()
12-
//' ts_num_individuals_ptr2(ts$pointer)
12+
//' ts_xptr_num_individuals2(ts$pointer)
1313
//' @export
1414
// [[Rcpp::export]]
15-
int ts_num_individuals_ptr2(const SEXP ts) {
15+
int ts_xptr_num_individuals2(const SEXP ts) {
1616
RcppTskit_treeseq_xptr ts_xptr(ts);
1717
return static_cast<int>(tsk_treeseq_get_num_individuals(ts_xptr));
1818
}

0 commit comments

Comments
 (0)