summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-11-11 21:15:58 +0000
committerrubidium <rubidium@openttd.org>2009-11-11 21:15:58 +0000
commit485b5a9c2fc1840255a0fe2fe7a1dd3f4d0e0130 (patch)
tree7ad968ec694d6acaf54711b090f88c9973590be3 /src/core
parent285d25e01bff95ce845f4b92efa9ce0253b66429 (diff)
downloadopenttd-485b5a9c2fc1840255a0fe2fe7a1dd3f4d0e0130.tar.xz
(svn r18045) -Fix: GCC 4.5@HEAD not compiling OpenTTD anymore because of a "non-placement deallocation function [is] selected for placement delete", or in other words delete(void *, size_t) is 'magic'.
We implemented these delete(void *, size_t) operator functions because MSVC warned that "no matching operator delete found; memory will not be freed if initialization throws an exception" for new(size_t, size_t). This disables MSVC warning about this because we do not use exceptions in the (constructors that use the) overridden allocation functions, as such they will never be called; delete(void *) remains necessary though.
Diffstat (limited to 'src/core')
-rw-r--r--src/core/pool_type.hpp29
1 files changed, 0 insertions, 29 deletions
diff --git a/src/core/pool_type.hpp b/src/core/pool_type.hpp
index 58a58f6ac..9c32a81df 100644
--- a/src/core/pool_type.hpp
+++ b/src/core/pool_type.hpp
@@ -119,20 +119,6 @@ struct Pool {
}
/**
- * Deletes item with given index.
- * @param p Titem memory to release
- * @param index index of item
- * @note never use this! Only for internal use
- * (called automatically when constructor of Titem uses throw())
- */
- FORCEINLINE void operator delete(void *p, size_t index)
- {
- assert(p == Tpool->Get(index));
- Tpool->FreeItem(index);
- }
-
-
- /**
* Allocates space for new Titem at given memory address
* @param size size of Titem
* @param ptr where are we allocating the item?
@@ -154,21 +140,6 @@ struct Pool {
return ptr;
}
- /**
- * Deletes item that was allocated by the function above
- * @param p Titem memory to release
- * @param ptr parameter given to operator new
- * @note never use this! Only for internal use
- * (called automatically when constructor of Titem uses throw())
- */
- FORCEINLINE void operator delete(void *p, void *ptr)
- {
- assert(p == ptr);
- for (size_t i = 0; i < Tpool->first_unused; i++) {
- assert(ptr != Tpool->data[i]);
- }
- }
-
/** Helper functions so we can use PoolItem::Function() instead of _poolitem_pool.Function() */