X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8be7ea3f9e71cd563e91b6aba63f5c70f043fbd5..7ea13a508781359049cc52ad576ba66b2c320721:/src/xbt/graph.c diff --git a/src/xbt/graph.c b/src/xbt/graph.c index 6e5fdb163a..5e47cf9598 100644 --- a/src/xbt/graph.c +++ b/src/xbt/graph.c @@ -1,13 +1,11 @@ /* a generic graph library. */ -/* Copyright (c) 2006-2013. The SimGrid Team. +/* Copyright (c) 2006-2014. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include -#include #include "xbt/sysdep.h" #include "xbt/log.h" #include "xbt/graph.h" @@ -16,8 +14,10 @@ #include "xbt/dict.h" #include "xbt/heap.h" #include "xbt/str.h" +#include "xbt/file.h" - +#include +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_graph, xbt, "Graph"); @@ -316,7 +316,6 @@ double *xbt_graph_get_length_matrix(xbt_graph_t g) } xbt_dynar_foreach(g->nodes, cursor, node) { - in_cursor = 0; D(cursor, cursor) = 0; xbt_dynar_foreach(node->out, in_cursor, edge) { @@ -627,7 +626,7 @@ xbt_graph_t xbt_graph_read(const char *filename, ETag_graphxml_edge_fun = __parse_edge; xbt_graph_parse_open(filename); - _XBT_GNUC_UNUSED int res; + XBT_ATTRIB_UNUSED int res; res = xbt_graph_parse(); xbt_assert(!res, "Parse error in %s", filename); xbt_graph_parse_close();