aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlloyd <[email protected]>2007-04-23 03:13:07 +0000
committerlloyd <[email protected]>2007-04-23 03:13:07 +0000
commitc687e28e5a1bab7e2ce3595db1bac103f05d0875 (patch)
treec031944c2fd19b97675ec8e30dca84a7471d1619
parentcd5eb9de24a08684aeef0b3bd1594f5c34581ac6 (diff)
Revert the last change; it actually broke the memory allocators in a
fairly massive way.
-rw-r--r--src/mem_pool.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mem_pool.cpp b/src/mem_pool.cpp
index 0b5687481..67da88a14 100644
--- a/src/mem_pool.cpp
+++ b/src/mem_pool.cpp
@@ -207,7 +207,7 @@ void Pooling_Allocator::deallocate(void* ptr, u32bit n)
const u32bit block_no = round_up(n, BLOCK_SIZE) / BLOCK_SIZE;
std::vector<Memory_Block>::iterator i =
- std::lower_bound(blocks.begin(), blocks.end(), Memory_Block(ptr));
+ std::lower_bound(blocks.begin(), blocks.end(), ptr);
if(i == blocks.end() || !i->contains(ptr, block_no))
throw Invalid_State("Pointer released to the wrong allocator");