diff options
| author | johnc <johnc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-06-12 16:06:45 +0000 |
|---|---|---|
| committer | johnc <johnc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-06-12 16:06:45 +0000 |
| commit | bc387619b9272c44b6f93edc70e684ffa4a05a96 (patch) | |
| tree | 1d7605075cda3dcc717734b0beb1ce1ee51a7200 | |
| parent | 02cc01dfbf0288c54325056784ebf9ac9682a052 (diff) | |
| download | ATCD-bc387619b9272c44b6f93edc70e684ffa4a05a96.tar.gz | |
ChangeLogTag: Tue Jun 12 15:52:09 UTC 2007 Ciju John <johnc at ociweb dot com>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp | 7 |
3 files changed, 17 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index bd80bebb0f7..6c005e717ab 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Tue Jun 12 15:52:09 UTC 2007 Ciju John <johnc at ociweb dot com> + + * orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp: + IPV6 dependent code enclosed within 'ACE_HAS_IPV6' + + * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp: + Fix for platforms which don't support 'getpid' API. + Fri Jun 8 19:23:45 UTC 2007 Adam Mitz <mitza@ociweb.com> * tao/Generic_Sequence_T.h: diff --git a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp index 63bc6ff66d9..c5ee86ae23a 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp @@ -65,9 +65,11 @@ main (int argc, char *argv[]) udp_addr->v4_addr().ipaddr); break; case RtecUDPAdmin::Rtec_inet6: +#if defined (ACE_HAS_IPV6) inet_addr.set_type(PF_INET6); inet_addr.set_address(udp_addr->v6_addr().ipaddr,16,0); inet_addr.set_port_number(udp_addr->v6_addr().port); +#endif /* ACE_HAS_IPV6 */ break; } } @@ -97,9 +99,11 @@ main (int argc, char *argv[]) udp_addr->v4_addr().ipaddr); break; case RtecUDPAdmin::Rtec_inet6: +#if defined (ACE_HAS_IPV6) inet_addr.set_type(PF_INET6); inet_addr.set_address(udp_addr->v6_addr().ipaddr,16,0); inet_addr.set_port_number(udp_addr->v6_addr().port); +#endif /* ACE_HAS_IPV6 */ break; } } diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp index 3c4bbb43e56..2973fd62445 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp @@ -27,8 +27,11 @@ void EchoEventConsumer_i::push(const RtecEventComm::EventSet& events) // Extract event data from the any. const char* eventData; std::ostringstream out; - out << "[" << getpid() << "] Received event," - << " type: " << events[i].header.type +#ifndef ACE_LACKS_GETPID + out << "[" << getpid(); +#endif + out << "] Received event," + << " type: " << events[i].header.type << " source: " << events[i].header.source; if (events[i].data.any_value >>= eventData) { out << " text: " << eventData; |