Fix profiler result merging
This commit is contained in:
parent
e0a185d349
commit
c7923f356e
1 changed files with 2 additions and 5 deletions
|
|
@ -124,13 +124,10 @@ namespace psemek::prof
|
||||||
auto it1 = t1.children.find(it2->first);
|
auto it1 = t1.children.find(it2->first);
|
||||||
if (it1 == t1.children.end())
|
if (it1 == t1.children.end())
|
||||||
{
|
{
|
||||||
it1 = t1.children.insert(*it2).first;
|
it1 = t1.children.insert({it2->first, profiler_tree{}}).first;
|
||||||
t1.children_list.push_back(it1);
|
t1.children_list.push_back(it1);
|
||||||
}
|
}
|
||||||
else
|
it1->second = merge(std::move(it1->second), it2->second);
|
||||||
{
|
|
||||||
it1->second = merge(std::move(it1->second), it2->second);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return t1;
|
return t1;
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue