Some missing from merge.

Signed-off-by: Salja <salja2012@hotmail.de>
This commit is contained in:
Salja 2012-08-05 14:54:07 +02:00 committed by Antz
parent ec939a5bce
commit f4be15a7af
1895 changed files with 160408 additions and 53601 deletions

View file

@ -1,3 +1,4 @@
// $Id: Message_Block.cpp 96985 2013-04-11 15:50:32Z huangh $
#include "ace/Message_Block.h"
#if !defined (__ACE_INLINE__)
@ -845,8 +846,9 @@ ACE_Data_Block::release (ACE_Lock *lock)
// since otherwise we'd be trying to "release" through a deleted
// pointer!
if (result == 0)
ACE_DES_FREE_THIS (allocator->free,
ACE_Data_Block);
ACE_DES_FREE (this,
allocator->free,
ACE_Data_Block);
return result;
}
@ -949,8 +951,9 @@ ACE_Message_Block::release_i (ACE_Lock *lock)
else
{
ACE_Allocator *allocator = this->message_block_allocator_;
ACE_DES_FREE_THIS (allocator->free,
ACE_Message_Block);
ACE_DES_FREE (this,
allocator->free,
ACE_Message_Block);
}
return result;