{
#ifdef __GXX_ABI_VERSION
int status;
- auto res = std::unique_ptr<char, void(*)(void*)>(
- abi::__cxa_demangle(name, nullptr, nullptr, &status),
- std::free
- );
+ auto res = std::unique_ptr<char, void (*)(void*)>(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, void (*)(void*)>(xbt_strdup(name), &std::free);
}
class BacktraceImpl {
die "$progname: Parse error: This line seem to be a test suite declaration, but failed to parse it\n$_\n";
}
- if (m/XBT_TEST_UNIT\(\w*"([^"]*)"\w*,([^,]*),(.*?)\)/) { #"{
+ if (m/XBT_TEST_UNIT\(\w*"([^"]*)"\w*, *([^,]*), *(.*?)\)/) { #"{
die "$progname: multiply defined unit in file $infile: $1\n" if (defined($tests{$1}));
my @t=($1,$2,$3);
$newmain .= " suite = xbt_test_suite_by_name(\"$suite_name\",$suite_title);\n";
map {
my ($name,$func,$title) = @{$_};
- $newmain .= " xbt_test_suite_push(suite, \"$name\", $func, $title);\n";
+ $newmain .= " xbt_test_suite_push(suite, \"$name\", &$func, $title);\n";
} @tests;
$newmain .= " /* SGU: END FILE */\n\n";