From 45b05e9734962b07f95630e76b9a680e1775f002 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Tue, 4 Aug 2020 19:05:19 +0200 Subject: [PATCH] AK: Let the compiler provide the default new and delete operators ...except in kernelspace. --- AK/kmalloc.h | 47 +---------------------------------------------- 1 file changed, 1 insertion(+), 46 deletions(-) diff --git a/AK/kmalloc.h b/AK/kmalloc.h index 6ef4caed0e..c76678dc4f 100644 --- a/AK/kmalloc.h +++ b/AK/kmalloc.h @@ -26,7 +26,7 @@ #pragma once -#ifndef __serenity__ +#if !defined(__serenity__) || !defined(KERNEL) # include #endif @@ -44,53 +44,8 @@ # include #else # include - # define kcalloc calloc # define kmalloc malloc # define kfree free # define krealloc realloc - -# 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; -} - -inline void* operator new[](size_t, void* ptr) -{ - return ptr; -} -# endif - #endif