diff options
| author | daan <daan@effp.org> | 2022-11-02 09:51:03 -0700 |
|---|---|---|
| committer | daan <daan@effp.org> | 2022-11-02 09:51:03 -0700 |
| commit | 6f8e115980105a5702640453392c4a56c26f86f3 (patch) | |
| tree | 8072bebe894cbd36f4c14f6cd4e9c7950f0e0c64 | |
| parent | b3b479490edbb820e7bc946c5c3e58b4cc92b06e (diff) | |
| parent | 5ad06f99978ce68c11fdbf8a527b6a124f44dc8b (diff) | |
Merge branch 'dev' into dev-slice
| -rw-r--r-- | include/mimalloc-new-delete.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/mimalloc-new-delete.h b/include/mimalloc-new-delete.h index 2749a0b..1c12fad 100644 --- a/include/mimalloc-new-delete.h +++ b/include/mimalloc-new-delete.h @@ -44,8 +44,8 @@ terms of the MIT license. A copy of the license can be found in the file void operator delete[](void* p, std::align_val_t al) noexcept { mi_free_aligned(p, static_cast<size_t>(al)); } void operator delete (void* p, std::size_t n, std::align_val_t al) noexcept { mi_free_size_aligned(p, n, static_cast<size_t>(al)); }; void operator delete[](void* p, std::size_t n, std::align_val_t al) noexcept { mi_free_size_aligned(p, n, static_cast<size_t>(al)); }; - void operator delete (void* p, std::align_val_t al, const std::nothrow_t& tag) noexcept { mi_free_aligned(p, static_cast<size_t>(al)); } - void operator delete[](void* p, std::align_val_t al, const std::nothrow_t& tag) noexcept { mi_free_aligned(p, static_cast<size_t>(al)); } + void operator delete (void* p, std::align_val_t al, const std::nothrow_t&) noexcept { mi_free_aligned(p, static_cast<size_t>(al)); } + void operator delete[](void* p, std::align_val_t al, const std::nothrow_t&) noexcept { mi_free_aligned(p, 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) noexcept(false) { return mi_new_aligned(n, static_cast<size_t>(al)); } |