mirror of
https://github.com/microsoft/mimalloc.git
synced 2025-05-06 23:39:31 +03:00
Merge fd5ab9f1f3
into fae61ed946
This commit is contained in:
commit
453eb34f8e
1 changed files with 2 additions and 2 deletions
|
@ -189,7 +189,6 @@ typedef void* mi_nothrow_t;
|
||||||
void* operator new[]( std::size_t n, std::align_val_t al) noexcept(false) { return mi_new_aligned(n, static_cast<size_t>(al)); }
|
void* operator new[]( std::size_t n, std::align_val_t al) noexcept(false) { return mi_new_aligned(n, static_cast<size_t>(al)); }
|
||||||
void* operator new (std::size_t n, std::align_val_t al, const std::nothrow_t&) noexcept { return mi_new_aligned_nothrow(n, static_cast<size_t>(al)); }
|
void* operator new (std::size_t n, std::align_val_t al, const std::nothrow_t&) noexcept { return mi_new_aligned_nothrow(n, static_cast<size_t>(al)); }
|
||||||
void* operator new[](std::size_t n, std::align_val_t al, const std::nothrow_t&) noexcept { return mi_new_aligned_nothrow(n, static_cast<size_t>(al)); }
|
void* operator new[](std::size_t n, std::align_val_t al, const std::nothrow_t&) noexcept { return mi_new_aligned_nothrow(n, static_cast<size_t>(al)); }
|
||||||
#endif
|
|
||||||
|
|
||||||
#elif (defined(__GNUC__) || defined(__clang__))
|
#elif (defined(__GNUC__) || defined(__clang__))
|
||||||
// ------------------------------------------------------
|
// ------------------------------------------------------
|
||||||
|
@ -234,6 +233,7 @@ typedef void* mi_nothrow_t;
|
||||||
#else
|
#else
|
||||||
#error "define overloads for new/delete for this platform (just for performance, can be skipped)"
|
#error "define overloads for new/delete for this platform (just for performance, can be skipped)"
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
#endif // __cplusplus
|
#endif // __cplusplus
|
||||||
|
|
||||||
// ------------------------------------------------------
|
// ------------------------------------------------------
|
||||||
|
|
Loading…
Add table
Reference in a new issue