diff --git a/AK/kmalloc.h b/AK/kmalloc.h index 6e0c864488..0d071972b4 100644 --- a/AK/kmalloc.h +++ b/AK/kmalloc.h @@ -47,6 +47,7 @@ # define krealloc realloc # ifdef __serenity__ + inline void* operator new(size_t size) { return kmalloc(size); @@ -57,6 +58,11 @@ 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); @@ -67,6 +73,11 @@ 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; diff --git a/Kernel/Heap/kmalloc.cpp b/Kernel/Heap/kmalloc.cpp index 8cf281dd03..5d0cdce0a3 100644 --- a/Kernel/Heap/kmalloc.cpp +++ b/Kernel/Heap/kmalloc.cpp @@ -239,22 +239,3 @@ void* operator new[](size_t size) return kmalloc(size); } -void operator delete(void* ptr) -{ - return kfree(ptr); -} - -void operator delete[](void* ptr) -{ - return kfree(ptr); -} - -void operator delete(void* ptr, size_t) -{ - return kfree(ptr); -} - -void operator delete[](void* ptr, size_t) -{ - return kfree(ptr); -} diff --git a/Makefile.common b/Makefile.common index 44d4092a83..924ae18ffa 100644 --- a/Makefile.common +++ b/Makefile.common @@ -1,7 +1,7 @@ MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST))) SERENITY_BASE_DIR := $(patsubst %/,%,$(dir $(MAKEFILE_PATH))) -CXX_STANDARD_FLAGS = -std=c++17 -Wno-sized-deallocation -fno-sized-deallocation +CXX_STANDARD_FLAGS = -std=c++17 CXX_WARNING_FLAGS = -Werror -Wextra -Wall -Wno-nonnull-compare -Wno-deprecated-copy -Wno-address-of-packed-member -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough -Wno-expansion-to-defined CXX_FLAVOR_FLAGS = -fno-exceptions -fno-rtti -fstack-protector #CXX_SUGGEST_FLAGS = -Wsuggest-final-types -Wsuggest-final-methods -Wsuggest-override #-Wsuggest-attribute=noreturn