merge from dev-exp

2019-11-11 14:51:16 -08:00
parent 21bbb1be87 2bb058bd25
commit 741a80256d
5 changed files with 28 additions and 55 deletions
--- a/include/mimalloc.h
+++ b/include/mimalloc.h
@@ -271,10 +271,8 @@ typedef enum mi_option_e {
  mi_option_reserve_huge_os_pages,
  mi_option_segment_cache,
  mi_option_page_reset,
-  mi_option_cache_reset,
-  mi_option_reset_decommits,
-  mi_option_eager_commit_delay,
  mi_option_segment_reset,
+  mi_option_eager_commit_delay,
  mi_option_reset_delay,
  mi_option_os_tag,
  mi_option_max_numa_node,