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

[10874] Update ACE to v5.8.3

Browse source 
(based on zergtmn's repo commit 3a8c259)
(based on zergtmn's repo commit 946c1a8)

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
zerg 2010-12-14 17:14:34 +03:00 • committed by VladimirMangos
parent c38c876b1d
commit b8d773091a
343 changed files with 3060 additions and 7431 deletions
Download patch file Download diff file Expand all files Collapse all files

27
dep/ACE_wrappers/ace/SOCK_Connector.cpp
View file

@ -1,4 +1,4 @@
// $Id: SOCK_Connector.cpp 91287 2010-08-05 10:30:49Z johnnyw $
// $Id: SOCK_Connector.cpp 91626 2010-09-07 10:59:20Z johnnyw $
#include "ace/SOCK_Connector.h"
#include "ace/INET_Addr.h"
@ -81,11 +81,9 @@ ACE_SOCK_Connector::shared_connect_start (ACE_SOCK_Stream &new_stream,
if (local_sap != ACE_Addr::sap_any)
{
sockaddr *laddr = reinterpret_cast<sockaddr *> (local_sap.get_addr ());
int size = local_sap.get_size ();
int const size = local_sap.get_size ();
if (ACE_OS::bind (new_stream.get_handle (),
laddr,
size) == -1)
if (ACE_OS::bind (new_stream.get_handle (), laddr, size) == -1)
{
// Save/restore errno.
ACE_Errno_Guard error (errno);
@ -148,9 +146,7 @@ ACE_SOCK_Connector::shared_connect_finish (ACE_SOCK_Stream &new_stream,
#endif /* ACE_WIN32 */
}
// Wait synchronously using timeout.
else if (this->complete (new_stream,
0,
timeout) == -1)
else if (this->complete (new_stream, 0, timeout) == -1)
error = errno;
else
return 0;
@ -177,7 +173,6 @@ ACE_SOCK_Connector::shared_connect_finish (ACE_SOCK_Stream &new_stream,
}
// Actively connect and produce a new ACE_SOCK_Stream if things go well...
int
ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream,
const ACE_Addr &remote_sap,
@ -204,9 +199,7 @@ ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream,
reinterpret_cast<sockaddr *> (remote_sap.get_addr ()),
remote_sap.get_size ());
return this->shared_connect_finish (new_stream,
timeout,
result);
return this->shared_connect_finish (new_stream, timeout, result);
}
#if !defined (ACE_HAS_WINCE)
@ -242,9 +235,7 @@ ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream,
remote_sap.get_size (),
qos_params);
return this->shared_connect_finish (new_stream,
timeout,
result);
return this->shared_connect_finish (new_stream, timeout, result);
}
#endif // ACE_HAS_WINCE
@ -256,8 +247,7 @@ ACE_SOCK_Connector::complete (ACE_SOCK_Stream &new_stream,
const ACE_Time_Value *tv)
{
ACE_TRACE ("ACE_SOCK_Connector::complete");
ACE_HANDLE h = ACE::handle_timed_complete (new_stream.get_handle (),
tv);
ACE_HANDLE h = ACE::handle_timed_complete (new_stream.get_handle (), tv);
// We failed to get connected.
if (h == ACE_INVALID_HANDLE)
{
@ -268,8 +258,7 @@ ACE_SOCK_Connector::complete (ACE_SOCK_Stream &new_stream,
// then retry to see if it's a real failure.
ACE_Time_Value time (0, ACE_NON_BLOCKING_BUG_DELAY);
ACE_OS::sleep (time);
h = ACE::handle_timed_complete (new_stream.get_handle (),
tv);
h = ACE::handle_timed_complete (new_stream.get_handle (), tv);
if (h == ACE_INVALID_HANDLE)
{
#endif /* ACE_WIN32 */