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,4 +1,6 @@
// MEM_IO.cpp
// $Id: MEM_IO.cpp 96985 2013-04-11 15:50:32Z huangh $
#include "ace/MEM_IO.h"
#include "ace/Handle_Set.h"
@ -251,15 +253,6 @@ ACE_MT_MEM_IO::init (ACE_HANDLE handle,
return 0;
}
int
ACE_MT_MEM_IO::fini ()
{
const int ret = ACE_MEM_SAP::fini ();
ACE_Process_Mutex::unlink (this->recv_channel_.lock_->name ());
ACE_Process_Mutex::unlink (this->send_channel_.lock_->name ());
return ret;
}
ssize_t
ACE_MT_MEM_IO::recv_buf (ACE_MEM_SAP_Node *&buf,
int flags,