diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-26 20:25:15 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-26 20:25:15 +0000 |
| commit | f3ec1b905961448460c093282126976e35e410b4 (patch) | |
| tree | a8b8cbf9b688d6df226955bd785fe257c55930e8 /TAO/tao/append.cpp | |
| parent | 8605c4b5cfb078bc87120991274fd9d38bd315ac (diff) | |
| download | ATCD-f3ec1b905961448460c093282126976e35e410b4.tar.gz | |
Small modifications to get rid of all MSVC level 4 warnings.
Mostly casting return values from integer to CORBA::Boolean and
the like.
Diffstat (limited to 'TAO/tao/append.cpp')
| -rw-r--r-- | TAO/tao/append.cpp | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/TAO/tao/append.cpp b/TAO/tao/append.cpp index 475577f159a..c26c6947fe0 100644 --- a/TAO/tao/append.cpp +++ b/TAO/tao/append.cpp @@ -153,7 +153,9 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr, // Decode the "kind" field of the typecode from the src for further // use. However, also write it back into the destination - continue_append = (src->read_ulong (kind) ? dest->write_ulong (kind) : 0); + continue_append = (CORBA::Boolean) (src->read_ulong (kind) + ? dest->write_ulong (kind) + : 0); if (continue_append == 1) { @@ -268,8 +270,9 @@ TAO_Marshal_ObjRef::append (CORBA::TypeCode_ptr, // get the count of profiles that follow. This will tell us the length of the // sequence - continue_append = (src->read_ulong (profiles) ? - dest->write_ulong (profiles) : 0); + continue_append = (CORBA::Boolean) (src->read_ulong (profiles) + ? dest->write_ulong (profiles) + : 0); // No profiles means a NIL objref. while (profiles-- != 0 && continue_append) @@ -277,13 +280,15 @@ TAO_Marshal_ObjRef::append (CORBA::TypeCode_ptr, CORBA::ULong tag = 0; // get the profile ID tag - if ((continue_append = (src->read_ulong (tag) ? - dest->write_ulong (tag) : 0)) == 0) + if ((continue_append = (CORBA::Boolean) (src->read_ulong (tag) + ? dest->write_ulong (tag) + : 0)) == 0) continue; CORBA::ULong length = 0; - if ((continue_append = (src->read_ulong (length) - ? dest->write_ulong (length) : 0)) == 0) + if ((continue_append = (CORBA::Boolean) (src->read_ulong (length) + ? dest->write_ulong (length) + : 0)) == 0) continue; // @@ This can be optimized! Pre-allocating on the destination @@ -292,9 +297,9 @@ TAO_Marshal_ObjRef::append (CORBA::TypeCode_ptr, ACE_NEW_RETURN (body, CORBA::Octet[length], CORBA::TypeCode::TRAVERSE_STOP); - continue_append = (src->read_octet_array (body, length) - ? dest->write_octet_array (body, length) - : 0); + continue_append = (CORBA::Boolean) (src->read_octet_array (body, length) + ? dest->write_octet_array (body, length) + : 0); delete [] body; } @@ -562,8 +567,9 @@ TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr tc, // here, on the "be gracious in what you accept" principle. We // don't generate illegal sequences (i.e. length > bounds). - continue_append = (src->read_ulong (bounds) ? - dest->write_ulong (bounds) : 0); + continue_append = (CORBA::Boolean) (src->read_ulong (bounds) + ? dest->write_ulong (bounds) + : 0); if (continue_append) { |