Drop simgrid::xbt::demangle and use boost::core::demangle instead.

[simgrid.git] / src / kernel / lmm / maxmin.cpp

diff --git a/src/kernel/lmm/maxmin.cpp b/src/kernel/lmm/maxmin.cpp
index 052a310..bd13a0a 100644 (file)
--- a/src/kernel/lmm/maxmin.cpp
+++ b/src/kernel/lmm/maxmin.cpp
@@ -1,10 +1,10 @@
-/* Copyright (c) 2004-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2021. 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 "src/kernel/lmm/maxmin.hpp"
-#include "xbt/backtrace.hpp"
+#include <boost/core/demangle.hpp>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_maxmin, surf, "Logging specific to SURF (maxmin)");
 
@@ -136,7 +136,7 @@ System::System(bool selective_update) : selective_update_active(selective_update
   XBT_DEBUG("Setting selective_update_active flag to %d", selective_update_active);
 
   if (selective_update)
-    modified_set_ = new kernel::resource::Action::ModifiedSet();
+    modified_set_ = std::make_unique<kernel::resource::Action::ModifiedSet>();
 }
 
 System::~System()
@@ -145,8 +145,8 @@ System::~System()
   Constraint* cnst;
 
   while ((var = extract_variable())) {
-    auto demangled = simgrid::xbt::demangle(var->id_ ? typeid(*var->id_).name() : "(unidentified)");
-    XBT_WARN("Probable bug: a %s variable (#%d) not removed before the LMM system destruction.", demangled.get(),
+    std::string demangled = boost::core::demangle(var->id_ ? typeid(*var->id_).name() : "(unidentified)");
+    XBT_WARN("Probable bug: a %s variable (#%d) not removed before the LMM system destruction.", demangled.c_str(),
              var->rank_);
     var_free(var);
   }
@@ -154,7 +154,6 @@ System::~System()
     cnst_free(cnst);
 
   xbt_mallocator_free(variable_mallocator_);
-  delete modified_set_;
 }
 
 void System::cnst_free(Constraint* cnst)