summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Corino <mcorino@remedy.nl>2015-06-01 11:35:13 +0200
committerMartin Corino <mcorino@remedy.nl>2015-06-01 11:35:13 +0200
commit242514556a78edf036bc2b791ef4c8ad8675237b (patch)
tree5d790da8efdb5332a0fd4b410f68727ee8d9edbc
parent7bc30b68770f26eb53e194c54f1e1e92ccd8fe43 (diff)
downloadATCD-242514556a78edf036bc2b791ef4c8ad8675237b.tar.gz
Fix MSVC integer conversion warnings.
* TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp: * TAO/tao/DynamicInterface/Request.cpp:
-rw-r--r--TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp5
-rw-r--r--TAO/tao/DynamicInterface/Request.cpp4
2 files changed, 6 insertions, 3 deletions
diff --git a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp
index ebdabe25ceb..830f379f67c 100644
--- a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp
+++ b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp
@@ -12,6 +12,8 @@
#include "tao/Pluggable_Messaging_Utils.h"
#include "tao/AnyTypeCode/Any_Impl.h"
+#include "ace/Truncate.h"
+
#if !defined (__ACE_INLINE__)
# include "AMH_DSI_Response_Handler.inl"
#endif /* ! __ACE_INLINE__ */
@@ -403,7 +405,8 @@ TAO_AMH_DSI_Response_Handler::gateway_exception_reply (
// We know nothing about this exception, so we marshal it as a block
// of bytes. The outgoing stream's byte order has already been matched
// to the original source of the reply.
- this->_tao_out.write_char_array (encap.buffer (), encap.length ());
+ this->_tao_out.write_char_array (encap.buffer (),
+ ACE_Utils::truncate_cast<ACE_CDR::ULong> (encap.length ()));
// This will prevent the marshaling of any parameters into this reply.
// this->sent_gateway_exception_ = 1;
this->_tao_rh_send_reply ();
diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp
index 1b6f8fff951..261f1e08bd7 100644
--- a/TAO/tao/DynamicInterface/Request.cpp
+++ b/TAO/tao/DynamicInterface/Request.cpp
@@ -219,9 +219,9 @@ CORBA::Request::send_deferred (void)
TAO::DII_Deferred_Invocation_Adapter _tao_call (
this->target_,
_tao_arg_list,
- number_args,
+ static_cast<int> (number_args),
this->opname_,
- static_cast<CORBA::ULong> (ACE_OS::strlen (this->opname_)),
+ ACE_OS::strlen (this->opname_),
0,
this->orb_->orb_core (),
this);