Merge branch 'master' into dev

This commit is contained in:
daan 2021-11-14 16:44:54 -08:00
commit 85eccf324f
5 changed files with 14 additions and 2 deletions

View file

@ -310,6 +310,7 @@ typedef enum mi_option_e {
mi_option_reset_decommits,
mi_option_large_os_pages, // implies eager commit
mi_option_reserve_huge_os_pages,
mi_option_reserve_huge_os_pages_at,
mi_option_reserve_os_memory,
mi_option_segment_cache,
mi_option_page_reset,