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,5 @@
// $Id: MEM_SAP.cpp 96985 2013-04-11 15:50:32Z huangh $
#include "ace/MEM_SAP.h"
#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
@ -10,7 +12,7 @@
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_ALLOC_HOOK_DEFINE(ACE_MEM_SAP)
ACE_ALLOC_HOOK_DEFINE(ACE_IPC_SAP)
void
ACE_MEM_SAP::dump (void) const
@ -82,9 +84,7 @@ ACE_MEM_SAP::close_shm_malloc (void)
int retv = -1;
if (this->shm_malloc_ != 0)
if (this->shm_malloc_->release (1) == 0)
ACE_Process_Mutex::unlink (this->shm_malloc_->memory_pool ().
mmap ().filename ());
this->shm_malloc_->release (1);
delete this->shm_malloc_;
this->shm_malloc_ = 0;