kiper220/mimalloc
1
0
Fork 0
mirror of https://github.com/microsoft/mimalloc.git synced 2025-07-07 20:08:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6 from microsoft/dev

Browse source 
Merge with last dev
This commit is contained in:
synacker 2020-04-24 12:24:06 +03:00 • committed by GitHub
commit eb3e849a3a
WARNING! Although there is a key with this ID in the database it does not verify this commit! This commit is SUSPICIOUS.
GPG key ID: 4AEE18F83AFDEB23
39 changed files with 250 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/mimalloc.h
View file

@ -8,7 +8,7 @@ terms of the MIT license. A copy of the license can be found in the file
#ifndef MIMALLOC_H
#define MIMALLOC_H
#define MI_MALLOC_VERSION 161 // major + 2 digits minor
#define MI_MALLOC_VERSION 163 // major + 2 digits minor
// ------------------------------------------------------
// Compiler specific attributes
@ -28,11 +28,11 @@ terms of the MIT license. A copy of the license can be found in the file
#define mi_decl_nodiscard [[nodiscard]]
#elif (__GNUC__ >= 4) || defined(__clang__) // includes clang, icc, and clang-cl
#define mi_decl_nodiscard __attribute__((warn_unused_result))
#elif (_MSC_VER >= 1700)
#elif (_MSC_VER >= 1700)
#define mi_decl_nodiscard _Check_return_
#else
#define mi_decl_nodiscard
#endif
#else
#define mi_decl_nodiscard
#endif
#if defined(_MSC_VER) || defined(__MINGW32__)
#if !defined(MI_SHARED_LIB)