diff options
| author | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-05-17 08:05:42 +0000 |
|---|---|---|
| committer | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-05-17 08:05:42 +0000 |
| commit | 11f16c52e4491f040ddd7346074c3120e7015bc3 (patch) | |
| tree | 643e01ffef83653bf33a3c92b7b39841988f7c48 | |
| parent | 0e1cca776ff60d1ced6818137aa8558376b40d9b (diff) | |
| download | ATCD-11f16c52e4491f040ddd7346074c3120e7015bc3.tar.gz | |
Fri May 17 08:03:00 UTC 2013 Simon Massey <simon dot massey at prismtech dot com> Cater for wchar version of call
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 45548a5157b..acf8a466431 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +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: + + Correction to Cater for wide character version of call. + Thu May 16 09:01:00 UTC 2013 Simon Massey <simon dot massey at prismtech dot com> * docs/Options.html: diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp index 9e388afa55e..58f3c7f3b7a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp @@ -132,7 +132,10 @@ TAO_UIPMC_Mcast_Connection_Handler::open (void *) bool success= !preferred_size; #endif // ALLOW_UNICAST_MIOP for (CORBA::ULong i= 0u; i < preferred_size; ++i) - if (0 == this->peer ().join (this->local_addr_, 1, preferred[i].c_str ())) + if (0 == this->peer ().join ( + this->local_addr_, + 1, + ACE_TEXT_CHAR_TO_TCHAR (preferred[i].c_str ()))) { success= true; // At least one perferred listener interface join succeeded if (TAO_debug_level > 5) |