diff options
Diffstat (limited to 'TAO/tao/CDR_Interpreter.h')
| -rw-r--r-- | TAO/tao/CDR_Interpreter.h | 35 |
1 files changed, 12 insertions, 23 deletions
diff --git a/TAO/tao/CDR_Interpreter.h b/TAO/tao/CDR_Interpreter.h index 1151e54a9f6..f1c2ec595f0 100644 --- a/TAO/tao/CDR_Interpreter.h +++ b/TAO/tao/CDR_Interpreter.h @@ -25,7 +25,7 @@ // Useful typedefs. typedef size_t TAO_attribute_calculator (TAO_InputCDR *stream, size_t &alignment, - CORBA_Environment &ACE_TRY_ENV); + CORBA_Environment &TAO_IN_ENV); typedef CORBA::Boolean TAO_param_skip_rtn (TAO_InputCDR *); class TAO_Export TAO_CDR_Interpreter @@ -106,14 +106,12 @@ public: static size_t calc_nested_size_and_alignment (CORBA::TypeCode_ptr tc, TAO_InputCDR *original_stream, size_t &alignment, - CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); static size_t calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc, TAO_InputCDR *stream, CORBA::TCKind kind, size_t &alignment, - CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // For a given typecode, figure out its size and alignment needs. // This version is used mostly when traversing other typecodes, and // follows these rules: @@ -146,8 +144,7 @@ public: static size_t calc_struct_and_except_attributes (TAO_InputCDR *stream, size_t &alignment, CORBA::Boolean is_exception, - CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Given typecode bytes for a structure (or exception), figure out // its alignment and size; return size, alignment is an 'out' // parameter. Only "CORBA::tk_struct" (or "CORBA::tk_except") has @@ -165,16 +162,14 @@ public: static size_t calc_struct_attributes (TAO_InputCDR *stream, size_t &alignment, - CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Calculate size and alignment for a structure. #if defined (TAO_NO_COPY_OCTET_SEQUENCES) static size_t calc_seq_attributes (TAO_InputCDR *stream, size_t &alignment, - CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Calculate size and alignment for a sequence, most of them have // the same requirements, but for the sequences of Octets that are // optimized to minimize copying. @@ -182,15 +177,13 @@ public: static size_t calc_exception_attributes (TAO_InputCDR *stream, size_t &alignment, - CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Calculate size and alignment for an exception. static size_t calc_union_attributes (TAO_InputCDR *stream, size_t &alignment, - CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Calculate size and alignment for a CORBA discriminated union. // // Note that this is really a two-element structure. The first @@ -202,14 +195,12 @@ public: static size_t calc_alias_attributes (TAO_InputCDR *stream, size_t &alignment, - CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Calculate size and alignment for a typedeffed type. static size_t calc_array_attributes (TAO_InputCDR *stream, size_t &alignment, - CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Calculate size and alignment of an array. (All such arrays are // described as single dimensional, even though the IDL definition // may specify a multidimensional array ... such arrays are treated @@ -218,16 +209,14 @@ public: static CORBA::Boolean match_value (CORBA::TCKind kind, TAO_InputCDR *tc_stream, const void *value, - CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Cast the discriminant values to the right type and compare them. static size_t calc_key_union_attributes (TAO_InputCDR *stream, size_t &overall_alignment, size_t &discrim_size_with_pad, - CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // = Utility routine that checks if a union member is a variable sized type |