diff options
| author | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-05-17 08:25:35 +0000 |
|---|---|---|
| committer | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-05-17 08:25:35 +0000 |
| commit | e80d1c10933ea86fd2975e05db6c038b11bcc328 (patch) | |
| tree | 0184f1d4d3bb817f8b907d1537721392196f5b4e | |
| parent | 11f16c52e4491f040ddd7346074c3120e7015bc3 (diff) | |
| download | ATCD-e80d1c10933ea86fd2975e05db6c038b11bcc328.tar.gz | |
Fri May 17 08:26:00 UTC 2013 Simon Massey <simon dot massey at prismtech dot com>
Correction to Cater ALLOW_UNICAST_MIOP builds.
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index acf8a466431..90d1bb5786a 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Fri May 17 08:26:00 UTC 2013 Simon Massey <simon dot massey at prismtech dot com> + + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp: + + Correction to Cater ALLOW_UNICAST_MIOP builds. + Fri May 17 08:03: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 58f3c7f3b7a..24e1491abe0 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp @@ -137,7 +137,9 @@ TAO_UIPMC_Mcast_Connection_Handler::open (void *) 1, ACE_TEXT_CHAR_TO_TCHAR (preferred[i].c_str ()))) { +#ifndef ALLOW_UNICAST_MIOP success= true; // At least one perferred listener interface join succeeded +#endif // ALLOW_UNICAST_MIOP if (TAO_debug_level > 5) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - UIPMC_Mcast_Connection_Handler::open, ") |