diff options
Diffstat (limited to 'TAO/tao/append.cpp')
| -rw-r--r-- | TAO/tao/append.cpp | 136 |
1 files changed, 68 insertions, 68 deletions
diff --git a/TAO/tao/append.cpp b/TAO/tao/append.cpp index 22ac70362c3..2df57c58492 100644 --- a/TAO/tao/append.cpp +++ b/TAO/tao/append.cpp @@ -36,8 +36,8 @@ ACE_RCSID(tao, append, "$Id$") CORBA::TypeCode::traverse_status TAO_Marshal_Primitive::append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, - TAO_OutputCDR *dest, - CORBA::Environment &ACE_TRY_ENV) + TAO_OutputCDR *dest + TAO_ENV_ARG_DECL) { CORBA::Boolean continue_append = 1; CORBA::TypeCode::traverse_status retval = @@ -99,8 +99,8 @@ TAO_Marshal_Primitive::append (CORBA::TypeCode_ptr tc, CORBA::TypeCode::traverse_status TAO_Marshal_Any::append (CORBA::TypeCode_ptr, TAO_InputCDR *src, - TAO_OutputCDR *dest, - CORBA::Environment &ACE_TRY_ENV) + TAO_OutputCDR *dest + TAO_ENV_ARG_DECL) { // Typecode of the element that makes the Any. CORBA::TypeCode_var elem_tc; @@ -119,8 +119,8 @@ TAO_Marshal_Any::append (CORBA::TypeCode_ptr, CORBA::TypeCode::traverse_status retval = TAO_Marshal_Object::perform_append (elem_tc.in (), src, - dest, - ACE_TRY_ENV); + dest + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE) @@ -140,8 +140,8 @@ TAO_Marshal_Any::append (CORBA::TypeCode_ptr, CORBA::TypeCode::traverse_status TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr, TAO_InputCDR *src, - TAO_OutputCDR *dest, - CORBA::Environment &ACE_TRY_ENV) + TAO_OutputCDR *dest + TAO_ENV_ARG_DECL) { CORBA::Boolean continue_append = 1; CORBA::TypeCode::traverse_status retval = @@ -177,8 +177,8 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr, retval = TAO_Marshal_Object::perform_append (CORBA::_tc_long, src, - dest, - ACE_TRY_ENV); + dest + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); } break; @@ -190,8 +190,8 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr, retval = TAO_Marshal_Object::perform_append (CORBA::_tc_long, src, - dest, - ACE_TRY_ENV); + dest + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); } break; @@ -211,8 +211,8 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr, retval = TAO_Marshal_Object::perform_append (TC_opaque, src, - dest, - ACE_TRY_ENV); + dest + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); } } // end of switch @@ -247,21 +247,21 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr, CORBA::TypeCode::traverse_status TAO_Marshal_Principal::append (CORBA::TypeCode_ptr, TAO_InputCDR *src, - TAO_OutputCDR *dest, - CORBA::Environment &ACE_TRY_ENV) + TAO_OutputCDR *dest + TAO_ENV_ARG_DECL) { // write the octet sequence representing the Principal return TAO_Marshal_Object::perform_append (TC_opaque, src, - dest, - ACE_TRY_ENV); + dest + TAO_ENV_ARG_PARAMETER); } CORBA::TypeCode::traverse_status TAO_Marshal_ObjRef::append (CORBA::TypeCode_ptr, TAO_InputCDR *src, - TAO_OutputCDR *dest, - CORBA::Environment &ACE_TRY_ENV) + TAO_OutputCDR *dest + TAO_ENV_ARG_DECL) { CORBA::Boolean continue_append = 1; @@ -333,15 +333,15 @@ TAO_Marshal_ObjRef::append (CORBA::TypeCode_ptr, CORBA::TypeCode::traverse_status TAO_Marshal_Struct::append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, - TAO_OutputCDR *dest, - CORBA::Environment &ACE_TRY_ENV) + TAO_OutputCDR *dest + TAO_ENV_ARG_DECL) { CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE; CORBA::TypeCode_var param; // Number of fields in the struct. - int member_count = tc->member_count (ACE_TRY_ENV); + int member_count = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); for (int i = 0; @@ -349,14 +349,14 @@ TAO_Marshal_Struct::append (CORBA::TypeCode_ptr tc, i++) { // get member type - param = tc->member_type (i, ACE_TRY_ENV); + param = tc->member_type (i TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); retval = TAO_Marshal_Object::perform_append (param.in (), src, - dest, - ACE_TRY_ENV); + dest + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); } @@ -375,15 +375,15 @@ TAO_Marshal_Struct::append (CORBA::TypeCode_ptr tc, CORBA::TypeCode::traverse_status TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, - TAO_OutputCDR *dest, - CORBA::Environment &ACE_TRY_ENV) + TAO_OutputCDR *dest + TAO_ENV_ARG_DECL) { CORBA::TypeCode_var discrim_tc = - tc->discriminator_type (ACE_TRY_ENV); + tc->discriminator_type (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); CORBA::ULong kind = - discrim_tc->kind (ACE_TRY_ENV); + discrim_tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); // Save the discriminator value in a temporary variable... @@ -467,7 +467,7 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc, } CORBA::ULong member_count = - tc->member_count (ACE_TRY_ENV); + tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); const CORBA::ULong null_member = ~ACE_static_cast (CORBA::ULong, 0U); @@ -479,15 +479,15 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc, i != member_count && current_member == null_member; ++i) { - CORBA::Any_var any = tc->member_label (i, - ACE_TRY_ENV); + CORBA::Any_var any = tc->member_label (i + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); CORBA::Octet o; if ((any >>= CORBA::Any::to_octet (o)) && o == 0) { CORBA::ULong default_index = - tc->default_index (ACE_TRY_ENV); + tc->default_index (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); if (i != default_index) @@ -584,12 +584,12 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc, { // Good, use the default to append... CORBA::TypeCode_var member_tc = - tc->member_type (default_member, ACE_TRY_ENV); + tc->member_type (default_member TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); return TAO_Marshal_Object::perform_append (member_tc.in (), src, - dest, - ACE_TRY_ENV); + dest + TAO_ENV_ARG_PARAMETER); } return CORBA::TypeCode::TRAVERSE_STOP; @@ -597,19 +597,19 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc, // If we found the member successfully then just use that one... CORBA::TypeCode_var member_tc = - tc->member_type (current_member, ACE_TRY_ENV); + tc->member_type (current_member TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); return TAO_Marshal_Object::perform_append (member_tc.in (), src, - dest, - ACE_TRY_ENV); + dest + TAO_ENV_ARG_PARAMETER); } CORBA::TypeCode::traverse_status TAO_Marshal_String::append (CORBA::TypeCode_ptr, TAO_InputCDR *src, - TAO_OutputCDR *dest, - CORBA::Environment &ACE_TRY_ENV) + TAO_OutputCDR *dest + TAO_ENV_ARG_DECL) { CORBA::Boolean continue_append = 1; @@ -637,8 +637,8 @@ TAO_Marshal_String::append (CORBA::TypeCode_ptr, CORBA::TypeCode::traverse_status TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, - TAO_OutputCDR *dest, - CORBA::Environment &ACE_TRY_ENV) + TAO_OutputCDR *dest + TAO_ENV_ARG_DECL) { // Size of element. CORBA::ULong bounds; @@ -671,13 +671,13 @@ TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr tc, { // Get element typecode. CORBA::TypeCode_var tc2 = - tc->content_type (ACE_TRY_ENV); + tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE; - CORBA::TCKind kind = tc2->kind (ACE_TRY_ENV); + CORBA::TCKind kind = tc2->kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); switch (kind) @@ -831,8 +831,8 @@ TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr tc, { retval = TAO_Marshal_Object::perform_append (tc2.in (), src, - dest, - ACE_TRY_ENV); + dest + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); } break; @@ -855,19 +855,19 @@ TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr tc, CORBA::TypeCode::traverse_status TAO_Marshal_Array::append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, - TAO_OutputCDR *dest, - CORBA::Environment &ACE_TRY_ENV) + TAO_OutputCDR *dest + TAO_ENV_ARG_DECL) { // retrieve the bounds of the array - CORBA::ULong bounds = tc->length (ACE_TRY_ENV); + CORBA::ULong bounds = tc->length (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); // get element typecode - CORBA::TypeCode_var tc2 = tc->content_type (ACE_TRY_ENV); + CORBA::TypeCode_var tc2 = tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); // For CORBA basic types, the copy can be optimized - CORBA::TCKind kind = tc2->kind (ACE_TRY_ENV); + CORBA::TCKind kind = tc2->kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); // Return status. @@ -1024,8 +1024,8 @@ TAO_Marshal_Array::append (CORBA::TypeCode_ptr tc, { retval = TAO_Marshal_Object::perform_append (tc2.in (), src, - dest, - ACE_TRY_ENV); + dest + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); } break; @@ -1046,8 +1046,8 @@ TAO_Marshal_Array::append (CORBA::TypeCode_ptr tc, CORBA::TypeCode::traverse_status TAO_Marshal_Alias::append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, - TAO_OutputCDR *dest, - CORBA::Environment &ACE_TRY_ENV) + TAO_OutputCDR *dest + TAO_ENV_ARG_DECL) { // Typecode of the aliased type. CORBA::TypeCode_var tc2; @@ -1057,13 +1057,13 @@ TAO_Marshal_Alias::append (CORBA::TypeCode_ptr tc, CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE; - tc2 = tc->content_type (ACE_TRY_ENV); + tc2 = tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); retval = TAO_Marshal_Object::perform_append (tc2.in (), src, - dest, - ACE_TRY_ENV); + dest + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE @@ -1088,8 +1088,8 @@ TAO_Marshal_Alias::append (CORBA::TypeCode_ptr tc, CORBA::TypeCode::traverse_status TAO_Marshal_Except::append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, - TAO_OutputCDR *dest, - CORBA::Environment &ACE_TRY_ENV) + TAO_OutputCDR *dest + TAO_ENV_ARG_DECL) { CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE; @@ -1100,20 +1100,20 @@ TAO_Marshal_Except::append (CORBA::TypeCode_ptr tc, continue_append = dest->append_string (*src); // Number of fields in the struct. - int member_count = tc->member_count (ACE_TRY_ENV); + int member_count = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); for (int i = 0; i < member_count && retval == CORBA::TypeCode::TRAVERSE_CONTINUE && continue_append == 1; i++) { - param = tc->member_type (i, ACE_TRY_ENV); + param = tc->member_type (i TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); retval = TAO_Marshal_Object::perform_append (param.in (), src, - dest, - ACE_TRY_ENV); + dest + TAO_ENV_ARG_PARAMETER); } if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE @@ -1131,8 +1131,8 @@ TAO_Marshal_Except::append (CORBA::TypeCode_ptr tc, CORBA::TypeCode::traverse_status TAO_Marshal_WString::append (CORBA::TypeCode_ptr, TAO_InputCDR *src, - TAO_OutputCDR *dest, - CORBA::Environment &ACE_TRY_ENV) + TAO_OutputCDR *dest + TAO_ENV_ARG_DECL) { CORBA::Boolean continue_append = 1; |