diff options
| author | Daan Leijen <daan@microsoft.com> | 2022-04-14 16:10:36 -0700 |
|---|---|---|
| committer | Daan Leijen <daan@microsoft.com> | 2022-04-14 16:10:36 -0700 |
| commit | ca0bac743da2bee23f2284dc63caaa6dd7ae621c (patch) | |
| tree | 5dccf745f5288a3eb20e2b105b11baca4b33acdd /include | |
| parent | f87cba9bd89f0a34838effa4366a73ddbe0963a6 (diff) | |
maintain backward compatible option order
Diffstat (limited to 'include')
| -rw-r--r-- | include/mimalloc-internal.h | 1 | ||||
| -rw-r--r-- | include/mimalloc.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/mimalloc-internal.h b/include/mimalloc-internal.h index 79adc23..961b36d 100644 --- a/include/mimalloc-internal.h +++ b/include/mimalloc-internal.h @@ -19,6 +19,7 @@ terms of the MIT license. A copy of the license can be found in the file #define MI_CACHE_LINE 64 #if defined(_MSC_VER) #pragma warning(disable:4127) // suppress constant conditional warning (due to MI_SECURE paths) +#pragma warning(disable:26812) // unscoped enum warning #define mi_decl_noinline __declspec(noinline) #define mi_decl_thread __declspec(thread) #define mi_decl_cache_align __declspec(align(MI_CACHE_LINE)) diff --git a/include/mimalloc.h b/include/mimalloc.h index 1e0062c..3354833 100644 --- a/include/mimalloc.h +++ b/include/mimalloc.h @@ -321,10 +321,10 @@ typedef enum mi_option_e { mi_option_reset_delay, mi_option_use_numa_nodes, // 0 = use available numa nodes, otherwise use at most N nodes. mi_option_limit_os_alloc, // 1 = do not use OS memory for allocation (but only reserved arenas) - mi_option_max_segment_reclaim, mi_option_os_tag, mi_option_max_errors, mi_option_max_warnings, + mi_option_max_segment_reclaim, _mi_option_last } mi_option_t; |