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_Connector.cpp 97326 2013-09-11 07:52:09Z johnnyw $
#include "ace/MEM_Connector.h"
#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
@ -32,7 +34,7 @@ ACE_MEM_Connector::ACE_MEM_Connector (void)
// Establish a connection.
ACE_MEM_Connector::ACE_MEM_Connector (ACE_MEM_Stream &new_stream,
const ACE_INET_Addr &remote_sap,
const ACE_Time_Value *timeout,
ACE_Time_Value *timeout,
const ACE_Addr &local_sap,
int reuse_addr,
int flags,
@ -55,7 +57,7 @@ ACE_MEM_Connector::ACE_MEM_Connector (ACE_MEM_Stream &new_stream,
int
ACE_MEM_Connector::connect (ACE_MEM_Stream &new_stream,
const ACE_INET_Addr &remote_sap,
const ACE_Time_Value *timeout,
ACE_Time_Value *timeout,
const ACE_Addr &local_sap,
int reuse_addr,
int flags,