diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-11-29 16:50:20 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-11-29 16:50:20 +0000 |
| commit | f9fb3aee89e84a7dd9e2f6cc8160d5efa56debb8 (patch) | |
| tree | 3958d9de8f1ad7aa195742e17963077f64dce2fe | |
| parent | ea55fc5113cdcabf4e63adf9c9f1c75e64de1ea1 (diff) | |
| download | ATCD-f9fb3aee89e84a7dd9e2f6cc8160d5efa56debb8.tar.gz | |
ChangeLogTag: Wed Nov 27 13:03:19 2002 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/tao/Typecode.cpp | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp index ff58936a682..8927d7bd29c 100644 --- a/TAO/tao/Typecode.cpp +++ b/TAO/tao/Typecode.cpp @@ -1829,16 +1829,19 @@ CORBA_TypeCode::private_member_count (ACE_ENV_SINGLE_ARG_DECL) const CORBA::ULong tc_kind_holder; CORBA::TCKind tc_kind; + // @@@ (JP) When the IDL compiler is updated to create typecodes + // using a CDR stream, ValueModifier will have to be changed to + // skip_short. if (!stream.skip_string () // ID || !stream.skip_string () // Name - || !stream.skip_short () // ValueModifier + || !stream.skip_long () // ValueModifier || !stream.read_ulong (tc_kind_holder)) // Base's TCKind { ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0); } - tc_kind = ACE_static_cast(CORBA::TCKind, tc_kind_holder); + tc_kind = ACE_static_cast (CORBA::TCKind, tc_kind_holder); // The tc_kind can be either tk_null or tk_value. @@ -2109,9 +2112,12 @@ CORBA_TypeCode::private_member_type (CORBA::ULong slot CORBA::ULong tc_kind_holder; CORBA::TCKind tc_kind; + // @@@ (JP) When the IDL compiler is updated to create typecodes + // using a CDR stream, ValueModifier will have to be changed to + // skip_short. if (!stream.skip_string () // ID || !stream.skip_string () // Name - || !stream.skip_short () // ValueModifier + || !stream.skip_long () // ValueModifier || !stream.read_ulong (tc_kind_holder)) // Base's TCKind { ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), @@ -2169,7 +2175,10 @@ 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 + // @@@ (JP) When the IDL compiler is updated to create typecodes + // using a CDR stream, this will have to be changed to + // skip_short. + if (!stream.skip_long ()) // skip member visibility { ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), CORBA::TypeCode::_nil ()); @@ -2743,9 +2752,12 @@ CORBA_TypeCode::private_member_visibility (CORBA::ULong slot // Skip rest of header (type ID, name, etc) and collect the // number of value members. + // @@@ (JP) When the IDL compiler is updated to create typecodes + // using a CDR stream, ValueModifier will have to be changed to + // skip_short. if (!stream.skip_string () // ID || !stream.skip_string () // Name - || !stream.skip_short () // ValueModifier + || !stream.skip_long () // ValueModifier || !this->skip_typecode (stream) // Concrete base typecode || !stream.skip_ulong ()) // Member count { @@ -2846,9 +2858,12 @@ CORBA_TypeCode::private_concrete_base_type (ACE_ENV_SINGLE_ARG_DECL) const // Skip rest of header (type ID, name, etc) and collect the // number of value members. + // @@@ (JP) When the IDL compiler is updated to create typecodes + // using a CDR stream, ValueModifier will have to be changed to + // skip_short. if (!stream.skip_string () // ID || !stream.skip_string () // Name - || !stream.skip_short ()) // ValueModifier + || !stream.skip_long ()) // ValueModifier { ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0); |