summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Corino <mcorino@remedy.nl>2015-06-02 13:58:59 +0200
committerMartin Corino <mcorino@remedy.nl>2015-06-02 13:58:59 +0200
commit404853f41d696d1b0cd421a594d1f69825c95f1f (patch)
treeb9f9104e1a15d38a7adea2d6da591b8b32ba9fb1
parent0b5d570a53372274fd306e0d23506a3ac9e007e8 (diff)
downloadATCD-404853f41d696d1b0cd421a594d1f69825c95f1f.tar.gz
Fix MSVC integer conversion warnings.
* TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp:
-rw-r--r--TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
index 4e62181384b..8d99f155162 100644
--- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
+++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
@@ -65,7 +65,7 @@ TAO_IOR_Multicast::init (const char *ior,
if (tmpnic != 0)
{
// i.e. a nic name has been specified
- length_addr = tmpnic - mcast_addr + 1;
+ length_addr = static_cast<CORBA::ULong> (tmpnic - mcast_addr + 1);
actual_mcast_addr = CORBA::string_alloc (length_addr);
ACE_OS::strncpy (actual_mcast_addr.inout (),
@@ -277,8 +277,8 @@ TAO_IOR_Multicast::handle_input (ACE_HANDLE)
// length as the first element, and ior itself as the second.)
// Length of ior to be sent.
- CORBA::Short data_len =
- static_cast<CORBA::Short> (ACE_HTONS (this->ior_.length () + 1));
+ CORBA::UShort data_len =
+ ACE_HTONS (static_cast<CORBA::UShort> (this->ior_.length () + 1));
// Vector to be sent.
const int cnt = 2;