X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=win%2Finspircd_memory_functions.cpp;h=c48c833dc4a83d14afd825fe6e522e2a655e2933;hb=9ee4abdf1120911c893ec5347f0881cef90a6b74;hp=1f269e000ea3a68b6b13bb6ce839f1ebff4590be;hpb=e4acbc95b8b6cd5b28d38a2242c02e8ff4991e4a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/win/inspircd_memory_functions.cpp b/win/inspircd_memory_functions.cpp index 1f269e000..c48c833dc 100644 --- a/win/inspircd_memory_functions.cpp +++ b/win/inspircd_memory_functions.cpp @@ -28,7 +28,7 @@ void * ::operator new(size_t iSize) { - void* ptr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, iSize); /* zero memory for unix compatibility */ + void* ptr = HeapAlloc(GetProcessHeap(), 0, iSize); /* zero memory for unix compatibility */ /* This is the correct behaviour according to C++ standards for out of memory, * not returning null -- Brain */ @@ -42,3 +42,16 @@ 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! */ + if (!ptr) + throw std::bad_alloc(); + else + return ptr; +} + +void operator delete[] (void* ptr) +{ + HeapFree(GetProcessHeap(), 0, ptr); +}