(svn r22041) -Codechange: add a check that we called PoolItem::CanAllocateItem() before actually allocating it

src/core/pool_func.hpp

@@ -123,6 +123,10 @@ 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);
 	}

src/core/pool_type.hpp

@@ -32,7 +32,9 @@ 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
@@ -69,7 +71,11 @@ struct Pool {
 	 */
 	FORCEINLINE bool CanAllocate(size_t n = 1)
 	{
-		return this->items <= Tmax_size - n;
+		bool ret = this->items <= Tmax_size - n;
+#ifdef OTTD_ASSERT
+		this->checked = ret ? n : 0;
+#endif /* OTTD_ASSERT */
+		return ret;
 	}
 
 	/**