(svn r18040) -Codechange: the size parameter (if it's that actually) isn't needed for the delete operator

This commit is contained in:
rubidium 2009-11-11 20:40:40 +00:00
parent c5ebac830a
commit 8f9157b648
2 changed files with 3 additions and 5 deletions

View File

@ -170,22 +170,20 @@ public:
/** /**
* Memory release for a single class instance. * Memory release for a single class instance.
* @param ptr the memory to free. * @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 * @warning The value of the \a size parameter can only be trusted for
* classes that have their own (virtual) destructor method. * 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. * Memory release for an array of class instances.
* @param ptr the memory to free. * @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 * @warning The value of the \a size parameter can only be trusted for
* classes that have their own (virtual) destructor method. * 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 */ #endif /* ALLOC_TYPE_HPP */

View File

@ -349,7 +349,7 @@ public:
* to destruct them all at the same time too, which is kinda hard. */ * to destruct them all at the same time too, which is kinda hard. */
FORCEINLINE void *operator new[](size_t size) { NOT_REACHED(); } FORCEINLINE void *operator new[](size_t size) { NOT_REACHED(); }
/* Don't free the window directly; it corrupts the linked list when iterating */ /* 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 uint16 flags4; ///< Window flags, @see WindowFlags
WindowClass window_class; ///< Window class WindowClass window_class; ///< Window class