namespace simgrid {
namespace xbt {
-std::unique_ptr<char, void(*)(void*)> demangle(const char* name)
+std::unique_ptr<char, std::function<void(char*)>> demangle(const char* name)
{
#ifdef __GXX_ABI_VERSION
int status;
- auto res = std::unique_ptr<char, void (*)(void*)>(abi::__cxa_demangle(name, nullptr, nullptr, &status), &std::free);
+ std::unique_ptr<char, std::function<void(char*)>> res(abi::__cxa_demangle(name, nullptr, nullptr, &status),
+ &std::free);
if (res != nullptr)
return res;
// We did not manage to resolve this. Probably because this is not a mangled symbol:
#endif
// Return the symbol:
- return std::unique_ptr<char, void (*)(void*)>(xbt_strdup(name), &std::free);
+ return std::unique_ptr<char, std::function<void(char*)>>(xbt_strdup(name), &xbt_free_f);
}
class BacktraceImpl {