Merge branch 'dev' into dev-slice

2022-11-28 09:18:04 -08:00
parent 447c2f18c5 be2bc9e7ca
commit 90c8f0516c
2 changed files with 16 additions and 5 deletions
--- a/include/mimalloc.h
+++ b/include/mimalloc.h
@@ -28,8 +28,10 @@ terms of the MIT license. A copy of the license can be found in the file
  #define mi_decl_nodiscard    [[nodiscard]]
 #elif (defined(__GNUC__) && (__GNUC__ >= 4)) || defined(__clang__)  // includes clang, icc, and clang-cl
  #define mi_decl_nodiscard    __attribute__((warn_unused_result))
+#elif defined(_HAS_NODISCARD)  
+  #define mi_decl_nodiscard    _NODISCARD
 #elif (_MSC_VER >= 1700)
-  #define mi_decl_nodiscard    _Check_return_
+  #define mi_decl_nodiscard    _Check_return_  
 #else
  #define mi_decl_nodiscard
 #endif