diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-12-06 20:15:28 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-12-06 20:15:28 +0000 |
| commit | 405131290320e57a04fd00f45b2e35d707d17a3c (patch) | |
| tree | 8bdb0a5f80f32ed5f54262d3575e7cc48214158e /TAO/tao/DynamicAny/DynArray_i.cpp | |
| parent | 27aece5a0b12de1144d5202e7aa28ae1531a3510 (diff) | |
| download | ATCD-405131290320e57a04fd00f45b2e35d707d17a3c.tar.gz | |
ChangeLogTag: Wed Dec 6 14:13:26 2000 Jeff Parsons <parsons@cs.wustl.edu>
Diffstat (limited to 'TAO/tao/DynamicAny/DynArray_i.cpp')
| -rw-r--r-- | TAO/tao/DynamicAny/DynArray_i.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/TAO/tao/DynamicAny/DynArray_i.cpp b/TAO/tao/DynamicAny/DynArray_i.cpp index 4b7ccc5a21a..7c8dd7d2fa7 100644 --- a/TAO/tao/DynamicAny/DynArray_i.cpp +++ b/TAO/tao/DynamicAny/DynArray_i.cpp @@ -43,11 +43,9 @@ TAO_DynArray_i::init (const CORBA_Any& any, ACE_CHECK; if (kind != CORBA::tk_array) - ACE_THROW (DynamicAny::DynAnyFactory::InconsistentTypeCode ()); - - // The type will be correct if this constructor called from a - // factory function, but it could also be called by the user, - // so..... + { + ACE_THROW (DynamicAny::DynAnyFactory::InconsistentTypeCode ()); + } this->type_ = tc; @@ -94,13 +92,14 @@ void TAO_DynArray_i::init (CORBA_TypeCode_ptr tc, CORBA::Environment &ACE_TRY_ENV) { - // Need to check if called by user. CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc, ACE_TRY_ENV); ACE_CHECK; if (kind != CORBA::tk_array) - ACE_THROW (DynamicAny::DynAnyFactory::InconsistentTypeCode ()); + { + ACE_THROW (DynamicAny::DynAnyFactory::InconsistentTypeCode ()); + } this->type_ = CORBA::TypeCode::_duplicate (tc); this->current_index_ = 0; @@ -169,7 +168,7 @@ TAO_DynArray_i::get_arg_length (CORBA::TypeCode_ptr tc, TAO_DynArray_i * TAO_DynArray_i::_narrow (CORBA::Object_ptr obj, - CORBA::Environment &) + CORBA::Environment &) { if (CORBA::is_nil (obj)) return 0; |