diff options
Diffstat (limited to 'dep/acelite/ace/Sock_Connect.cpp')
| -rw-r--r-- | dep/acelite/ace/Sock_Connect.cpp | 38 |
1 files changed, 1 insertions, 37 deletions
diff --git a/dep/acelite/ace/Sock_Connect.cpp b/dep/acelite/ace/Sock_Connect.cpp index dc4362e697e..ce2a17d2bf5 100644 --- a/dep/acelite/ace/Sock_Connect.cpp +++ b/dep/acelite/ace/Sock_Connect.cpp @@ -1,4 +1,4 @@ -// $Id: Sock_Connect.cpp 90399 2010-06-03 21:35:20Z mesnier_p $ +// $Id: Sock_Connect.cpp 91685 2010-09-09 09:35:14Z johnnyw $ #include "ace/Sock_Connect.h" #include "ace/INET_Addr.h" @@ -157,11 +157,6 @@ static ACE_Auto_Array_Ptr<sockaddr> force_compiler_to_include_socket_h; #endif /* AIX && __IBMCPP__ >= 500 */ -ACE_RCSID (ace, - Sock_Connect, - "$Id: Sock_Connect.cpp 90399 2010-06-03 21:35:20Z mesnier_p $") - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Bind socket to an unused port. @@ -247,29 +242,16 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr, if (hp == 0) return -1; else -#if !defined(_UNICOS) ACE_OS::memcpy ((char *) &ip_addr.sin_addr.s_addr, (char *) hp->h_addr, hp->h_length); -#else /* _UNICOS */ - { - ACE_UINT64 haddr; // a place to put the address - char * haddrp = (char *) &haddr; // convert to char pointer - ACE_OS::memcpy(haddrp,(char *) hp->h_addr,hp->h_length); - ip_addr.sin_addr.s_addr = haddr; - } -#endif /* ! _UNICOS */ } else { ACE_OS::memset ((void *) &ip_addr, 0, sizeof ip_addr); -#if !defined(_UNICOS) ACE_OS::memcpy ((void *) &ip_addr.sin_addr, (void*) &host_addr, sizeof ip_addr.sin_addr); -#else /* _UNICOS */ - ip_addr.sin_addr.s_addr = host_addr; // just copy to the bitfield -#endif /* ! _UNICOS */ } #if !defined(AIX) && !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (__Lynx__) @@ -1284,7 +1266,6 @@ ACE::get_ip_interfaces (size_t &count, ACE_INET_Addr *&addrs) ) { -# if !defined(_UNICOS) struct sockaddr_in *addr = reinterpret_cast<sockaddr_in *> (&pcur->IFR_ADDR); @@ -1305,23 +1286,6 @@ ACE::get_ip_interfaces (size_t &count, ACE_INET_Addr *&addrs) addrs[count].set (addr, addrlen); ++count; } -# else /* ! _UNICOS */ - // need to explicitly copy on the Cray, since the bitfields kinda - // screw things up here - struct sockaddr_in inAddr; - - inAddr.sin_len = pcur->IFR_ADDR.sa_len; - inAddr.sin_family = pcur->IFR_ADDR.sa_family; - memcpy((void *)&(inAddr.sin_addr), - (const void *)&(pcur->IFR_ADDR.sa_data[8]), - sizeof(struct in_addr)); - - if (inAddr.sin_addr.s_addr != 0) - { - addrs[count].set(&inAddr, sizeof(struct sockaddr_in)); - ++count; - } -# endif /* ! _UNICOS */ } #if !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (ACE_HAS_RTEMS) && !defined (__Lynx__) |