system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-21 18:15:58 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Revert "AK+LibC: Move non-placement new/delete into LibC"

Browse source 
This reverts commit 2c82347393.
This commit is contained in:
Andreas Kling 2020-05-20 15:52:12 +02:00
parent 0c5e441a0b
commit bded472ec4
2 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
AK/kmalloc.h
View file

@ -52,6 +52,36 @@
# ifdef __serenity__
inline void* operator new(size_t size)
{
return kmalloc(size);
}
inline void operator delete(void* ptr)
{
return kfree(ptr);
}
inline void operator delete(void* ptr, size_t)
{
return kfree(ptr);
}
inline void* operator new[](size_t size)
{
return kmalloc(size);
}
inline void operator delete[](void* ptr)
{
return kfree(ptr);
}
inline void operator delete[](void* ptr, size_t)
{
return kfree(ptr);
}
inline void* operator new(size_t, void* ptr)
{
return ptr;

30
Libraries/LibC/malloc.cpp
View file

@ -439,33 +439,3 @@ void __malloc_init()
new (&big_allocators()[0])(BigAllocator);
}
}
void* operator new(size_t size)
{
return malloc(size);
}
void* operator new[](size_t size)
{
return malloc(size);
}
void operator delete(void* ptr)
{
return free(ptr);
}
void operator delete(void* ptr, size_t)
{
return free(ptr);
}
void operator delete[](void* ptr)
{
return free(ptr);
}
void operator delete[](void* ptr, size_t)
{
return free(ptr);
}