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_Addr.cpp 96985 2013-04-11 15:50:32Z huangh $
// Defines the Internet domain address family address format.
#include "ace/MEM_Addr.h"
@ -12,9 +14,6 @@
#include "ace/OS_NS_stdlib.h"
#include "ace/OS_NS_unistd.h"
#include "ace/os_include/os_netdb.h"
#if defined (ACE_HAS_ALLOC_HOOKS)
# include "ace/Malloc_Base.h"
#endif /* ACE_HAS_ALLOC_HOOKS */
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@ -118,7 +117,7 @@ ACE_MEM_Addr::get_addr (void) const
// Set a pointer to the address.
void
ACE_MEM_Addr::set_addr (const void *addr, int len)
ACE_MEM_Addr::set_addr (void *addr, int len)
{
ACE_TRACE ("ACE_MEM_Addr::set_addr");