Merge pull request #10707 from kjbracey-arm/sized_delete

Add C++14 sized delete operators
pull/10776/head
Martin Kojtal 2019-06-09 18:58:33 +01:00 committed by GitHub
commit e7bc177b20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 0 deletions

View File

@ -1571,11 +1571,22 @@ void operator delete (void *ptr)
{ {
free_wrapper(ptr, MBED_CALLER_ADDR()); free_wrapper(ptr, MBED_CALLER_ADDR());
} }
void operator delete (void *ptr, std::size_t)
{
free_wrapper(ptr, MBED_CALLER_ADDR());
}
void operator delete[](void *ptr) void operator delete[](void *ptr)
{ {
free_wrapper(ptr, MBED_CALLER_ADDR()); free_wrapper(ptr, MBED_CALLER_ADDR());
} }
void operator delete[](void *ptr, std::size_t)
{
free_wrapper(ptr, MBED_CALLER_ADDR());
}
#elif defined(MBED_MEM_TRACING_ENABLED) && defined(__GNUC__) #elif defined(MBED_MEM_TRACING_ENABLED) && defined(__GNUC__)
#include <reent.h> #include <reent.h>
@ -1616,11 +1627,21 @@ void operator delete (void *ptr)
free_wrapper(_REENT, ptr, MBED_CALLER_ADDR()); free_wrapper(_REENT, ptr, MBED_CALLER_ADDR());
} }
void operator delete (void *ptr, std::size_t)
{
free_wrapper(_REENT, ptr, MBED_CALLER_ADDR());
}
void operator delete[](void *ptr) void operator delete[](void *ptr)
{ {
free_wrapper(_REENT, ptr, MBED_CALLER_ADDR()); free_wrapper(_REENT, ptr, MBED_CALLER_ADDR());
} }
void operator delete[](void *ptr, std::size_t)
{
free_wrapper(_REENT, ptr, MBED_CALLER_ADDR());
}
#else #else
void *operator new (std::size_t count) void *operator new (std::size_t count)
@ -1655,11 +1676,22 @@ void operator delete (void *ptr)
{ {
free(ptr); free(ptr);
} }
void operator delete (void *ptr, std::size_t)
{
free(ptr);
}
void operator delete[](void *ptr) void operator delete[](void *ptr)
{ {
free(ptr); free(ptr);
} }
void operator delete[](void *ptr, std::size_t)
{
free(ptr);
}
#endif #endif
/* @brief standard c library clock() function. /* @brief standard c library clock() function.