diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-04-14 22:12:14 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-04-14 22:12:14 +0000 |
| commit | 24772c23f1fed28b0d1b50bd176e238181b86260 (patch) | |
| tree | 54fd8630909a4af25df87e1a9c74abd2750c6bb8 /TAO/tao/GIOP.cpp | |
| parent | a36e5e789e00271c65c4ef043631a8ebf8f3d27e (diff) | |
| download | ATCD-24772c23f1fed28b0d1b50bd176e238181b86260.tar.gz | |
ChangeLogTag:Tue Apr 14 16:37:50 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
Diffstat (limited to 'TAO/tao/GIOP.cpp')
| -rw-r--r-- | TAO/tao/GIOP.cpp | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/TAO/tao/GIOP.cpp b/TAO/tao/GIOP.cpp index 348ab0aea7f..1187f669275 100644 --- a/TAO/tao/GIOP.cpp +++ b/TAO/tao/GIOP.cpp @@ -1022,16 +1022,14 @@ TAO_GIOP_Invocation::invoke (CORBA::ExceptionList &exceptions, // value; if that exception is not allowed by this operation, // fail (next). - u_int i; - CORBA::TypeCode_ptr *tcp; - - for (i = 0, tcp = xlist->buffer; - i < xlist->length; - i++, tcp++) + for (CORBA::ULong i = 0; + i < xlist->length (); + i++) { - const char *xid; + CORBA::TypeCode_ptr tcp = (*xlist) [i]; + + const char *xid = tcp->id (env); - xid = (*tcp)->id (env); if (env.exception () != 0) { dexc (env, "invoke (), get exception ID"); @@ -1044,7 +1042,7 @@ TAO_GIOP_Invocation::invoke (CORBA::ExceptionList &exceptions, size_t size; CORBA::Exception *exception; - size = (*tcp)->size (env); + size = tcp->size (env); if (env.exception () != 0) { dexc (env, "invoke (), get exception size"); @@ -1057,9 +1055,9 @@ TAO_GIOP_Invocation::invoke (CORBA::ExceptionList &exceptions, // to clean them all up together, in case of errors // unmarshaling. - exception = new (new char [size]) CORBA::Exception (*tcp); + exception = new (new char [size]) CORBA::Exception (tcp); - if (this->inp_stream_.decode (*tcp, exception, 0, env) + if (this->inp_stream_.decode (tcp, exception, 0, env) != CORBA::TypeCode::TRAVERSE_CONTINUE) { delete exception; @@ -1244,11 +1242,11 @@ TAO_GIOP::start_message (TAO_GIOP::Message_Type type, #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class TAO_Unbounded_Sequence<TAO_GIOP_ServiceContext>; template class TAO_Unbounded_Sequence<TAO_IOP_TaggedComponent>; -template class CORBA_SEQUENCE<CORBA::Octet>; -template class CORBA_SEQUENCE<CORBA::TypeCode*>; +template class TAO_Unbounded_Sequence<CORBA::Octet>; +template class TAO_Unbounded_Object_Sequence<CORBA::TypeCode>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate TAO_Unbounded_Sequence<TAO_GIOP_ServiceContext> #pragma instantiate TAO_Unbounded_Sequence<TAO_IOP_TaggedComponent> -#pragma instantiate CORBA_SEQUENCE<CORBA::Octet> -#pragma instantiate CORBA_SEQUENCE<CORBA::TypeCode*> +#pragma instantiate TAO_Unbounded_Sequence<CORBA::Octet> +#pragma instantiate TAO_Unbounded_Object_Sequence<CORBA::TypeCode> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |