diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-06-01 05:06:33 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-06-01 05:06:33 +0000 |
| commit | e3a2ffc3b081bc8776cf1e5e309ded9378f16524 (patch) | |
| tree | 4a0554fc765fcc91e9dfff1507b9884ccd726615 | |
| parent | 4ed578757f17762f3072f8ddf5a8ec1ca5a15e49 (diff) | |
| download | ATCD-e3a2ffc3b081bc8776cf1e5e309ded9378f16524.tar.gz | |
ChangeLogTag: Sat May 31 23:57:45 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 10 | ||||
| -rw-r--r-- | TAO/tao/Typecode.cpp | 14 |
2 files changed, 17 insertions, 7 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 676d67e7f1e..e62c5d77028 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,13 @@ +Sat May 31 23:57:45 2003 Jeff Parsons <j.parsons@vanderbilt.edu> + + * tao/Typecode.cpp: + + Replaced all instances of skip_short() (for ValueModifer and member + visibility in valuetypes and eventtypes) with skip_ulong(). Although + these quantities are defined by CORBA to be 2 bytes, all values + inserted into a type code are padded to 4-byte boundaries, including + strings, This differs from the padding of CDR streams in general. + Sat May 31 10:39:18 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * docs/configurations.html: Added a example for an optimized diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp index 922f841ca13..5f0b933dbdf 100644 --- a/TAO/tao/Typecode.cpp +++ b/TAO/tao/Typecode.cpp @@ -2022,7 +2022,7 @@ CORBA::TypeCode::private_member_count (ACE_ENV_SINGLE_ARG_DECL) const if (!stream.skip_string () // ID || !stream.skip_string () // Name - || !stream.skip_short () // ValueModifier + || !stream.skip_ulong () // ValueModifier || !stream.read_ulong (tc_kind_holder)) // Base's TCKind { ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), @@ -2274,7 +2274,7 @@ CORBA::TypeCode::private_member_type (CORBA::ULong slot if (!stream.skip_string () // ID || !stream.skip_string () // Name - || !stream.skip_short () // ValueModifier + || !stream.skip_ulong () // ValueModifier || !stream.read_ulong (tc_kind_holder)) // Base's TCKind { ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), @@ -2332,7 +2332,7 @@ CORBA::TypeCode::private_member_type (CORBA::ULong slot ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); - if (!stream.skip_short ()) // skip member visibility + if (!stream.skip_ulong ()) // skip member visibility { ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), CORBA::TypeCode::_nil ()); @@ -2544,7 +2544,7 @@ CORBA::TypeCode::private_member_name (CORBA::ULong slot if (!stream.skip_string () // ID || !stream.skip_string () // Name - || !stream.skip_short () // ValueModifier + || !stream.skip_ulong () // ValueModifier || !stream.read_ulong (tc_kind_holder)) // Base's TCKind { ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), @@ -2591,7 +2591,7 @@ CORBA::TypeCode::private_member_name (CORBA::ULong slot this->private_state_->tc_member_name_list_[i] ) || !this->skip_typecode (stream) // member typecode - || !stream.skip_short ()) // member visibility + || !stream.skip_ulong ()) // member visibility { ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0); @@ -3082,7 +3082,7 @@ CORBA::TypeCode::private_member_visibility (CORBA::ULong slot // number of value members. if (!stream.skip_string () // ID || !stream.skip_string () // Name - || !stream.skip_short () // ValueModifier + || !stream.skip_ulong () // ValueModifier || !this->skip_typecode (stream) // Concrete base typecode || !stream.skip_ulong ()) // Member count { @@ -3189,7 +3189,7 @@ CORBA::TypeCode::private_concrete_base_type (ACE_ENV_SINGLE_ARG_DECL) const // number of value members. if (!stream.skip_string () // ID || !stream.skip_string () // Name - || !stream.skip_short ()) // ValueModifier + || !stream.skip_ulong ()) // ValueModifier { ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), CORBA::TypeCode::_nil ()); |