diff options
| author | Martin Corino <mcorino@remedy.nl> | 2015-06-01 11:22:37 +0200 |
|---|---|---|
| committer | Martin Corino <mcorino@remedy.nl> | 2015-06-01 11:22:37 +0200 |
| commit | 98a76c8a801f3c9d35ebedca4de7bb18effdc888 (patch) | |
| tree | 64db51e0bf963d8cf594abb36f4a635d3e6da324 | |
| parent | d6b3c39af65a94712d7860c5301ccd49f540b814 (diff) | |
| download | ATCD-98a76c8a801f3c9d35ebedca4de7bb18effdc888.tar.gz | |
Fix MSVC integer conversion warnings.
* TAO/tao/Valuetype/ValueBase.cpp:
| -rw-r--r-- | TAO/tao/Valuetype/ValueBase.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/TAO/tao/Valuetype/ValueBase.cpp b/TAO/tao/Valuetype/ValueBase.cpp index d01a38d9a49..9fc61b1b0c3 100644 --- a/TAO/tao/Valuetype/ValueBase.cpp +++ b/TAO/tao/Valuetype/ValueBase.cpp @@ -395,9 +395,9 @@ CORBA::ValueBase::_tao_unmarshal_find_factory ( CORBA::ValueFactory_var factory; CORBA::Boolean requires_truncation = false; - const CORBA::ULong num_ids = ids.size (); + const size_t num_ids = ids.size (); const char *id = (num_ids) ? ids[0].c_str () : "{Null}"; - for (CORBA::ULong i = 0u; i < num_ids; ++i) + for (size_t i = 0u; i < num_ids; ++i) { factory = orb_core->orb ()->lookup_value_factory (ids[i].c_str ()); if (factory.in() != 0) @@ -955,7 +955,8 @@ TAO_ChunkInfo::write_previous_chunk_size(TAO_OutputCDR &strm) if (this->chunk_size_pos_ != 0) { // Calculate the chunk size. - CORBA::Long const chunk_size = strm.total_length () - this->length_to_chunk_octets_pos_; + CORBA::Long const chunk_size = + static_cast<CORBA::Long> (strm.total_length () - this->length_to_chunk_octets_pos_); // This should not happen since this is called in end_chunk() and // the idl generated code always have the matched start_chunk() and |