From 6be6c692926e8c6138c8b98f3db241ff7aad9547 Mon Sep 17 00:00:00 2001 From: rich_sposato Date: Thu, 14 Jul 2005 08:50:34 +0000 Subject: [PATCH] Fixed bug in FixedAllocator::Allocate. (Many thanks to Chad Lehman.) git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@147 7ec92016-0320-0410-acc4-a06ded1c099a --- MSVC/1300/SmallObj.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/MSVC/1300/SmallObj.cpp b/MSVC/1300/SmallObj.cpp index 9c196b5..0b1a82b 100644 --- a/MSVC/1300/SmallObj.cpp +++ b/MSVC/1300/SmallObj.cpp @@ -13,7 +13,7 @@ // without express or implied warranty. //////////////////////////////////////////////////////////////////////////////// -// Last update: Nov 26, 2004 +// Last update: Jun 22, 2005 #include "SmallObj.h" @@ -316,6 +316,8 @@ void * FixedAllocator::Allocate( void ) } } } + else if ( allocChunk_ == emptyChunk_) + emptyChunk_ = NULL; assert( allocChunk_ != NULL ); assert( !allocChunk_->IsFilled() ); @@ -591,6 +593,7 @@ void SmallObjAllocator::Deallocate( void * p, std::size_t numBytes ) // June 20, 2001: ported by Nick Thurn to gcc 2.95.3. Kudos, Nick!!! // Aug 02, 2002: Fix in VicinityFind sent by Pavel Vozenilek // Nov 26, 2004: Re-implemented by Rich Sposato. +// Jun 22, 2005: Fix in FixedAllocator::Allocate by Chad Lehman //////////////////////////////////////////////////////////////////////////////// }; // end namespace Loki