Fix extras compilation under Windows

[user/henk/code/inspircd.git] / win / inspircd_memory_functions.cpp

diff --git a/win/inspircd_memory_functions.cpp b/win/inspircd_memory_functions.cpp
index afff4287eb591cf42337f41941a6eb5c5db508d0..6eb76e31a03483714948e335617f944d0426c52f 100644 (file)
--- a/win/inspircd_memory_functions.cpp
+++ b/win/inspircd_memory_functions.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2011 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -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
         */
@@ -40,5 +40,20 @@ void * ::operator new(size_t iSize)
 
 void ::operator delete(void * ptr)
 {
-       HeapFree(GetProcessHeap(), 0, ptr);
+       if (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)
+{
+       if (ptr)
+               HeapFree(GetProcessHeap(), 0, ptr);
 }