From 177135320d530e51474c0dc8f411c292251684ee Mon Sep 17 00:00:00 2001 From: rubidium Date: Tue, 15 Feb 2011 22:04:57 +0000 Subject: [PATCH] (svn r22088) [1.1] -Revert (r22041): assertions to check whether Pools are actually checked before allocation still triggered in some corner cases, so leave it in trunk but remove it from the 1.1 branch --- src/core/pool_func.hpp | 4 ---- src/core/pool_type.hpp | 9 +-------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/core/pool_func.hpp b/src/core/pool_func.hpp index 299aee86ce..2f87d3de27 100644 --- a/src/core/pool_func.hpp +++ b/src/core/pool_func.hpp @@ -123,10 +123,6 @@ DEFINE_POOL_METHOD(void *)::GetNew(size_t size) { size_t index = this->FindFirstFree(); -#ifdef OTTD_ASSERT - assert(this->checked != 0); - this->checked--; -#endif /* OTTD_ASSERT */ if (index == NO_FREE_ITEM) { error("%s: no more free items", this->name); } diff --git a/src/core/pool_type.hpp b/src/core/pool_type.hpp index 395aa8438d..e5211235cb 100644 --- a/src/core/pool_type.hpp +++ b/src/core/pool_type.hpp @@ -32,9 +32,6 @@ struct Pool { size_t first_free; ///< No item with index lower than this is free (doesn't say anything about this one!) size_t first_unused; ///< This and all higher indexes are free (doesn't say anything about first_unused-1 !) size_t items; ///< Number of used indexes (non-NULL) -#ifdef OTTD_ASSERT - size_t checked; ///< Number of items we checked for -#endif /* OTTD_ASSERT */ bool cleaning; ///< True if cleaning pool (deleting all items) Titem **data; ///< Pointer to array of pointers to Titem @@ -71,11 +68,7 @@ struct Pool { */ FORCEINLINE bool CanAllocate(size_t n = 1) { - bool ret = this->items <= Tmax_size - n; -#ifdef OTTD_ASSERT - this->checked = ret ? n : 0; -#endif /* OTTD_ASSERT */ - return ret; + return this->items <= Tmax_size - n; } /**