diff options
| author | Adam Mitz <mitza@objectcomputing.com> | 2020-04-15 17:02:09 -0500 |
|---|---|---|
| committer | Adam Mitz <mitza@objectcomputing.com> | 2020-04-15 17:02:09 -0500 |
| commit | 8039e5058d85b8f62b506fb3eec5ffe0201a99b7 (patch) | |
| tree | b63a7e95a1f960e0b481cd288fc28d29e058c874 | |
| parent | 6bba4e6ab236c0357b76ed8f7e5e7792b608de22 (diff) | |
| download | ATCD-8039e5058d85b8f62b506fb3eec5ffe0201a99b7.tar.gz | |
Continued changes from peer review
| -rw-r--r-- | ACE/ace/SOCK_Dgram.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/ACE/ace/SOCK_Dgram.cpp b/ACE/ace/SOCK_Dgram.cpp index 7776ac74580..17b00ad015e 100644 --- a/ACE/ace/SOCK_Dgram.cpp +++ b/ACE/ace/SOCK_Dgram.cpp @@ -729,12 +729,11 @@ ACE_SOCK_Dgram::make_multicast_ifaddr6 (ipv6_mreq *ret_mreq, 0, sizeof (lmreq)); -#if !defined(ACE_LACKS_IF_NAME_INDEX) +#ifndef ACE_LACKS_IF_NAMETOINDEX if (net_if != 0) { - lmreq.ipv6mr_interface = ACE_OS::if_nametoindex (ACE_TEXT_ALWAYS_CHAR(net_if)); + lmreq.ipv6mr_interface = ACE_OS::if_nametoindex (ACE_TEXT_ALWAYS_CHAR (net_if)); } - else #elif defined (ACE_WIN32) if (net_if != 0) { @@ -790,11 +789,9 @@ ACE_SOCK_Dgram::make_multicast_ifaddr6 (ipv6_mreq *ret_mreq, delete[] buf; // clean up } - else #else /* ACE_WIN32 */ ACE_UNUSED_ARG(net_if); #endif /* ACE_WIN32 */ - lmreq.ipv6mr_interface = 0; // now set the multicast address ACE_OS::memcpy (&lmreq.ipv6mr_multiaddr, @@ -807,6 +804,6 @@ ACE_SOCK_Dgram::make_multicast_ifaddr6 (ipv6_mreq *ret_mreq, return 0; } -#endif /* ACE_LINUX && ACE_HAS_IPV6 */ +#endif /* ACE_HAS_IPV6 */ ACE_END_VERSIONED_NAMESPACE_DECL |