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: Addr.cpp 96985 2013-04-11 15:50:32Z huangh $
#include "ace/Addr.h"
#if !defined (__ACE_INLINE__)
@ -6,9 +8,6 @@
#include "ace/Log_Category.h"
#include "ace/os_include/sys/os_socket.h"
#if defined (ACE_HAS_ALLOC_HOOKS)
# include "ace/Malloc_Base.h"
#endif /* ACE_HAS_ALLOC_HOOKS */
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@ -39,7 +38,7 @@ ACE_Addr::get_addr (void) const
}
void
ACE_Addr::set_addr (const void *, int)
ACE_Addr::set_addr (void *, int)
{
}