Skip to content

chore: Don't pass attributes to C functions #1048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aviator-app merged 1 commit into from
Dec 30, 2023
Merged

chore: Don't pass attributes to C functions #1048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions R/aaa-auto.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ vcount_impl <- function(graph) {
res
}

empty_attrs_impl <- function(n, directed, attr) {
empty_attrs_impl <- function(n, directed) {
# Argument checks
n <- as.numeric(n)
directed <- as.logical(directed)

on.exit( .Call(R_igraph_finalizer) )
# Function call
res <- .Call(R_igraph_empty_attrs, n, directed, attr)
res <- .Call(R_igraph_empty_attrs, n, directed)

res
}
Expand Down
4 changes: 2 additions & 2 deletions src/cpp11.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ extern SEXP R_igraph_eigen_matrix(void *, void *, void *, void *, void *, void *
extern SEXP R_igraph_eigen_matrix_symmetric(void *, void *, void *, void *, void *, void *, void *);
extern SEXP R_igraph_eigenvector_centrality(void *, void *, void *, void *, void *);
extern SEXP R_igraph_empty(void *, void *);
extern SEXP R_igraph_empty_attrs(void *, void *, void *);
extern SEXP R_igraph_empty_attrs(void *, void *);
extern SEXP R_igraph_erdos_renyi_game(void *, void *, void *, void *, void *);
extern SEXP R_igraph_es_adj(void *, void *, void *, void *);
extern SEXP R_igraph_es_pairs(void *, void *, void *);
Expand Down Expand Up @@ -628,7 +628,7 @@ static const R_CallMethodDef CallEntries[] = {
{"R_igraph_eigen_matrix_symmetric", (DL_FUNC) &R_igraph_eigen_matrix_symmetric, 7},
{"R_igraph_eigenvector_centrality", (DL_FUNC) &R_igraph_eigenvector_centrality, 5},
{"R_igraph_empty", (DL_FUNC) &R_igraph_empty, 2},
{"R_igraph_empty_attrs", (DL_FUNC) &R_igraph_empty_attrs, 3},
{"R_igraph_empty_attrs", (DL_FUNC) &R_igraph_empty_attrs, 2},
{"R_igraph_erdos_renyi_game", (DL_FUNC) &R_igraph_erdos_renyi_game, 5},
{"R_igraph_es_adj", (DL_FUNC) &R_igraph_es_adj, 4},
{"R_igraph_es_pairs", (DL_FUNC) &R_igraph_es_pairs, 3},
Expand Down
4 changes: 3 additions & 1 deletion tools/stimulus/types-RR.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ MATRIX:
ARRAY3:
INCONV: '%I%[] <- as.numeric(%I%)'

ATTRIBUTES: {}
ATTRIBUTES:
CALL: {}
HEADER: ~

CONNECTEDNESS:
DEFAULT:
Expand Down