diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/almalloc.h | 10 | ||||
| -rw-r--r-- | common/flexarray.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/common/almalloc.h b/common/almalloc.h index 8a976aae..b3d8dd58 100644 --- a/common/almalloc.h +++ b/common/almalloc.h @@ -20,7 +20,7 @@ void *al_malloc(size_t alignment, size_t size); void *al_calloc(size_t alignment, size_t size); -#define DISABLE_ALLOC() \ +#define DISABLE_ALLOC \ void *operator new(size_t) = delete; \ void *operator new[](size_t) = delete; \ void operator delete(void*) noexcept = delete; \ @@ -39,9 +39,9 @@ void *al_calloc(size_t alignment, size_t size); void operator delete(void *block) noexcept { al_free(block); } \ void operator delete[](void *block) noexcept { operator delete(block); } -#define DEF_PLACE_NEWDEL() \ - void *operator new(size_t /*size*/, void *ptr) noexcept { return ptr; } \ - void *operator new[](size_t /*size*/, void *ptr) noexcept { return ptr; } \ +#define DEF_PLACE_NEWDEL \ + void *operator new(size_t) = delete; \ + void *operator new[](size_t) = delete; \ void operator delete(void *block, void*) noexcept { al_free(block); } \ void operator delete(void *block) noexcept { al_free(block); } \ void operator delete[](void *block, void*) noexcept { al_free(block); } \ @@ -65,7 +65,7 @@ enum FamCount : size_t { }; throw std::bad_alloc(); \ } \ void *operator new[](size_t /*size*/) = delete; \ - void operator delete(void *block, FamCount) { al_free(block); } \ + void operator delete(void *block, FamCount) noexcept { al_free(block); } \ void operator delete(void *block) noexcept { al_free(block); } \ void operator delete[](void* /*block*/) = delete; diff --git a/common/flexarray.h b/common/flexarray.h index d02a7342..c317bfbe 100644 --- a/common/flexarray.h +++ b/common/flexarray.h @@ -105,7 +105,7 @@ struct FlexArray { [[nodiscard]] auto rend() const noexcept -> const_reverse_iterator { return begin(); } [[nodiscard]] auto crend() const noexcept -> const_reverse_iterator { return cbegin(); } - DEF_PLACE_NEWDEL() + DEF_PLACE_NEWDEL }; } // namespace al |