summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-11-11 20:40:40 +0000
committerrubidium <rubidium@openttd.org>2009-11-11 20:40:40 +0000
commit8f9157b6486374983cc82c10037b34644f48e75a (patch)
tree7c77dc1222144ad871c1d425145b2dcd563f7c3f
parentc5ebac830a7fd25cf69040b24e7691e008343dff (diff)
downloadopenttd-8f9157b6486374983cc82c10037b34644f48e75a.tar.xz
(svn r18040) -Codechange: the size parameter (if it's that actually) isn't needed for the delete operator
-rw-r--r--src/core/alloc_type.hpp6
-rw-r--r--src/window_gui.h2
2 files changed, 3 insertions, 5 deletions
diff --git a/src/core/alloc_type.hpp b/src/core/alloc_type.hpp
index 5d9884b86..b1b27c194 100644
--- a/src/core/alloc_type.hpp
+++ b/src/core/alloc_type.hpp
@@ -170,22 +170,20 @@ public:
/**
* 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 */
diff --git a/src/window_gui.h b/src/window_gui.h
index 723c00ef1..4cd4c990b 100644
--- a/src/window_gui.h
+++ b/src/window_gui.h
@@ -349,7 +349,7 @@ public:
* 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