X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bc7a96b28610454ce4a2030936471f548bd0c02f..a5f17092ece4ade9cfce4dfc07fc6ce43b8bc349:/src/simdag/sd_daxloader.cpp diff --git a/src/simdag/sd_daxloader.cpp b/src/simdag/sd_daxloader.cpp index 07a3919c57..54baf3766c 100644 --- a/src/simdag/sd_daxloader.cpp +++ b/src/simdag/sd_daxloader.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2018. The SimGrid Team. +/* Copyright (c) 2009-2019. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -12,11 +12,11 @@ #include #include -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_daxparse, sd, "Parsing DAX files"); - #include "dax_dtd.h" #include "dax_dtd.c" +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_daxparse, sd, "Parsing DAX files"); + /* Ensure that transfer tasks have unique names even though a file is used several times */ void uniq_transfer_task_name(SD_task_t task) { @@ -222,7 +222,7 @@ xbt_dynar_t SD_daxload(const char *filename) if (not acyclic_graph_detail(result)) { XBT_ERROR("The DAX described in %s is not a DAG. It contains a cycle.", - simgrid::xbt::Path(filename).getBasename().c_str()); + simgrid::xbt::Path(filename).get_base_name().c_str()); xbt_dynar_foreach(result, cpt, file) SD_task_destroy(file); xbt_dynar_free_container(&result);