X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=win%2Finspircd_memory_functions.cpp;h=3987083172f5c2ae8c4c729f4498c95e6ed90d3b;hb=a785f350fd584d87f3b84bbaff569ecb59c29f04;hp=e40e09c9ca3ae91f7a40332fa802cb494022c5a2;hpb=fcacc8e0306382bc3f938073092c3729d77e2b41;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/win/inspircd_memory_functions.cpp b/win/inspircd_memory_functions.cpp index e40e09c9c..398708317 100644 --- a/win/inspircd_memory_functions.cpp +++ b/win/inspircd_memory_functions.cpp @@ -16,8 +16,7 @@ * along with this program. If not, see . */ - -#include "inspircd_win32wrapper.h" +#include #include #include #include @@ -34,7 +33,7 @@ void * ::operator new(size_t iSize) { - void* ptr = HeapAlloc(GetProcessHeap(), 0, iSize); /* zero memory for unix compatibility */ + void* ptr = HeapAlloc(GetProcessHeap(), 0, iSize); /* This is the correct behaviour according to C++ standards for out of memory, * not returning null -- Brain */ @@ -50,8 +49,9 @@ void ::operator delete(void * ptr) HeapFree(GetProcessHeap(), 0, ptr); } -void * operator new[] (size_t iSize) { - void* ptr = HeapAlloc(GetProcessHeap(), 0, iSize); /* Why were we initializing the memory to zeros here? This is just a waste of cpu! */ +void * operator new[] (size_t iSize) +{ + void* ptr = HeapAlloc(GetProcessHeap(), 0, iSize); if (!ptr) throw std::bad_alloc(); else