Mercurial > hg > openttd
changeset 13521:1d83136bfd28 draft
(svn r18040) -Codechange: the size parameter (if it's that actually) isn't needed for the delete operator
author | rubidium <rubidium@openttd.org> |
---|---|
date | Wed, 11 Nov 2009 20:40:40 +0000 |
parents | 8ab9179e0f86 |
children | a59c95f8d236 |
files | src/core/alloc_type.hpp src/window_gui.h |
diffstat | 2 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/alloc_type.hpp +++ b/src/core/alloc_type.hpp @@ -170,22 +170,20 @@ /** * Memory release for a single class instance. * @param ptr the memory to free. - * @param size the amount of allocated memory (unused). * * @warning The value of the \a size parameter can only be trusted for * classes that have their own (virtual) destructor method. */ - FORCEINLINE void operator delete(void *ptr, size_t size) { free(ptr); } + FORCEINLINE void operator delete(void *ptr) { free(ptr); } /** * Memory release for an array of class instances. * @param ptr the memory to free. - * @param size the amount of allocated memory (unused). * * @warning The value of the \a size parameter can only be trusted for * classes that have their own (virtual) destructor method. */ - FORCEINLINE void operator delete[](void *ptr, size_t size) { free(ptr); } + FORCEINLINE void operator delete[](void *ptr) { free(ptr); } }; #endif /* ALLOC_TYPE_HPP */
--- a/src/window_gui.h +++ b/src/window_gui.h @@ -349,7 +349,7 @@ * to destruct them all at the same time too, which is kinda hard. */ FORCEINLINE void *operator new[](size_t size) { NOT_REACHED(); } /* Don't free the window directly; it corrupts the linked list when iterating */ - FORCEINLINE void operator delete(void *ptr, size_t size) {} + FORCEINLINE void operator delete(void *ptr) {} uint16 flags4; ///< Window flags, @see WindowFlags WindowClass window_class; ///< Window class