mirror of
https://github.com/microsoft/mimalloc.git
synced 2025-07-01 17:24:38 +03:00
Merge branch 'dev' into dev3
This commit is contained in:
commit
d8b7456a1f
1 changed files with 1 additions and 2 deletions
1
src/os.c
1
src/os.c
|
@ -381,7 +381,6 @@ void* _mi_os_alloc_aligned(size_t size, size_t alignment, bool commit, bool allo
|
||||||
mi_assert_internal(memid->mem.os.size >= size);
|
mi_assert_internal(memid->mem.os.size >= size);
|
||||||
mi_assert_internal(_mi_is_aligned(p,alignment));
|
mi_assert_internal(_mi_is_aligned(p,alignment));
|
||||||
if (commit) { mi_assert_internal(memid->initially_committed); }
|
if (commit) { mi_assert_internal(memid->initially_committed); }
|
||||||
if (memid->initially_zero) { mi_assert_internal(memid->initially_committed); }
|
|
||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue