diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2002-06-11 16:43:25 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2002-06-11 16:43:25 +0000 |
| commit | cf5870d952e622410eaec91119511c9118e7c17c (patch) | |
| tree | 640a03369c77f295ca4a0c2b75b1e6352cbddc80 | |
| parent | b134c3d78ccfffc7ffe0fd44954e35ea0831bd62 (diff) | |
| download | ATCD-cf5870d952e622410eaec91119511c9118e7c17c.tar.gz | |
ChangeLogTag:Tue Jun 11 09:42:06 2002 Ossama Othman <ossama@uci.edu>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 7 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 7 | ||||
| -rw-r--r-- | ace/SOCK_Dgram_Mcast_T.cpp | 11 |
4 files changed, 27 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index af452218843..124e50dc507 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Jun 11 09:42:06 2002 Ossama Othman <ossama@uci.edu> + + * ace/SOCK_Dgram_Mcast_T.cpp (make_multicast_ifaddr): + + Use ACE_HTONL instead of htonl(). The latter causes the + assembler to choke on some Linux installations. + Mon Jun 10 14:50:46 2002 Nanbor Wang <nanbor@cs.wustl.edu> * examples/DLL/Dll.dsw: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index af452218843..124e50dc507 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,10 @@ +Tue Jun 11 09:42:06 2002 Ossama Othman <ossama@uci.edu> + + * ace/SOCK_Dgram_Mcast_T.cpp (make_multicast_ifaddr): + + Use ACE_HTONL instead of htonl(). The latter causes the + assembler to choke on some Linux installations. + Mon Jun 10 14:50:46 2002 Nanbor Wang <nanbor@cs.wustl.edu> * examples/DLL/Dll.dsw: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index af452218843..124e50dc507 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,10 @@ +Tue Jun 11 09:42:06 2002 Ossama Othman <ossama@uci.edu> + + * ace/SOCK_Dgram_Mcast_T.cpp (make_multicast_ifaddr): + + Use ACE_HTONL instead of htonl(). The latter causes the + assembler to choke on some Linux installations. + Mon Jun 10 14:50:46 2002 Nanbor Wang <nanbor@cs.wustl.edu> * examples/DLL/Dll.dsw: diff --git a/ace/SOCK_Dgram_Mcast_T.cpp b/ace/SOCK_Dgram_Mcast_T.cpp index 689c5d6c809..735296092bd 100644 --- a/ace/SOCK_Dgram_Mcast_T.cpp +++ b/ace/SOCK_Dgram_Mcast_T.cpp @@ -1,4 +1,3 @@ -/* $Id$ */ #include "ace/SOCK_Dgram_Mcast.h" #include "ace/INET_Addr.h" @@ -9,7 +8,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -ACE_RCSID(ace, SOCK_Dgram_Mcast_T, "SOCK_Dgram_Mcast_T.cpp,v 4.55 2001/02/18 01:34:39 brunsch Exp") +ACE_RCSID (ace, + SOCK_Dgram_Mcast_T, + "$Id$") // This is a workaround for platforms with non-standard // definitions of the ip_mreq structure @@ -124,7 +125,7 @@ void ACE_SOCK_Dgram_Mcast_Ex<ACE_SDMOPT_LOCK>::dump (void) ACE_CONST_WHEN_MUTABL // Constructor. template <class ACE_SDMOPT_LOCK> -ACE_SOCK_Dgram_Mcast_Ex<ACE_SDMOPT_LOCK>::ACE_SOCK_Dgram_Mcast_Ex +ACE_SOCK_Dgram_Mcast_Ex<ACE_SDMOPT_LOCK>::ACE_SOCK_Dgram_Mcast_Ex (ACE_TYPENAME ACE_SOCK_Dgram_Mcast_Ex<ACE_SDMOPT_LOCK>::options bind_addr_opt, ACE_TYPENAME ACE_SOCK_Dgram_Mcast_Ex<ACE_SDMOPT_LOCK>::options null_iface_opt, ACE_TYPENAME ACE_SOCK_Dgram_Mcast_Ex<ACE_SDMOPT_LOCK>::options dtor_unsub_opt) @@ -367,7 +368,7 @@ int ACE_SOCK_Dgram_Mcast_Ex<ACE_SDMOPT_LOCK>::subscribe_ifs (const ACE_INET_Addr ACE_SDM_helpers::addr_to_string (mcast_addr, sub_addr_string, 1); ACE_SDM_helpers::addr_to_string (this->bound_addr_, bound_addr_string, 1); - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("Subscribed address (%s) different than bound address (%s).\n"), sub_addr_string, bound_addr_string)); @@ -692,7 +693,7 @@ int ACE_SOCK_Dgram_Mcast_Ex<ACE_SDMOPT_LOCK>::make_multicast_ifaddr (ip_mreq *re else lmreq.imr_interface.s_addr = INADDR_ANY; - lmreq.IMR_MULTIADDR.s_addr = htonl (mcast_addr.get_ip_address ()); + lmreq.IMR_MULTIADDR.s_addr = ACE_HTONL (mcast_addr.get_ip_address ()); // Set return info, if requested. if (ret_mreq) |