فهرست منبع

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

This reverts commit 2c823473930121aecbacf0422c8372a0912e581b.
Andreas Kling 5 سال پیش
والد
کامیت
bded472ec4
2فایلهای تغییر یافته به همراه30 افزوده شده و 30 حذف شده
  1. 30 0
      AK/kmalloc.h
  2. 0 30
      Libraries/LibC/malloc.cpp

+ 30 - 0
AK/kmalloc.h

@@ -52,6 +52,36 @@
 
 
 #    ifdef __serenity__
 #    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)
 inline void* operator new(size_t, void* ptr)
 {
 {
     return ptr;
     return ptr;

+ 0 - 30
Libraries/LibC/malloc.cpp

@@ -439,33 +439,3 @@ void __malloc_init()
     new (&big_allocators()[0])(BigAllocator);
     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);
-}