mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-12 01:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some missing from merge.

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

10
dep/acelite/ace/SOCK_SEQPACK_Connector.cpp
View file

@ -1,3 +1,5 @@
// $Id: SOCK_SEQPACK_Connector.cpp 96985 2013-04-11 15:50:32Z huangh $
#include "ace/SOCK_SEQPACK_Connector.h"
#include "ace/INET_Addr.h"
@ -133,11 +135,7 @@ ACE_SOCK_SEQPACK_Connector::shared_connect_start (ACE_SOCK_SEQPACK_Association &
// representations of the primary and secondary
// addresses.
sockaddr_in* local_inet_addrs = 0;
#if defined(ACE_HAS_ALLOC_HOOKS)
ACE_ALLOCATOR_NORETURN (local_inet_addrs, static_cast<sockaddr_in*>(ACE_Allocator::instance()->malloc(sizeof(sockaddr_in) * (num_addresses))));
#else
ACE_NEW_NORETURN (local_inet_addrs, sockaddr_in[num_addresses]);
#endif
if (!local_inet_addrs)
return -1;
@ -219,11 +217,7 @@ ACE_SOCK_SEQPACK_Connector::shared_connect_start (ACE_SOCK_SEQPACK_Association &
}
#endif /* ACE_HAS_LKSCTP */
#if defined (ACE_HAS_ALLOC_HOOKS)
ACE_Allocator::instance()->free(local_inet_addrs);
#else
delete [] local_inet_addrs;
#endif /* ACE_HAS_ALLOC_HOOKS */
}
// Enable non-blocking, if required.