kiper220/mimalloc
1
0
Fork 0
mirror of https://github.com/microsoft/mimalloc.git synced 2025-07-07 20:08:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix merge conflict

Browse source
This commit is contained in:
Daan 2025-05-21 15:28:52 -07:00
parent ed474ce525
commit 0c62893367
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/stats.c
View file

@ -407,10 +407,6 @@ void _mi_stats_merge_from(mi_stats_t* to, mi_stats_t* from) {
}
}
void _mi_stats_merge_thread(mi_tld_t* tld) {
_mi_stats_merge_from( &tld->subproc->stats, &tld->stats );
}
void _mi_stats_done(mi_stats_t* stats) { // called from `mi_thread_done`
_mi_stats_merge_from(&_mi_subproc()->stats, stats);
}