diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-06-23 22:58:14 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-06-23 22:58:14 +0000 |
| commit | ece7c97713f6e464082b862f0d62b824bb833806 (patch) | |
| tree | 83c650a9e12f9d1dc64b4e96b80490e97b7979f0 /TAO/tao | |
| parent | 7d66bfe2ae7e8a4ca7ed86aa48a84cdd8e7c27b0 (diff) | |
| download | ATCD-ece7c97713f6e464082b862f0d62b824bb833806.tar.gz | |
ACE try macros changes.
Diffstat (limited to 'TAO/tao')
35 files changed, 787 insertions, 787 deletions
diff --git a/TAO/tao/Any.h b/TAO/tao/Any.h index bc95ca51c72..2dab86bf915 100644 --- a/TAO/tao/Any.h +++ b/TAO/tao/Any.h @@ -252,14 +252,14 @@ public: void replace (CORBA::TypeCode_ptr type, const void *value, CORBA::Boolean any_owns_data, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // Replace the current typecode and data with the specified one - // unsafe. void replace (CORBA::TypeCode_ptr type, const void *value, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // Replace the current typecode and data with the specified one - // unsafe. This uses a default value for the "any_owns_data" parameter @@ -268,7 +268,7 @@ public: // Return TypeCode of the element stored in the Any. void type (CORBA::TypeCode_ptr type, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // For use along with <<= of a value of aliased type when the alias must // be preserved. @@ -298,7 +298,7 @@ public: void _tao_replace (CORBA::TypeCode_ptr, const ACE_Message_Block *mb, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); // Replace via message block instead of <value_>. @@ -306,14 +306,14 @@ public: const ACE_Message_Block *mb, CORBA::Boolean any_owns_data, void* value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); // Replace all the contents of the any, used in the <<= operators. void _tao_replace (CORBA::TypeCode_ptr type, CORBA::Boolean any_owns_data, void* value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); // Replace the value of the Any, used in the >>= operators. @@ -324,7 +324,7 @@ public: // Useful for template programming. protected: - void free_value (CORBA::Environment &TAO_IN_ENV); + void free_value (CORBA::Environment &ACE_TRY_ENV); // Release the <value_>. private: diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h index c4dcbd2476f..54819e1c36b 100644 --- a/TAO/tao/CDR.h +++ b/TAO/tao/CDR.h @@ -116,7 +116,7 @@ public: CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // Append the contents of the CDR stream based on information - // described by <tc>; returning any errors in <TAO_IN_ENV>. + // described by <tc>; returning any errors in <ACE_TRY_ENV>. // @@ TODO: do we want a special method to write an array of // strings and wstrings? @@ -129,7 +129,7 @@ public: CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // Marshalls the contents of <data> as described by the TypeCode in - // <tc>. Any errors are reported though the <TAO_IN_ENV> parameter. + // <tc>. Any errors are reported though the <ACE_TRY_ENV> parameter. private: TAO_OutputCDR (const TAO_OutputCDR& rhs); @@ -221,13 +221,13 @@ public: CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // Demarshall the contents of the CDR stream into <data> as - // described by <tc>; returning any errors in <TAO_IN_ENV>. + // described by <tc>; returning any errors in <ACE_TRY_ENV>. CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // Skip the contents of the CDR stream based on information - // described by <tc>; returning any errors in <TAO_IN_ENV>. + // described by <tc>; returning any errors in <ACE_TRY_ENV>. TAO_ORB_Core *orb_core (void) const; // Accessor diff --git a/TAO/tao/CDR_Interpreter.h b/TAO/tao/CDR_Interpreter.h index f1c2ec595f0..29d4cf91b55 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 &TAO_IN_ENV); + CORBA_Environment &ACE_TRY_ENV); typedef CORBA::Boolean TAO_param_skip_rtn (TAO_InputCDR *); class TAO_Export TAO_CDR_Interpreter @@ -106,12 +106,12 @@ public: static size_t calc_nested_size_and_alignment (CORBA::TypeCode_ptr tc, TAO_InputCDR *original_stream, size_t &alignment, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_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 &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_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: @@ -144,7 +144,7 @@ public: static size_t calc_struct_and_except_attributes (TAO_InputCDR *stream, size_t &alignment, CORBA::Boolean is_exception, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_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 @@ -162,14 +162,14 @@ public: static size_t calc_struct_attributes (TAO_InputCDR *stream, size_t &alignment, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_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 &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_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. @@ -177,13 +177,13 @@ public: static size_t calc_exception_attributes (TAO_InputCDR *stream, size_t &alignment, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_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 &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // Calculate size and alignment for a CORBA discriminated union. // // Note that this is really a two-element structure. The first @@ -195,12 +195,12 @@ public: static size_t calc_alias_attributes (TAO_InputCDR *stream, size_t &alignment, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_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 &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_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 @@ -209,14 +209,14 @@ public: static CORBA::Boolean match_value (CORBA::TCKind kind, TAO_InputCDR *tc_stream, const void *value, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_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 &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // = Utility routine that checks if a union member is a variable sized type diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h index 693c7683dbb..37d8d4c123d 100644 --- a/TAO/tao/CurrentC.h +++ b/TAO/tao/CurrentC.h @@ -115,12 +115,12 @@ class CORBA_Current : public virtual ACE_CORBA_1 (Object) // the static operations static CORBA_Current_ptr _duplicate (CORBA_Current_ptr obj); static CORBA_Current_ptr _narrow (CORBA::Object_ptr obj, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static CORBA_Current_ptr _nil (void); virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual const char* _interface_repository_id (void) const; diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h index 454cf84253c..b720bcb41ff 100644 --- a/TAO/tao/DomainC.h +++ b/TAO/tao/DomainC.h @@ -82,12 +82,12 @@ public: static CORBA_DomainManager_ptr _duplicate (CORBA_DomainManager_ptr obj); static CORBA_DomainManager_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static CORBA_DomainManager_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static CORBA_DomainManager_ptr _nil (void); @@ -99,7 +99,7 @@ public: ); virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual const char* _interface_repository_id (void) const; @@ -250,12 +250,12 @@ public: static CORBA_ConstructionPolicy_ptr _duplicate (CORBA_ConstructionPolicy_ptr obj); static CORBA_ConstructionPolicy_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static CORBA_ConstructionPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static CORBA_ConstructionPolicy_ptr _nil (void); @@ -268,7 +268,7 @@ public: ); virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual const char* _interface_repository_id (void) const; diff --git a/TAO/tao/DynAnyC.h b/TAO/tao/DynAnyC.h index 3e39743055e..bb2098b4c57 100644 --- a/TAO/tao/DynAnyC.h +++ b/TAO/tao/DynAnyC.h @@ -224,190 +224,190 @@ public: static CORBA::TypeCode_ptr _tc_InvalidSeq; virtual CORBA::TypeCode_ptr type ( - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual void assign ( CORBA_DynAny_ptr dyn_any, - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual void from_any ( const CORBA::Any & value, - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual CORBA::Any * to_any ( - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual void destroy ( - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual CORBA_DynAny_ptr copy ( - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual void insert_boolean ( CORBA::Boolean value, - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual void insert_octet ( CORBA::Octet value, - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual void insert_char ( CORBA::Char value, - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual void insert_short ( CORBA::Short value, - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual void insert_ushort ( CORBA::UShort value, - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual void insert_long ( CORBA::Long value, - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual void insert_ulong ( CORBA::ULong value, - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual void insert_float ( CORBA::Float value, - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual void insert_double ( CORBA::Double value, - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual void insert_string ( const char * value, - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual void insert_reference ( CORBA::Object_ptr value, - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual void insert_typecode ( CORBA::TypeCode_ptr value, - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual void insert_longlong ( CORBA::LongLong value, - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual void insert_ulonglong ( CORBA::ULongLong value, - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual void insert_wchar ( CORBA::WChar value, - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual void insert_any ( const CORBA::Any & value, - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual CORBA::Boolean get_boolean ( - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual CORBA::Octet get_octet ( - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual CORBA::Char get_char ( - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual CORBA::Short get_short ( - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual CORBA::UShort get_ushort ( - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual CORBA::Long get_long ( - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual CORBA::ULong get_ulong ( - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual CORBA::Float get_float ( - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual CORBA::Double get_double ( - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual char * get_string ( - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual CORBA::Object_ptr get_reference ( - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual CORBA::TypeCode_ptr get_typecode ( - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual CORBA::LongLong get_longlong ( - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual CORBA::ULongLong get_ulonglong ( - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual CORBA::WChar get_wchar ( - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual CORBA::Any * get_any ( - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual CORBA_DynAny_ptr current_component ( - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual CORBA::Boolean next ( - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual CORBA::Boolean seek ( CORBA::Long slot, - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual void rewind ( - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual CORBA::Boolean _is_a ( @@ -493,21 +493,21 @@ public: static CORBA_DynEnum_ptr _nil (void); virtual char * value_as_string ( - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual void value_as_string ( const char * value_as_string, - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual CORBA::ULong value_as_ulong ( - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual void value_as_ulong ( CORBA::ULong value_as_ulong, - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual CORBA::Boolean _is_a ( @@ -922,20 +922,20 @@ public: static CORBA_DynStruct_ptr _nil (void); virtual char * current_member_name ( - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual CORBA::TCKind current_member_kind ( - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual CORBA_NameValuePairSeq * get_members ( - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual void set_members ( const CORBA_NameValuePairSeq & value, - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual CORBA::Boolean _is_a ( @@ -1021,37 +1021,37 @@ public: static CORBA_DynUnion_ptr _nil (void); virtual CORBA::Boolean set_as_default ( - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual void set_as_default ( CORBA::Boolean set_as_default, - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual CORBA_DynAny_ptr discriminator ( - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual CORBA::TCKind discriminator_kind ( - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual CORBA_DynAny_ptr member ( - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual char * member_name ( - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual void member_name ( const char * member_name, - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual CORBA::TCKind member_kind ( - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual CORBA::Boolean _is_a ( @@ -1407,21 +1407,21 @@ public: static CORBA_DynSequence_ptr _nil (void); virtual CORBA::ULong length ( - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual void length ( CORBA::ULong length, - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual CORBA_AnySeq * get_elements ( - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual void set_elements ( const CORBA_AnySeq & value, - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual CORBA::Boolean _is_a ( @@ -1507,12 +1507,12 @@ public: static CORBA_DynArray_ptr _nil (void); virtual CORBA_AnySeq * get_elements ( - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual void set_elements ( const CORBA_AnySeq & value, - CORBA::Environment &_tao_environment = + CORBA::Environment &ACE_TRY_ENVironment = CORBA::Environment::default_environment () ); virtual CORBA::Boolean _is_a ( diff --git a/TAO/tao/Environment.h b/TAO/tao/Environment.h index 86516d652c3..3748628996b 100644 --- a/TAO/tao/Environment.h +++ b/TAO/tao/Environment.h @@ -63,10 +63,10 @@ public: CORBA_Environment (void); // The default constructor, the environment will hold no exceptions. - CORBA_Environment (const CORBA_Environment &env); + CORBA_Environment (const CORBA_Environment &ACE_TRY_ENV); // Copy constructor. - CORBA_Environment &operator=(const CORBA_Environment &env); + CORBA_Environment &operator=(const CORBA_Environment &ACE_TRY_ENV); // Assingment. ~CORBA_Environment (void); diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h index 0cac40dc027..d5ec3245c57 100644 --- a/TAO/tao/Exception.h +++ b/TAO/tao/Exception.h @@ -315,7 +315,7 @@ public: // Make the TypeCode for the CORBA::UnknownUserException standard // exception. - static void init (CORBA_Environment &TAO_IN_ENV = + static void init (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // Runtime initialization of all standard exception typecodes. // Called from <CORBA::ORB_init>. @@ -325,7 +325,7 @@ public: static CORBA_SystemException * create_system_exception (const char *id, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // Create a CORBA::SystemException given the interface repository // ID. @@ -382,12 +382,12 @@ public: // Add and consume a TypeCode to the list CORBA::TypeCode_ptr item (CORBA::ULong slot, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // Return the typecode at slot i. Raises the "Bounds" exception. void remove (CORBA::ULong slot, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // Remove the typecode at slot i. Raises the "Bounds" exception. diff --git a/TAO/tao/Forwarding_Servant.h b/TAO/tao/Forwarding_Servant.h index 81c9c551a70..b093f1d28c6 100644 --- a/TAO/tao/Forwarding_Servant.h +++ b/TAO/tao/Forwarding_Servant.h @@ -35,7 +35,7 @@ public: // Constructor virtual void invoke (CORBA::ServerRequest_ptr request, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // The <invoke> method receives requests issued to any CORBA object // incarnated by the DSI servant and performs the processing @@ -43,7 +43,7 @@ public: virtual CORBA::RepositoryId _primary_interface (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // The <_primary_interface> method receives an ObjectId value and a // POA_ptr as input parameters and returns a valid RepositoryId // representing the most-derived interface for that oid. diff --git a/TAO/tao/GIOP.h b/TAO/tao/GIOP.h index b15f91ead9f..1f063f0cb47 100644 --- a/TAO/tao/GIOP.h +++ b/TAO/tao/GIOP.h @@ -354,7 +354,7 @@ public: // Constructor void init (TAO_InputCDR &msg, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // Initialize the header from the values found in <msg>. diff --git a/TAO/tao/GIOP_Server_Request.h b/TAO/tao/GIOP_Server_Request.h index 77ee397b5e1..5d6b4269b9f 100644 --- a/TAO/tao/GIOP_Server_Request.h +++ b/TAO/tao/GIOP_Server_Request.h @@ -53,18 +53,18 @@ public: // = General ServerRequest operations void arguments (CORBA::NVList_ptr &list, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); void set_result (const CORBA::Any &value, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); void set_exception (const CORBA::Any &value, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - virtual void dsi_marshal (CORBA_Environment &TAO_IN_ENV = + virtual void dsi_marshal (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // does the marshaling of outgoing parameters and is used by the DSI // based scheme @@ -95,20 +95,20 @@ public: // meant to be used internally. // - virtual void demarshal (CORBA_Environment &orb_env, + virtual void demarshal (CORBA_Environment &ACE_TRY_ENV, const TAO_Call_Data_Skel *info, ...); // demarshal incoming parameters. Used by the SII skeleton (i.e., the IDL // compiler generated skeleton) - virtual void marshal (CORBA_Environment &orb_env, + virtual void marshal (CORBA_Environment &ACE_TRY_ENV, // CORBA_Environment &skel_env, const TAO_Call_Data_Skel *info, ...); // marshal outgoing parameters and return value. This is used by the SSI // i.e., by the IDL compiler generated skeletons. - virtual void init_reply (CORBA_Environment &TAO_IN_ENV = + virtual void init_reply (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // start a Reply message diff --git a/TAO/tao/IIOP_Profile.h b/TAO/tao/IIOP_Profile.h index 0e720606a6d..0928e6483c7 100644 --- a/TAO/tao/IIOP_Profile.h +++ b/TAO/tao/IIOP_Profile.h @@ -65,7 +65,7 @@ public: TAO_IIOP_Profile (const char *string, TAO_ORB_Core *orb_core, - CORBA::Environment &env); + CORBA::Environment &ACE_TRY_ENV); // Create object using a string ior. TAO_IIOP_Profile (const TAO_IIOP_Profile &pfile); @@ -81,10 +81,10 @@ public: // Destructor is to be called only through <_decr_refcnt>. int parse_string (const char *string, - CORBA::Environment &env); + CORBA::Environment &ACE_TRY_ENV); // Initialize this object using the given input string. - CORBA::String to_string (CORBA::Environment &env); + CORBA::String to_string (CORBA::Environment &ACE_TRY_ENV); // Return a string representation for this profile. // client must deallocate memory. @@ -109,7 +109,7 @@ public: // version are the same. CORBA::ULong hash (CORBA::ULong max, - CORBA::Environment &env); + CORBA::Environment &ACE_TRY_ENV); // Return a hash value for this object. int addr_to_string (char *buffer, size_t length); diff --git a/TAO/tao/IORC.h b/TAO/tao/IORC.h index 4e331af092e..6c115b2c6cf 100644 --- a/TAO/tao/IORC.h +++ b/TAO/tao/IORC.h @@ -115,12 +115,12 @@ TAO_NAMESPACE TAO_IOP static TAO_IOR_Manipulation_ptr _duplicate (TAO_IOR_Manipulation_ptr obj); static TAO_IOR_Manipulation_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static TAO_IOR_Manipulation_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static TAO_IOR_Manipulation_ptr _nil (void); @@ -531,7 +531,7 @@ TAO_NAMESPACE TAO_IOP virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual const char* _interface_repository_id (void) const; diff --git a/TAO/tao/Invocation.h b/TAO/tao/Invocation.h index 1073979b2c6..b28d47f5650 100644 --- a/TAO/tao/Invocation.h +++ b/TAO/tao/Invocation.h @@ -70,7 +70,7 @@ public: void put_param (CORBA::TypeCode_ptr tc, void *value, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // Encodes the value into the undelying CDR stream based on the // TypeCode parameter @@ -91,7 +91,7 @@ protected: // raises the CORBA::TRANSIENT exception. int invoke (CORBA::Boolean is_roundtrip, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); // Sends the request, does not wait for the response. @@ -106,7 +106,7 @@ protected: // (to the same server) int location_forward (TAO_InputCDR &inp_stream, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); // Helper method, the response for a Request or LocateRequest was a @@ -159,13 +159,13 @@ public: const char *operation, TAO_ORB_Core* orb_core); - void start (CORBA_Environment &TAO_IN_ENV = + void start (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); // Calls TAO_GIOP_Invocation::start. int invoke (CORBA::ExceptionList &exceptions, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException,CORBA::UnknownUserException)); // Send request, block until any reply comes back, and unmarshal @@ -173,7 +173,7 @@ public: int invoke (TAO_Exception_Data *excepts, CORBA::ULong except_count, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::Exception)); // Special purpose invoke method used by the interpretive stubs. This @@ -183,7 +183,7 @@ public: void get_value (CORBA::TypeCode_ptr tc, void *value, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // No CORBA::Context support (deprecated). @@ -215,12 +215,12 @@ public: const char *operation, TAO_ORB_Core* orb_core); - void start (CORBA_Environment &TAO_IN_ENV = + void start (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); // Call TAO_GIOP_Invocation::start() - int invoke (CORBA_Environment &TAO_IN_ENV = + int invoke (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); // Send request, without blocking for any response. @@ -237,12 +237,12 @@ public: TAO_GIOP_Locate_Request_Invocation (TAO_Stub *data, TAO_ORB_Core* orb_core); - void start (CORBA_Environment &TAO_IN_ENV = + void start (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); // Calls TAO_GIOP_Invocation::start. - int invoke (CORBA_Environment &TAO_IN_ENV = + int invoke (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); // Send request, without blocking for any response. diff --git a/TAO/tao/MProfile.h b/TAO/tao/MProfile.h index f3d69d15f1d..4843ff77a04 100644 --- a/TAO/tao/MProfile.h +++ b/TAO/tao/MProfile.h @@ -141,7 +141,7 @@ public: // the profiles will not change during the call. CORBA::ULong hash (CORBA::ULong max, - CORBA::Environment &env); + CORBA::Environment &ACE_TRY_ENV); // use all registered profiles. The hash() method is called on each // profile and the results are averaged together. // NON-THREAD SAFE. diff --git a/TAO/tao/Marshal.h b/TAO/tao/Marshal.h index 6ddf39ce1b6..65d45f56889 100644 --- a/TAO/tao/Marshal.h +++ b/TAO/tao/Marshal.h @@ -33,13 +33,13 @@ CORBA::TypeCode::traverse_status DEEP_COPY (CORBA::TypeCode_ptr param, const void *source, const void *dest, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); CORBA::TypeCode::traverse_status DEEP_FREE (CORBA::TypeCode_ptr param, const void *source, const void *dest, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // = Forward declarations. class TAO_Marshal_Object; @@ -71,7 +71,7 @@ public: // destructor virtual TAO_Marshal_Object *make_marshal_object (CORBA::TypeCode_ptr tc, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // Factory method that returns the appropriate marshal object. private: @@ -116,25 +116,25 @@ public: const void *data, const void *, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // encoding operation virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // decoding operation virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // append operation TAO_Marshal_Object (void); @@ -159,25 +159,25 @@ public: const void *data, const void *, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, const void *data, const void *, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // append operation }; @@ -197,25 +197,25 @@ public: const void *data, const void *, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, const void *source, const void *, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // append operation }; @@ -235,25 +235,25 @@ public: const void *data, const void *, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, const void *data, const void *, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // append operation }; @@ -273,25 +273,25 @@ public: const void *data, const void *, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, const void *data, const void *, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // append operation }; @@ -311,25 +311,25 @@ public: const void *data, const void *, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, const void *data, const void *, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // append operation }; @@ -349,25 +349,25 @@ public: const void *data, const void *, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, const void *data, const void *, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // append operation }; @@ -387,25 +387,25 @@ public: const void *data, const void *, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, const void *data, const void *, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // append operation }; @@ -425,25 +425,25 @@ public: const void *data, const void *, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, const void *data, const void *, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // append operation }; @@ -463,25 +463,25 @@ public: const void *data, const void *, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, const void *data, const void *, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // append operation }; @@ -501,25 +501,25 @@ public: const void *data, const void *, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, const void *data, const void *, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // append operation }; @@ -539,25 +539,25 @@ public: const void *data, const void *, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, const void *data, const void *, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // append operation }; @@ -576,25 +576,25 @@ public: const void *data, const void *, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, const void *data, const void *, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // append operation }; @@ -613,25 +613,25 @@ public: const void *data, const void *, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, const void *data, const void *, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // append operation }; diff --git a/TAO/tao/MessagingC.h b/TAO/tao/MessagingC.h index d22e41adf31..84dd0d8b2dc 100644 --- a/TAO/tao/MessagingC.h +++ b/TAO/tao/MessagingC.h @@ -164,12 +164,12 @@ TAO_NAMESPACE Messaging static RebindPolicy_ptr _duplicate (RebindPolicy_ptr obj); static RebindPolicy_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); static RebindPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); static RebindPolicy_ptr _nil (void); @@ -180,7 +180,7 @@ TAO_NAMESPACE Messaging ) = 0; virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual const char* _interface_repository_id (void) const; @@ -257,12 +257,12 @@ TAO_NAMESPACE Messaging static SyncScopePolicy_ptr _duplicate (SyncScopePolicy_ptr obj); static SyncScopePolicy_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); static SyncScopePolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); static SyncScopePolicy_ptr _nil (void); @@ -273,7 +273,7 @@ TAO_NAMESPACE Messaging ) = 0; virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual const char* _interface_repository_id (void) const; @@ -387,12 +387,12 @@ TAO_NAMESPACE Messaging static RequestPriorityPolicy_ptr _duplicate (RequestPriorityPolicy_ptr obj); static RequestPriorityPolicy_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); static RequestPriorityPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); static RequestPriorityPolicy_ptr _nil (void); @@ -403,7 +403,7 @@ TAO_NAMESPACE Messaging ) = 0; virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual const char* _interface_repository_id (void) const; @@ -480,12 +480,12 @@ TAO_NAMESPACE Messaging static ReplyPriorityPolicy_ptr _duplicate (ReplyPriorityPolicy_ptr obj); static ReplyPriorityPolicy_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); static ReplyPriorityPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); static ReplyPriorityPolicy_ptr _nil (void); @@ -496,7 +496,7 @@ TAO_NAMESPACE Messaging ) = 0; virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual const char* _interface_repository_id (void) const; @@ -573,12 +573,12 @@ TAO_NAMESPACE Messaging static RequestStartTimePolicy_ptr _duplicate (RequestStartTimePolicy_ptr obj); static RequestStartTimePolicy_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); static RequestStartTimePolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); static RequestStartTimePolicy_ptr _nil (void); @@ -589,7 +589,7 @@ TAO_NAMESPACE Messaging ) = 0; virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual const char* _interface_repository_id (void) const; @@ -666,12 +666,12 @@ TAO_NAMESPACE Messaging static RequestEndTimePolicy_ptr _duplicate (RequestEndTimePolicy_ptr obj); static RequestEndTimePolicy_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); static RequestEndTimePolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); static RequestEndTimePolicy_ptr _nil (void); @@ -682,7 +682,7 @@ TAO_NAMESPACE Messaging ) = 0; virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual const char* _interface_repository_id (void) const; @@ -759,12 +759,12 @@ TAO_NAMESPACE Messaging static ReplyStartTimePolicy_ptr _duplicate (ReplyStartTimePolicy_ptr obj); static ReplyStartTimePolicy_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); static ReplyStartTimePolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); static ReplyStartTimePolicy_ptr _nil (void); @@ -775,7 +775,7 @@ TAO_NAMESPACE Messaging ) = 0; virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual const char* _interface_repository_id (void) const; @@ -852,12 +852,12 @@ TAO_NAMESPACE Messaging static ReplyEndTimePolicy_ptr _duplicate (ReplyEndTimePolicy_ptr obj); static ReplyEndTimePolicy_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); static ReplyEndTimePolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); static ReplyEndTimePolicy_ptr _nil (void); @@ -868,7 +868,7 @@ TAO_NAMESPACE Messaging ) = 0; virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual const char* _interface_repository_id (void) const; @@ -945,12 +945,12 @@ TAO_NAMESPACE Messaging static RelativeRequestTimeoutPolicy_ptr _duplicate (RelativeRequestTimeoutPolicy_ptr obj); static RelativeRequestTimeoutPolicy_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); static RelativeRequestTimeoutPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); static RelativeRequestTimeoutPolicy_ptr _nil (void); @@ -961,7 +961,7 @@ TAO_NAMESPACE Messaging ) = 0; virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual const char* _interface_repository_id (void) const; @@ -1038,12 +1038,12 @@ TAO_NAMESPACE Messaging static RelativeRoundtripTimeoutPolicy_ptr _duplicate (RelativeRoundtripTimeoutPolicy_ptr obj); static RelativeRoundtripTimeoutPolicy_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); static RelativeRoundtripTimeoutPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); static RelativeRoundtripTimeoutPolicy_ptr _nil (void); @@ -1054,7 +1054,7 @@ TAO_NAMESPACE Messaging ) = 0; virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual const char* _interface_repository_id (void) const; @@ -1168,12 +1168,12 @@ TAO_NAMESPACE Messaging static RoutingPolicy_ptr _duplicate (RoutingPolicy_ptr obj); static RoutingPolicy_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); static RoutingPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); static RoutingPolicy_ptr _nil (void); @@ -1184,7 +1184,7 @@ TAO_NAMESPACE Messaging ) = 0; virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual const char* _interface_repository_id (void) const; @@ -1261,12 +1261,12 @@ TAO_NAMESPACE Messaging static MaxHopsPolicy_ptr _duplicate (MaxHopsPolicy_ptr obj); static MaxHopsPolicy_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); static MaxHopsPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); static MaxHopsPolicy_ptr _nil (void); @@ -1277,7 +1277,7 @@ TAO_NAMESPACE Messaging ) = 0; virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual const char* _interface_repository_id (void) const; @@ -1354,12 +1354,12 @@ TAO_NAMESPACE Messaging static QueueOrderPolicy_ptr _duplicate (QueueOrderPolicy_ptr obj); static QueueOrderPolicy_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); static QueueOrderPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); static QueueOrderPolicy_ptr _nil (void); @@ -1370,7 +1370,7 @@ TAO_NAMESPACE Messaging ) = 0; virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual const char* _interface_repository_id (void) const; @@ -1692,19 +1692,19 @@ TAO_NAMESPACE Messaging static ReplyHandler_ptr _duplicate (ReplyHandler_ptr obj); static ReplyHandler_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); static ReplyHandler_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); static ReplyHandler_ptr _nil (void); virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual const char* _interface_repository_id (void) const; @@ -1779,12 +1779,12 @@ TAO_NAMESPACE Messaging static Poller_ptr _duplicate (Poller_ptr obj); static Poller_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); static Poller_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); static Poller_ptr _nil (void); @@ -1820,7 +1820,7 @@ TAO_NAMESPACE Messaging ); virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual const char* _interface_repository_id (void) const; diff --git a/TAO/tao/MessagingS.h b/TAO/tao/MessagingS.h index 22d8fb1b4a3..957c74c8064 100644 --- a/TAO/tao/MessagingS.h +++ b/TAO/tao/MessagingS.h @@ -119,7 +119,7 @@ TAO_NAMESPACE POA_Messaging // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); Messaging::RebindMode rebind_mode ( @@ -240,7 +240,7 @@ private: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); Messaging::SyncScope synchronization ( @@ -361,7 +361,7 @@ private: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); Messaging::PriorityRange priority_range ( @@ -482,7 +482,7 @@ private: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); Messaging::PriorityRange priority_range ( @@ -603,7 +603,7 @@ private: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); TimeBase::UtcT start_time ( @@ -724,7 +724,7 @@ private: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); TimeBase::UtcT end_time ( @@ -845,7 +845,7 @@ private: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); TimeBase::UtcT start_time ( @@ -966,7 +966,7 @@ private: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); TimeBase::UtcT end_time ( @@ -1087,7 +1087,7 @@ private: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); TimeBase::TimeT relative_expiry ( @@ -1208,7 +1208,7 @@ private: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); TimeBase::TimeT relative_expiry ( @@ -1329,7 +1329,7 @@ private: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); Messaging::RoutingTypeRange routing_range ( @@ -1450,7 +1450,7 @@ private: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); CORBA::UShort max_hops ( @@ -1571,7 +1571,7 @@ private: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); Messaging::Ordering allowed_orders ( @@ -1701,7 +1701,7 @@ private: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); private: @@ -1741,7 +1741,7 @@ private: CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA::Environment &_tao_env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); @@ -1753,7 +1753,7 @@ private: CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA::Environment &_tao_env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); @@ -1765,7 +1765,7 @@ private: CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA::Environment &_tao_env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); @@ -1778,7 +1778,7 @@ private: CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA::Environment &_tao_env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); @@ -1790,7 +1790,7 @@ private: CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA::Environment &_tao_env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); @@ -1802,7 +1802,7 @@ private: CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA::Environment &_tao_env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); @@ -1814,7 +1814,7 @@ private: CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA::Environment &_tao_env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); @@ -1840,7 +1840,7 @@ private: CORBA::ServerRequest &req, void *obj, void *context, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); @@ -1848,7 +1848,7 @@ private: CORBA::ServerRequest &req, void *obj, void *context, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); @@ -1945,7 +1945,7 @@ private: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); CORBA::Object_ptr operation_target ( diff --git a/TAO/tao/NVList.h b/TAO/tao/NVList.h index dfb7dd3e040..7887a4c4cde 100644 --- a/TAO/tao/NVList.h +++ b/TAO/tao/NVList.h @@ -179,38 +179,38 @@ public: // return the current number of elements in the list CORBA_NamedValue_ptr add (CORBA::Flags, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // add an element and just initialize the flags CORBA_NamedValue_ptr add_item (const char *, CORBA::Flags, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // add an element and initialize its name and flags CORBA_NamedValue_ptr add_value (const char *, const CORBA::Any &, CORBA::Flags, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // initializes a value, name, and flags CORBA_NamedValue_ptr add_item_consume (char *, CORBA::Flags, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // just like add_item. In addition, memory management of char * name is taken // over by the NVList CORBA_NamedValue_ptr add_value_consume (char *, CORBA::Any_ptr, CORBA::Flags, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // just like add_value. In addition, the NVList controls the memory // management of the char *name and Any *value parameter - CORBA_NamedValue_ptr item (CORBA::ULong n, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_NamedValue_ptr item (CORBA::ULong n, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // retrieve the item at the nth location. Raises Bounds // CORBA::Status - void remove (CORBA::ULong n, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + void remove (CORBA::ULong n, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // remove element at index n. Raises Bounds // The pseudo object static methods.. @@ -232,7 +232,7 @@ private: // constructor - cannot be instantiated directly other than through the // ORB::create_list method - CORBA_NamedValue_ptr add_element (CORBA::Flags, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_NamedValue_ptr add_element (CORBA::Flags, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // helper to increase the list size. This is used by all the add_ methods of // the NVList class diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h index b3fb9fa8aaf..59d13577e91 100644 --- a/TAO/tao/ORB.h +++ b/TAO/tao/ORB.h @@ -450,25 +450,25 @@ public: // @@EXC@@ Add the ACE_THROW_SPEC for these functions... CORBA_DynAny_ptr create_dyn_any (const CORBA_Any& any, - CORBA::Environment &TAO_IN_ENV); + CORBA::Environment &ACE_TRY_ENV); CORBA_DynAny_ptr create_basic_dyn_any (CORBA_TypeCode_ptr tc, - CORBA::Environment &TAO_IN_ENV); + CORBA::Environment &ACE_TRY_ENV); CORBA_DynStruct_ptr create_dyn_struct (CORBA_TypeCode_ptr tc, - CORBA::Environment &TAO_IN_ENV); + CORBA::Environment &ACE_TRY_ENV); CORBA_DynSequence_ptr create_dyn_sequence (CORBA_TypeCode_ptr tc, - CORBA::Environment &TAO_IN_ENV); + CORBA::Environment &ACE_TRY_ENV); CORBA_DynArray_ptr create_dyn_array (CORBA_TypeCode_ptr tc, - CORBA::Environment &TAO_IN_ENV); + CORBA::Environment &ACE_TRY_ENV); CORBA_DynUnion_ptr create_dyn_union (CORBA_TypeCode_ptr tc, - CORBA::Environment &TAO_IN_ENV); + CORBA::Environment &ACE_TRY_ENV); CORBA_DynEnum_ptr create_dyn_enum (CORBA_TypeCode_ptr tc, - CORBA::Environment &TAO_IN_ENV); + CORBA::Environment &ACE_TRY_ENV); #endif /* TAO_HAS_MINIMUM_CORBA */ int run (void); @@ -495,12 +495,12 @@ public: // @@EXC@@ Add the ACE_THROW_SPEC for these two functions CORBA_Object_ptr resolve_initial_references (const char *name, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); CORBA_Object_ptr resolve_initial_references (const char *name, ACE_Time_Value *timeout, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // This method acts as a mini-bootstrapping Naming Service, which is // provided by the ORB for certain well-known object references. TAO @@ -516,7 +516,7 @@ public: // <resolve_initial_references> specification. // Unimplemented function - throws CORBA::NO_IMPLEMENT. - CORBA_ORB_ObjectIdList_ptr list_initial_services (CORBA_Environment &TAO_IN_ENV = + CORBA_ORB_ObjectIdList_ptr list_initial_services (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); #if defined(TAO_HAS_CORBA_MESSAGING) @@ -545,7 +545,7 @@ public: CORBA::Object_ptr &obj); // Find the given ObjectID in the table. - CORBA_Object_ptr resolve_root_poa (CORBA_Environment &TAO_IN_ENV, + CORBA_Object_ptr resolve_root_poa (CORBA_Environment &ACE_TRY_ENV, const char *adapter_name = TAO_DEFAULT_ROOTPOA_NAME, TAO_POA_Manager *poa_manager = 0, const TAO_POA_Policies *policies = 0); @@ -553,13 +553,13 @@ public: TAO_Stub *create_stub_object (const TAO_ObjectKey &key, const char *type_id, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // Makes sure that the ORB is open and then creates an IIOP object // based on the endpoint. CORBA_Object_ptr key_to_object (const TAO_ObjectKey &key, const char *type_id, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // Convert key into an object reference. Return Object_ptr as out // parameter. Errors will come through the environment. // @@ -583,7 +583,7 @@ public: // previously-specified port for requests. Returns -1 on failure, // else 0. - static void init_orb_globals (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + static void init_orb_globals (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // Initialize the ORB globals correctly, i.e., only when they // haven't been initialized yet. @@ -625,7 +625,7 @@ protected: CORBA_ORB (TAO_ORB_Core *orb_core); virtual ~CORBA_ORB (void); - CORBA_Object_ptr resolve_poa_current (CORBA_Environment &TAO_IN_ENV); + CORBA_Object_ptr resolve_poa_current (CORBA_Environment &ACE_TRY_ENV); // Resolve the POA current. CORBA_Object_ptr resolve_policy_manager (CORBA::Environment&); @@ -670,12 +670,12 @@ private: // Resolve the reference of a service of type <name>. CORBA::Object_ptr file_string_to_object (const char* filename, - CORBA::Environment& env); + CORBA::Environment &ACE_TRY_ENV); // Read an IOR from a file and then parse it, returning the object // reference. CORBA::Object_ptr ior_string_to_object (const char* ior, - CORBA::Environment& env); + CORBA::Environment &ACE_TRY_ENV); // Read an IOR from a file and then parse it, returning the object // reference. diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index b4e58b68cbb..301235b7542 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -245,11 +245,11 @@ public: ACE_Thread_Manager *thr_mgr (void); // = Set/get <rootPOA>. - TAO_POA *root_poa (CORBA::Environment &TAO_IN_ENV = TAO_default_environment (), + TAO_POA *root_poa (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment (), const char *adapter_name = TAO_DEFAULT_ROOTPOA_NAME, TAO_POA_Manager *poa_manager = 0, const TAO_POA_Policies *policies = 0); - PortableServer::POA_ptr root_poa_reference (CORBA::Environment &TAO_IN_ENV = TAO_default_environment (), + PortableServer::POA_ptr root_poa_reference (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment (), const char *adapter_name = TAO_DEFAULT_ROOTPOA_NAME, TAO_POA_Manager *poa_manager = 0, const TAO_POA_Policies *policies = 0); @@ -432,7 +432,7 @@ protected: void create_and_set_root_poa (const char *adapter_name, TAO_POA_Manager *poa_manager, const TAO_POA_Policies *policies, - CORBA::Environment &TAO_IN_ENV); + CORBA::Environment &ACE_TRY_ENV); // Initialize the root POA. TAO_Object_Adapter *object_adapter_i (void); diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index 78210f5912c..e187b48c89b 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -43,7 +43,7 @@ public: // return a NUL object static CORBA_Object_ptr _narrow (CORBA_Object_ptr obj, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // no-op it is just here to simplify some templates. @@ -54,7 +54,7 @@ public: // appropriate. virtual CORBA::Boolean _is_a (const CORBA::Char *logical_type_id, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // determine if we are of the type specified by the "logical_type_id" @@ -70,16 +70,16 @@ public: #if !defined (TAO_HAS_MINIMUM_CORBA) - virtual CORBA::Boolean _non_existent (CORBA_Environment &TAO_IN_ENV = + virtual CORBA::Boolean _non_existent (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual CORBA::ImplementationDef_ptr - _get_implementation (CORBA_Environment &TAO_IN_ENV = + _get_implementation (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // This method is deprecated in the CORBA 2.2 spec, we just return 0 // every time. - virtual CORBA::InterfaceDef_ptr _get_interface (CORBA_Environment &TAO_IN_ENV = + virtual CORBA::InterfaceDef_ptr _get_interface (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // Interface repository related operations. @@ -96,7 +96,7 @@ public: CORBA::NamedValue_ptr result, CORBA::Request_ptr &request, CORBA::Flags req_flags, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual void _create_request (CORBA::Context_ptr ctx, @@ -107,7 +107,7 @@ public: CORBA::ContextList_ptr ctxtlist, CORBA::Request_ptr &request, CORBA::Flags req_flags, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // The default implementation of this method uses the same simple, @@ -115,7 +115,7 @@ public: // calls above ... that's how it can have a default implementation. virtual CORBA::Request_ptr _request (const CORBA::Char *operation, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // DII operation to create a request. @@ -151,7 +151,7 @@ public: #endif /* TAO_HAS_CORBA_MESSAGING */ virtual CORBA::ULong _hash (CORBA::ULong maximum, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // Return a (potentially non-unique) hash value for this object. // This method relies on the representation of the object @@ -160,7 +160,7 @@ public: // implementation. virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC (()); // Try to determine if this object is the same as <other_obj>. This @@ -168,7 +168,7 @@ public: // private state. Since that changes easily (when different ORB // protocols are in use) there is no default implementation. - virtual TAO_ObjectKey *_key (CORBA_Environment &TAO_IN_ENV = + virtual TAO_ObjectKey *_key (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // Return the object key as an out parameter. Caller should release // return value when finished with it. @@ -298,7 +298,7 @@ public: // destructor virtual void _downcast (CORBA_Object* base_ptr, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; virtual CORBA_Object* _upcast (void) = 0; virtual void _release (void) = 0; diff --git a/TAO/tao/POAS.h b/TAO/tao/POAS.h index 1a013cabab1..b86e7067820 100644 --- a/TAO/tao/POAS.h +++ b/TAO/tao/POAS.h @@ -45,33 +45,33 @@ TAO_NAMESPACE POA_PortableServer virtual ~ThreadPolicy (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - virtual PortableServer::ThreadPolicyValue value (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; + virtual PortableServer::ThreadPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES) - static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()); - static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static void _get_policy_type_skel ( CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); - virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */ - PortableServer::ThreadPolicy *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + PortableServer::ThreadPolicy *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -90,19 +90,19 @@ TAO_NAMESPACE POA_PortableServer ThreadPolicy_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual PortableServer::ThreadPolicyValue value ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual CORBA::Policy_ptr copy ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual void destroy ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual CORBA::PolicyType policy_type ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); private: ThreadPolicy_ptr servant_; @@ -123,34 +123,34 @@ TAO_NAMESPACE POA_PortableServer virtual ~LifespanPolicy (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - virtual PortableServer::LifespanPolicyValue value (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; + virtual PortableServer::LifespanPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES) - static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()); - static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static void _get_policy_type_skel ( CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); - virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */ - PortableServer::LifespanPolicy *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + PortableServer::LifespanPolicy *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -169,19 +169,19 @@ TAO_NAMESPACE POA_PortableServer LifespanPolicy_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual PortableServer::LifespanPolicyValue value ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual CORBA::Policy_ptr copy ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual void destroy ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual CORBA::PolicyType policy_type ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); private: @@ -202,34 +202,34 @@ TAO_NAMESPACE POA_PortableServer virtual ~IdUniquenessPolicy (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - virtual PortableServer::IdUniquenessPolicyValue value (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; + virtual PortableServer::IdUniquenessPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES) - static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()); - static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static void _get_policy_type_skel ( CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); - virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */ - PortableServer::IdUniquenessPolicy *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + PortableServer::IdUniquenessPolicy *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -248,19 +248,19 @@ TAO_NAMESPACE POA_PortableServer IdUniquenessPolicy_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual PortableServer::IdUniquenessPolicyValue value ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual CORBA::Policy_ptr copy ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual void destroy ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual CORBA::PolicyType policy_type ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); private: @@ -281,34 +281,34 @@ TAO_NAMESPACE POA_PortableServer virtual ~IdAssignmentPolicy (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - virtual PortableServer::IdAssignmentPolicyValue value (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; + virtual PortableServer::IdAssignmentPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES) - static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()); - static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static void _get_policy_type_skel ( CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); - virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */ - PortableServer::IdAssignmentPolicy *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + PortableServer::IdAssignmentPolicy *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -327,19 +327,19 @@ TAO_NAMESPACE POA_PortableServer IdAssignmentPolicy_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual PortableServer::IdAssignmentPolicyValue value ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual CORBA::Policy_ptr copy ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual void destroy ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual CORBA::PolicyType policy_type ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); private: @@ -362,34 +362,34 @@ TAO_NAMESPACE POA_PortableServer virtual ~ImplicitActivationPolicy (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - virtual PortableServer::ImplicitActivationPolicyValue value (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; + virtual PortableServer::ImplicitActivationPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES) - static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()); - static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static void _get_policy_type_skel ( CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); - virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */ - PortableServer::ImplicitActivationPolicy *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + PortableServer::ImplicitActivationPolicy *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -408,19 +408,19 @@ TAO_NAMESPACE POA_PortableServer ImplicitActivationPolicy_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual PortableServer::ImplicitActivationPolicyValue value ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual CORBA::Policy_ptr copy ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual void destroy ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual CORBA::PolicyType policy_type ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); private: @@ -441,34 +441,34 @@ TAO_NAMESPACE POA_PortableServer virtual ~ServantRetentionPolicy (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - virtual PortableServer::ServantRetentionPolicyValue value (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; + virtual PortableServer::ServantRetentionPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES) - static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()); - static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static void _get_policy_type_skel ( CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); - virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */ - PortableServer::ServantRetentionPolicy *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + PortableServer::ServantRetentionPolicy *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -487,19 +487,19 @@ TAO_NAMESPACE POA_PortableServer ServantRetentionPolicy_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual PortableServer::ServantRetentionPolicyValue value ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual CORBA::Policy_ptr copy ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual void destroy ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual CORBA::PolicyType policy_type ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); private: @@ -520,34 +520,34 @@ TAO_NAMESPACE POA_PortableServer virtual ~RequestProcessingPolicy (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - virtual PortableServer::RequestProcessingPolicyValue value (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; + virtual PortableServer::RequestProcessingPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES) - static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()); - static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); static void _get_policy_type_skel ( CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); - virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */ - PortableServer::RequestProcessingPolicy *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + PortableServer::RequestProcessingPolicy *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -566,19 +566,19 @@ TAO_NAMESPACE POA_PortableServer RequestProcessingPolicy_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual PortableServer::RequestProcessingPolicyValue value ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual CORBA::Policy_ptr copy ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual void destroy ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual CORBA::PolicyType policy_type ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); private: @@ -601,25 +601,25 @@ TAO_NAMESPACE POA_PortableServer virtual ~POAManager (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - virtual void activate ( CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual + virtual void activate ( CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual #if !defined (TAO_HAS_MINIMUM_CORBA) - virtual void hold_requests (CORBA::Boolean wait_for_completion, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual + virtual void hold_requests (CORBA::Boolean wait_for_completion, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual void discard_requests (CORBA::Boolean wait_for_completion, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual + virtual void discard_requests (CORBA::Boolean wait_for_completion, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual void deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual + virtual void deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual #endif /* TAO_HAS_MINIMUM_CORBA */ - virtual PortableServer::POAManager::State get_state (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual + virtual PortableServer::POAManager::State get_state (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual - PortableServer::POAManager *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + PortableServer::POAManager *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -637,31 +637,31 @@ TAO_NAMESPACE POA_PortableServer POAManager_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual void activate ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); #if !defined (TAO_HAS_MINIMUM_CORBA) virtual void hold_requests ( CORBA::Boolean wait_for_completion, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual void discard_requests ( CORBA::Boolean wait_for_completion, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual void deactivate ( CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); #endif /* TAO_HAS_MINIMUM_CORBA */ - virtual PortableServer::POAManager::State get_state (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + virtual PortableServer::POAManager::State get_state (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); private: POAManager_ptr servant_; @@ -683,13 +683,13 @@ TAO_NAMESPACE POA_PortableServer virtual ~AdapterActivator (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - virtual CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent, const char *name, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual + virtual CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent, const char *name, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual - PortableServer::AdapterActivator *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + PortableServer::AdapterActivator *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -707,12 +707,12 @@ TAO_NAMESPACE POA_PortableServer AdapterActivator_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual CORBA::Boolean unknown_adapter ( PortableServer::POA_ptr parent, const char* name, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); private: @@ -733,12 +733,12 @@ TAO_NAMESPACE POA_PortableServer virtual ~ServantManager (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - PortableServer::ServantManager *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + PortableServer::ServantManager *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -756,7 +756,7 @@ TAO_NAMESPACE POA_PortableServer ServantManager_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); private: @@ -777,15 +777,15 @@ TAO_NAMESPACE POA_PortableServer virtual ~ServantActivator (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual + virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual void etherealize (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, PortableServer::Servant serv, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual + virtual void etherealize (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, PortableServer::Servant serv, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual - PortableServer::ServantActivator *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + PortableServer::ServantActivator *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -804,12 +804,12 @@ TAO_NAMESPACE POA_PortableServer ServantActivator_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual PortableServer::Servant incarnate ( const PortableServer::ObjectId & oid, PortableServer::POA_ptr adapter, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual void etherealize ( const PortableServer::ObjectId & oid, @@ -817,7 +817,7 @@ TAO_NAMESPACE POA_PortableServer PortableServer::Servant serv, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); private: @@ -838,7 +838,7 @@ TAO_NAMESPACE POA_PortableServer virtual ~ServantLocator (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual void* _downcast ( const char* logical_type_id ); @@ -846,11 +846,11 @@ TAO_NAMESPACE POA_PortableServer PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie & the_cookie, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual void postinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual + virtual void postinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual - PortableServer::ServantLocator *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + PortableServer::ServantLocator *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -869,14 +869,14 @@ TAO_NAMESPACE POA_PortableServer ServantLocator_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual PortableServer::Servant preinvoke ( const PortableServer::ObjectId & oid, PortableServer::POA_ptr adapter, const char * operation, PortableServer::ServantLocator::Cookie & the_cookie, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual void postinvoke ( const PortableServer::ObjectId & oid, @@ -884,7 +884,7 @@ TAO_NAMESPACE POA_PortableServer const char * operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); private: @@ -906,83 +906,83 @@ TAO_NAMESPACE POA_PortableServer virtual ~POA (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - virtual PortableServer::POA_ptr create_POA (const char *adapter_name, PortableServer::POAManager_ptr a_POAManager, const CORBA::PolicyList &policies, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual + virtual PortableServer::POA_ptr create_POA (const char *adapter_name, PortableServer::POAManager_ptr a_POAManager, const CORBA::PolicyList &policies, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual PortableServer::POA_ptr find_POA (const char *adapter_name, CORBA::Boolean activate_it, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual + virtual PortableServer::POA_ptr find_POA (const char *adapter_name, CORBA::Boolean activate_it, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual void destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual + virtual void destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual #if !defined (TAO_HAS_MINIMUM_CORBA) - virtual PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual + virtual PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual #endif /* TAO_HAS_MINIMUM_CORBA */ - virtual PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual + virtual PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual + virtual PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual + virtual PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual #if !defined (TAO_HAS_MINIMUM_CORBA) - virtual PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual + virtual PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual + virtual PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual + virtual PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual #endif /* TAO_HAS_MINIMUM_CORBA */ - virtual char * the_name (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; + virtual char * the_name (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; - virtual PortableServer::POA_ptr the_parent (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; + virtual PortableServer::POA_ptr the_parent (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; - virtual PortableServer::POAManager_ptr the_POAManager (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; + virtual PortableServer::POAManager_ptr the_POAManager (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; #if !defined (TAO_HAS_MINIMUM_CORBA) - virtual PortableServer::AdapterActivator_ptr the_activator (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; + virtual PortableServer::AdapterActivator_ptr the_activator (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; - virtual void the_activator(PortableServer::AdapterActivator_ptr the_activator, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; + virtual void the_activator(PortableServer::AdapterActivator_ptr the_activator, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; - virtual PortableServer::ServantManager_ptr get_servant_manager ( CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual + virtual PortableServer::ServantManager_ptr get_servant_manager ( CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual void set_servant_manager (PortableServer::ServantManager_ptr imgr, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual + virtual void set_servant_manager (PortableServer::ServantManager_ptr imgr, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual PortableServer::Servant get_servant ( CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual + virtual PortableServer::Servant get_servant ( CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual void set_servant (PortableServer::Servant p_servant, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual + virtual void set_servant (PortableServer::Servant p_servant, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual #endif /* TAO_HAS_MINIMUM_CORBA */ - virtual PortableServer::ObjectId * activate_object (PortableServer::Servant p_servant, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual + virtual PortableServer::ObjectId * activate_object (PortableServer::Servant p_servant, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual void activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant p_servant, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual + virtual void activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant p_servant, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual void deactivate_object (const PortableServer::ObjectId &oid, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual + virtual void deactivate_object (const PortableServer::ObjectId &oid, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual CORBA::Object_ptr create_reference (const char *intf, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual + virtual CORBA::Object_ptr create_reference (const char *intf, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid, const char *intf, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual + virtual CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid, const char *intf, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual PortableServer::ObjectId * servant_to_id (PortableServer::Servant p_servant, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual + virtual PortableServer::ObjectId * servant_to_id (PortableServer::Servant p_servant, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual + virtual CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual + virtual PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual PortableServer::ObjectId * reference_to_id (CORBA::Object_ptr reference, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual + virtual PortableServer::ObjectId * reference_to_id (CORBA::Object_ptr reference, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual + virtual PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual + virtual CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual - PortableServer::POA *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + PortableServer::POA *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -1000,142 +1000,142 @@ TAO_NAMESPACE POA_PortableServer POA_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual PortableServer::POA_ptr create_POA ( const char* adapter_name, PortableServer::POAManager_ptr a_POAManager, const CORBA::PolicyList & policies, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual PortableServer::POA_ptr find_POA ( const char* adapter_name, CORBA::Boolean activate_it, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual void destroy ( CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); #if !defined (TAO_HAS_MINIMUM_CORBA) virtual PortableServer::ThreadPolicy_ptr create_thread_policy ( PortableServer::ThreadPolicyValue value, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); #endif /* TAO_HAS_MINIMUM_CORBA */ virtual PortableServer::LifespanPolicy_ptr create_lifespan_policy ( PortableServer::LifespanPolicyValue value, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy ( PortableServer::IdUniquenessPolicyValue value, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy ( PortableServer::IdAssignmentPolicyValue value, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); #if !defined (TAO_HAS_MINIMUM_CORBA) virtual PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy ( PortableServer::ImplicitActivationPolicyValue value, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy ( PortableServer::ServantRetentionPolicyValue value, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy ( PortableServer::RequestProcessingPolicyValue value, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); #endif /* TAO_HAS_MINIMUM_CORBA */ virtual char* the_name ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual PortableServer::POA_ptr the_parent ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual PortableServer::POAManager_ptr the_POAManager ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); #if !defined (TAO_HAS_MINIMUM_CORBA) virtual PortableServer::AdapterActivator_ptr the_activator ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual void the_activator (PortableServer::AdapterActivator_ptr _tao_value, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual PortableServer::ServantManager_ptr get_servant_manager ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual void set_servant_manager ( PortableServer::ServantManager_ptr imgr, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual PortableServer::Servant get_servant ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual void set_servant ( PortableServer::Servant p_servant, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); #endif /* TAO_HAS_MINIMUM_CORBA */ virtual PortableServer::ObjectId * activate_object ( PortableServer::Servant p_servant, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual void activate_object_with_id ( const PortableServer::ObjectId & id, PortableServer::Servant p_servant, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual void deactivate_object ( const PortableServer::ObjectId & oid, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual CORBA::Object_ptr create_reference ( const char *intf, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual CORBA::Object_ptr create_reference_with_id ( const PortableServer::ObjectId & oid, const char *intf, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual PortableServer::ObjectId * servant_to_id ( PortableServer::Servant p_servant, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual CORBA::Object_ptr servant_to_reference ( PortableServer::Servant p_servant, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual PortableServer::Servant reference_to_servant ( CORBA::Object_ptr reference, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual PortableServer::ObjectId * reference_to_id ( CORBA::Object_ptr reference, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual PortableServer::Servant id_to_servant ( const PortableServer::ObjectId & oid, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual CORBA::Object_ptr id_to_reference ( const PortableServer::ObjectId & oid, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); private: @@ -1156,15 +1156,15 @@ TAO_NAMESPACE POA_PortableServer virtual ~Current (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - virtual PortableServer::POA_ptr get_POA ( CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual + virtual PortableServer::POA_ptr get_POA ( CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual - virtual PortableServer::ObjectId * get_object_id ( CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual + virtual PortableServer::ObjectId * get_object_id ( CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // pure virtual - PortableServer::Current *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + PortableServer::Current *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -1183,13 +1183,13 @@ TAO_NAMESPACE POA_PortableServer Current_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual PortableServer::POA_ptr get_POA ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual PortableServer::ObjectId * get_object_id ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); private: diff --git a/TAO/tao/POA_CORBA.h b/TAO/tao/POA_CORBA.h index 4554cf457d9..033e5fe4432 100644 --- a/TAO/tao/POA_CORBA.h +++ b/TAO/tao/POA_CORBA.h @@ -57,12 +57,12 @@ public: virtual ~Current (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - ACE_CORBA_1(Current) *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + ACE_CORBA_1(Current) *_this (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 @@ -82,7 +82,7 @@ public: Current_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); private: @@ -108,22 +108,22 @@ public: virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual void* _downcast ( const char* logical_type_id ); virtual CORBA::PolicyType policy_type ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ) = 0; virtual CORBA::Policy_ptr copy ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ) = 0; virtual void destroy ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ) = 0; #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES) @@ -131,28 +131,28 @@ public: CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); static void copy_skel ( CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); static void destroy_skel ( CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); static void _is_a_skel ( CORBA::ServerRequest &req, void *obj, void *context, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -167,13 +167,13 @@ public: virtual void _dispatch ( CORBA::ServerRequest &_tao_req, void *_tao_context, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */ CORBA_Policy_ptr _this ( - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); virtual const char* _interface_repository_id (void) const; @@ -194,16 +194,16 @@ public: Policy_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual CORBA::PolicyType policy_type ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual CORBA::Policy_ptr copy ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual void destroy ( - CORBA_Environment &TAO_IN_ENV = TAO_default_environment () + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); private: @@ -388,7 +388,7 @@ public: CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA::Environment &_tao_env = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -441,7 +441,7 @@ public: CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA::Environment &_tao_env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); @@ -453,7 +453,7 @@ public: CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA::Environment &_tao_env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); @@ -555,7 +555,7 @@ public: CORBA::ServerRequest &req, void *obj, void *context, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); @@ -563,7 +563,7 @@ public: CORBA::ServerRequest &req, void *obj, void *context, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); @@ -627,7 +627,7 @@ public: CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA::Environment &_tao_env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); @@ -640,7 +640,7 @@ public: CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA::Environment &_tao_env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); @@ -653,7 +653,7 @@ public: CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA::Environment &_tao_env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); @@ -666,7 +666,7 @@ public: CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA::Environment &_tao_env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); @@ -678,7 +678,7 @@ public: CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA::Environment &_tao_env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); @@ -769,243 +769,243 @@ public: virtual ~DynAny (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual void* _downcast ( const char* logical_type_id ); virtual CORBA::TypeCode_ptr type ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual void assign ( CORBA_DynAny_ptr dyn_any, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual void from_any ( const CORBA::Any & value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual CORBA::Any * to_any ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual void destroy ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual CORBA_DynAny_ptr copy ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual void insert_boolean ( CORBA::Boolean value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual void insert_octet ( CORBA::Octet value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual void insert_char ( CORBA::Char value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual void insert_short ( CORBA::Short value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual void insert_ushort ( CORBA::UShort value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual void insert_long ( CORBA::Long value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual void insert_ulong ( CORBA::ULong value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual void insert_float ( CORBA::Float value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual void insert_double ( CORBA::Double value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual void insert_string ( const char * value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual void insert_reference ( CORBA::Object_ptr value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual void insert_typecode ( CORBA::TypeCode_ptr value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual void insert_longlong ( CORBA::LongLong value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual void insert_ulonglong ( CORBA::ULongLong value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual void insert_wchar ( CORBA::WChar value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual void insert_any ( const CORBA::Any & value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual CORBA::Boolean get_boolean ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual CORBA::Octet get_octet ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual CORBA::Char get_char ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual CORBA::Short get_short ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual CORBA::UShort get_ushort ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual CORBA::Long get_long ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual CORBA::ULong get_ulong ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual CORBA::Float get_float ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual CORBA::Double get_double ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual char * get_string ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual CORBA::Object_ptr get_reference ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual CORBA::TypeCode_ptr get_typecode ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual CORBA::LongLong get_longlong ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual CORBA::ULongLong get_ulonglong ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual CORBA::WChar get_wchar ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual CORBA::Any * get_any ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual CORBA_DynAny_ptr current_component ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual CORBA::Boolean next ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual CORBA::Boolean seek ( CORBA::Long slot, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual void rewind ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; CORBA_DynAny *_this ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual const char* _interface_repository_id (void) const; @@ -1027,194 +1027,194 @@ public: DynAny_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual CORBA::TypeCode_ptr type ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual void assign ( CORBA_DynAny_ptr CORBA_Dyn_any, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual void from_any ( const CORBA::Any & value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual CORBA::Any * to_any ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual void destroy ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual CORBA_DynAny_ptr copy ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual void insert_boolean ( CORBA::Boolean value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual void insert_octet ( CORBA::Octet value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual void insert_char ( CORBA::Char value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual void insert_short ( CORBA::Short value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual void insert_ushort ( CORBA::UShort value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual void insert_long ( CORBA::Long value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual void insert_ulong ( CORBA::ULong value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual void insert_float ( CORBA::Float value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual void insert_double ( CORBA::Double value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual void insert_string ( const char * value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual void insert_reference ( CORBA::Object_ptr value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual void insert_typecode ( CORBA::TypeCode_ptr value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual void insert_longlong ( CORBA::LongLong value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual void insert_ulonglong ( CORBA::ULongLong value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual void insert_wchar ( CORBA::WChar value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual void insert_any ( const CORBA::Any & value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual CORBA::Boolean get_boolean ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual CORBA::Octet get_octet ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual CORBA::Char get_char ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual CORBA::Short get_short ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual CORBA::UShort get_ushort ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual CORBA::Long get_long ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual CORBA::ULong get_ulong ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual CORBA::Float get_float ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual CORBA::Double get_double ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual char * get_string ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual CORBA::Object_ptr get_reference ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual CORBA::TypeCode_ptr get_typecode ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual CORBA::LongLong get_longlong ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual CORBA::ULongLong get_ulonglong ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual CORBA::WChar get_wchar ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual CORBA::Any * get_any ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual CORBA_DynAny_ptr current_component ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual CORBA::Boolean next ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual CORBA::Boolean seek ( CORBA::Long slot, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual void rewind ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); @@ -1233,36 +1233,36 @@ public: virtual ~DynEnum (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual void* _downcast ( const char* logical_type_id ); virtual char * value_as_string ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual void value_as_string ( const char * value_as_string, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual CORBA::ULong value_as_ulong ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual void value_as_ulong ( CORBA::ULong value_as_ulong, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; CORBA_DynEnum *_this ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual const char* _interface_repository_id (void) const; @@ -1285,25 +1285,25 @@ public: DynEnum_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual char * value_as_string ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual void value_as_string ( const char * value_as_string, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual CORBA::ULong value_as_ulong ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual void value_as_ulong ( CORBA::ULong value_as_ulong, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); @@ -1322,35 +1322,35 @@ public: virtual ~DynStruct (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual void* _downcast ( const char* logical_type_id ); virtual char * current_member_name ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual CORBA::TCKind current_member_kind ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual CORBA::NameValuePairSeq * get_members ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual void set_members ( const CORBA::NameValuePairSeq & value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; CORBA_DynStruct *_this ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual const char* _interface_repository_id (void) const; @@ -1373,24 +1373,24 @@ public: DynStruct_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual char * current_member_name ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual CORBA::TCKind current_member_kind ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual CORBA::NameValuePairSeq * get_members ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual void set_members ( const CORBA::NameValuePairSeq & value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); @@ -1409,56 +1409,56 @@ public: virtual ~DynUnion (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual void* _downcast ( const char* logical_type_id ); virtual CORBA::Boolean set_as_default ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual void set_as_default ( CORBA::Boolean set_as_default, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual CORBA_DynAny_ptr discriminator ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual CORBA::TCKind discriminator_kind ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual CORBA_DynAny_ptr member ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual char * member_name ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual void member_name ( const char * member_name, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual CORBA::TCKind member_kind ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; CORBA_DynUnion *_this ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual const char* _interface_repository_id (void) const; @@ -1481,41 +1481,41 @@ public: DynUnion_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual CORBA::Boolean set_as_default ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual void set_as_default ( CORBA::Boolean set_as_default, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual CORBA_DynAny_ptr discriminator ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual CORBA::TCKind discriminator_kind ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual CORBA_DynAny_ptr member ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual char * member_name ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual void member_name ( const char * member_name, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual CORBA::TCKind member_kind ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); @@ -1534,31 +1534,31 @@ public: virtual ~DynSequence (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual void* _downcast ( const char* logical_type_id ); virtual CORBA::ULong length ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual void length ( CORBA::ULong length, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual CORBA_AnySeq * get_elements ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual void set_elements ( const CORBA_AnySeq & value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; @@ -1566,12 +1566,12 @@ public: CORBA::ServerRequest &req, void *obj, void *context, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); CORBA_DynSequence *_this ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual const char* _interface_repository_id (void) const; @@ -1594,25 +1594,25 @@ public: DynSequence_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual CORBA::ULong length ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual void length ( CORBA::ULong length, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual CORBA_AnySeq * get_elements ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual void set_elements ( const CORBA_AnySeq & value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); @@ -1631,25 +1631,25 @@ public: virtual ~DynArray (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual void* _downcast ( const char* logical_type_id ); virtual CORBA_AnySeq * get_elements ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; virtual void set_elements ( const CORBA_AnySeq & value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ) = 0; CORBA_DynArray *_this ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual const char* _interface_repository_id (void) const; @@ -1672,16 +1672,16 @@ public: DynArray_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual CORBA_AnySeq * get_elements ( - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); virtual void set_elements ( const CORBA_AnySeq & value, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); @@ -1750,7 +1750,7 @@ private: CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA::Environment &_tao_env = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); diff --git a/TAO/tao/Pluggable.h b/TAO/tao/Pluggable.h index 875676194da..93526cfb105 100644 --- a/TAO/tao/Pluggable.h +++ b/TAO/tao/Pluggable.h @@ -228,11 +228,11 @@ public: // MProfile accessor virtual int parse_string (const char *string, - CORBA::Environment &env) = 0; + CORBA::Environment &ACE_TRY_ENV) = 0; // Initialize this object using the given input string. // Supports URL stylr of object references - virtual CORBA::String to_string (CORBA::Environment &env) = 0; + virtual CORBA::String to_string (CORBA::Environment &ACE_TRY_ENV) = 0; // Return a string representation for this profile. client must // deallocate memory. @@ -258,7 +258,7 @@ public: // version are the same. virtual CORBA::ULong hash (CORBA::ULong max, - CORBA::Environment &env) = 0; + CORBA::Environment &ACE_TRY_ENV) = 0; // Return a hash value for this object. virtual int addr_to_string(char *buffer, size_t length) = 0; @@ -311,15 +311,15 @@ public: // = The TAO_Profile methods look above virtual int parse_string (const char *string, - CORBA::Environment &env); - virtual CORBA::String to_string (CORBA::Environment &env); + CORBA::Environment &ACE_TRY_ENV); + virtual CORBA::String to_string (CORBA::Environment &ACE_TRY_ENV); virtual int decode (TAO_InputCDR& cdr); virtual int encode (TAO_OutputCDR &stream) const; virtual const TAO_ObjectKey &object_key (void) const; virtual TAO_ObjectKey *_key (void) const; virtual CORBA::Boolean is_equivalent (const TAO_Profile* other_profile); virtual CORBA::ULong hash (CORBA::ULong max, - CORBA::Environment &env); + CORBA::Environment &ACE_TRY_ENV); virtual int addr_to_string(char *buffer, size_t length); virtual void reset_hint (void); diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h index 5ee036fc789..9aae513c10a 100644 --- a/TAO/tao/PolicyC.h +++ b/TAO/tao/PolicyC.h @@ -138,47 +138,47 @@ public: static CORBA_Policy_ptr _duplicate (CORBA_Policy_ptr obj); static CORBA_Policy_ptr _narrow ( CORBA::Object_ptr obj, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); static CORBA_Policy_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); static CORBA_Policy_ptr _nil (void); #if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES) virtual CORBA::PolicyType policy_type ( - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual CORBA_Policy_ptr copy ( - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual void destroy ( - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); #else virtual CORBA::PolicyType policy_type ( - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ) = 0; virtual CORBA_Policy_ptr copy ( - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ) = 0; virtual void destroy ( - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ) = 0; #endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */ virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual const char* _interface_repository_id (void) const; @@ -395,12 +395,12 @@ public: static CORBA_PolicyManager_ptr _duplicate (CORBA_PolicyManager_ptr obj); static CORBA_PolicyManager_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static CORBA_PolicyManager_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static CORBA_PolicyManager_ptr _nil (void); @@ -418,7 +418,7 @@ public: ); virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual const char* _interface_repository_id (void) const; @@ -490,19 +490,19 @@ public: static CORBA_PolicyCurrent_ptr _duplicate (CORBA_PolicyCurrent_ptr obj); static CORBA_PolicyCurrent_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static CORBA_PolicyCurrent_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static CORBA_PolicyCurrent_ptr _nil (void); virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual const char* _interface_repository_id (void) const; diff --git a/TAO/tao/PollableC.h b/TAO/tao/PollableC.h index 135728c5266..ace8b397b10 100644 --- a/TAO/tao/PollableC.h +++ b/TAO/tao/PollableC.h @@ -140,12 +140,12 @@ class TAO_Export CORBA_Pollable : public virtual CORBA_Object static CORBA_Pollable_ptr _duplicate (CORBA_Pollable_ptr obj); static CORBA_Pollable_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static CORBA_Pollable_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static CORBA_Pollable_ptr _nil (void); @@ -161,7 +161,7 @@ class TAO_Export CORBA_Pollable : public virtual CORBA_Object ); virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual const char* _interface_repository_id (void) const; @@ -234,19 +234,19 @@ public: static CORBA_DIIPollable_ptr _duplicate (CORBA_DIIPollable_ptr obj); static CORBA_DIIPollable_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static CORBA_DIIPollable_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static CORBA_DIIPollable_ptr _nil (void); virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual const char* _interface_repository_id (void) const; @@ -274,12 +274,12 @@ public: static CORBA_PollableSet_ptr _duplicate (CORBA_PollableSet_ptr obj); static CORBA_PollableSet_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static CORBA_PollableSet_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static CORBA_PollableSet_ptr _nil (void); @@ -372,7 +372,7 @@ public: ); virtual CORBA::Boolean _is_a ( const CORBA::Char *type_id, - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); virtual const char* _interface_repository_id (void) const; diff --git a/TAO/tao/PollableS.h b/TAO/tao/PollableS.h index abacbd7b139..12543d0c754 100644 --- a/TAO/tao/PollableS.h +++ b/TAO/tao/PollableS.h @@ -66,7 +66,7 @@ TAO_NAMESPACE POA_CORBA // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); CORBA::Boolean is_ready ( @@ -122,7 +122,7 @@ private: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); CORBA::Boolean is_ready ( @@ -178,7 +178,7 @@ private: // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( - CORBA::Environment &env = + CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment () ); CORBA::DIIPollable_ptr create_dii_pollable ( diff --git a/TAO/tao/Request.h b/TAO/tao/Request.h index 000157734df..6faed78b810 100644 --- a/TAO/tao/Request.h +++ b/TAO/tao/Request.h @@ -135,12 +135,12 @@ private: CORBA::NVList_ptr args, CORBA::NamedValue_ptr result, CORBA::Flags flags, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); CORBA_Request (CORBA::Object_ptr obj, const CORBA::Char *op, - CORBA::Environment &TAO_IN_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); ~CORBA_Request (void); diff --git a/TAO/tao/Sequence.h b/TAO/tao/Sequence.h index 433bc6949c7..bc6bfbe5f59 100644 --- a/TAO/tao/Sequence.h +++ b/TAO/tao/Sequence.h @@ -63,7 +63,7 @@ public: virtual void _downcast (void *target, CORBA_Object *src, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // Used for sequences of objects to downcast a recently demarshalled // object reference into the right type. diff --git a/TAO/tao/Server_Request.h b/TAO/tao/Server_Request.h index bb03b9812e5..c33daf72639 100644 --- a/TAO/tao/Server_Request.h +++ b/TAO/tao/Server_Request.h @@ -113,13 +113,13 @@ public: #if !defined (TAO_HAS_MINIMUM_CORBA) virtual void arguments (CORBA::NVList_ptr &list, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // Implementation uses this to provide the ORB with the operation's // parameter list ... on return, their values are available; the // list fed in has typecodes and (perhap) memory assigned. virtual void set_result (const CORBA::Any &value, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // Implementation uses this to provide the operation result // ... illegal if exception() was called or params() was not called. // @@ -127,7 +127,7 @@ public: // sent when this returns, and reclaim memory it allocated. virtual void set_exception (const CORBA::Any &value, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // Implementation uses this to provide the exception value which is // the only result of this particular invocation. // @@ -143,7 +143,7 @@ public: // this stuff is a catastrophic error since this is all part of the // basic CORBA Object Model. - virtual void dsi_marshal (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; + virtual void dsi_marshal (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // marshal outgoing parameters. Used by DSI #endif /* TAO_HAS_MINIMUM_CORBA */ @@ -154,7 +154,7 @@ public: virtual unsigned int operation_length (void) const = 0; // get the length of the operation name - virtual void init_reply (CORBA_Environment &TAO_IN_ENV = + virtual void init_reply (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; // Start a Reply message. @@ -169,12 +169,12 @@ public: virtual CORBA::ORB_ptr orb (void) = 0; // get the underlying ORB - virtual void demarshal (CORBA_Environment &orb_env, + virtual void demarshal (CORBA_Environment &ACE_TRY_ENV, const TAO_Call_Data_Skel *info, ...) = 0; // demarshal incoming parameters - virtual void marshal (CORBA_Environment &orb_env, + virtual void marshal (CORBA_Environment &ACE_TRY_ENV, // CORBA_Environment &skel_env, const TAO_Call_Data_Skel *info, ...) = 0; diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h index 2b8f69774ab..b5c4ff2a70a 100644 --- a/TAO/tao/Stub.h +++ b/TAO/tao/Stub.h @@ -213,12 +213,12 @@ class TAO_Export TAO_Stub // The stub and DII interpreter APIs are member functions of this // type. public: - void do_static_call (CORBA_Environment &TAO_IN_ENV, + void do_static_call (CORBA_Environment &ACE_TRY_ENV, const TAO_Call_Data *info, void** args); // The "stub interpreter" method parameters are: // - // - TAO_IN_ENV ... used for exception reporting + // - ACE_TRY_ENV ... used for exception reporting // - info ... describes the call // - args parameters follow // @@ -241,7 +241,7 @@ public: CORBA::NamedValue_ptr result, CORBA::Flags flags, CORBA::ExceptionList &exceptions, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // Dynamic invocations use a more costly "varargs" calling // convention; it's got the same input data as the (static) @@ -259,7 +259,7 @@ public: // - result ... result and its description // - flags ... only one DII flag is legal // - exceptions ... list of legal user-defined exceptions - // - TAO_IN_ENV ... used for exception reporting. + // - ACE_TRY_ENV ... used for exception reporting. #endif /* TAO_HAS_MINIMUM_CORBA */ @@ -300,7 +300,7 @@ public: // All objref representations carry around a type ID. CORBA::ULong hash (CORBA::ULong maximum, - CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // All objref representations know how to hash themselves and // compare themselves for equivalence to others. It's easily // possible to have two objrefs that are distinct copies of data @@ -400,7 +400,7 @@ public: // temporary. protected: - void put_params (CORBA_Environment &TAO_IN_ENV, + void put_params (CORBA_Environment &ACE_TRY_ENV, const TAO_Call_Data *info, TAO_GIOP_Invocation &call, void** args); @@ -411,7 +411,7 @@ protected: void put_params (TAO_GIOP_Invocation &call, CORBA::NVList_ptr args, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // Helper method to factor out common code in dynamic oneway // vs. twoway invocations. diff --git a/TAO/tao/Typecode.h b/TAO/tao/Typecode.h index 5e56496f222..50276eaebd8 100644 --- a/TAO/tao/Typecode.h +++ b/TAO/tao/Typecode.h @@ -91,69 +91,69 @@ public: // Returns a NULL typecode. CORBA::Boolean equal (const CORBA::TypeCode_ptr, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) const; // Compares two typecodes. CORBA::Boolean equivalent (CORBA::TypeCode_ptr, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) const; // Unaliases receiver and argument before comparing. - CORBA::TCKind kind (CORBA_Environment &TAO_IN_ENV = + CORBA::TCKind kind (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) const; // For all TypeCode kinds, returns the "kind" of the typecode. - const char *id (CORBA_Environment &TAO_IN_ENV = + const char *id (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) const; // For tk_{objref,struct,union,enum,alias,except}. Returns the // repository ID, raises BadKind. - const char *name (CORBA_Environment &TAO_IN_ENV = + const char *name (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) const; // Returns name (), raises (BadKind). - CORBA::ULong member_count (CORBA_Environment &TAO_IN_ENV = + CORBA::ULong member_count (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) const; // Returns member_count (), raises (BadKind). Useful for tk_struct, // tk_union, tk_enum, tk_alias, and tk_except. const char *member_name (CORBA::ULong slot, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) const; // Returns member_name (...), raises (BadKind, Bounds); Useful for // tk_struct, tk_union, tk_enum, tk_alias, and tk_except. CORBA::TypeCode_ptr member_type (CORBA::ULong slot, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) const; // Returns member_type (...), raises (BadKind, Bounds); Useful for // tk_struct, tk_union, and tk_except. CORBA::Any_ptr member_label (CORBA::ULong n, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) const; // For tk_union. Returns the label. Raises BadKind, Bounds. - CORBA::TypeCode_ptr discriminator_type (CORBA_Environment &TAO_IN_ENV = + CORBA::TypeCode_ptr discriminator_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) const; // Returns the discriminator type for tk_union. raises (BadKind). - CORBA::Long default_index (CORBA_Environment &TAO_IN_ENV = + CORBA::Long default_index (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) const; // Returns the default slot for the tk_union. Raises (BadKind). - CORBA::ULong length (CORBA_Environment &TAO_IN_ENV = + CORBA::ULong length (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) const; // Returns length, raises (BadKind). Used for tk_string, // tk_sequence, and tk_array. - CORBA::TypeCode_ptr content_type (CORBA_Environment &TAO_IN_ENV = + CORBA::TypeCode_ptr content_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) const; // Returns the content type (element type). Raises (BadKind); Useful // for tk_sequence, tk_array, and tk_alias. - CORBA::ULong TAO_discrim_pad_size (CORBA_Environment &TAO_IN_ENV = + CORBA::ULong TAO_discrim_pad_size (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // Calculates the padded size of discriminant type TAO Extension. @@ -197,11 +197,11 @@ public: }; // these are used to indicate the status of marshaling - size_t size (CORBA_Environment &TAO_IN_ENV = + size_t size (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // returns the size. Used by the IIOP marshaling engine. - size_t alignment (CORBA_Environment &TAO_IN_ENV = + size_t alignment (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // returns the alignment requirements for this typecode. // used by the IIOP marshaling engine. @@ -218,12 +218,12 @@ public: // throw CORBA::NO_IMPLEMENT. CORBA::Any_ptr parameter (const CORBA::Long slot, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // Deprecated in the CORBA 2.2 spec and // missing altogether from 2.3a (98-12-04), - CORBA::ULong param_count (CORBA_Environment &TAO_IN_ENV = + CORBA::ULong param_count (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) const; // Deprecated, CORBA 1.2, not fully usable. Returns the number of // parameters that the typecode takes. @@ -276,121 +276,121 @@ private: // = All the private/helper methods CORBA::Boolean private_equal (CORBA::TypeCode_ptr tc, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) const; // Compares the typecodes. - const char *private_id (CORBA_Environment &TAO_IN_ENV = + const char *private_id (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) const; // For tk_{objref,struct,union,enum,alias,except}. Returns the // repository ID, raises BadKind. - const char *private_name (CORBA_Environment &TAO_IN_ENV = + const char *private_name (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) const; // returns name (), raises (BadKind) - CORBA::ULong private_member_count (CORBA_Environment &TAO_IN_ENV = + CORBA::ULong private_member_count (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) const; // returns member_count (), raises (BadKind). Useful for tk_struct, // tk_union, tk_enum, tk_alias, and tk_except. CORBA::TypeCode_ptr private_member_type (CORBA::ULong slot, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) const; // returns member_type (...), raises (BadKind, Bounds); Useful for // tk_struct, tk_union, and tk_except const char *private_member_name (CORBA::ULong slot, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) const; // returns member_name (...), raises (BadKind, Bounds); Useful for tk_union, // tk_struct, tk_except, and tk_enum CORBA::Any_ptr private_member_label (CORBA::ULong n, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) const; // For tk_union. Returns the label. Raises BadKind, Bounds. - CORBA::TypeCode_ptr private_discriminator_type (CORBA_Environment &TAO_IN_ENV = + CORBA::TypeCode_ptr private_discriminator_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) const; // returns the discriminator type for tk_union. raises (BadKind); - CORBA::Long private_default_index (CORBA_Environment &TAO_IN_ENV = + CORBA::Long private_default_index (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) const; // returns the default slot for the tk_union. Raises (BadKind); - CORBA::Long private_length (CORBA_Environment &TAO_IN_ENV = + CORBA::Long private_length (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) const; // returns length, raises (BadKind). Used for tk_string, // tk_sequence, and tk_array - CORBA::TypeCode_ptr private_content_type (CORBA_Environment &TAO_IN_ENV = + CORBA::TypeCode_ptr private_content_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) const; // returns the content type (element type). Raises (BadKind); Useful // for tk_sequence, tk_array, and tk_alias - size_t private_size (CORBA_Environment &TAO_IN_ENV = + size_t private_size (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // returns the size. Used by the IIOP marshaling engine. - size_t private_alignment (CORBA_Environment &TAO_IN_ENV = + size_t private_alignment (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // returns the alignment requirements for this typecode. used by the // IIOP marshaling engine. - CORBA::ULong private_discrim_pad_size (CORBA_Environment &TAO_IN_ENV = + CORBA::ULong private_discrim_pad_size (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); // Calculates the padded size of discriminant type TAO Extension // = All the private helpers testing for equality of typecodes CORBA::Boolean private_equal_objref (CORBA::TypeCode_ptr tc, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) const; // test equality for typecodes of objrefs CORBA::Boolean private_equal_struct (CORBA::TypeCode_ptr tc, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) const; // test equality for typecodes of structs CORBA::Boolean private_equal_union (CORBA::TypeCode_ptr tc, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) const; // test equality for typecodes of unions CORBA::Boolean private_equal_enum (CORBA::TypeCode_ptr tc, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) const; // test equality for typecodes of enums CORBA::Boolean private_equal_string (CORBA::TypeCode_ptr tc, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) const; // test equality for typecodes of strings CORBA::Boolean private_equal_wstring (CORBA::TypeCode_ptr tc, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) const; // test equality for typecodes of wide strings CORBA::Boolean private_equal_sequence (CORBA::TypeCode_ptr tc, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) const; // test equality for typecodes of sequences CORBA::Boolean private_equal_array (CORBA::TypeCode_ptr tc, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) const; // test equality for typecodes of array CORBA::Boolean private_equal_alias (CORBA::TypeCode_ptr tc, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) const; // test equality for typecodes of typedefs CORBA::Boolean private_equal_except (CORBA::TypeCode_ptr tc, - CORBA_Environment &TAO_IN_ENV = + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) const; // test equality for typecodes of exceptions diff --git a/TAO/tao/UIOP_Profile.h b/TAO/tao/UIOP_Profile.h index 7e95a15d1dd..a835db08e01 100644 --- a/TAO/tao/UIOP_Profile.h +++ b/TAO/tao/UIOP_Profile.h @@ -66,7 +66,7 @@ public: TAO_UIOP_Profile (const char *string, TAO_ORB_Core *orb_core, - CORBA::Environment &env); + CORBA::Environment &ACE_TRY_ENV); // Create object using a string ior. TAO_UIOP_Profile (const TAO_UIOP_Profile &pfile); @@ -82,10 +82,10 @@ public: // Destructor is to be called only through <_decr_refcnt>. int parse_string (const char *string, - CORBA::Environment &env); + CORBA::Environment &ACE_TRY_ENV); // Initialize this object using the given input string. - CORBA::String to_string (CORBA::Environment &env); + CORBA::String to_string (CORBA::Environment &ACE_TRY_ENV); // Return a string representation for this profile. // client must deallocate memory. @@ -111,7 +111,7 @@ public: // and version are the same. CORBA::ULong hash (CORBA::ULong max, - CORBA::Environment &env); + CORBA::Environment &ACE_TRY_ENV); // Return a hash value for this object. int addr_to_string (char *buffer, size_t length); diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h index 7b2b140f100..d889f57136d 100644 --- a/TAO/tao/corbafwd.h +++ b/TAO/tao/corbafwd.h @@ -343,7 +343,7 @@ typedef void (*TAO_Skeleton)( CORBA_ServerRequest &, void *, void *, - CORBA_Environment &TAO_IN_ENV + CORBA_Environment &ACE_TRY_ENV ); // forward declare sequences. @@ -887,7 +887,7 @@ TAO_NAMESPACE CORBA TAO_NAMESPACE_STORAGE_CLASS ORB_ptr ORB_init (int &argc, char *argv[], const char *orb_name, - CORBA_Environment &TAO_IN_ENV); + CORBA_Environment &ACE_TRY_ENV); // ORB initialisation // = TAO extensions... |