mirror of
https://github.com/mangosfour/server.git
synced 2025-12-12 01:37:00 +00:00
Some missing from merge.
Signed-off-by: Salja <salja2012@hotmail.de>
This commit is contained in:
parent
ec939a5bce
commit
f4be15a7af
1895 changed files with 160408 additions and 53601 deletions
|
|
@ -1,3 +1,5 @@
|
|||
// $Id: MEM_Acceptor.cpp 97308 2013-09-01 00:58:08Z mesnier_p $
|
||||
|
||||
#include "ace/MEM_Acceptor.h"
|
||||
#include "ace/Lib_Find.h"
|
||||
|
||||
|
|
@ -39,11 +41,7 @@ ACE_MEM_Acceptor::ACE_MEM_Acceptor (void)
|
|||
ACE_MEM_Acceptor::~ACE_MEM_Acceptor (void)
|
||||
{
|
||||
ACE_TRACE ("ACE_MEM_Acceptor::~ACE_MEM_Acceptor");
|
||||
#if defined (ACE_HAS_ALLOC_HOOKS)
|
||||
ACE_Allocator::instance()->free(this->mmap_prefix_);
|
||||
#else
|
||||
delete[] this->mmap_prefix_;
|
||||
#endif /* ACE_HAS_ALLOC_HOOKS */
|
||||
}
|
||||
|
||||
// General purpose routine for performing server ACE_SOCK creation.
|
||||
|
|
@ -142,10 +140,10 @@ ACE_MEM_Acceptor::accept (ACE_MEM_Stream &new_stream,
|
|||
|
||||
if (this->mmap_prefix_ != 0)
|
||||
{
|
||||
ACE_OS::snprintf (buf, sizeof buf / sizeof buf[0],
|
||||
ACE_TEXT ("%s_%d_"),
|
||||
this->mmap_prefix_,
|
||||
local_addr.get_port_number ());
|
||||
ACE_OS::sprintf (buf,
|
||||
ACE_TEXT ("%s_%d_"),
|
||||
this->mmap_prefix_,
|
||||
local_addr.get_port_number ());
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -159,9 +157,9 @@ ACE_MEM_Acceptor::accept (ACE_MEM_Stream &new_stream,
|
|||
buf[0] = 0;
|
||||
}
|
||||
|
||||
ACE_OS::snprintf (name, 25,
|
||||
ACE_TEXT ("MEM_Acceptor_%d_"),
|
||||
local_addr.get_port_number ());
|
||||
ACE_OS::sprintf (name,
|
||||
ACE_TEXT ("MEM_Acceptor_%d_"),
|
||||
local_addr.get_port_number ());
|
||||
ACE_OS::strcat (buf, name);
|
||||
}
|
||||
ACE_TCHAR unique [MAXPATHLEN];
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue