diff options
| author | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-05-17 10:12:03 +0000 |
|---|---|---|
| committer | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-05-17 10:12:03 +0000 |
| commit | 9fa86b8f142870c12a5624bcfbe5c8182c362210 (patch) | |
| tree | 76b7d1a4c51d2843e920f251d3d96bbe061fbd3c | |
| parent | 5d11c9e5b15ee1faa5ec758a532c1478fae57f7a (diff) | |
| download | ATCD-9fa86b8f142870c12a5624bcfbe5c8182c362210.tar.gz | |
Fri May 17 10:11:00 UTC 2013 Simon Massey <simon dot massey at prismtech dot com> size_t not CORBA::ULong for ACE_Vector size.
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index adaade27ecc..a3e2e0aeef6 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Fri May 17 10:11:00 UTC 2013 Simon Massey <simon dot massey at prismtech dot com> + + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp: + + size_t not CORBA::ULong for ACE_Vector size. + Fri May 17 09:10:00 UTC 2013 Simon Massey <simon dot massey at prismtech dot com> * orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp: diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp index b1608a6bd87..04229fa4c30 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp @@ -111,7 +111,7 @@ TAO_UIPMC_Mcast_Connection_Handler::open (void *) this->local_addr_.get_host_addr (target_multicast_group, sizeof target_multicast_group); // Check if we are supposed to be listening on specified interface(s) - CORBA::ULong preferred_size= 0u; + size_t preferred_size= 0u; if (this->listener_interfaces_[0]) { // Since we have been told to match some targetNetwork=localNetwork listener interface @@ -131,7 +131,7 @@ TAO_UIPMC_Mcast_Connection_Handler::open (void *) // default join to be attempted later. bool success= !preferred_size; #endif // TAO_ALLOW_UNICAST_MIOP - for (CORBA::ULong i= 0u; i < preferred_size; ++i) + for (size_t i= 0u; i < preferred_size; ++i) if (0 == this->peer ().join ( this->local_addr_, 1, |