Merge pull request #623 from ChrisTX/insp20+compilerfixes

[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 29c37a42e0badd899dc95308ceb6d6510cd196e0..3987083172f5c2ae8c4c729f4498c95e6ed90d3b 100644 (file)
--- a/win/inspircd_memory_functions.cpp
+++ b/win/inspircd_memory_functions.cpp
@@ -1 +1,65 @@
-/*       +------------------------------------+\r *       | Inspire Internet Relay Chat Daemon |\r *       +------------------------------------+\r *\r *  InspIRCd: (C) 2002-2007 InspIRCd Development Team\r * See: http://www.inspircd.org/wiki/index.php/Credits\r *\r * This program is free but copyrighted software; see\r *            the file COPYING for details.\r *\r * ---------------------------------------------------\r */\r\r#include "inspircd_win32wrapper.h"\r#include <exception>\r#include <new>\r#include <new.h>\r\r/** On windows, all dll files and executables have their own private heap,\r * whereas on POSIX systems, shared objects loaded into an executable share\r * the executable's heap. This means that if we pass an arbitrary pointer to\r * a windows DLL which is not allocated in that dll, without some form of\r * marshalling, we get a page fault. To fix this, these overrided operators\r * new and delete use the windows HeapAlloc and HeapFree functions to claim\r * memory from the windows global heap. This makes windows 'act like' POSIX\r * when it comes to memory usage between dlls and exes.\r */\r\rvoid * ::operator new(size_t iSize)\r{\r     void* ptr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, iSize);               /* zero memory for unix compatibility */\r       /* This is the correct behaviour according to C++ standards for out of memory,\r  * not returning null -- Brain\r  */\r    if (!ptr)\r              throw std::bad_alloc();\r        else\r           return ptr;\r}\r\rvoid ::operator delete(void * ptr)\r{\r    HeapFree(GetProcessHeap(), 0, ptr);\r}\r
\ No newline at end of file
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <windows.h>
+#include <exception>
+#include <new>
+#include <new.h>
+
+/** On windows, all dll files and executables have their own private heap,
+ * whereas on POSIX systems, shared objects loaded into an executable share
+ * the executable's heap. This means that if we pass an arbitrary pointer to
+ * a windows DLL which is not allocated in that dll, without some form of
+ * marshalling, we get a page fault. To fix this, these overrided operators
+ * new and delete use the windows HeapAlloc and HeapFree functions to claim
+ * memory from the windows global heap. This makes windows 'act like' POSIX
+ * when it comes to memory usage between dlls and exes.
+ */
+
+void * ::operator new(size_t iSize)
+{
+       void* ptr = HeapAlloc(GetProcessHeap(), 0, iSize);
+       /* This is the correct behaviour according to C++ standards for out of memory,
+        * not returning null -- Brain
+        */
+       if (!ptr)
+               throw std::bad_alloc();
+       else
+               return ptr;
+}
+
+void ::operator delete(void * ptr)
+{
+       if (ptr)
+               HeapFree(GetProcessHeap(), 0, ptr);
+}
+
+void * operator new[] (size_t iSize)
+{
+       void* ptr = HeapAlloc(GetProcessHeap(), 0, iSize);
+       if (!ptr)
+               throw std::bad_alloc();
+       else
+               return ptr;
+}
+
+void operator delete[] (void* ptr)
+{
+       if (ptr)
+               HeapFree(GetProcessHeap(), 0, ptr);
+}