diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-02-05 19:16:08 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-02-05 19:16:08 +0000 |
| commit | 9b98b34585ea201527ee21ace5da7110382d4052 (patch) | |
| tree | a10d0a015ce668e8fb0de116553f9311745b296d | |
| parent | b634a0a04d3c9837a389d1f5891fdf392e6c96db (diff) | |
| download | ATCD-9b98b34585ea201527ee21ace5da7110382d4052.tar.gz | |
ChangeLogTag: Wed Feb 5 13:11:42 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 40cd536d357..a6b6755fac8 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Wed Feb 5 13:11:42 2003 Jeff Parsons <j.parsons@vanderbilt.edu> + + * tao/TypeCodeFactory/TypeCodeFactory_i.cpp (valid_content_type): + + Fixed a bug in the unaliasing loop. + Mon Feb 3 16:14:27 2003 Jeff Parsons <j.parsons@vanderbilt.edu> * tao/TypeCodeFactory/TypeCodeFactory_i.cpp: diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp index 4f5bc2b13bd..d8be5d67942 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp @@ -1334,11 +1334,11 @@ TAO_TypeCodeFactory_i::valid_content_type (CORBA::TypeCode_ptr tc CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - CORBA::TypeCode_var tmp; + CORBA::TypeCode_var tmp = CORBA::TypeCode::_duplicate (tc); while (kind == CORBA::tk_alias) { - tmp = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); + tmp = tmp->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); kind = tmp->kind (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -1563,7 +1563,7 @@ TAO_TypeCodeFactory_i::update_map ( { ptr_arith_t unaligned_offset = ACE_static_cast (ptr_arith_t, - cdr.begin ()->wr_ptr () - cdr.buffer ()); + cdr.total_length ()); CORBA::Long aligned_offset = ACE_static_cast (CORBA::Long, |