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: Connector.cpp 97769 2014-06-05 06:37:53Z johnnyw $
#ifndef ACE_CONNECTOR_CPP
#define ACE_CONNECTOR_CPP
@ -13,9 +15,7 @@
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_ALLOC_HOOK_DEFINE_Tc (ACE_NonBlocking_Connect_Handler)
ACE_ALLOC_HOOK_DEFINE_Tco (ACE_Connector)
ACE_ALLOC_HOOK_DEFINE_Tco (ACE_Strategy_Connector)
ACE_ALLOC_HOOK_DEFINE(ACE_Connector)
template <typename SVC_HANDLER>
ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::ACE_NonBlocking_Connect_Handler (ACE_Connector_Base<SVC_HANDLER> &connector,
@ -771,10 +771,10 @@ ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::info (ACE_TCHAR **strp, size_t lengt
ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::info");
ACE_TCHAR buf[BUFSIZ];
ACE_OS::snprintf (buf, BUFSIZ,
ACE_TEXT ("%s\t %s"),
ACE_TEXT ("ACE_Connector"),
ACE_TEXT ("# connector factory\n"));
ACE_OS::sprintf (buf,
ACE_TEXT ("%s\t %s"),
ACE_TEXT ("ACE_Connector"),
ACE_TEXT ("# connector factory\n"));
if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0)
return -1;