Merge pull request #1230 from SaberUK/insp20+ipcache

[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 6eb76e31a03483714948e335617f944d0426c52f..3987083172f5c2ae8c4c729f4498c95e6ed90d3b 100644 (file)
--- a/win/inspircd_memory_functions.cpp
+++ b/win/inspircd_memory_functions.cpp
@@ -1,17 +1,22 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2011 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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 "inspircd_win32wrapper.h"
+#include <windows.h>
 #include <exception>
 #include <new>
 #include <new.h>
@@ -28,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
         */
@@ -44,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