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: Acceptor.cpp 97075 2013-04-24 15:01:48Z schmidt $
#ifndef ACE_ACCEPTOR_CPP
#define ACE_ACCEPTOR_CPP
@ -15,7 +17,7 @@
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_ALLOC_HOOK_DEFINE_Tca(ACE_Acceptor)
ACE_ALLOC_HOOK_DEFINE(ACE_Acceptor)
template <typename SVC_HANDLER, typename PEER_ACCEPTOR> void
ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::dump (void) const
@ -172,11 +174,11 @@ ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::info (ACE_TCHAR **strp,
else if (addr.addr_to_string (addr_str, sizeof addr_str) == -1)
return -1;
ACE_OS::snprintf (buf, BUFSIZ,
ACE_TEXT ("%s\t %s %s"),
ACE_TEXT ("ACE_Acceptor"),
addr_str,
ACE_TEXT ("# acceptor factory\n"));
ACE_OS::sprintf (buf,
ACE_TEXT ("%s\t %s %s"),
ACE_TEXT ("ACE_Acceptor"),
addr_str,
ACE_TEXT ("# acceptor factory\n"));
if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0)
return -1;
@ -447,7 +449,7 @@ ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_input (ACE_HANDLE listener)
return 0;
}
ACE_ALLOC_HOOK_DEFINE_Tca(ACE_Strategy_Acceptor)
ACE_ALLOC_HOOK_DEFINE(ACE_Strategy_Acceptor)
template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int
ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::suspend (void)
@ -832,15 +834,15 @@ ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::info (ACE_TCHAR **strp,
return -1;
// @@ Should add the protocol in...
ACE_OS::snprintf (buf, BUFSIZ,
ACE_TEXT ("%s\t %s #%s\n"),
this->service_name_ == 0
? ACE_TEXT ("<unknown>")
: this->service_name_,
service_addr_str,
this->service_description_ == 0
? ACE_TEXT ("<unknown>")
: this->service_description_);
ACE_OS::sprintf (buf,
ACE_TEXT ("%s\t %s #%s\n"),
this->service_name_ == 0
? ACE_TEXT ("<unknown>")
: this->service_name_,
service_addr_str,
this->service_description_ == 0
? ACE_TEXT ("<unknown>")
: this->service_description_);
if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0)
return -1;
@ -856,7 +858,7 @@ ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::fini (void)
return this->ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_close ();
}
ACE_ALLOC_HOOK_DEFINE_Tca(ACE_Oneshot_Acceptor)
ACE_ALLOC_HOOK_DEFINE(ACE_Oneshot_Acceptor)
template <typename SVC_HANDLER, typename PEER_ACCEPTOR> void
ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::dump (void) const
@ -1199,11 +1201,11 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::info (ACE_TCHAR **strp,
else if (addr.addr_to_string (addr_str, sizeof addr_str) == -1)
return -1;
ACE_OS::snprintf (buf, BUFSIZ,
ACE_TEXT ("%s\t %s %s"),
ACE_TEXT ("ACE_Oneshot_Acceptor"),
addr_str,
ACE_TEXT ("#oneshot acceptor factory\n"));
ACE_OS::sprintf (buf,
ACE_TEXT ("%s\t %s %s"),
ACE_TEXT ("ACE_Oneshot_Acceptor"),
addr_str,
ACE_TEXT ("#oneshot acceptor factory\n"));
if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0)
return -1;