mirror of
https://github.com/microsoft/mimalloc.git
synced 2025-05-05 15:09:31 +03:00
Merge branch 'dev' into dev-win
This commit is contained in:
commit
13ca6a088b
1 changed files with 0 additions and 3 deletions
|
@ -231,8 +231,6 @@ static bool _mi_heap_done(void) {
|
||||||
mi_heap_t* heap = _mi_heap_default;
|
mi_heap_t* heap = _mi_heap_default;
|
||||||
if (!mi_heap_is_initialized(heap)) return true;
|
if (!mi_heap_is_initialized(heap)) return true;
|
||||||
|
|
||||||
void* p = mi_malloc(16);
|
|
||||||
|
|
||||||
// reset default heap
|
// reset default heap
|
||||||
_mi_heap_default = (_mi_is_main_thread() ? &_mi_heap_main : (mi_heap_t*)&_mi_heap_empty);
|
_mi_heap_default = (_mi_is_main_thread() ? &_mi_heap_main : (mi_heap_t*)&_mi_heap_empty);
|
||||||
|
|
||||||
|
@ -260,7 +258,6 @@ static bool _mi_heap_done(void) {
|
||||||
mi_assert_internal(heap->tld->heap_backing == &_mi_heap_main);
|
mi_assert_internal(heap->tld->heap_backing == &_mi_heap_main);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
mi_free(p);
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue