Use simgrid::xbt::Path instead of xbt_{base,dir}name in C++ files.

[simgrid.git] / src / simdag / sd_dotloader.cpp

diff --git a/src/simdag/sd_dotloader.cpp b/src/simdag/sd_dotloader.cpp
index 8e3f736..b4f8b3b 100644 (file)
--- a/src/simdag/sd_dotloader.cpp
+++ b/src/simdag/sd_dotloader.cpp
@@ -7,7 +7,7 @@
 #include "simdag_private.hpp"
 #include "simgrid/simdag.h"
 #include "src/internal_config.h"
 #include "simdag_private.hpp"
 #include "simgrid/simdag.h"
 #include "src/internal_config.h"

-#include "xbt/file.h"
+#include "xbt/file.hpp"

 #include <cstring>
 #include <unordered_map>
 
 #include <cstring>
 #include <unordered_map>
 


@@ -238,9 +238,8 @@ xbt_dynar_t SD_dotload_generic(const char* filename, bool sequential, bool sched
   }
 
   if (result && not acyclic_graph_detail(result)) {
   }
 
   if (result && not acyclic_graph_detail(result)) {

-    char* base = xbt_basename(filename);
-    XBT_ERROR("The DOT described in %s is not a DAG. It contains a cycle.", base);
-    free(base);
+    std::string base = simgrid::xbt::Path(filename).getBasename();
+    XBT_ERROR("The DOT described in %s is not a DAG. It contains a cycle.", base.c_str());

     xbt_dynar_free(&result);
     result = nullptr;
   }
     xbt_dynar_free(&result);
     result = nullptr;
   }