diff options
| author | daan <daanl@outlook.com> | 2021-11-13 14:13:12 -0800 |
|---|---|---|
| committer | daan <daanl@outlook.com> | 2021-11-13 14:13:12 -0800 |
| commit | 0a86b45a9177940e2b09d906df710ede522f54b2 (patch) | |
| tree | 74d2d472ccc8b50989064153b63a1f7a385e42a1 | |
| parent | 97a1584bb5cd479333434baf2f470736bb94e9d0 (diff) | |
| parent | 959845540d8263ed08fea321f78313d9e89090ae (diff) | |
Merge branch 'dev' into dev-slice
| -rw-r--r-- | ide/vs2019/mimalloc.vcxproj | 6 | ||||
| -rw-r--r-- | src/options.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ide/vs2019/mimalloc.vcxproj b/ide/vs2019/mimalloc.vcxproj index 98dee52..9f967d9 100644 --- a/ide/vs2019/mimalloc.vcxproj +++ b/ide/vs2019/mimalloc.vcxproj @@ -92,7 +92,7 @@ </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> - <WarningLevel>Level3</WarningLevel> + <WarningLevel>Level4</WarningLevel> <Optimization>Disabled</Optimization> <SDLCheck>true</SDLCheck> <ConformanceMode>true</ConformanceMode> @@ -138,7 +138,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <WarningLevel>Level3</WarningLevel> + <WarningLevel>Level4</WarningLevel> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <ConformanceMode>true</ConformanceMode> @@ -166,7 +166,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> - <WarningLevel>Level3</WarningLevel> + <WarningLevel>Level4</WarningLevel> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <ConformanceMode>true</ConformanceMode> diff --git a/src/options.c b/src/options.c index 859b387..261dcc1 100644 --- a/src/options.c +++ b/src/options.c @@ -116,7 +116,7 @@ void _mi_options_init(void) { mi_max_warning_count = mi_option_get(mi_option_max_warnings); } -long mi_option_get(mi_option_t option) { +mi_decl_nodiscard long mi_option_get(mi_option_t option) { mi_assert(option >= 0 && option < _mi_option_last); mi_option_desc_t* desc = &options[option]; mi_assert(desc->option == option); // index should match the option @@ -142,7 +142,7 @@ void mi_option_set_default(mi_option_t option, long value) { } } -bool mi_option_is_enabled(mi_option_t option) { +mi_decl_nodiscard bool mi_option_is_enabled(mi_option_t option) { return (mi_option_get(option) != 0); } |