From 912ad879af24e5f7efb9bc2d49a8c20383790072 Mon Sep 17 00:00:00 2001 From: Sebastian Buchwald Date: Wed, 3 Dec 2008 22:33:58 +0000 Subject: [PATCH] Added declaration and fixed call. [r24282] --- pbqp_edge.h | 2 ++ pbqp_node.c | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pbqp_edge.h b/pbqp_edge.h index c10643584..4ea827466 100644 --- a/pbqp_edge.h +++ b/pbqp_edge.h @@ -5,6 +5,8 @@ pbqp_edge *alloc_edge(pbqp *pbqp, int src_index, int tgt_index, pbqp_matrix *costs); +pbqp_edge *pbqp_edge_deep_copy(pbqp *pbqp, pbqp_edge *edge); + void delete_edge(pbqp_edge *edge); #endif /* KAPS_PBQP_EDGE_H */ diff --git a/pbqp_node.c b/pbqp_node.c index b4aaae67b..7a785f8c4 100644 --- a/pbqp_node.c +++ b/pbqp_node.c @@ -2,9 +2,10 @@ #include "assert.h" +#include "pbqp_edge.h" +#include "pbqp_edge_t.h" #include "pbqp_node.h" #include "pbqp_node_t.h" -#include "pbqp_edge_t.h" #include "vector.h" pbqp_node *alloc_node(pbqp *pbqp, unsigned node_index, vector *costs) @@ -77,10 +78,10 @@ pbqp_node *pbqp_node_deep_copy(pbqp *pbqp, pbqp_node *node) pbqp_node *copy = obstack_alloc(&pbqp->obstack, sizeof(*node)); assert(copy); + copy->edges = NEW_ARR_F(pbqp_edge *, 0); for (edge_index = 0; edge_index < edge_length; ++edge_index) { - copy->edges[edge_index] = pbqp_edge_deep_copy(node->edges[edge_index]); + ARR_APP1(pbqp_edge *, copy->edges, pbqp_edge_deep_copy(pbqp, node->edges[edge_index])); } - copy->edges = NEW_ARR_F(pbqp_edge *, 0); copy->costs = vector_copy(pbqp, node->costs); copy->bucket_index = node->bucket_index; copy->solution = node->solution; -- 2.20.1