Dima353/openal-soft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly define the new[] and delete[] operators

Browse Source
This commit is contained in:
Chris Robinson
2020-03-22 13:28:45 -07:00
parent 3c631149e3
commit 49b2d703e7
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/almalloc.h
+10 -3
View File
@@ -25,12 +25,17 @@ void al_free(void *ptr) noexcept;
if(!ret) throw std::bad_alloc(); \
return ret; \
} \
void operator delete(void *block) noexcept { al_free(block); }
void *operator new[](size_t size) { return operator new(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; } \
void operator delete(void *block, void*) noexcept { al_free(block); } \
void operator delete(void *block) noexcept { al_free(block); }
void operator delete(void *block) noexcept { al_free(block); } \
void operator delete[](void *block, void*) noexcept { al_free(block); } \
void operator delete[](void *block) noexcept { al_free(block); }
struct FamCount { size_t mCount; };
@@ -44,8 +49,10 @@ struct FamCount { size_t mCount; };
return ret; \
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) noexcept { al_free(block); }
void operator delete(void *block) noexcept { al_free(block); } \
void operator delete[](void* /*block*/) = delete;
namespace al {