From 22f03b43c5acc3b912d2d0df894dca16a2c46a91 Mon Sep 17 00:00:00 2001 From: peavey Date: Mon, 16 Jul 2007 13:35:59 +0000 Subject: Begone evil DOS format :< git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7449 e03df62e-2008-0410-955e-edbf42e46eb7 --- win/inspircd_memory_functions.cpp | 88 +++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 44 deletions(-) (limited to 'win/inspircd_memory_functions.cpp') diff --git a/win/inspircd_memory_functions.cpp b/win/inspircd_memory_functions.cpp index 2ab9d8bb5..afff4287e 100644 --- a/win/inspircd_memory_functions.cpp +++ b/win/inspircd_memory_functions.cpp @@ -1,44 +1,44 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ - * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits - * - * This program is free but copyrighted software; see - * the file COPYING for details. - * - * --------------------------------------------------- - */ - -#include "inspircd_win32wrapper.h" -#include -#include -#include - -/** 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(), HEAP_ZERO_MEMORY, iSize); /* zero memory for unix compatibility */ - /* 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) -{ - HeapFree(GetProcessHeap(), 0, ptr); -} +/* +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ + * + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * + * This program is free but copyrighted software; see + * the file COPYING for details. + * + * --------------------------------------------------- + */ + +#include "inspircd_win32wrapper.h" +#include +#include +#include + +/** 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(), HEAP_ZERO_MEMORY, iSize); /* zero memory for unix compatibility */ + /* 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) +{ + HeapFree(GetProcessHeap(), 0, ptr); +} -- cgit v1.3.1-10-gc9f91