instr: prefer std::str to char*

[simgrid.git] / src / instr / instr_config.cpp

diff --git a/src/instr/instr_config.cpp b/src/instr/instr_config.cpp
index daa18c4..cf20d44 100644 (file)
--- a/src/instr/instr_config.cpp
+++ b/src/instr/instr_config.cpp
@@ -63,7 +63,7 @@ static int trace_precision;
 static bool trace_configured = false;
 static bool trace_active     = false;
 
-static type_t rootType = nullptr;        /* the root type */
+static simgrid::instr::Type* rootType = nullptr; /* the root type */
 
 instr_fmt_type_t instr_fmt_type = instr_fmt_paje;
 
@@ -143,8 +143,7 @@ int TRACE_end()
 
     /* destroy all data structures of tracing (and free) */
     PJ_container_free_all();
-    recursiveDestroyType (PJ_type_get_root());
-    PJ_container_release();
+    delete PJ_type_get_root();
     rootType = nullptr;
 
     /* close the trace files */
@@ -482,7 +481,7 @@ static void output_categories(const char* name, FILE* file)
 {
   unsigned int i = created_categories.size();
   fprintf (file, "    values = (");
-  for (auto cat : created_categories) {
+  for (auto const& cat : created_categories) {
     --i;
     fprintf(file, "\"%s%s\"", name, cat.c_str());
     if (i > 0) {