Merge "optimize delete/delete[] operators by removing unneeded branch"

This commit is contained in:
David Turner
2010-03-16 17:21:52 -07:00
committed by Android Code Review

View File

@@ -23,16 +23,12 @@ void* operator new[](std::size_t size)
void operator delete(void* ptr)
{
if (ptr) {
free(ptr);
}
free(ptr);
}
void operator delete[](void* ptr)
{
if (ptr) {
free(ptr);
}
free(ptr);
}
void* operator new(std::size_t size, const std::nothrow_t&)
@@ -47,16 +43,12 @@ void* operator new[](std::size_t size, const std::nothrow_t&)
void operator delete(void* ptr, const std::nothrow_t&)
{
if (ptr) {
free(ptr);
}
free(ptr);
}
void operator delete[](void* ptr, const std::nothrow_t&)
{
if (ptr) {
free(ptr);
}
free(ptr);
}