diff --git a/src/rinterface.c b/src/rinterface.c index a86469744e..0374a61fee 100644 --- a/src/rinterface.c +++ b/src/rinterface.c @@ -11106,10 +11106,8 @@ SEXP R_igraph_eulerian_cycle(SEXP graph) { R_SEXP_to_igraph(graph, &c_graph); IGRAPH_R_CHECK(igraph_vector_int_init(&c_edge_res, 0)); IGRAPH_FINALLY(igraph_vector_int_destroy, &c_edge_res); - if (0 != igraph_vector_int_init(&c_vertex_res, 0)) { - igraph_error("", __FILE__, __LINE__, IGRAPH_ENOMEM); - } - IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &c_vertex_res); + IGRAPH_R_CHECK(igraph_vector_int_init(&c_vertex_res, 0)); + IGRAPH_FINALLY(igraph_vector_int_destroy, &c_vertex_res); /* Call igraph */ IGRAPH_R_CHECK(igraph_eulerian_cycle(&c_graph, &c_edge_res, &c_vertex_res)); diff --git a/src/vendor/cigraph/interfaces/functions.yaml b/src/vendor/cigraph/interfaces/functions.yaml index 163f863bcd..e6e923e805 100644 --- a/src/vendor/cigraph/interfaces/functions.yaml +++ b/src/vendor/cigraph/interfaces/functions.yaml @@ -2563,7 +2563,7 @@ igraph_eulerian_path: DEPS: edge_res ON graph, vertex_res ON graph igraph_eulerian_cycle: - PARAMS: GRAPH graph, OPTIONAL OUT EDGE_INDICES edge_res, OPTIONAL OUT VERTEX_INDICES_PV vertex_res + PARAMS: GRAPH graph, OPTIONAL OUT EDGE_INDICES edge_res, OPTIONAL OUT VERTEX_INDICES vertex_res DEPS: edge_res ON graph, vertex_res ON graph ####################################### diff --git a/src/vendor/cigraph/interfaces/types.yaml b/src/vendor/cigraph/interfaces/types.yaml index f726e1f59b..4865b99292 100644 --- a/src/vendor/cigraph/interfaces/types.yaml +++ b/src/vendor/cigraph/interfaces/types.yaml @@ -157,13 +157,6 @@ VERTEX_INDICES: CTYPE: igraph_vector_int_t FLAGS: BY_REF -# Temporary, for https://github.com/igraph/rigraph/pull/1630 -# We should call the `_PV` versions for all types in the future. -VERTEX_INDICES_PV: - # An integer vector containing vertex indices. - CTYPE: igraph_vector_int_t - FLAGS: BY_REF - VERTEX_INDEX_PAIRS: # An integer vector containing pairs of vertex indices, in a flattened # representation diff --git a/src/vendor/igraph_version.h b/src/vendor/igraph_version.h index 3bad40e7ff..60eec6ee76 100644 --- a/src/vendor/igraph_version.h +++ b/src/vendor/igraph_version.h @@ -28,11 +28,11 @@ __BEGIN_DECLS -#define IGRAPH_VERSION "0.10.15-47-g521624378" +#define IGRAPH_VERSION "0.10.15-48-g2ab6b8794" #define IGRAPH_VERSION_MAJOR 0 #define IGRAPH_VERSION_MINOR 10 #define IGRAPH_VERSION_PATCH 15 -#define IGRAPH_VERSION_PRERELEASE "47-g521624378" +#define IGRAPH_VERSION_PRERELEASE "48-g2ab6b8794" IGRAPH_EXPORT void igraph_version(const char **version_string, int *major,