diff options
| author | Daan Leijen <daan@microsoft.com> | 2022-04-10 13:02:38 -0700 |
|---|---|---|
| committer | Daan Leijen <daan@microsoft.com> | 2022-04-10 13:02:38 -0700 |
| commit | 4b95e8ea1db86a043661dde229b3bdfbc7cd07ce (patch) | |
| tree | e9e19dd0f5171a106e89c1100e66b15f99e02dab /src/alloc-override.c | |
| parent | a3ced56b1808a42baab4308e76855441eb5bbf1a (diff) | |
| parent | 9afdf762a6f6909040903963b756f600cbea967e (diff) | |
Merge branch 'dev' into dev-slice
Diffstat (limited to 'src/alloc-override.c')
| -rw-r--r-- | src/alloc-override.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/alloc-override.c b/src/alloc-override.c index 12e9e0d..e29cb4b 100644 --- a/src/alloc-override.c +++ b/src/alloc-override.c @@ -166,8 +166,8 @@ typedef struct mi_nothrow_s { int _tag; } mi_nothrow_t; 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)); } |