X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/347996b4a10c4e8579080692afa60e0afb88b60a..2b1640b1ff96d9a64a02d0c9862cf81e32d73e2e:/src/simdag/sd_dotloader.cpp diff --git a/src/simdag/sd_dotloader.cpp b/src/simdag/sd_dotloader.cpp index 25fdbae1c5..d33cb25bbe 100644 --- a/src/simdag/sd_dotloader.cpp +++ b/src/simdag/sd_dotloader.cpp @@ -6,14 +6,11 @@ #include "src/simdag/simdag_private.h" #include "simgrid/simdag.h" -#include "xbt/log.h" -#include +#include "xbt/file.h" #include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_dotparse, sd, "Parsing DOT files"); -#undef CLEANUP - #ifdef HAVE_CGRAPH_H #include #elif HAVE_AGRAPH_H @@ -30,7 +27,6 @@ typedef enum { xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par, bool schedule); - static void dot_task_p_free(void *task) { SD_task_destroy(*(SD_task_t *)task); } @@ -248,7 +244,7 @@ xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par, bool } if (result && !acyclic_graph_detail(result)) { - XBT_ERROR("The DOT described in %s is not a DAG. It contains a cycle.", basename((char*)filename)); + XBT_ERROR("The DOT described in %s is not a DAG. It contains a cycle.", xbt_basename((char*)filename)); xbt_dynar_free(&result); result = NULL; }