diff options
110 files changed, 4996 insertions, 7811 deletions
diff --git a/TAO/TAO_IDL/ast/ast_type.cpp b/TAO/TAO_IDL/ast/ast_type.cpp index ffbdb1f81ed..7719f80bb5c 100644 --- a/TAO/TAO_IDL/ast/ast_type.cpp +++ b/TAO/TAO_IDL/ast/ast_type.cpp @@ -401,11 +401,6 @@ AST_Type::nested_name (const char* local_name, len_to_match) == 0) { - // Initial prefix matches i.e., they have a common root. - // Start by initializing the macro. - ACE_OS::sprintf (this->nested_type_name_, - "ACE_NESTED_CLASS ("); - // Initialize the first argument. ACE_OS::strncat (this->nested_type_name_, def_curr, @@ -479,7 +474,7 @@ AST_Type::nested_name (const char* local_name, } // Start the 2nd argument of the macro. - ACE_OS::strcat (this->nested_type_name_, ", "); + ACE_OS::strcat (this->nested_type_name_, "::"); // Copy the remaining def_name (if any are left). if (def_curr != 0) @@ -506,9 +501,6 @@ AST_Type::nested_name (const char* local_name, suffix); } - ACE_OS::strcat (this->nested_type_name_, - ")"); - return this->nested_type_name_; } // End of if the root prefixes match. } diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp index 8d3efb98a50..c47878e2d6b 100644 --- a/TAO/TAO_IDL/be/be_codegen.cpp +++ b/TAO/TAO_IDL/be/be_codegen.cpp @@ -30,7 +30,6 @@ ACE_RCSID (be, be_codegen, "$Id$") - TAO_CodeGen * tao_cg = 0; TAO_CodeGen::TAO_CodeGen (void) @@ -1638,7 +1637,7 @@ TAO_CodeGen::gen_stub_hdr_includes (void) // Generated if (w)string member of struct/union/exception/array/valuetype // has been seen. this->gen_cond_file_include (idl_global->string_member_seen_, - "tao/Managed_Types.h", + "tao/String_Manager_T.h", this->client_header_); // Include the Messaging library entry point, if AMI is enabled. @@ -1787,27 +1786,8 @@ TAO_CodeGen::gen_stub_src_includes (void) this->gen_standard_include (this->client_stubs_, "tao/Messaging/Asynch_Invocation_Adapter.h"); -#if !defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER) this->gen_standard_include (this->client_stubs_, "tao/Messaging/ExceptionHolder_i.h"); -#endif - -#if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER) - // If a valuetype has been seen, this will already be in the header file. - if (!idl_global->valuetype_seen_) - { - // This may already be in the generated header file. - if (!idl_global->valuebase_seen_) - { - // For AMI exception holders. - this->gen_standard_include (this->client_stubs_, - "tao/Valuetype/ValueBase.h"); - } - - this->gen_standard_include (this->client_stubs_, - "tao/Valuetype/Valuetype_Adapter_Impl.h"); - } -#endif } // If valuefactory_seen_ was set, this was generated in the stub header file, diff --git a/TAO/TAO_IDL/be/be_visitor_traits.cpp b/TAO/TAO_IDL/be/be_visitor_traits.cpp index 40c94c16bc8..920bc63e736 100644 --- a/TAO/TAO_IDL/be/be_visitor_traits.cpp +++ b/TAO/TAO_IDL/be/be_visitor_traits.cpp @@ -19,6 +19,7 @@ #include "be_interface.h" #include "be_valuebox.h" #include "be_valuetype.h" +#include "be_valuebox.h" #include "be_interface_fwd.h" #include "be_valuetype_fwd.h" #include "be_eventtype.h" @@ -62,7 +63,7 @@ be_visitor_traits::visit_root (be_root *node) << "// " << __FILE__ << ":" << __LINE__; *os << be_global->core_versioning_begin () << be_nl; - + *os << be_nl << be_nl << "// Traits specializations." << be_nl << "namespace TAO" << be_nl @@ -176,41 +177,6 @@ be_visitor_traits::visit_interface_fwd (be_interface_fwd *node) } int -be_visitor_traits::visit_valuebox (be_valuebox *node) -{ - if (node->cli_traits_gen ()) - { - return 0; - } - - TAO_OutStream *os = this->ctx_->stream (); - - // I think we need to generate this only for non-defined forward - // declarations. - if (!node->imported ()) - { - os->gen_ifdef_macro (node->flat_name (), "traits", false); - - *os << be_nl << be_nl - << "template<>" << be_nl - << "struct " << be_global->stub_export_macro () << " Value_Traits<" - << node->name () << ">" << be_nl - << "{" << be_idt_nl - << "static void add_ref (" << node->name () << " *);" << be_nl - << "static void remove_ref (" << node->name () << " *);" - << be_nl - << "static void release (" << node->name () << " *);" - << be_uidt_nl - << "};"; - - os->gen_endif (); - } - - node->cli_traits_gen (true); - return 0; -} - -int be_visitor_traits::visit_valuetype (be_valuetype *node) { if (node->cli_traits_gen ()) @@ -283,6 +249,41 @@ be_visitor_traits::visit_valuetype_fwd (be_valuetype_fwd *node) } int +be_visitor_traits::visit_valuebox (be_valuebox *node) +{ + if (node->cli_traits_gen ()) + { + return 0; + } + + TAO_OutStream *os = this->ctx_->stream (); + + // I think we need to generate this only for non-defined forward + // declarations. + if (!node->imported ()) + { + os->gen_ifdef_macro (node->flat_name (), "traits", false); + + *os << be_nl << be_nl + << "template<>" << be_nl + << "struct " << be_global->stub_export_macro () << " Value_Traits<" + << node->name () << ">" << be_nl + << "{" << be_idt_nl + << "static void add_ref (" << node->name () << " *);" << be_nl + << "static void remove_ref (" << node->name () << " *);" + << be_nl + << "static void release (" << node->name () << " *);" + << be_uidt_nl + << "};"; + + os->gen_endif (); + } + + node->cli_traits_gen (true); + return 0; +} + +int be_visitor_traits::visit_component (be_component *node) { return this->visit_interface (node); @@ -451,6 +452,11 @@ be_visitor_traits::visit_array (be_array *node) << be_uidt_nl << ");" << be_uidt_nl << "static " << name << "_slice * alloc (void);" + << "static void zero (" << be_idt << be_idt_nl + << name << "_slice * _tao_slice" + << be_uidt_nl + << ");" << be_uidt_nl + << be_uidt_nl << "};"; diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode.inl b/TAO/tao/AnyTypeCode/Alias_TypeCode.inl index 0be28aa9d70..d781ee5641f 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.inl @@ -21,7 +21,7 @@ TAO::TypeCode::Alias<StringType, #else TypeCodeType const & tc) #endif - : CORBA::TypeCode (kind) + : ::CORBA::TypeCode (kind) , RefCountPolicy () , attributes_ (id, name) , content_type_ (tc) diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.inl index 1be08b55121..0f077af6689 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.inl +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.inl @@ -12,8 +12,8 @@ TAO::TypeCode::Alias<char const *, char const * id, char const * name, CORBA::TypeCode_ptr const * tc) - : CORBA::TypeCode (kind) - , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) () + : ::CORBA::TypeCode (kind) + , ::TAO::Null_RefCount_Policy () , attributes_ (id, name) , content_type_ (tc) { diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp index ad9c1a3470e..a3d7f0db70a 100644 --- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp @@ -123,7 +123,7 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any, } // Duplicated by Any_Impl base class constructor. - CORBA::release (any_tc); + ::CORBA::release (any_tc); } ACE_CATCHANY { @@ -144,7 +144,7 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::free_value (void) } this->value_ = 0; - CORBA::release (this->type_); + ::CORBA::release (this->type_); } template<typename T_slice, typename T_forany> diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp index 1da4200709a..d228f450e2a 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp @@ -165,7 +165,7 @@ namespace TAO } // Duplicated by Any_Impl base class constructor. - CORBA::release (any_tc); + ::CORBA::release (any_tc); } ACE_CATCHANY { diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp index d2871693f43..6adfea2fcd8 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp @@ -106,7 +106,7 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any, } // Duplicated by Any_Impl base class constructor. - CORBA::release (any_tc); + ::CORBA::release (any_tc); } ACE_CATCHANY { diff --git a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp index 59aded80015..f4acd760936 100644 --- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp @@ -162,7 +162,7 @@ TAO::Any_Dual_Impl_T<T>::extract (const CORBA::Any & any, } // Duplicated by Any_Impl base class constructor. - CORBA::release (any_tc); + ::CORBA::release (any_tc); } ACE_CATCHANY { @@ -182,7 +182,7 @@ TAO::Any_Dual_Impl_T<T>::free_value (void) this->value_destructor_ = 0; } - CORBA::release (this->type_); + ::CORBA::release (this->type_); this->value_ = 0; } diff --git a/TAO/tao/AnyTypeCode/Any_Impl.cpp b/TAO/tao/AnyTypeCode/Any_Impl.cpp index d51a2539146..9995c7f3f7e 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl.cpp +++ b/TAO/tao/AnyTypeCode/Any_Impl.cpp @@ -45,7 +45,7 @@ void TAO::Any_Impl::free_value (void) { // We always have to do this. - CORBA::release (this->type_); + ::CORBA::release (this->type_); } CORBA::TypeCode_ptr @@ -63,7 +63,7 @@ TAO::Any_Impl::_tao_get_typecode (void) const void TAO::Any_Impl::type (CORBA::TypeCode_ptr tc) { - CORBA::release (this->type_); + ::CORBA::release (this->type_); this->type_ = CORBA::TypeCode::_duplicate (tc); } diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp index d4afd38e237..bf03b8280a4 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp @@ -117,7 +117,7 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any, } // Duplicated by Any_Impl base class constructor. - CORBA::release (any_tc); + ::CORBA::release (any_tc); } ACE_CATCHANY { @@ -137,7 +137,7 @@ TAO::Any_Impl_T<T>::free_value (void) this->value_destructor_ = 0; } - CORBA::release (this->type_); + ::CORBA::release (this->type_); this->value_ = 0; } diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp index 544e89127d3..3c815466717 100644 --- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp @@ -166,7 +166,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any, } // Duplicated by Any_Impl base class constructor. - CORBA::release (tc); + ::CORBA::release (tc); } ACE_CATCHANY { @@ -186,7 +186,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::free_value (void) this->value_destructor_ = 0; } - CORBA::release (this->type_); + ::CORBA::release (this->type_); this->value_ = 0; } diff --git a/TAO/tao/AnyTypeCode/NVList.h b/TAO/tao/AnyTypeCode/NVList.h index 0b73c17576c..48d5a65d5f9 100644 --- a/TAO/tao/AnyTypeCode/NVList.h +++ b/TAO/tao/AnyTypeCode/NVList.h @@ -35,7 +35,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -class TAO_ORB_Core; class TAO_InputCDR; namespace CORBA diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.inl b/TAO/tao/AnyTypeCode/Objref_TypeCode.inl index fa8f28d1808..de813439b87 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.inl @@ -10,7 +10,7 @@ TAO::TypeCode::Objref<StringType, RefCountPolicy>::Objref ( CORBA::TCKind kind, char const * id, char const * name) - : CORBA::TypeCode (kind) + : ::CORBA::TypeCode (kind) , RefCountPolicy () , attributes_ (id, name) { diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.inl index 6673159051b..b9492be9bf2 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.inl +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.inl @@ -9,8 +9,8 @@ TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::Objref ( CORBA::TCKind kind, char const * id, char const * name) - : CORBA::TypeCode (kind) - , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) () + : ::CORBA::TypeCode (kind) + , ::TAO::Null_RefCount_Policy () , attributes_ (id, name) { } diff --git a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp index db48e1583f7..be526f4b094 100644 --- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp @@ -130,7 +130,7 @@ TAO::TypeCode::Recursive_Type<TypeCodeBase, // Top-level TypeCode case. if (!(this->in_recursion_)) - return this->ACE_NESTED_CLASS (CORBA, TypeCode)::tao_marshal_kind (cdr); + return this->::CORBA::TypeCode::tao_marshal_kind (cdr); // Recursive/indirected TypeCode case. CORBA::ULong const indirection_kind = 0xffffffff; diff --git a/TAO/tao/AnyTypeCode/RefCount_Policy_Traits.h b/TAO/tao/AnyTypeCode/RefCount_Policy_Traits.h index ac0be52fc3b..d5e4f08d50d 100644 --- a/TAO/tao/AnyTypeCode/RefCount_Policy_Traits.h +++ b/TAO/tao/AnyTypeCode/RefCount_Policy_Traits.h @@ -32,7 +32,6 @@ namespace TAO class Null_RefCount_Policy; class True_RefCount_Policy; -#if !defined (_MSC_VER) || (_MSC_VER >= 1310) /** * @struct RefCount_Policy_Traits * @@ -74,34 +73,6 @@ namespace TAO CORBA::release (ptr); } }; - -#else - - // MSVC++ 6 can't handle partial template specializations so fall - // back on an alternate implementation. - - template<class RefCountPolicy> struct RefCount_Policy_Traits; - - template<> - struct RefCount_Policy_Traits<Null_RefCount_Policy> - { - static bool is_refcounted (void) - { - return false; - } - }; - - template<> - struct RefCount_Policy_Traits<True_RefCount_Policy> - { - static bool is_refcounted (void) - { - return true; - } - }; - -#endif /* !_MSC_VER || _MSC_VER >= 1310 */ - } // End namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode.inl b/TAO/tao/AnyTypeCode/Sequence_TypeCode.inl index 27de6a56926..eced0644709 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.inl @@ -16,7 +16,7 @@ TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::Sequence ( TypeCodeType const & content_type, #endif CORBA::ULong length) - : CORBA::TypeCode (kind) + : ::CORBA::TypeCode (kind) , RefCountPolicy () , content_type_ (content_type) , length_ (length) diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.inl index b433031f883..84361bf52de 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.inl +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.inl @@ -10,8 +10,8 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, CORBA::TCKind kind, CORBA::TypeCode_ptr const * content_type, CORBA::ULong length) - : CORBA::TypeCode (kind) - , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) () + : ::CORBA::TypeCode (kind) + , ::TAO::Null_RefCount_Policy () , content_type_ (content_type) , length_ (length) { diff --git a/TAO/tao/AnyTypeCode/String_TypeCode.inl b/TAO/tao/AnyTypeCode/String_TypeCode.inl index 2f5fb0b6487..c83c7be8667 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/String_TypeCode.inl @@ -8,7 +8,7 @@ template <class RefCountPolicy> ACE_INLINE TAO::TypeCode::String<RefCountPolicy>::String (CORBA::TCKind kind, CORBA::ULong length) - : CORBA::TypeCode (kind) + : ::CORBA::TypeCode (kind) , RefCountPolicy () , length_ (length) { diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/String_TypeCode_Static.inl index 726d9242f8e..f9b3517f049 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.inl +++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.inl @@ -8,8 +8,8 @@ ACE_INLINE TAO::TypeCode::String<TAO::Null_RefCount_Policy>::String ( CORBA::TCKind kind, CORBA::ULong length) - : CORBA::TypeCode (kind) - , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) () + : ::CORBA::TypeCode (kind) + , ::TAO::Null_RefCount_Policy () , length_ (length) { // ACE_ASSERT (kind == CORBA::tk_string || kind == CORBA::tk_wstring); diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.inl b/TAO/tao/AnyTypeCode/Struct_TypeCode.inl index ad95ae544fa..d064338ee22 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.inl @@ -18,7 +18,7 @@ TAO::TypeCode::Struct<StringType, char const * name, FieldArrayType const & fields, CORBA::ULong nfields) - : CORBA::TypeCode (kind) + : ::CORBA::TypeCode (kind) , RefCountPolicy () , base_attributes_ (id, name) , nfields_ (nfields) @@ -37,7 +37,7 @@ TAO::TypeCode::Struct<StringType, RefCountPolicy>::Struct ( CORBA::TCKind kind, char const * id) - : CORBA::TypeCode (kind) + : ::CORBA::TypeCode (kind) , RefCountPolicy () , base_attributes_ (id) , nfields_ (0) diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.inl index d17483fe23f..7b2d60faa3f 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.inl +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.inl @@ -15,8 +15,8 @@ TAO::TypeCode::Struct<char const *, char const * name, Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * fields, CORBA::ULong nfields) - : CORBA::TypeCode (kind) - , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) () + : ::CORBA::TypeCode (kind) + , ::TAO::Null_RefCount_Policy () , base_attributes_ (id, name) , nfields_ (nfields) , fields_ (fields) diff --git a/TAO/tao/AnyTypeCode/TypeCode.cpp b/TAO/tao/AnyTypeCode/TypeCode.cpp index 4af8e87ee16..cb811228132 100644 --- a/TAO/tao/AnyTypeCode/TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode.cpp @@ -455,7 +455,7 @@ namespace TAO void Objref_Traits<CORBA::TypeCode>::release (CORBA::TypeCode_ptr p) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::TypeCode_ptr diff --git a/TAO/tao/AnyTypeCode/TypeCode.inl b/TAO/tao/AnyTypeCode/TypeCode.inl index eb044d6641f..f06f9f5ba2d 100644 --- a/TAO/tao/AnyTypeCode/TypeCode.inl +++ b/TAO/tao/AnyTypeCode/TypeCode.inl @@ -155,7 +155,7 @@ CORBA::TypeCode::concrete_base_type (ACE_ENV_SINGLE_ARG_DECL) const ACE_INLINE void CORBA::TypeCode::_tao_any_destructor (void * x) { - CORBA::release (static_cast <CORBA::TypeCode_ptr> (x)); + ::CORBA::release (static_cast <CORBA::TypeCode_ptr> (x)); } diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.inl b/TAO/tao/AnyTypeCode/Union_TypeCode.inl index 28ac14d3537..ab001d57baf 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/Union_TypeCode.inl @@ -25,7 +25,7 @@ TAO::TypeCode::Union<StringType, CaseArrayType const & cases, CORBA::ULong ncases, CORBA::Long default_index) - : CORBA::TypeCode (CORBA::tk_union) + : ::CORBA::TypeCode (CORBA::tk_union) , RefCountPolicy () , base_attributes_ (id, name) , discriminant_type_ (discriminant_type) @@ -46,7 +46,7 @@ TAO::TypeCode::Union<StringType, RefCountPolicy>::Union ( CORBA::TCKind, char const * id) - : CORBA::TypeCode (CORBA::tk_union) + : ::CORBA::TypeCode (CORBA::tk_union) , RefCountPolicy () , base_attributes_ (id) , discriminant_type_ (0) diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.inl index 4398e2a0a62..39b9465a2da 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.inl +++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.inl @@ -16,8 +16,8 @@ TAO::TypeCode::Union<char const *, Case<char const *, CORBA::TypeCode_ptr const *> const * const * cases, CORBA::ULong ncases, CORBA::Long default_index) - : CORBA::TypeCode (CORBA::tk_union) - , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) () + : ::CORBA::TypeCode (CORBA::tk_union) + , ::TAO::Null_RefCount_Policy () , base_attributes_ (id, name) , discriminant_type_ (discriminant_type) , default_index_ (default_index) diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.inl b/TAO/tao/AnyTypeCode/Value_TypeCode.inl index 6a63efab53e..e5b0b3ab2f1 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode.inl +++ b/TAO/tao/AnyTypeCode/Value_TypeCode.inl @@ -26,7 +26,7 @@ TAO::TypeCode::Value<StringType, #endif FieldArrayType const & fields, CORBA::ULong nfields) - : CORBA::TypeCode (kind) + : ::CORBA::TypeCode (kind) , RefCountPolicy () , base_attributes_ (id, name) , type_modifier_ (modifier) @@ -47,7 +47,7 @@ TAO::TypeCode::Value<StringType, RefCountPolicy>::Value ( CORBA::TCKind kind, char const * id) - : CORBA::TypeCode (kind) + : ::CORBA::TypeCode (kind) , RefCountPolicy () , base_attributes_ (id) , type_modifier_ (CORBA::VM_NONE) diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.inl b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.inl index 3341e18053f..c35fbce0b42 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.inl +++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.inl @@ -17,8 +17,8 @@ TAO::TypeCode::Value<char const *, CORBA::TypeCode_ptr const * concrete_base, Value_Field<char const *, CORBA::TypeCode_ptr const *> const * fields, CORBA::ULong nfields) - : CORBA::TypeCode (kind) - , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) () + : ::CORBA::TypeCode (kind) + , ::TAO::Null_RefCount_Policy () , base_attributes_ (id, name) , type_modifier_ (modifier) , concrete_base_ (concrete_base) diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp b/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp index 07fe0de4a78..4ad5f842c83 100644 --- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp +++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp @@ -66,7 +66,7 @@ TAO::Objref_Traits<BiDirPolicy::BidirectionalPolicy>::release ( BiDirPolicy::BidirectionalPolicy_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } BiDirPolicy::BidirectionalPolicy_ptr @@ -100,10 +100,10 @@ BiDirPolicy::BidirectionalPolicy::_narrow ( { return BidirectionalPolicy::_nil (); } - + BidirectionalPolicy_ptr proxy = dynamic_cast<BidirectionalPolicy_ptr> (_tao_objref); - + return BidirectionalPolicy::_duplicate (proxy); } @@ -117,28 +117,28 @@ BiDirPolicy::BidirectionalPolicy::_unchecked_narrow ( { return BidirectionalPolicy::_nil (); } - + BidirectionalPolicy_ptr proxy = dynamic_cast<BidirectionalPolicy_ptr> (_tao_objref); - + return BidirectionalPolicy::_duplicate (proxy); } BiDirPolicy::BidirectionalPolicy_ptr BiDirPolicy::BidirectionalPolicy::_duplicate (BidirectionalPolicy_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void BiDirPolicy::BidirectionalPolicy::_tao_release (BidirectionalPolicy_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp index 926dbcf223e..c040e779226 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp +++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp @@ -14,20 +14,20 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_BidirectionalPolicy::TAO_BidirectionalPolicy ( const BiDirPolicy::BidirectionalPolicyValue val) - : ACE_NESTED_CLASS (CORBA, Object) () - , ACE_NESTED_CLASS (CORBA, Policy) () - , ACE_NESTED_CLASS (BiDirPolicy, BidirectionalPolicy) () - , ACE_NESTED_CLASS (CORBA, LocalObject) () + : ::CORBA::Object () + , ::CORBA::Policy () + , ::BiDirPolicy::BidirectionalPolicy () + , ::CORBA::LocalObject () , TAO_Local_RefCounted_Object () , value_ (val) { } TAO_BidirectionalPolicy::TAO_BidirectionalPolicy (const TAO_BidirectionalPolicy &rhs) - : ACE_NESTED_CLASS (CORBA, Object) () - , ACE_NESTED_CLASS (CORBA, Policy) () - , ACE_NESTED_CLASS (BiDirPolicy, BidirectionalPolicy) () - , ACE_NESTED_CLASS (CORBA, LocalObject) () + : ::CORBA::Object () + , ::CORBA::Policy () + , ::BiDirPolicy::BidirectionalPolicy () + , ::CORBA::LocalObject () , TAO_Local_RefCounted_Object () , value_ (rhs.value_) { diff --git a/TAO/tao/Domain/DomainS.cpp b/TAO/tao/Domain/DomainS.cpp index b17f2e46588..10531e046e6 100644 --- a/TAO/tao/Domain/DomainS.cpp +++ b/TAO/tao/Domain/DomainS.cpp @@ -1177,7 +1177,7 @@ POA_CORBA::ConstructionPolicy::ConstructionPolicy (void) POA_CORBA::ConstructionPolicy::ConstructionPolicy (const ConstructionPolicy& rhs) : TAO_Abstract_ServantBase (rhs), TAO_ServantBase (rhs), - ACE_NESTED_CLASS (POA_CORBA, Policy) (rhs) + ::POA_CORBA::Policy (rhs) { } diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h index d80f9900855..888601f9793 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h +++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h @@ -159,7 +159,7 @@ namespace TAO TAO_DII_Deferred_Reply_Dispatcher *rd_; /// Cache the orb_core - TAO_ORB_Core *orb_core_; + TAO_ORB_Core * const orb_core_; }; } // End namespace TAO diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp index 6f9aa2d6bf7..6e09d9ff5fa 100644 --- a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp +++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp @@ -187,7 +187,7 @@ TAO_DynamicImplementation::_dispatch (TAO_ServerRequest &request, } ACE_ENDTRY; - CORBA::release (dsi_request); + ::CORBA::release (dsi_request); } CORBA::RepositoryId diff --git a/TAO/tao/DynamicInterface/ExceptionList.cpp b/TAO/tao/DynamicInterface/ExceptionList.cpp index 41c1d44d322..18de9aee9d0 100644 --- a/TAO/tao/DynamicInterface/ExceptionList.cpp +++ b/TAO/tao/DynamicInterface/ExceptionList.cpp @@ -35,7 +35,7 @@ CORBA::ExceptionList::~ExceptionList (void) return; } - CORBA::release (*tc); + ::CORBA::release (*tc); } } diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp index 5a1ef1942f5..9027cecb530 100644 --- a/TAO/tao/DynamicInterface/Request.cpp +++ b/TAO/tao/DynamicInterface/Request.cpp @@ -127,11 +127,11 @@ CORBA::Request::~Request (void) { ACE_ASSERT (refcount_ == 0); - CORBA::release (this->target_); + ::CORBA::release (this->target_); CORBA::string_free ((char*) this->opname_); this->opname_ = 0; - CORBA::release (this->args_); - CORBA::release (this->result_); + ::CORBA::release (this->args_); + ::CORBA::release (this->result_); } // The public DII interfaces: normal and oneway calls. diff --git a/TAO/tao/DynamicInterface/Request.h b/TAO/tao/DynamicInterface/Request.h index 2c119dca9b3..21b59006fad 100644 --- a/TAO/tao/DynamicInterface/Request.h +++ b/TAO/tao/DynamicInterface/Request.h @@ -33,13 +33,11 @@ #include "tao/ORB.h" #include "tao/Environment.h" -#include "tao/Sequence.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/NVList.h" #include "ace/SString.h" - #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO #endif diff --git a/TAO/tao/DynamicInterface/Server_Request.cpp b/TAO/tao/DynamicInterface/Server_Request.cpp index 57c440c55db..5582886beee 100644 --- a/TAO/tao/DynamicInterface/Server_Request.cpp +++ b/TAO/tao/DynamicInterface/Server_Request.cpp @@ -72,7 +72,7 @@ CORBA::ServerRequest::~ServerRequest (void) { if (this->params_ != 0) { - CORBA::release (this->params_); + ::CORBA::release (this->params_); } delete this->retval_; diff --git a/TAO/tao/IFR_Client/IFR_BaseC.cpp b/TAO/tao/IFR_Client/IFR_BaseC.cpp index a684ebb3841..cc95c71fa12 100644 --- a/TAO/tao/IFR_Client/IFR_BaseC.cpp +++ b/TAO/tao/IFR_Client/IFR_BaseC.cpp @@ -71,13 +71,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Arg traits specializations. namespace TAO { - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:786 #if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_) #define _CORBA_DEFINITIONKIND__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::DefinitionKind> : public @@ -89,13 +89,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:118 #if !defined (_CORBA_CONTAINED__ARG_TRAITS_) #define _CORBA_CONTAINED__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::Contained> : public @@ -110,13 +110,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:828 #if !defined (_CORBA_CONTAINED_DESCRIPTION__ARG_TRAITS_) #define _CORBA_CONTAINED_DESCRIPTION__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::Contained::Description> : public @@ -130,13 +130,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:118 #if !defined (_CORBA_REPOSITORY__ARG_TRAITS_) #define _CORBA_REPOSITORY__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::Repository> : public @@ -151,13 +151,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:118 #if !defined (_CORBA_CONTAINER__ARG_TRAITS_) #define _CORBA_CONTAINER__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::Container> : public @@ -172,13 +172,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:543 #if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ__ARG_TRAITS_) #define _CORBA_CONTAINER_DESCRIPTIONSEQ__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::Container::DescriptionSeq> : public @@ -192,13 +192,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:118 #if !defined (_CORBA_MODULEDEF__ARG_TRAITS_) #define _CORBA_MODULEDEF__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::ModuleDef> : public @@ -213,13 +213,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:118 #if !defined (_CORBA_CONSTANTDEF__ARG_TRAITS_) #define _CORBA_CONSTANTDEF__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::ConstantDef> : public @@ -234,13 +234,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:118 #if !defined (_CORBA_IDLTYPE__ARG_TRAITS_) #define _CORBA_IDLTYPE__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::IDLType> : public @@ -255,13 +255,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:118 #if !defined (_CORBA_STRUCTDEF__ARG_TRAITS_) #define _CORBA_STRUCTDEF__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::StructDef> : public @@ -276,13 +276,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:118 #if !defined (_CORBA_UNIONDEF__ARG_TRAITS_) #define _CORBA_UNIONDEF__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::UnionDef> : public @@ -297,13 +297,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:118 #if !defined (_CORBA_ENUMDEF__ARG_TRAITS_) #define _CORBA_ENUMDEF__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::EnumDef> : public @@ -318,13 +318,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:118 #if !defined (_CORBA_ALIASDEF__ARG_TRAITS_) #define _CORBA_ALIASDEF__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::AliasDef> : public @@ -339,13 +339,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:118 #if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_) #define _CORBA_INTERFACEDEF__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::InterfaceDef> : public @@ -360,13 +360,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:543 #if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_) #define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::InterfaceDefSeq> : public @@ -380,13 +380,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:118 #if !defined (_CORBA_EXCEPTIONDEF__ARG_TRAITS_) #define _CORBA_EXCEPTIONDEF__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::ExceptionDef> : public @@ -401,13 +401,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:118 #if !defined (_CORBA_NATIVEDEF__ARG_TRAITS_) #define _CORBA_NATIVEDEF__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::NativeDef> : public @@ -422,13 +422,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:118 #if !defined (_CORBA_VALUEDEF__ARG_TRAITS_) #define _CORBA_VALUEDEF__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::ValueDef> : public @@ -443,13 +443,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:543 #if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_) #define _CORBA_VALUEDEFSEQ__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::ValueDefSeq> : public @@ -463,13 +463,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:118 #if !defined (_CORBA_VALUEBOXDEF__ARG_TRAITS_) #define _CORBA_VALUEBOXDEF__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::ValueBoxDef> : public @@ -484,13 +484,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:118 #if !defined (_CORBA_ABSTRACTINTERFACEDEF__ARG_TRAITS_) #define _CORBA_ABSTRACTINTERFACEDEF__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::AbstractInterfaceDef> : public @@ -505,13 +505,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:543 #if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_) #define _CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::AbstractInterfaceDefSeq> : public @@ -525,13 +525,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:118 #if !defined (_CORBA_LOCALINTERFACEDEF__ARG_TRAITS_) #define _CORBA_LOCALINTERFACEDEF__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::LocalInterfaceDef> : public @@ -546,13 +546,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:118 #if !defined (_CORBA_EXTVALUEDEF__ARG_TRAITS_) #define _CORBA_EXTVALUEDEF__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::ExtValueDef> : public @@ -567,13 +567,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:543 #if !defined (_CORBA_CONTAINEDSEQ__ARG_TRAITS_) #define _CORBA_CONTAINEDSEQ__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::ContainedSeq> : public @@ -587,13 +587,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:543 #if !defined (_CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_) #define _CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::StructMemberSeq> : public @@ -607,13 +607,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:543 #if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_) #define _CORBA_INITIALIZERSEQ__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::InitializerSeq> : public @@ -627,13 +627,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:543 #if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_) #define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::ExtInitializerSeq> : public @@ -647,13 +647,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:543 #if !defined (_CORBA_UNIONMEMBERSEQ__ARG_TRAITS_) #define _CORBA_UNIONMEMBERSEQ__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::UnionMemberSeq> : public @@ -667,13 +667,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:543 #if !defined (_CORBA_ENUMMEMBERSEQ__ARG_TRAITS_) #define _CORBA_ENUMMEMBERSEQ__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::EnumMemberSeq> : public @@ -701,7 +701,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/CORBA/ScopedName:1.0", "ScopedName", &CORBA::_tc_string); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_ScopedName = @@ -751,7 +751,7 @@ static char const * const _tao_enumerators_CORBA_DefinitionKind[] = "dk_Provides", "dk_Uses", "dk_Event" - + }; static TAO::TypeCode::Enum<char const *, @@ -762,7 +762,7 @@ static TAO::TypeCode::Enum<char const *, "DefinitionKind", _tao_enumerators_CORBA_DefinitionKind, 36); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_DefinitionKind = @@ -789,7 +789,7 @@ TAO::Objref_Traits<CORBA::IRObject>::release ( CORBA::IRObject_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::IRObject_ptr @@ -808,7 +808,7 @@ TAO::Objref_Traits<CORBA::IRObject>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA__TAO_IRObject_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -825,21 +825,21 @@ TAO::Collocation_Proxy_Broker * { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_IRObject_Proxy_Broker_ == 0) { CORBA_IRObject_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::DefinitionKind>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -848,10 +848,10 @@ TAO::Collocation_Proxy_Broker * 13, this->the_TAO_IRObject_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -867,21 +867,21 @@ void CORBA::IRObject::destroy ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_IRObject_Proxy_Broker_ == 0) { CORBA_IRObject_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -890,7 +890,7 @@ void CORBA::IRObject::destroy ( 7, this->the_TAO_IRObject_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -914,12 +914,12 @@ CORBA::IRObject::CORBA_IRObject_setup_collocation () CORBA::IRObject::~IRObject (void) {} -void +void CORBA::IRObject::_tao_any_destructor (void *_tao_void_pointer) { IRObject *_tao_tmp_pointer = static_cast<IRObject *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::IRObject_ptr @@ -955,18 +955,18 @@ CORBA::IRObject::_unchecked_narrow ( CORBA::IRObject_ptr CORBA::IRObject::_duplicate (IRObject_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void CORBA::IRObject::_tao_release (IRObject_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -990,7 +990,7 @@ CORBA::IRObject::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -1017,7 +1017,7 @@ static TAO::TypeCode::Objref<char const *, CORBA::tk_objref, "IDL:omg.org/CORBA/IRObject:1.0", "IRObject"); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_IRObject = @@ -1037,7 +1037,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/CORBA/VersionSpec:1.0", "VersionSpec", &CORBA::_tc_string); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_VersionSpec = @@ -1064,7 +1064,7 @@ TAO::Objref_Traits<CORBA::Contained>::release ( CORBA::Contained_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::Contained_ptr @@ -1083,7 +1083,7 @@ TAO::Objref_Traits<CORBA::Contained>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA__TAO_Contained_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -1100,21 +1100,21 @@ char * CORBA::Contained::id ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_Contained_Proxy_Broker_ == 0) { CORBA_Contained_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::RepositoryId>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -1123,10 +1123,10 @@ char * CORBA::Contained::id ( 7, this->the_TAO_Contained_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -1143,23 +1143,23 @@ void CORBA::Contained::id ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_Contained_Proxy_Broker_ == 0) { CORBA_Contained_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_id }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -1168,7 +1168,7 @@ void CORBA::Contained::id ( 7, this->the_TAO_Contained_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -1185,21 +1185,21 @@ char * CORBA::Contained::name ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_Contained_Proxy_Broker_ == 0) { CORBA_Contained_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::Identifier>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -1208,10 +1208,10 @@ char * CORBA::Contained::name ( 9, this->the_TAO_Contained_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -1228,23 +1228,23 @@ void CORBA::Contained::name ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_Contained_Proxy_Broker_ == 0) { CORBA_Contained_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_name }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -1253,7 +1253,7 @@ void CORBA::Contained::name ( 9, this->the_TAO_Contained_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -1270,21 +1270,21 @@ char * CORBA::Contained::version ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_Contained_Proxy_Broker_ == 0) { CORBA_Contained_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::VersionSpec>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -1293,10 +1293,10 @@ char * CORBA::Contained::version ( 12, this->the_TAO_Contained_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -1313,23 +1313,23 @@ void CORBA::Contained::version ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_Contained_Proxy_Broker_ == 0) { CORBA_Contained_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_version }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -1338,7 +1338,7 @@ void CORBA::Contained::version ( 12, this->the_TAO_Contained_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -1355,21 +1355,21 @@ void CORBA::Contained::version ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_Contained_Proxy_Broker_ == 0) { CORBA_Contained_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::Container>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -1378,10 +1378,10 @@ void CORBA::Contained::version ( 15, this->the_TAO_Contained_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -1397,21 +1397,21 @@ char * CORBA::Contained::absolute_name ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_Contained_Proxy_Broker_ == 0) { CORBA_Contained_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::ScopedName>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -1420,10 +1420,10 @@ char * CORBA::Contained::absolute_name ( 18, this->the_TAO_Contained_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -1439,21 +1439,21 @@ char * CORBA::Contained::absolute_name ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_Contained_Proxy_Broker_ == 0) { CORBA_Contained_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::Repository>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -1462,10 +1462,10 @@ char * CORBA::Contained::absolute_name ( 26, this->the_TAO_Contained_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -1476,7 +1476,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co { { "kind", &CORBA::_tc_DefinitionKind }, { "value", &CORBA::_tc_any } - + }; static TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *, @@ -1488,14 +1488,14 @@ static TAO::TypeCode::Struct<char const *, "Description", _tao_fields_CORBA_Contained_Description, 2); - + ::CORBA::TypeCode_ptr const CORBA::Contained::_tc_Description = &_tao_tc_CORBA_Contained_Description; -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/structure_cs.cpp:66 -void +void CORBA::Contained::Description::_tao_any_destructor ( void *_tao_void_pointer ) @@ -1517,21 +1517,21 @@ CORBA::Contained::Description::_tao_any_destructor ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_Contained_Proxy_Broker_ == 0) { CORBA_Contained_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::Contained::Description>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -1540,10 +1540,10 @@ CORBA::Contained::Description::_tao_any_destructor ( 8, this->the_TAO_Contained_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -1562,19 +1562,19 @@ void CORBA::Contained::move ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_Contained_Proxy_Broker_ == 0) { CORBA_Contained_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::Container>::in_arg_val _tao_new_container (new_container); TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_new_name (new_name); TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_new_version (new_version); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -1582,7 +1582,7 @@ void CORBA::Contained::move ( &_tao_new_name, &_tao_new_version }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -1591,7 +1591,7 @@ void CORBA::Contained::move ( 4, this->the_TAO_Contained_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -1610,19 +1610,19 @@ CORBA::Contained::CORBA_Contained_setup_collocation () this->the_TAO_Contained_Proxy_Broker_ = ::CORBA__TAO_Contained_Proxy_Broker_Factory_function_pointer (this); } - + this->CORBA_IRObject_setup_collocation (); } CORBA::Contained::~Contained (void) {} -void +void CORBA::Contained::_tao_any_destructor (void *_tao_void_pointer) { Contained *_tao_tmp_pointer = static_cast<Contained *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::Contained_ptr @@ -1658,18 +1658,18 @@ CORBA::Contained::_unchecked_narrow ( CORBA::Contained_ptr CORBA::Contained::_duplicate (Contained_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void CORBA::Contained::_tao_release (Contained_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -1697,7 +1697,7 @@ CORBA::Contained::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -1724,7 +1724,7 @@ static TAO::TypeCode::Objref<char const *, CORBA::tk_objref, "IDL:omg.org/CORBA/Contained:1.0", "Contained"); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_Contained = @@ -1733,7 +1733,7 @@ namespace CORBA -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_CORBA_INTERFACEDEFSEQ_CS_) @@ -1745,7 +1745,7 @@ CORBA::InterfaceDefSeq::InterfaceDefSeq (void) CORBA::InterfaceDefSeq::InterfaceDefSeq ( CORBA::ULong max ) - : TAO_Unbounded_Object_Sequence< + : TAO::unbounded_object_reference_sequence< InterfaceDef, InterfaceDef_var > @@ -1758,7 +1758,7 @@ CORBA::InterfaceDefSeq::InterfaceDefSeq ( CORBA::InterfaceDef_ptr * buffer, CORBA::Boolean release ) - : TAO_Unbounded_Object_Sequence< + : TAO::unbounded_object_reference_sequence< InterfaceDef, InterfaceDef_var > @@ -1768,7 +1768,7 @@ CORBA::InterfaceDefSeq::InterfaceDefSeq ( CORBA::InterfaceDefSeq::InterfaceDefSeq ( const InterfaceDefSeq &seq ) - : TAO_Unbounded_Object_Sequence< + : TAO::unbounded_object_reference_sequence< InterfaceDef, InterfaceDef_var > @@ -1815,10 +1815,10 @@ namespace TAO CORBA::tk_sequence, &CORBA::_tc_InterfaceDef, 0U); - + ::CORBA::TypeCode_ptr const tc_CORBA_InterfaceDefSeq_0 = &CORBA_InterfaceDefSeq_0; - + } } @@ -1833,7 +1833,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/CORBA/InterfaceDefSeq:1.0", "InterfaceDefSeq", &TAO::TypeCode::tc_CORBA_InterfaceDefSeq_0); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_InterfaceDefSeq = @@ -1842,7 +1842,7 @@ namespace CORBA -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_CORBA_VALUEDEFSEQ_CS_) @@ -1854,7 +1854,7 @@ CORBA::ValueDefSeq::ValueDefSeq (void) CORBA::ValueDefSeq::ValueDefSeq ( CORBA::ULong max ) - : TAO_Unbounded_Object_Sequence< + : TAO::unbounded_object_reference_sequence< ValueDef, ValueDef_var > @@ -1867,7 +1867,7 @@ CORBA::ValueDefSeq::ValueDefSeq ( CORBA::ValueDef_ptr * buffer, CORBA::Boolean release ) - : TAO_Unbounded_Object_Sequence< + : TAO::unbounded_object_reference_sequence< ValueDef, ValueDef_var > @@ -1877,7 +1877,7 @@ CORBA::ValueDefSeq::ValueDefSeq ( CORBA::ValueDefSeq::ValueDefSeq ( const ValueDefSeq &seq ) - : TAO_Unbounded_Object_Sequence< + : TAO::unbounded_object_reference_sequence< ValueDef, ValueDef_var > @@ -1924,10 +1924,10 @@ namespace TAO CORBA::tk_sequence, &CORBA::_tc_ValueDef, 0U); - + ::CORBA::TypeCode_ptr const tc_CORBA_ValueDefSeq_0 = &CORBA_ValueDefSeq_0; - + } } @@ -1942,7 +1942,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/CORBA/ValueDefSeq:1.0", "ValueDefSeq", &TAO::TypeCode::tc_CORBA_ValueDefSeq_0); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_ValueDefSeq = @@ -1951,7 +1951,7 @@ namespace CORBA -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ_CS_) @@ -1963,7 +1963,7 @@ CORBA::AbstractInterfaceDefSeq::AbstractInterfaceDefSeq (void) CORBA::AbstractInterfaceDefSeq::AbstractInterfaceDefSeq ( CORBA::ULong max ) - : TAO_Unbounded_Object_Sequence< + : TAO::unbounded_object_reference_sequence< AbstractInterfaceDef, AbstractInterfaceDef_var > @@ -1976,7 +1976,7 @@ CORBA::AbstractInterfaceDefSeq::AbstractInterfaceDefSeq ( CORBA::AbstractInterfaceDef_ptr * buffer, CORBA::Boolean release ) - : TAO_Unbounded_Object_Sequence< + : TAO::unbounded_object_reference_sequence< AbstractInterfaceDef, AbstractInterfaceDef_var > @@ -1986,7 +1986,7 @@ CORBA::AbstractInterfaceDefSeq::AbstractInterfaceDefSeq ( CORBA::AbstractInterfaceDefSeq::AbstractInterfaceDefSeq ( const AbstractInterfaceDefSeq &seq ) - : TAO_Unbounded_Object_Sequence< + : TAO::unbounded_object_reference_sequence< AbstractInterfaceDef, AbstractInterfaceDef_var > @@ -2033,10 +2033,10 @@ namespace TAO CORBA::tk_sequence, &CORBA::_tc_AbstractInterfaceDef, 0U); - + ::CORBA::TypeCode_ptr const tc_CORBA_AbstractInterfaceDefSeq_0 = &CORBA_AbstractInterfaceDefSeq_0; - + } } @@ -2051,7 +2051,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/CORBA/AbstractInterfaceDefSeq:1.0", "AbstractInterfaceDefSeq", &TAO::TypeCode::tc_CORBA_AbstractInterfaceDefSeq_0); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_AbstractInterfaceDefSeq = @@ -2060,7 +2060,7 @@ namespace CORBA -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_CORBA_LOCALINTERFACEDEFSEQ_CS_) @@ -2072,7 +2072,7 @@ CORBA::LocalInterfaceDefSeq::LocalInterfaceDefSeq (void) CORBA::LocalInterfaceDefSeq::LocalInterfaceDefSeq ( CORBA::ULong max ) - : TAO_Unbounded_Object_Sequence< + : TAO::unbounded_object_reference_sequence< LocalInterfaceDef, LocalInterfaceDef_var > @@ -2085,7 +2085,7 @@ CORBA::LocalInterfaceDefSeq::LocalInterfaceDefSeq ( CORBA::LocalInterfaceDef_ptr * buffer, CORBA::Boolean release ) - : TAO_Unbounded_Object_Sequence< + : TAO::unbounded_object_reference_sequence< LocalInterfaceDef, LocalInterfaceDef_var > @@ -2095,7 +2095,7 @@ CORBA::LocalInterfaceDefSeq::LocalInterfaceDefSeq ( CORBA::LocalInterfaceDefSeq::LocalInterfaceDefSeq ( const LocalInterfaceDefSeq &seq ) - : TAO_Unbounded_Object_Sequence< + : TAO::unbounded_object_reference_sequence< LocalInterfaceDef, LocalInterfaceDef_var > @@ -2142,10 +2142,10 @@ namespace TAO CORBA::tk_sequence, &CORBA::_tc_LocalInterfaceDef, 0U); - + ::CORBA::TypeCode_ptr const tc_CORBA_LocalInterfaceDefSeq_0 = &CORBA_LocalInterfaceDefSeq_0; - + } } @@ -2160,7 +2160,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/CORBA/LocalInterfaceDefSeq:1.0", "LocalInterfaceDefSeq", &TAO::TypeCode::tc_CORBA_LocalInterfaceDefSeq_0); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_LocalInterfaceDefSeq = @@ -2169,7 +2169,7 @@ namespace CORBA -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_CORBA_EXTINTERFACEDEFSEQ_CS_) @@ -2181,7 +2181,7 @@ CORBA::ExtInterfaceDefSeq::ExtInterfaceDefSeq (void) CORBA::ExtInterfaceDefSeq::ExtInterfaceDefSeq ( CORBA::ULong max ) - : TAO_Unbounded_Object_Sequence< + : TAO::unbounded_object_reference_sequence< ExtInterfaceDef, ExtInterfaceDef_var > @@ -2194,7 +2194,7 @@ CORBA::ExtInterfaceDefSeq::ExtInterfaceDefSeq ( CORBA::ExtInterfaceDef_ptr * buffer, CORBA::Boolean release ) - : TAO_Unbounded_Object_Sequence< + : TAO::unbounded_object_reference_sequence< ExtInterfaceDef, ExtInterfaceDef_var > @@ -2204,7 +2204,7 @@ CORBA::ExtInterfaceDefSeq::ExtInterfaceDefSeq ( CORBA::ExtInterfaceDefSeq::ExtInterfaceDefSeq ( const ExtInterfaceDefSeq &seq ) - : TAO_Unbounded_Object_Sequence< + : TAO::unbounded_object_reference_sequence< ExtInterfaceDef, ExtInterfaceDef_var > @@ -2251,10 +2251,10 @@ namespace TAO CORBA::tk_sequence, &CORBA::_tc_ExtInterfaceDef, 0U); - + ::CORBA::TypeCode_ptr const tc_CORBA_ExtInterfaceDefSeq_0 = &CORBA_ExtInterfaceDefSeq_0; - + } } @@ -2269,7 +2269,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/CORBA/ExtInterfaceDefSeq:1.0", "ExtInterfaceDefSeq", &TAO::TypeCode::tc_CORBA_ExtInterfaceDefSeq_0); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_ExtInterfaceDefSeq = @@ -2278,7 +2278,7 @@ namespace CORBA -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_CORBA_EXTVALUEDEFSEQ_CS_) @@ -2290,7 +2290,7 @@ CORBA::ExtValueDefSeq::ExtValueDefSeq (void) CORBA::ExtValueDefSeq::ExtValueDefSeq ( CORBA::ULong max ) - : TAO_Unbounded_Object_Sequence< + : TAO::unbounded_object_reference_sequence< ExtValueDef, ExtValueDef_var > @@ -2303,7 +2303,7 @@ CORBA::ExtValueDefSeq::ExtValueDefSeq ( CORBA::ExtValueDef_ptr * buffer, CORBA::Boolean release ) - : TAO_Unbounded_Object_Sequence< + : TAO::unbounded_object_reference_sequence< ExtValueDef, ExtValueDef_var > @@ -2313,7 +2313,7 @@ CORBA::ExtValueDefSeq::ExtValueDefSeq ( CORBA::ExtValueDefSeq::ExtValueDefSeq ( const ExtValueDefSeq &seq ) - : TAO_Unbounded_Object_Sequence< + : TAO::unbounded_object_reference_sequence< ExtValueDef, ExtValueDef_var > @@ -2360,10 +2360,10 @@ namespace TAO CORBA::tk_sequence, &CORBA::_tc_ExtValueDef, 0U); - + ::CORBA::TypeCode_ptr const tc_CORBA_ExtValueDefSeq_0 = &CORBA_ExtValueDefSeq_0; - + } } @@ -2378,7 +2378,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/CORBA/ExtValueDefSeq:1.0", "ExtValueDefSeq", &TAO::TypeCode::tc_CORBA_ExtValueDefSeq_0); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_ExtValueDefSeq = @@ -2387,7 +2387,7 @@ namespace CORBA -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_CORBA_EXTABSTRACTINTERFACEDEFSEQ_CS_) @@ -2399,7 +2399,7 @@ CORBA::ExtAbstractInterfaceDefSeq::ExtAbstractInterfaceDefSeq (void) CORBA::ExtAbstractInterfaceDefSeq::ExtAbstractInterfaceDefSeq ( CORBA::ULong max ) - : TAO_Unbounded_Object_Sequence< + : TAO::unbounded_object_reference_sequence< ExtAbstractInterfaceDef, ExtAbstractInterfaceDef_var > @@ -2412,7 +2412,7 @@ CORBA::ExtAbstractInterfaceDefSeq::ExtAbstractInterfaceDefSeq ( CORBA::ExtAbstractInterfaceDef_ptr * buffer, CORBA::Boolean release ) - : TAO_Unbounded_Object_Sequence< + : TAO::unbounded_object_reference_sequence< ExtAbstractInterfaceDef, ExtAbstractInterfaceDef_var > @@ -2422,7 +2422,7 @@ CORBA::ExtAbstractInterfaceDefSeq::ExtAbstractInterfaceDefSeq ( CORBA::ExtAbstractInterfaceDefSeq::ExtAbstractInterfaceDefSeq ( const ExtAbstractInterfaceDefSeq &seq ) - : TAO_Unbounded_Object_Sequence< + : TAO::unbounded_object_reference_sequence< ExtAbstractInterfaceDef, ExtAbstractInterfaceDef_var > @@ -2469,10 +2469,10 @@ namespace TAO CORBA::tk_sequence, &CORBA::_tc_ExtAbstractInterfaceDef, 0U); - + ::CORBA::TypeCode_ptr const tc_CORBA_ExtAbstractInterfaceDefSeq_0 = &CORBA_ExtAbstractInterfaceDefSeq_0; - + } } @@ -2487,7 +2487,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/CORBA/ExtAbstractInterfaceDefSeq:1.0", "ExtAbstractInterfaceDefSeq", &TAO::TypeCode::tc_CORBA_ExtAbstractInterfaceDefSeq_0); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_ExtAbstractInterfaceDefSeq = @@ -2496,7 +2496,7 @@ namespace CORBA -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_CORBA_EXTLOCALINTERFACEDEFSEQ_CS_) @@ -2508,7 +2508,7 @@ CORBA::ExtLocalInterfaceDefSeq::ExtLocalInterfaceDefSeq (void) CORBA::ExtLocalInterfaceDefSeq::ExtLocalInterfaceDefSeq ( CORBA::ULong max ) - : TAO_Unbounded_Object_Sequence< + : TAO::unbounded_object_reference_sequence< ExtLocalInterfaceDef, ExtLocalInterfaceDef_var > @@ -2521,7 +2521,7 @@ CORBA::ExtLocalInterfaceDefSeq::ExtLocalInterfaceDefSeq ( CORBA::ExtLocalInterfaceDef_ptr * buffer, CORBA::Boolean release ) - : TAO_Unbounded_Object_Sequence< + : TAO::unbounded_object_reference_sequence< ExtLocalInterfaceDef, ExtLocalInterfaceDef_var > @@ -2531,7 +2531,7 @@ CORBA::ExtLocalInterfaceDefSeq::ExtLocalInterfaceDefSeq ( CORBA::ExtLocalInterfaceDefSeq::ExtLocalInterfaceDefSeq ( const ExtLocalInterfaceDefSeq &seq ) - : TAO_Unbounded_Object_Sequence< + : TAO::unbounded_object_reference_sequence< ExtLocalInterfaceDef, ExtLocalInterfaceDef_var > @@ -2578,10 +2578,10 @@ namespace TAO CORBA::tk_sequence, &CORBA::_tc_ExtLocalInterfaceDef, 0U); - + ::CORBA::TypeCode_ptr const tc_CORBA_ExtLocalInterfaceDefSeq_0 = &CORBA_ExtLocalInterfaceDefSeq_0; - + } } @@ -2596,7 +2596,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/CORBA/ExtLocalInterfaceDefSeq:1.0", "ExtLocalInterfaceDefSeq", &TAO::TypeCode::tc_CORBA_ExtLocalInterfaceDefSeq_0); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_ExtLocalInterfaceDefSeq = @@ -2605,7 +2605,7 @@ namespace CORBA -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_CORBA_CONTAINEDSEQ_CS_) @@ -2617,7 +2617,7 @@ CORBA::ContainedSeq::ContainedSeq (void) CORBA::ContainedSeq::ContainedSeq ( CORBA::ULong max ) - : TAO_Unbounded_Object_Sequence< + : TAO::unbounded_object_reference_sequence< Contained, Contained_var > @@ -2630,7 +2630,7 @@ CORBA::ContainedSeq::ContainedSeq ( CORBA::Contained_ptr * buffer, CORBA::Boolean release ) - : TAO_Unbounded_Object_Sequence< + : TAO::unbounded_object_reference_sequence< Contained, Contained_var > @@ -2640,7 +2640,7 @@ CORBA::ContainedSeq::ContainedSeq ( CORBA::ContainedSeq::ContainedSeq ( const ContainedSeq &seq ) - : TAO_Unbounded_Object_Sequence< + : TAO::unbounded_object_reference_sequence< Contained, Contained_var > @@ -2682,10 +2682,10 @@ namespace TAO CORBA::tk_sequence, &CORBA::_tc_Contained, 0U); - + ::CORBA::TypeCode_ptr const tc_CORBA_ContainedSeq_0 = &CORBA_ContainedSeq_0; - + } } @@ -2700,7 +2700,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/CORBA/ContainedSeq:1.0", "ContainedSeq", &TAO::TypeCode::tc_CORBA_ContainedSeq_0); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_ContainedSeq = @@ -2717,7 +2717,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co { "name", &CORBA::_tc_Identifier }, { "type", &CORBA::_tc_TypeCode }, { "type_def", &CORBA::_tc_IDLType } - + }; static TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *, @@ -2729,7 +2729,7 @@ static TAO::TypeCode::Struct<char const *, "StructMember", _tao_fields_CORBA_StructMember, 3); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_StructMember = @@ -2738,10 +2738,10 @@ namespace CORBA -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/structure_cs.cpp:66 -void +void CORBA::StructMember::_tao_any_destructor ( void *_tao_void_pointer ) @@ -2751,7 +2751,7 @@ CORBA::StructMember::_tao_any_destructor ( delete _tao_tmp_pointer; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_CORBA_STRUCTMEMBERSEQ_CS_) @@ -2763,7 +2763,7 @@ CORBA::StructMemberSeq::StructMemberSeq (void) CORBA::StructMemberSeq::StructMemberSeq ( CORBA::ULong max ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< StructMember > (max) @@ -2775,7 +2775,7 @@ CORBA::StructMemberSeq::StructMemberSeq ( CORBA::StructMember * buffer, CORBA::Boolean release ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< StructMember > (max, length, buffer, release) @@ -2784,7 +2784,7 @@ CORBA::StructMemberSeq::StructMemberSeq ( CORBA::StructMemberSeq::StructMemberSeq ( const StructMemberSeq &seq ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< StructMember > (seq) @@ -2825,10 +2825,10 @@ namespace TAO CORBA::tk_sequence, &CORBA::_tc_StructMember, 0U); - + ::CORBA::TypeCode_ptr const tc_CORBA_StructMemberSeq_0 = &CORBA_StructMemberSeq_0; - + } } @@ -2843,7 +2843,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/CORBA/StructMemberSeq:1.0", "StructMemberSeq", &TAO::TypeCode::tc_CORBA_StructMemberSeq_0); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_StructMemberSeq = @@ -2864,7 +2864,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co { { "members", &CORBA::_tc_StructMemberSeq }, { "name", &CORBA::_tc_Identifier } - + }; static TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *, @@ -2876,7 +2876,7 @@ static TAO::TypeCode::Struct<char const *, "Initializer", _tao_fields_CORBA_Initializer, 2); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_Initializer = @@ -2885,10 +2885,10 @@ namespace CORBA -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/structure_cs.cpp:66 -void +void CORBA::Initializer::_tao_any_destructor ( void *_tao_void_pointer ) @@ -2898,7 +2898,7 @@ CORBA::Initializer::_tao_any_destructor ( delete _tao_tmp_pointer; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_CORBA_INITIALIZERSEQ_CS_) @@ -2910,7 +2910,7 @@ CORBA::InitializerSeq::InitializerSeq (void) CORBA::InitializerSeq::InitializerSeq ( CORBA::ULong max ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< Initializer > (max) @@ -2922,7 +2922,7 @@ CORBA::InitializerSeq::InitializerSeq ( CORBA::Initializer * buffer, CORBA::Boolean release ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< Initializer > (max, length, buffer, release) @@ -2931,7 +2931,7 @@ CORBA::InitializerSeq::InitializerSeq ( CORBA::InitializerSeq::InitializerSeq ( const InitializerSeq &seq ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< Initializer > (seq) @@ -2972,10 +2972,10 @@ namespace TAO CORBA::tk_sequence, &CORBA::_tc_Initializer, 0U); - + ::CORBA::TypeCode_ptr const tc_CORBA_InitializerSeq_0 = &CORBA_InitializerSeq_0; - + } } @@ -2990,7 +2990,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/CORBA/InitializerSeq:1.0", "InitializerSeq", &TAO::TypeCode::tc_CORBA_InitializerSeq_0); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_InitializerSeq = @@ -3009,7 +3009,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co { "defined_in", &CORBA::_tc_RepositoryId }, { "version", &CORBA::_tc_VersionSpec }, { "type", &CORBA::_tc_TypeCode } - + }; static TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *, @@ -3021,7 +3021,7 @@ static TAO::TypeCode::Struct<char const *, "ExceptionDescription", _tao_fields_CORBA_ExceptionDescription, 5); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_ExceptionDescription = @@ -3030,10 +3030,10 @@ namespace CORBA -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/structure_cs.cpp:66 -void +void CORBA::ExceptionDescription::_tao_any_destructor ( void *_tao_void_pointer ) @@ -3043,7 +3043,7 @@ CORBA::ExceptionDescription::_tao_any_destructor ( delete _tao_tmp_pointer; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_CORBA_EXCDESCRIPTIONSEQ_CS_) @@ -3055,7 +3055,7 @@ CORBA::ExcDescriptionSeq::ExcDescriptionSeq (void) CORBA::ExcDescriptionSeq::ExcDescriptionSeq ( CORBA::ULong max ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< ExceptionDescription > (max) @@ -3067,7 +3067,7 @@ CORBA::ExcDescriptionSeq::ExcDescriptionSeq ( CORBA::ExceptionDescription * buffer, CORBA::Boolean release ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< ExceptionDescription > (max, length, buffer, release) @@ -3076,7 +3076,7 @@ CORBA::ExcDescriptionSeq::ExcDescriptionSeq ( CORBA::ExcDescriptionSeq::ExcDescriptionSeq ( const ExcDescriptionSeq &seq ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< ExceptionDescription > (seq) @@ -3117,10 +3117,10 @@ namespace TAO CORBA::tk_sequence, &CORBA::_tc_ExceptionDescription, 0U); - + ::CORBA::TypeCode_ptr const tc_CORBA_ExcDescriptionSeq_0 = &CORBA_ExcDescriptionSeq_0; - + } } @@ -3135,7 +3135,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/CORBA/ExcDescriptionSeq:1.0", "ExcDescriptionSeq", &TAO::TypeCode::tc_CORBA_ExcDescriptionSeq_0); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_ExcDescriptionSeq = @@ -3162,7 +3162,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co { "members", &CORBA::_tc_StructMemberSeq }, { "exceptions", &CORBA::_tc_ExcDescriptionSeq }, { "name", &CORBA::_tc_Identifier } - + }; static TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *, @@ -3174,7 +3174,7 @@ static TAO::TypeCode::Struct<char const *, "ExtInitializer", _tao_fields_CORBA_ExtInitializer, 3); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_ExtInitializer = @@ -3183,10 +3183,10 @@ namespace CORBA -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/structure_cs.cpp:66 -void +void CORBA::ExtInitializer::_tao_any_destructor ( void *_tao_void_pointer ) @@ -3196,7 +3196,7 @@ CORBA::ExtInitializer::_tao_any_destructor ( delete _tao_tmp_pointer; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_CORBA_EXTINITIALIZERSEQ_CS_) @@ -3208,7 +3208,7 @@ CORBA::ExtInitializerSeq::ExtInitializerSeq (void) CORBA::ExtInitializerSeq::ExtInitializerSeq ( CORBA::ULong max ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< ExtInitializer > (max) @@ -3220,7 +3220,7 @@ CORBA::ExtInitializerSeq::ExtInitializerSeq ( CORBA::ExtInitializer * buffer, CORBA::Boolean release ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< ExtInitializer > (max, length, buffer, release) @@ -3229,7 +3229,7 @@ CORBA::ExtInitializerSeq::ExtInitializerSeq ( CORBA::ExtInitializerSeq::ExtInitializerSeq ( const ExtInitializerSeq &seq ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< ExtInitializer > (seq) @@ -3270,10 +3270,10 @@ namespace TAO CORBA::tk_sequence, &CORBA::_tc_ExtInitializer, 0U); - + ::CORBA::TypeCode_ptr const tc_CORBA_ExtInitializerSeq_0 = &CORBA_ExtInitializerSeq_0; - + } } @@ -3288,7 +3288,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/CORBA/ExtInitializerSeq:1.0", "ExtInitializerSeq", &TAO::TypeCode::tc_CORBA_ExtInitializerSeq_0); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_ExtInitializerSeq = @@ -3306,7 +3306,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co { "label", &CORBA::_tc_any }, { "type", &CORBA::_tc_TypeCode }, { "type_def", &CORBA::_tc_IDLType } - + }; static TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *, @@ -3318,7 +3318,7 @@ static TAO::TypeCode::Struct<char const *, "UnionMember", _tao_fields_CORBA_UnionMember, 4); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_UnionMember = @@ -3327,10 +3327,10 @@ namespace CORBA -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/structure_cs.cpp:66 -void +void CORBA::UnionMember::_tao_any_destructor ( void *_tao_void_pointer ) @@ -3340,7 +3340,7 @@ CORBA::UnionMember::_tao_any_destructor ( delete _tao_tmp_pointer; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_CORBA_UNIONMEMBERSEQ_CS_) @@ -3352,7 +3352,7 @@ CORBA::UnionMemberSeq::UnionMemberSeq (void) CORBA::UnionMemberSeq::UnionMemberSeq ( CORBA::ULong max ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< UnionMember > (max) @@ -3364,7 +3364,7 @@ CORBA::UnionMemberSeq::UnionMemberSeq ( CORBA::UnionMember * buffer, CORBA::Boolean release ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< UnionMember > (max, length, buffer, release) @@ -3373,7 +3373,7 @@ CORBA::UnionMemberSeq::UnionMemberSeq ( CORBA::UnionMemberSeq::UnionMemberSeq ( const UnionMemberSeq &seq ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< UnionMember > (seq) @@ -3414,10 +3414,10 @@ namespace TAO CORBA::tk_sequence, &CORBA::_tc_UnionMember, 0U); - + ::CORBA::TypeCode_ptr const tc_CORBA_UnionMemberSeq_0 = &CORBA_UnionMemberSeq_0; - + } } @@ -3432,7 +3432,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/CORBA/UnionMemberSeq:1.0", "UnionMemberSeq", &TAO::TypeCode::tc_CORBA_UnionMemberSeq_0); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_UnionMemberSeq = @@ -3441,7 +3441,7 @@ namespace CORBA -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_CORBA_ENUMMEMBERSEQ_CS_) @@ -3453,7 +3453,7 @@ CORBA::EnumMemberSeq::EnumMemberSeq (void) CORBA::EnumMemberSeq::EnumMemberSeq ( CORBA::ULong max ) - : TAO_Unbounded_String_Sequence + : TAO::unbounded_string_sequence (max) {} @@ -3463,14 +3463,14 @@ CORBA::EnumMemberSeq::EnumMemberSeq ( char * * buffer, CORBA::Boolean release ) - : TAO_Unbounded_String_Sequence + : TAO::unbounded_string_sequence (max, length, buffer, release) {} CORBA::EnumMemberSeq::EnumMemberSeq ( const EnumMemberSeq &seq ) - : TAO_Unbounded_String_Sequence + : TAO::unbounded_string_sequence (seq) {} @@ -3509,10 +3509,10 @@ namespace TAO CORBA::tk_sequence, &CORBA::_tc_Identifier, 0U); - + ::CORBA::TypeCode_ptr const tc_CORBA_EnumMemberSeq_0 = &CORBA_EnumMemberSeq_0; - + } } @@ -3527,7 +3527,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/CORBA/EnumMemberSeq:1.0", "EnumMemberSeq", &TAO::TypeCode::tc_CORBA_EnumMemberSeq_0); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_EnumMemberSeq = @@ -3554,7 +3554,7 @@ TAO::Objref_Traits<CORBA::Container>::release ( CORBA::Container_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::Container_ptr @@ -3573,7 +3573,7 @@ TAO::Objref_Traits<CORBA::Container>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA__TAO_Container_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -3591,23 +3591,23 @@ TAO::Collocation_Proxy_Broker * { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_Container_Proxy_Broker_ == 0) { CORBA_Container_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::Contained>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::ScopedName>::in_arg_val _tao_search_name (search_name); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_search_name }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -3616,10 +3616,10 @@ TAO::Collocation_Proxy_Broker * 6, this->the_TAO_Container_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -3637,25 +3637,25 @@ TAO::Collocation_Proxy_Broker * { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_Container_Proxy_Broker_ == 0) { CORBA_Container_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::ContainedSeq>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::DefinitionKind>::in_arg_val _tao_limit_type (limit_type); TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_exclude_inherited (exclude_inherited); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_limit_type, &_tao_exclude_inherited }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -3664,10 +3664,10 @@ TAO::Collocation_Proxy_Broker * 8, this->the_TAO_Container_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -3687,20 +3687,20 @@ TAO::Collocation_Proxy_Broker * { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_Container_Proxy_Broker_ == 0) { CORBA_Container_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::ContainedSeq>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_search_name (search_name); TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_levels_to_search (levels_to_search); TAO::Arg_Traits< ::CORBA::DefinitionKind>::in_arg_val _tao_limit_type (limit_type); TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_exclude_inherited (exclude_inherited); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -3709,7 +3709,7 @@ TAO::Collocation_Proxy_Broker * &_tao_limit_type, &_tao_exclude_inherited }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -3718,10 +3718,10 @@ TAO::Collocation_Proxy_Broker * 11, this->the_TAO_Container_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -3733,7 +3733,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co { "contained_object", &CORBA::_tc_Contained }, { "kind", &CORBA::_tc_DefinitionKind }, { "value", &CORBA::_tc_any } - + }; static TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *, @@ -3745,14 +3745,14 @@ static TAO::TypeCode::Struct<char const *, "Description", _tao_fields_CORBA_Container_Description, 3); - + ::CORBA::TypeCode_ptr const CORBA::Container::_tc_Description = &_tao_tc_CORBA_Container_Description; -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/structure_cs.cpp:66 -void +void CORBA::Container::Description::_tao_any_destructor ( void *_tao_void_pointer ) @@ -3762,7 +3762,7 @@ CORBA::Container::Description::_tao_any_destructor ( delete _tao_tmp_pointer; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ_CS_) @@ -3774,7 +3774,7 @@ CORBA::Container::DescriptionSeq::DescriptionSeq (void) CORBA::Container::DescriptionSeq::DescriptionSeq ( CORBA::ULong max ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< Description > (max) @@ -3786,7 +3786,7 @@ CORBA::Container::DescriptionSeq::DescriptionSeq ( CORBA::Container::Description * buffer, CORBA::Boolean release ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< Description > (max, length, buffer, release) @@ -3795,7 +3795,7 @@ CORBA::Container::DescriptionSeq::DescriptionSeq ( CORBA::Container::DescriptionSeq::DescriptionSeq ( const DescriptionSeq &seq ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< Description > (seq) @@ -3836,10 +3836,10 @@ namespace TAO CORBA::tk_sequence, &CORBA::Container::_tc_Description, 0U); - + ::CORBA::TypeCode_ptr const tc_CORBA_Container_DescriptionSeq_0 = &CORBA_Container_DescriptionSeq_0; - + } } @@ -3854,7 +3854,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/CORBA/Container/DescriptionSeq:1.0", "DescriptionSeq", &TAO::TypeCode::tc_CORBA_Container_DescriptionSeq_0); - + ::CORBA::TypeCode_ptr const CORBA::Container::_tc_DescriptionSeq = &_tao_tc_CORBA_Container_DescriptionSeq; @@ -3873,19 +3873,19 @@ static TAO::TypeCode::Alias<char const *, { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_Container_Proxy_Broker_ == 0) { CORBA_Container_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::Container::DescriptionSeq>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::DefinitionKind>::in_arg_val _tao_limit_type (limit_type); TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_exclude_inherited (exclude_inherited); TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_max_returned_objs (max_returned_objs); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -3893,7 +3893,7 @@ static TAO::TypeCode::Alias<char const *, &_tao_exclude_inherited, &_tao_max_returned_objs }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -3902,10 +3902,10 @@ static TAO::TypeCode::Alias<char const *, 17, this->the_TAO_Container_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -3924,19 +3924,19 @@ static TAO::TypeCode::Alias<char const *, { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_Container_Proxy_Broker_ == 0) { CORBA_Container_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::ModuleDef>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id); TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name); TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -3944,7 +3944,7 @@ static TAO::TypeCode::Alias<char const *, &_tao_name, &_tao_version }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -3953,10 +3953,10 @@ static TAO::TypeCode::Alias<char const *, 13, this->the_TAO_Container_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -3977,21 +3977,21 @@ static TAO::TypeCode::Alias<char const *, { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_Container_Proxy_Broker_ == 0) { CORBA_Container_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::ConstantDef>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id); TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name); TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version); TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type (type); TAO::Arg_Traits< ::CORBA::Any>::in_arg_val _tao_value (value); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -4001,7 +4001,7 @@ static TAO::TypeCode::Alias<char const *, &_tao_type, &_tao_value }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -4010,10 +4010,10 @@ static TAO::TypeCode::Alias<char const *, 15, this->the_TAO_Container_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -4033,20 +4033,20 @@ static TAO::TypeCode::Alias<char const *, { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_Container_Proxy_Broker_ == 0) { CORBA_Container_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::StructDef>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id); TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name); TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version); TAO::Arg_Traits< ::CORBA::StructMemberSeq>::in_arg_val _tao_members (members); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -4055,7 +4055,7 @@ static TAO::TypeCode::Alias<char const *, &_tao_version, &_tao_members }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -4064,10 +4064,10 @@ static TAO::TypeCode::Alias<char const *, 13, this->the_TAO_Container_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -4088,21 +4088,21 @@ static TAO::TypeCode::Alias<char const *, { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_Container_Proxy_Broker_ == 0) { CORBA_Container_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::UnionDef>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id); TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name); TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version); TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_discriminator_type (discriminator_type); TAO::Arg_Traits< ::CORBA::UnionMemberSeq>::in_arg_val _tao_members (members); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -4112,7 +4112,7 @@ static TAO::TypeCode::Alias<char const *, &_tao_discriminator_type, &_tao_members }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -4121,10 +4121,10 @@ static TAO::TypeCode::Alias<char const *, 12, this->the_TAO_Container_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -4144,20 +4144,20 @@ static TAO::TypeCode::Alias<char const *, { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_Container_Proxy_Broker_ == 0) { CORBA_Container_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::EnumDef>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id); TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name); TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version); TAO::Arg_Traits< ::CORBA::EnumMemberSeq>::in_arg_val _tao_members (members); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -4166,7 +4166,7 @@ static TAO::TypeCode::Alias<char const *, &_tao_version, &_tao_members }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -4175,10 +4175,10 @@ static TAO::TypeCode::Alias<char const *, 11, this->the_TAO_Container_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -4198,20 +4198,20 @@ static TAO::TypeCode::Alias<char const *, { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_Container_Proxy_Broker_ == 0) { CORBA_Container_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::AliasDef>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id); TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name); TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version); TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_original_type (original_type); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -4220,7 +4220,7 @@ static TAO::TypeCode::Alias<char const *, &_tao_version, &_tao_original_type }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -4229,10 +4229,10 @@ static TAO::TypeCode::Alias<char const *, 12, this->the_TAO_Container_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -4252,20 +4252,20 @@ static TAO::TypeCode::Alias<char const *, { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_Container_Proxy_Broker_ == 0) { CORBA_Container_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::InterfaceDef>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id); TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name); TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version); TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces (base_interfaces); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -4274,7 +4274,7 @@ static TAO::TypeCode::Alias<char const *, &_tao_version, &_tao_base_interfaces }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -4283,10 +4283,10 @@ static TAO::TypeCode::Alias<char const *, 16, this->the_TAO_Container_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -4312,14 +4312,14 @@ static TAO::TypeCode::Alias<char const *, { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_Container_Proxy_Broker_ == 0) { CORBA_Container_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::ValueDef>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id); TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name); @@ -4331,7 +4331,7 @@ static TAO::TypeCode::Alias<char const *, TAO::Arg_Traits< ::CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values (abstract_base_values); TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces); TAO::Arg_Traits< ::CORBA::InitializerSeq>::in_arg_val _tao_initializers (initializers); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -4346,7 +4346,7 @@ static TAO::TypeCode::Alias<char const *, &_tao_supported_interfaces, &_tao_initializers }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -4355,10 +4355,10 @@ static TAO::TypeCode::Alias<char const *, 12, this->the_TAO_Container_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -4378,20 +4378,20 @@ static TAO::TypeCode::Alias<char const *, { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_Container_Proxy_Broker_ == 0) { CORBA_Container_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::ValueBoxDef>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id); TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name); TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version); TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_original_type_def (original_type_def); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -4400,7 +4400,7 @@ static TAO::TypeCode::Alias<char const *, &_tao_version, &_tao_original_type_def }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -4409,10 +4409,10 @@ static TAO::TypeCode::Alias<char const *, 16, this->the_TAO_Container_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -4432,20 +4432,20 @@ static TAO::TypeCode::Alias<char const *, { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_Container_Proxy_Broker_ == 0) { CORBA_Container_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::ExceptionDef>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id); TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name); TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version); TAO::Arg_Traits< ::CORBA::StructMemberSeq>::in_arg_val _tao_members (members); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -4454,7 +4454,7 @@ static TAO::TypeCode::Alias<char const *, &_tao_version, &_tao_members }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -4463,10 +4463,10 @@ static TAO::TypeCode::Alias<char const *, 16, this->the_TAO_Container_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -4485,19 +4485,19 @@ static TAO::TypeCode::Alias<char const *, { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_Container_Proxy_Broker_ == 0) { CORBA_Container_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::NativeDef>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id); TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name); TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -4505,7 +4505,7 @@ static TAO::TypeCode::Alias<char const *, &_tao_name, &_tao_version }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -4514,10 +4514,10 @@ static TAO::TypeCode::Alias<char const *, 13, this->the_TAO_Container_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -4537,20 +4537,20 @@ static TAO::TypeCode::Alias<char const *, { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_Container_Proxy_Broker_ == 0) { CORBA_Container_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::AbstractInterfaceDef>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id); TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name); TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version); TAO::Arg_Traits< ::CORBA::AbstractInterfaceDefSeq>::in_arg_val _tao_base_interfaces (base_interfaces); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -4559,7 +4559,7 @@ static TAO::TypeCode::Alias<char const *, &_tao_version, &_tao_base_interfaces }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -4568,10 +4568,10 @@ static TAO::TypeCode::Alias<char const *, 25, this->the_TAO_Container_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -4591,20 +4591,20 @@ static TAO::TypeCode::Alias<char const *, { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_Container_Proxy_Broker_ == 0) { CORBA_Container_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::LocalInterfaceDef>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id); TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name); TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version); TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces (base_interfaces); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -4613,7 +4613,7 @@ static TAO::TypeCode::Alias<char const *, &_tao_version, &_tao_base_interfaces }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -4622,10 +4622,10 @@ static TAO::TypeCode::Alias<char const *, 22, this->the_TAO_Container_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -4651,14 +4651,14 @@ static TAO::TypeCode::Alias<char const *, { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_Container_Proxy_Broker_ == 0) { CORBA_Container_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::ExtValueDef>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id); TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name); @@ -4670,7 +4670,7 @@ static TAO::TypeCode::Alias<char const *, TAO::Arg_Traits< ::CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values (abstract_base_values); TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces); TAO::Arg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_val _tao_initializers (initializers); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -4685,7 +4685,7 @@ static TAO::TypeCode::Alias<char const *, &_tao_supported_interfaces, &_tao_initializers }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -4694,10 +4694,10 @@ static TAO::TypeCode::Alias<char const *, 16, this->the_TAO_Container_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -4715,19 +4715,19 @@ CORBA::Container::CORBA_Container_setup_collocation () this->the_TAO_Container_Proxy_Broker_ = ::CORBA__TAO_Container_Proxy_Broker_Factory_function_pointer (this); } - + this->CORBA_IRObject_setup_collocation (); } CORBA::Container::~Container (void) {} -void +void CORBA::Container::_tao_any_destructor (void *_tao_void_pointer) { Container *_tao_tmp_pointer = static_cast<Container *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::Container_ptr @@ -4763,18 +4763,18 @@ CORBA::Container::_unchecked_narrow ( CORBA::Container_ptr CORBA::Container::_duplicate (Container_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void CORBA::Container::_tao_release (Container_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -4802,7 +4802,7 @@ CORBA::Container::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -4829,7 +4829,7 @@ static TAO::TypeCode::Objref<char const *, CORBA::tk_objref, "IDL:omg.org/CORBA/Container:1.0", "Container"); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_Container = @@ -4856,7 +4856,7 @@ TAO::Objref_Traits<CORBA::IDLType>::release ( CORBA::IDLType_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::IDLType_ptr @@ -4875,7 +4875,7 @@ TAO::Objref_Traits<CORBA::IDLType>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA__TAO_IDLType_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -4892,21 +4892,21 @@ CORBA::TypeCode_ptr CORBA::IDLType::type ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_IDLType_Proxy_Broker_ == 0) { CORBA_IDLType_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -4915,10 +4915,10 @@ CORBA::TypeCode_ptr CORBA::IDLType::type ( 9, this->the_TAO_IDLType_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -4936,19 +4936,19 @@ CORBA::IDLType::CORBA_IDLType_setup_collocation () this->the_TAO_IDLType_Proxy_Broker_ = ::CORBA__TAO_IDLType_Proxy_Broker_Factory_function_pointer (this); } - + this->CORBA_IRObject_setup_collocation (); } CORBA::IDLType::~IDLType (void) {} -void +void CORBA::IDLType::_tao_any_destructor (void *_tao_void_pointer) { IDLType *_tao_tmp_pointer = static_cast<IDLType *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::IDLType_ptr @@ -4984,18 +4984,18 @@ CORBA::IDLType::_unchecked_narrow ( CORBA::IDLType_ptr CORBA::IDLType::_duplicate (IDLType_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void CORBA::IDLType::_tao_release (IDLType_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -5023,7 +5023,7 @@ CORBA::IDLType::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -5050,7 +5050,7 @@ static TAO::TypeCode::Objref<char const *, CORBA::tk_objref, "IDL:omg.org/CORBA/IDLType:1.0", "IDLType"); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_IDLType = @@ -5077,7 +5077,7 @@ TAO::Objref_Traits<CORBA::TypedefDef>::release ( CORBA::TypedefDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::TypedefDef_ptr @@ -5096,7 +5096,7 @@ TAO::Objref_Traits<CORBA::TypedefDef>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA__TAO_TypedefDef_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -5115,7 +5115,7 @@ CORBA::TypedefDef::CORBA_TypedefDef_setup_collocation () this->the_TAO_TypedefDef_Proxy_Broker_ = ::CORBA__TAO_TypedefDef_Proxy_Broker_Factory_function_pointer (this); } - + this->CORBA_Contained_setup_collocation (); this->CORBA_IDLType_setup_collocation (); } @@ -5123,12 +5123,12 @@ CORBA::TypedefDef::CORBA_TypedefDef_setup_collocation () CORBA::TypedefDef::~TypedefDef (void) {} -void +void CORBA::TypedefDef::_tao_any_destructor (void *_tao_void_pointer) { TypedefDef *_tao_tmp_pointer = static_cast<TypedefDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::TypedefDef_ptr @@ -5164,18 +5164,18 @@ CORBA::TypedefDef::_unchecked_narrow ( CORBA::TypedefDef_ptr CORBA::TypedefDef::_duplicate (TypedefDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void CORBA::TypedefDef::_tao_release (TypedefDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -5211,7 +5211,7 @@ CORBA::TypedefDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -5238,7 +5238,7 @@ static TAO::TypeCode::Objref<char const *, CORBA::tk_objref, "IDL:omg.org/CORBA/TypedefDef:1.0", "TypedefDef"); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_TypedefDef = @@ -5257,7 +5257,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co { "defined_in", &CORBA::_tc_RepositoryId }, { "version", &CORBA::_tc_VersionSpec }, { "type", &CORBA::_tc_TypeCode } - + }; static TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *, @@ -5269,7 +5269,7 @@ static TAO::TypeCode::Struct<char const *, "TypeDescription", _tao_fields_CORBA_TypeDescription, 5); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_TypeDescription = @@ -5278,10 +5278,10 @@ namespace CORBA -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/structure_cs.cpp:66 -void +void CORBA::TypeDescription::_tao_any_destructor ( void *_tao_void_pointer ) @@ -5315,7 +5315,7 @@ CORBA::Boolean operator>>= ( TAO::Any_Basic_Impl_T<CORBA::DefinitionKind>::extract ( _tao_any, CORBA::_tc_DefinitionKind, - _tao_elem + _tao_elem ); } @@ -5435,7 +5435,7 @@ operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -5493,7 +5493,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/any_op_cs.cpp:54 @@ -5552,7 +5552,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/any_op_cs.cpp:54 @@ -5611,7 +5611,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/any_op_cs.cpp:54 @@ -5670,7 +5670,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/any_op_cs.cpp:54 @@ -5729,7 +5729,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/any_op_cs.cpp:54 @@ -5788,7 +5788,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/any_op_cs.cpp:54 @@ -5847,7 +5847,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/any_op_cs.cpp:54 @@ -5906,7 +5906,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/any_op_cs.cpp:54 @@ -5965,7 +5965,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/any_op_cs.cpp:54 @@ -6024,7 +6024,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -6082,7 +6082,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/any_op_cs.cpp:54 @@ -6141,7 +6141,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -6199,7 +6199,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/any_op_cs.cpp:54 @@ -6258,7 +6258,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -6316,7 +6316,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/any_op_cs.cpp:54 @@ -6375,7 +6375,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -6433,7 +6433,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/any_op_cs.cpp:54 @@ -6492,7 +6492,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -6550,7 +6550,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/any_op_cs.cpp:54 @@ -6609,7 +6609,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/any_op_cs.cpp:54 @@ -6726,7 +6726,7 @@ operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -6784,7 +6784,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/any_op_cs.cpp:54 @@ -6959,7 +6959,7 @@ operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -7029,12 +7029,12 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, CORBA::DefinitionKind & _tao_enu { CORBA::ULong _tao_temp = 0; CORBA::Boolean const _tao_success = strm >> _tao_temp; - + if (_tao_success) { _tao_enumerator = static_cast<CORBA::DefinitionKind> (_tao_temp); } - + return _tao_success; } @@ -7056,21 +7056,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::IRObject RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_IRObject_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -7115,21 +7115,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::Contained RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_Contained_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -7144,25 +7144,7 @@ CORBA::Boolean operator<< ( const CORBA::InterfaceDefSeq &_tao_sequence ) { - const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = - TAO::Objref_Traits<CORBA::InterfaceDef>::marshal ( - _tao_sequence[i].in (), strm - ); - } - - return _tao_marshal_flag; - } - - return false; + return TAO::marshal_sequence(strm, _tao_sequence); } CORBA::Boolean operator>> ( @@ -7170,40 +7152,7 @@ CORBA::Boolean operator>> ( CORBA::InterfaceDefSeq &_tao_sequence ) { - CORBA::ULong _tao_seq_len; - - if (strm >> _tao_seq_len) - { - // Add a check to the length of the sequence - // to make sure it does not exceed the length - // of the stream. (See bug 58.) - if (_tao_seq_len > strm.length ()) - { - return false; - } - - // Set the length of the sequence. - _tao_sequence.length (_tao_seq_len); - - // If length is 0 we return true. - if (0 >= _tao_seq_len) - { - return true; - } - - // Retrieve all the elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm >> _tao_sequence[i].out ()); - } - - return _tao_marshal_flag; - - } - - return false; + return TAO::demarshal_sequence(strm, _tao_sequence); } #endif /* _TAO_CDR_OP_CORBA_InterfaceDefSeq_CPP_ */ @@ -7219,25 +7168,7 @@ CORBA::Boolean operator<< ( const CORBA::ValueDefSeq &_tao_sequence ) { - const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = - TAO::Objref_Traits<CORBA::ValueDef>::marshal ( - _tao_sequence[i].in (), strm - ); - } - - return _tao_marshal_flag; - } - - return false; + return TAO::marshal_sequence(strm, _tao_sequence); } CORBA::Boolean operator>> ( @@ -7245,40 +7176,7 @@ CORBA::Boolean operator>> ( CORBA::ValueDefSeq &_tao_sequence ) { - CORBA::ULong _tao_seq_len; - - if (strm >> _tao_seq_len) - { - // Add a check to the length of the sequence - // to make sure it does not exceed the length - // of the stream. (See bug 58.) - if (_tao_seq_len > strm.length ()) - { - return false; - } - - // Set the length of the sequence. - _tao_sequence.length (_tao_seq_len); - - // If length is 0 we return true. - if (0 >= _tao_seq_len) - { - return true; - } - - // Retrieve all the elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm >> _tao_sequence[i].out ()); - } - - return _tao_marshal_flag; - - } - - return false; + return TAO::demarshal_sequence(strm, _tao_sequence); } #endif /* _TAO_CDR_OP_CORBA_ValueDefSeq_CPP_ */ @@ -7294,25 +7192,7 @@ CORBA::Boolean operator<< ( const CORBA::AbstractInterfaceDefSeq &_tao_sequence ) { - const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = - TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::marshal ( - _tao_sequence[i].in (), strm - ); - } - - return _tao_marshal_flag; - } - - return false; + return TAO::marshal_sequence(strm, _tao_sequence); } CORBA::Boolean operator>> ( @@ -7320,40 +7200,7 @@ CORBA::Boolean operator>> ( CORBA::AbstractInterfaceDefSeq &_tao_sequence ) { - CORBA::ULong _tao_seq_len; - - if (strm >> _tao_seq_len) - { - // Add a check to the length of the sequence - // to make sure it does not exceed the length - // of the stream. (See bug 58.) - if (_tao_seq_len > strm.length ()) - { - return false; - } - - // Set the length of the sequence. - _tao_sequence.length (_tao_seq_len); - - // If length is 0 we return true. - if (0 >= _tao_seq_len) - { - return true; - } - - // Retrieve all the elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm >> _tao_sequence[i].out ()); - } - - return _tao_marshal_flag; - - } - - return false; + return TAO::demarshal_sequence(strm, _tao_sequence); } #endif /* _TAO_CDR_OP_CORBA_AbstractInterfaceDefSeq_CPP_ */ @@ -7369,25 +7216,7 @@ CORBA::Boolean operator<< ( const CORBA::LocalInterfaceDefSeq &_tao_sequence ) { - const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = - TAO::Objref_Traits<CORBA::LocalInterfaceDef>::marshal ( - _tao_sequence[i].in (), strm - ); - } - - return _tao_marshal_flag; - } - - return false; + return TAO::marshal_sequence(strm, _tao_sequence); } CORBA::Boolean operator>> ( @@ -7395,40 +7224,7 @@ CORBA::Boolean operator>> ( CORBA::LocalInterfaceDefSeq &_tao_sequence ) { - CORBA::ULong _tao_seq_len; - - if (strm >> _tao_seq_len) - { - // Add a check to the length of the sequence - // to make sure it does not exceed the length - // of the stream. (See bug 58.) - if (_tao_seq_len > strm.length ()) - { - return false; - } - - // Set the length of the sequence. - _tao_sequence.length (_tao_seq_len); - - // If length is 0 we return true. - if (0 >= _tao_seq_len) - { - return true; - } - - // Retrieve all the elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm >> _tao_sequence[i].out ()); - } - - return _tao_marshal_flag; - - } - - return false; + return TAO::demarshal_sequence(strm, _tao_sequence); } #endif /* _TAO_CDR_OP_CORBA_LocalInterfaceDefSeq_CPP_ */ @@ -7444,25 +7240,7 @@ CORBA::Boolean operator<< ( const CORBA::ExtInterfaceDefSeq &_tao_sequence ) { - const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = - TAO::Objref_Traits<CORBA::ExtInterfaceDef>::marshal ( - _tao_sequence[i].in (), strm - ); - } - - return _tao_marshal_flag; - } - - return false; + return TAO::marshal_sequence(strm, _tao_sequence); } CORBA::Boolean operator>> ( @@ -7470,40 +7248,7 @@ CORBA::Boolean operator>> ( CORBA::ExtInterfaceDefSeq &_tao_sequence ) { - CORBA::ULong _tao_seq_len; - - if (strm >> _tao_seq_len) - { - // Add a check to the length of the sequence - // to make sure it does not exceed the length - // of the stream. (See bug 58.) - if (_tao_seq_len > strm.length ()) - { - return false; - } - - // Set the length of the sequence. - _tao_sequence.length (_tao_seq_len); - - // If length is 0 we return true. - if (0 >= _tao_seq_len) - { - return true; - } - - // Retrieve all the elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm >> _tao_sequence[i].out ()); - } - - return _tao_marshal_flag; - - } - - return false; + return TAO::demarshal_sequence(strm, _tao_sequence); } #endif /* _TAO_CDR_OP_CORBA_ExtInterfaceDefSeq_CPP_ */ @@ -7519,25 +7264,7 @@ CORBA::Boolean operator<< ( const CORBA::ExtValueDefSeq &_tao_sequence ) { - const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = - TAO::Objref_Traits<CORBA::ExtValueDef>::marshal ( - _tao_sequence[i].in (), strm - ); - } - - return _tao_marshal_flag; - } - - return false; + return TAO::marshal_sequence(strm, _tao_sequence); } CORBA::Boolean operator>> ( @@ -7545,40 +7272,7 @@ CORBA::Boolean operator>> ( CORBA::ExtValueDefSeq &_tao_sequence ) { - CORBA::ULong _tao_seq_len; - - if (strm >> _tao_seq_len) - { - // Add a check to the length of the sequence - // to make sure it does not exceed the length - // of the stream. (See bug 58.) - if (_tao_seq_len > strm.length ()) - { - return false; - } - - // Set the length of the sequence. - _tao_sequence.length (_tao_seq_len); - - // If length is 0 we return true. - if (0 >= _tao_seq_len) - { - return true; - } - - // Retrieve all the elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm >> _tao_sequence[i].out ()); - } - - return _tao_marshal_flag; - - } - - return false; + return TAO::demarshal_sequence(strm, _tao_sequence); } #endif /* _TAO_CDR_OP_CORBA_ExtValueDefSeq_CPP_ */ @@ -7594,25 +7288,7 @@ CORBA::Boolean operator<< ( const CORBA::ExtAbstractInterfaceDefSeq &_tao_sequence ) { - const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = - TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::marshal ( - _tao_sequence[i].in (), strm - ); - } - - return _tao_marshal_flag; - } - - return false; + return TAO::marshal_sequence(strm, _tao_sequence); } CORBA::Boolean operator>> ( @@ -7620,40 +7296,7 @@ CORBA::Boolean operator>> ( CORBA::ExtAbstractInterfaceDefSeq &_tao_sequence ) { - CORBA::ULong _tao_seq_len; - - if (strm >> _tao_seq_len) - { - // Add a check to the length of the sequence - // to make sure it does not exceed the length - // of the stream. (See bug 58.) - if (_tao_seq_len > strm.length ()) - { - return false; - } - - // Set the length of the sequence. - _tao_sequence.length (_tao_seq_len); - - // If length is 0 we return true. - if (0 >= _tao_seq_len) - { - return true; - } - - // Retrieve all the elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm >> _tao_sequence[i].out ()); - } - - return _tao_marshal_flag; - - } - - return false; + return TAO::demarshal_sequence(strm, _tao_sequence); } #endif /* _TAO_CDR_OP_CORBA_ExtAbstractInterfaceDefSeq_CPP_ */ @@ -7669,25 +7312,7 @@ CORBA::Boolean operator<< ( const CORBA::ExtLocalInterfaceDefSeq &_tao_sequence ) { - const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = - TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::marshal ( - _tao_sequence[i].in (), strm - ); - } - - return _tao_marshal_flag; - } - - return false; + return TAO::marshal_sequence(strm, _tao_sequence); } CORBA::Boolean operator>> ( @@ -7695,40 +7320,7 @@ CORBA::Boolean operator>> ( CORBA::ExtLocalInterfaceDefSeq &_tao_sequence ) { - CORBA::ULong _tao_seq_len; - - if (strm >> _tao_seq_len) - { - // Add a check to the length of the sequence - // to make sure it does not exceed the length - // of the stream. (See bug 58.) - if (_tao_seq_len > strm.length ()) - { - return false; - } - - // Set the length of the sequence. - _tao_sequence.length (_tao_seq_len); - - // If length is 0 we return true. - if (0 >= _tao_seq_len) - { - return true; - } - - // Retrieve all the elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm >> _tao_sequence[i].out ()); - } - - return _tao_marshal_flag; - - } - - return false; + return TAO::demarshal_sequence(strm, _tao_sequence); } #endif /* _TAO_CDR_OP_CORBA_ExtLocalInterfaceDefSeq_CPP_ */ @@ -7744,25 +7336,7 @@ CORBA::Boolean operator<< ( const CORBA::ContainedSeq &_tao_sequence ) { - const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = - TAO::Objref_Traits<CORBA::Contained>::marshal ( - _tao_sequence[i].in (), strm - ); - } - - return _tao_marshal_flag; - } - - return false; + return TAO::marshal_sequence(strm, _tao_sequence); } CORBA::Boolean operator>> ( @@ -7770,40 +7344,7 @@ CORBA::Boolean operator>> ( CORBA::ContainedSeq &_tao_sequence ) { - CORBA::ULong _tao_seq_len; - - if (strm >> _tao_seq_len) - { - // Add a check to the length of the sequence - // to make sure it does not exceed the length - // of the stream. (See bug 58.) - if (_tao_seq_len > strm.length ()) - { - return false; - } - - // Set the length of the sequence. - _tao_sequence.length (_tao_seq_len); - - // If length is 0 we return true. - if (0 >= _tao_seq_len) - { - return true; - } - - // Retrieve all the elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm >> _tao_sequence[i].out ()); - } - - return _tao_marshal_flag; - - } - - return false; + return TAO::demarshal_sequence(strm, _tao_sequence); } #endif /* _TAO_CDR_OP_CORBA_ContainedSeq_CPP_ */ @@ -7847,22 +7388,7 @@ CORBA::Boolean operator<< ( const CORBA::StructMemberSeq &_tao_sequence ) { - const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm << _tao_sequence[i]); - } - - return _tao_marshal_flag; - } - - return false; + return TAO::marshal_sequence(strm, _tao_sequence); } CORBA::Boolean operator>> ( @@ -7870,40 +7396,7 @@ CORBA::Boolean operator>> ( CORBA::StructMemberSeq &_tao_sequence ) { - CORBA::ULong _tao_seq_len; - - if (strm >> _tao_seq_len) - { - // Add a check to the length of the sequence - // to make sure it does not exceed the length - // of the stream. (See bug 58.) - if (_tao_seq_len > strm.length ()) - { - return false; - } - - // Set the length of the sequence. - _tao_sequence.length (_tao_seq_len); - - // If length is 0 we return true. - if (0 >= _tao_seq_len) - { - return true; - } - - // Retrieve all the elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm >> _tao_sequence[i]); - } - - return _tao_marshal_flag; - - } - - return false; + return TAO::demarshal_sequence(strm, _tao_sequence); } #endif /* _TAO_CDR_OP_CORBA_StructMemberSeq_CPP_ */ @@ -7942,22 +7435,7 @@ CORBA::Boolean operator<< ( const CORBA::InitializerSeq &_tao_sequence ) { - const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm << _tao_sequence[i]); - } - - return _tao_marshal_flag; - } - - return false; + return TAO::marshal_sequence(strm, _tao_sequence); } CORBA::Boolean operator>> ( @@ -7965,40 +7443,7 @@ CORBA::Boolean operator>> ( CORBA::InitializerSeq &_tao_sequence ) { - CORBA::ULong _tao_seq_len; - - if (strm >> _tao_seq_len) - { - // Add a check to the length of the sequence - // to make sure it does not exceed the length - // of the stream. (See bug 58.) - if (_tao_seq_len > strm.length ()) - { - return false; - } - - // Set the length of the sequence. - _tao_sequence.length (_tao_seq_len); - - // If length is 0 we return true. - if (0 >= _tao_seq_len) - { - return true; - } - - // Retrieve all the elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm >> _tao_sequence[i]); - } - - return _tao_marshal_flag; - - } - - return false; + return TAO::demarshal_sequence(strm, _tao_sequence); } #endif /* _TAO_CDR_OP_CORBA_InitializerSeq_CPP_ */ @@ -8043,22 +7488,7 @@ CORBA::Boolean operator<< ( const CORBA::ExcDescriptionSeq &_tao_sequence ) { - const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm << _tao_sequence[i]); - } - - return _tao_marshal_flag; - } - - return false; + return TAO::marshal_sequence(strm, _tao_sequence); } CORBA::Boolean operator>> ( @@ -8066,40 +7496,7 @@ CORBA::Boolean operator>> ( CORBA::ExcDescriptionSeq &_tao_sequence ) { - CORBA::ULong _tao_seq_len; - - if (strm >> _tao_seq_len) - { - // Add a check to the length of the sequence - // to make sure it does not exceed the length - // of the stream. (See bug 58.) - if (_tao_seq_len > strm.length ()) - { - return false; - } - - // Set the length of the sequence. - _tao_sequence.length (_tao_seq_len); - - // If length is 0 we return true. - if (0 >= _tao_seq_len) - { - return true; - } - - // Retrieve all the elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm >> _tao_sequence[i]); - } - - return _tao_marshal_flag; - - } - - return false; + return TAO::demarshal_sequence(strm, _tao_sequence); } #endif /* _TAO_CDR_OP_CORBA_ExcDescriptionSeq_CPP_ */ @@ -8140,22 +7537,7 @@ CORBA::Boolean operator<< ( const CORBA::ExtInitializerSeq &_tao_sequence ) { - const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm << _tao_sequence[i]); - } - - return _tao_marshal_flag; - } - - return false; + return TAO::marshal_sequence(strm, _tao_sequence); } CORBA::Boolean operator>> ( @@ -8163,40 +7545,7 @@ CORBA::Boolean operator>> ( CORBA::ExtInitializerSeq &_tao_sequence ) { - CORBA::ULong _tao_seq_len; - - if (strm >> _tao_seq_len) - { - // Add a check to the length of the sequence - // to make sure it does not exceed the length - // of the stream. (See bug 58.) - if (_tao_seq_len > strm.length ()) - { - return false; - } - - // Set the length of the sequence. - _tao_sequence.length (_tao_seq_len); - - // If length is 0 we return true. - if (0 >= _tao_seq_len) - { - return true; - } - - // Retrieve all the elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm >> _tao_sequence[i]); - } - - return _tao_marshal_flag; - - } - - return false; + return TAO::demarshal_sequence(strm, _tao_sequence); } #endif /* _TAO_CDR_OP_CORBA_ExtInitializerSeq_CPP_ */ @@ -8242,22 +7591,7 @@ CORBA::Boolean operator<< ( const CORBA::UnionMemberSeq &_tao_sequence ) { - const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm << _tao_sequence[i]); - } - - return _tao_marshal_flag; - } - - return false; + return TAO::marshal_sequence(strm, _tao_sequence); } CORBA::Boolean operator>> ( @@ -8265,40 +7599,7 @@ CORBA::Boolean operator>> ( CORBA::UnionMemberSeq &_tao_sequence ) { - CORBA::ULong _tao_seq_len; - - if (strm >> _tao_seq_len) - { - // Add a check to the length of the sequence - // to make sure it does not exceed the length - // of the stream. (See bug 58.) - if (_tao_seq_len > strm.length ()) - { - return false; - } - - // Set the length of the sequence. - _tao_sequence.length (_tao_seq_len); - - // If length is 0 we return true. - if (0 >= _tao_seq_len) - { - return true; - } - - // Retrieve all the elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm >> _tao_sequence[i]); - } - - return _tao_marshal_flag; - - } - - return false; + return TAO::demarshal_sequence(strm, _tao_sequence); } #endif /* _TAO_CDR_OP_CORBA_UnionMemberSeq_CPP_ */ @@ -8314,22 +7615,7 @@ CORBA::Boolean operator<< ( const CORBA::EnumMemberSeq &_tao_sequence ) { - const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm << _tao_sequence[i].in ()); - } - - return _tao_marshal_flag; - } - - return false; + return TAO::marshal_sequence(strm, _tao_sequence); } CORBA::Boolean operator>> ( @@ -8337,41 +7623,7 @@ CORBA::Boolean operator>> ( CORBA::EnumMemberSeq &_tao_sequence ) { - CORBA::ULong _tao_seq_len; - - if (strm >> _tao_seq_len) - { - // Add a check to the length of the sequence - // to make sure it does not exceed the length - // of the stream. (See bug 58.) - if (_tao_seq_len > strm.length ()) - { - return false; - } - - // Set the length of the sequence. - _tao_sequence.length (_tao_seq_len); - - // If length is 0 we return true. - if (0 >= _tao_seq_len) - { - return true; - } - - // Retrieve all the elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm >> _tao_sequence[i].out ()); - - } - - return _tao_marshal_flag; - - } - -return false; + return TAO::demarshal_sequence(strm, _tao_sequence); } #endif /* _TAO_CDR_OP_CORBA_EnumMemberSeq_CPP_ */ @@ -8415,22 +7667,7 @@ CORBA::Boolean operator<< ( const CORBA::Container::DescriptionSeq &_tao_sequence ) { - const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm << _tao_sequence[i]); - } - - return _tao_marshal_flag; - } - - return false; + return TAO::marshal_sequence(strm, _tao_sequence); } CORBA::Boolean operator>> ( @@ -8438,40 +7675,7 @@ CORBA::Boolean operator>> ( CORBA::Container::DescriptionSeq &_tao_sequence ) { - CORBA::ULong _tao_seq_len; - - if (strm >> _tao_seq_len) - { - // Add a check to the length of the sequence - // to make sure it does not exceed the length - // of the stream. (See bug 58.) - if (_tao_seq_len > strm.length ()) - { - return false; - } - - // Set the length of the sequence. - _tao_sequence.length (_tao_seq_len); - - // If length is 0 we return true. - if (0 >= _tao_seq_len) - { - return true; - } - - // Retrieve all the elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm >> _tao_sequence[i]); - } - - return _tao_marshal_flag; - - } - - return false; + return TAO::demarshal_sequence(strm, _tao_sequence); } #endif /* _TAO_CDR_OP_CORBA_Container_DescriptionSeq_CPP_ */ @@ -8494,21 +7698,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::Container RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_Container_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -8530,21 +7734,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::IDLType RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_IDLType_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -8566,21 +7770,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::TypedefDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_TypedefDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } diff --git a/TAO/tao/IFR_Client/IFR_BaseC.h b/TAO/tao/IFR_Client/IFR_BaseC.h index 774ff7f019f..b8afb930ab7 100644 --- a/TAO/tao/IFR_Client/IFR_BaseC.h +++ b/TAO/tao/IFR_Client/IFR_BaseC.h @@ -517,7 +517,7 @@ namespace CORBA typedef Description_var _var_type; static void _tao_any_destructor (void *); - ACE_NESTED_CLASS (CORBA, DefinitionKind) kind; + ::CORBA::DefinitionKind kind; CORBA::Any value; }; @@ -793,29 +793,20 @@ namespace CORBA class InterfaceDefSeq; typedef - TAO_MngSeq_Var_T< - InterfaceDefSeq, - TAO_Object_Manager< - InterfaceDef, - InterfaceDef_var - > + TAO_VarSeq_Var_T< + InterfaceDefSeq > InterfaceDefSeq_var; typedef - TAO_MngSeq_Out_T< - InterfaceDefSeq, - InterfaceDefSeq_var, - TAO_Object_Manager< - InterfaceDef, - InterfaceDef_var - > + TAO_Seq_Out_T< + InterfaceDefSeq > InterfaceDefSeq_out; class TAO_IFR_Client_Export InterfaceDefSeq : public - TAO_Unbounded_Object_Sequence< + TAO::unbounded_object_reference_sequence< InterfaceDef, InterfaceDef_var > @@ -827,7 +818,7 @@ namespace CORBA CORBA::ULong max, CORBA::ULong length, InterfaceDef_ptr* buffer, - CORBA::Boolean release = 0 + CORBA::Boolean release = false ); InterfaceDefSeq (const InterfaceDefSeq &); ~InterfaceDefSeq (void); @@ -922,29 +913,20 @@ namespace CORBA class ValueDefSeq; typedef - TAO_MngSeq_Var_T< - ValueDefSeq, - TAO_Object_Manager< - ValueDef, - ValueDef_var - > + TAO_VarSeq_Var_T< + ValueDefSeq > ValueDefSeq_var; typedef - TAO_MngSeq_Out_T< - ValueDefSeq, - ValueDefSeq_var, - TAO_Object_Manager< - ValueDef, - ValueDef_var - > + TAO_Seq_Out_T< + ValueDefSeq > ValueDefSeq_out; class TAO_IFR_Client_Export ValueDefSeq : public - TAO_Unbounded_Object_Sequence< + TAO::unbounded_object_reference_sequence< ValueDef, ValueDef_var > @@ -956,7 +938,7 @@ namespace CORBA CORBA::ULong max, CORBA::ULong length, ValueDef_ptr* buffer, - CORBA::Boolean release = 0 + CORBA::Boolean release = false ); ValueDefSeq (const ValueDefSeq &); ~ValueDefSeq (void); @@ -1028,29 +1010,20 @@ namespace CORBA class AbstractInterfaceDefSeq; typedef - TAO_MngSeq_Var_T< - AbstractInterfaceDefSeq, - TAO_Object_Manager< - AbstractInterfaceDef, - AbstractInterfaceDef_var - > + TAO_VarSeq_Var_T< + AbstractInterfaceDefSeq > AbstractInterfaceDefSeq_var; typedef - TAO_MngSeq_Out_T< - AbstractInterfaceDefSeq, - AbstractInterfaceDefSeq_var, - TAO_Object_Manager< - AbstractInterfaceDef, - AbstractInterfaceDef_var - > + TAO_Seq_Out_T< + AbstractInterfaceDefSeq > AbstractInterfaceDefSeq_out; class TAO_IFR_Client_Export AbstractInterfaceDefSeq : public - TAO_Unbounded_Object_Sequence< + TAO::unbounded_object_reference_sequence< AbstractInterfaceDef, AbstractInterfaceDef_var > @@ -1062,7 +1035,7 @@ namespace CORBA CORBA::ULong max, CORBA::ULong length, AbstractInterfaceDef_ptr* buffer, - CORBA::Boolean release = 0 + CORBA::Boolean release = false ); AbstractInterfaceDefSeq (const AbstractInterfaceDefSeq &); ~AbstractInterfaceDefSeq (void); @@ -1111,29 +1084,20 @@ namespace CORBA class LocalInterfaceDefSeq; typedef - TAO_MngSeq_Var_T< - LocalInterfaceDefSeq, - TAO_Object_Manager< - LocalInterfaceDef, - LocalInterfaceDef_var - > + TAO_VarSeq_Var_T< + LocalInterfaceDefSeq > LocalInterfaceDefSeq_var; typedef - TAO_MngSeq_Out_T< - LocalInterfaceDefSeq, - LocalInterfaceDefSeq_var, - TAO_Object_Manager< - LocalInterfaceDef, - LocalInterfaceDef_var - > + TAO_Seq_Out_T< + LocalInterfaceDefSeq > LocalInterfaceDefSeq_out; class TAO_IFR_Client_Export LocalInterfaceDefSeq : public - TAO_Unbounded_Object_Sequence< + TAO::unbounded_object_reference_sequence< LocalInterfaceDef, LocalInterfaceDef_var > @@ -1145,7 +1109,7 @@ namespace CORBA CORBA::ULong max, CORBA::ULong length, LocalInterfaceDef_ptr* buffer, - CORBA::Boolean release = 0 + CORBA::Boolean release = false ); LocalInterfaceDefSeq (const LocalInterfaceDefSeq &); ~LocalInterfaceDefSeq (void); @@ -1194,29 +1158,20 @@ namespace CORBA class ExtInterfaceDefSeq; typedef - TAO_MngSeq_Var_T< - ExtInterfaceDefSeq, - TAO_Object_Manager< - ExtInterfaceDef, - ExtInterfaceDef_var - > + TAO_VarSeq_Var_T< + ExtInterfaceDefSeq > ExtInterfaceDefSeq_var; typedef - TAO_MngSeq_Out_T< - ExtInterfaceDefSeq, - ExtInterfaceDefSeq_var, - TAO_Object_Manager< - ExtInterfaceDef, - ExtInterfaceDef_var - > + TAO_Seq_Out_T< + ExtInterfaceDefSeq > ExtInterfaceDefSeq_out; class TAO_IFR_Client_Export ExtInterfaceDefSeq : public - TAO_Unbounded_Object_Sequence< + TAO::unbounded_object_reference_sequence< ExtInterfaceDef, ExtInterfaceDef_var > @@ -1228,7 +1183,7 @@ namespace CORBA CORBA::ULong max, CORBA::ULong length, ExtInterfaceDef_ptr* buffer, - CORBA::Boolean release = 0 + CORBA::Boolean release = false ); ExtInterfaceDefSeq (const ExtInterfaceDefSeq &); ~ExtInterfaceDefSeq (void); @@ -1277,29 +1232,20 @@ namespace CORBA class ExtValueDefSeq; typedef - TAO_MngSeq_Var_T< - ExtValueDefSeq, - TAO_Object_Manager< - ExtValueDef, - ExtValueDef_var - > + TAO_VarSeq_Var_T< + ExtValueDefSeq > ExtValueDefSeq_var; typedef - TAO_MngSeq_Out_T< - ExtValueDefSeq, - ExtValueDefSeq_var, - TAO_Object_Manager< - ExtValueDef, - ExtValueDef_var - > + TAO_Seq_Out_T< + ExtValueDefSeq > ExtValueDefSeq_out; class TAO_IFR_Client_Export ExtValueDefSeq : public - TAO_Unbounded_Object_Sequence< + TAO::unbounded_object_reference_sequence< ExtValueDef, ExtValueDef_var > @@ -1311,7 +1257,7 @@ namespace CORBA CORBA::ULong max, CORBA::ULong length, ExtValueDef_ptr* buffer, - CORBA::Boolean release = 0 + CORBA::Boolean release = false ); ExtValueDefSeq (const ExtValueDefSeq &); ~ExtValueDefSeq (void); @@ -1360,29 +1306,20 @@ namespace CORBA class ExtAbstractInterfaceDefSeq; typedef - TAO_MngSeq_Var_T< - ExtAbstractInterfaceDefSeq, - TAO_Object_Manager< - ExtAbstractInterfaceDef, - ExtAbstractInterfaceDef_var - > + TAO_VarSeq_Var_T< + ExtAbstractInterfaceDefSeq > ExtAbstractInterfaceDefSeq_var; typedef - TAO_MngSeq_Out_T< - ExtAbstractInterfaceDefSeq, - ExtAbstractInterfaceDefSeq_var, - TAO_Object_Manager< - ExtAbstractInterfaceDef, - ExtAbstractInterfaceDef_var - > + TAO_Seq_Out_T< + ExtAbstractInterfaceDefSeq > ExtAbstractInterfaceDefSeq_out; class TAO_IFR_Client_Export ExtAbstractInterfaceDefSeq : public - TAO_Unbounded_Object_Sequence< + TAO::unbounded_object_reference_sequence< ExtAbstractInterfaceDef, ExtAbstractInterfaceDef_var > @@ -1394,7 +1331,7 @@ namespace CORBA CORBA::ULong max, CORBA::ULong length, ExtAbstractInterfaceDef_ptr* buffer, - CORBA::Boolean release = 0 + CORBA::Boolean release = false ); ExtAbstractInterfaceDefSeq (const ExtAbstractInterfaceDefSeq &); ~ExtAbstractInterfaceDefSeq (void); @@ -1443,29 +1380,20 @@ namespace CORBA class ExtLocalInterfaceDefSeq; typedef - TAO_MngSeq_Var_T< - ExtLocalInterfaceDefSeq, - TAO_Object_Manager< - ExtLocalInterfaceDef, - ExtLocalInterfaceDef_var - > + TAO_VarSeq_Var_T< + ExtLocalInterfaceDefSeq > ExtLocalInterfaceDefSeq_var; typedef - TAO_MngSeq_Out_T< - ExtLocalInterfaceDefSeq, - ExtLocalInterfaceDefSeq_var, - TAO_Object_Manager< - ExtLocalInterfaceDef, - ExtLocalInterfaceDef_var - > + TAO_Seq_Out_T< + ExtLocalInterfaceDefSeq > ExtLocalInterfaceDefSeq_out; class TAO_IFR_Client_Export ExtLocalInterfaceDefSeq : public - TAO_Unbounded_Object_Sequence< + TAO::unbounded_object_reference_sequence< ExtLocalInterfaceDef, ExtLocalInterfaceDef_var > @@ -1477,7 +1405,7 @@ namespace CORBA CORBA::ULong max, CORBA::ULong length, ExtLocalInterfaceDef_ptr* buffer, - CORBA::Boolean release = 0 + CORBA::Boolean release = false ); ExtLocalInterfaceDefSeq (const ExtLocalInterfaceDefSeq &); ~ExtLocalInterfaceDefSeq (void); @@ -1503,29 +1431,20 @@ namespace CORBA class ContainedSeq; typedef - TAO_MngSeq_Var_T< - ContainedSeq, - TAO_Object_Manager< - Contained, - Contained_var - > + TAO_VarSeq_Var_T< + ContainedSeq > ContainedSeq_var; typedef - TAO_MngSeq_Out_T< - ContainedSeq, - ContainedSeq_var, - TAO_Object_Manager< - Contained, - Contained_var - > + TAO_Seq_Out_T< + ContainedSeq > ContainedSeq_out; class TAO_IFR_Client_Export ContainedSeq : public - TAO_Unbounded_Object_Sequence< + TAO::unbounded_object_reference_sequence< Contained, Contained_var > @@ -1537,7 +1456,7 @@ namespace CORBA CORBA::ULong max, CORBA::ULong length, Contained_ptr* buffer, - CORBA::Boolean release = 0 + CORBA::Boolean release = false ); ContainedSeq (const ContainedSeq &); ~ContainedSeq (void); @@ -1580,7 +1499,7 @@ namespace CORBA typedef StructMember_var _var_type; static void _tao_any_destructor (void *); - TAO_String_Manager name; + TAO::String_Manager name; CORBA::TypeCode_var type; CORBA::IDLType_var type_def; }; @@ -1600,22 +1519,19 @@ namespace CORBA typedef TAO_VarSeq_Var_T< - StructMemberSeq, - StructMember + StructMemberSeq > StructMemberSeq_var; typedef TAO_Seq_Out_T< - StructMemberSeq, - StructMemberSeq_var, - StructMember + StructMemberSeq > StructMemberSeq_out; class TAO_IFR_Client_Export StructMemberSeq : public - TAO_Unbounded_Sequence< + TAO::unbounded_value_sequence< StructMember > { @@ -1626,7 +1542,7 @@ namespace CORBA CORBA::ULong max, CORBA::ULong length, StructMember* buffer, - CORBA::Boolean release = 0 + CORBA::Boolean release = false ); StructMemberSeq (const StructMemberSeq &); ~StructMemberSeq (void); @@ -1670,7 +1586,7 @@ namespace CORBA static void _tao_any_destructor (void *); CORBA::StructMemberSeq members; - TAO_String_Manager name; + TAO::String_Manager name; }; // TAO_IDL - Generated from @@ -1688,22 +1604,19 @@ namespace CORBA typedef TAO_VarSeq_Var_T< - InitializerSeq, - Initializer + InitializerSeq > InitializerSeq_var; typedef TAO_Seq_Out_T< - InitializerSeq, - InitializerSeq_var, - Initializer + InitializerSeq > InitializerSeq_out; class TAO_IFR_Client_Export InitializerSeq : public - TAO_Unbounded_Sequence< + TAO::unbounded_value_sequence< Initializer > { @@ -1714,7 +1627,7 @@ namespace CORBA CORBA::ULong max, CORBA::ULong length, Initializer* buffer, - CORBA::Boolean release = 0 + CORBA::Boolean release = false ); InitializerSeq (const InitializerSeq &); ~InitializerSeq (void); @@ -1757,10 +1670,10 @@ namespace CORBA typedef ExceptionDescription_var _var_type; static void _tao_any_destructor (void *); - TAO_String_Manager name; - TAO_String_Manager id; - TAO_String_Manager defined_in; - TAO_String_Manager version; + TAO::String_Manager name; + TAO::String_Manager id; + TAO::String_Manager defined_in; + TAO::String_Manager version; CORBA::TypeCode_var type; }; @@ -1779,22 +1692,19 @@ namespace CORBA typedef TAO_VarSeq_Var_T< - ExcDescriptionSeq, - ExceptionDescription + ExcDescriptionSeq > ExcDescriptionSeq_var; typedef TAO_Seq_Out_T< - ExcDescriptionSeq, - ExcDescriptionSeq_var, - ExceptionDescription + ExcDescriptionSeq > ExcDescriptionSeq_out; class TAO_IFR_Client_Export ExcDescriptionSeq : public - TAO_Unbounded_Sequence< + TAO::unbounded_value_sequence< ExceptionDescription > { @@ -1805,7 +1715,7 @@ namespace CORBA CORBA::ULong max, CORBA::ULong length, ExceptionDescription* buffer, - CORBA::Boolean release = 0 + CORBA::Boolean release = false ); ExcDescriptionSeq (const ExcDescriptionSeq &); ~ExcDescriptionSeq (void); @@ -1850,7 +1760,7 @@ namespace CORBA static void _tao_any_destructor (void *); CORBA::StructMemberSeq members; CORBA::ExcDescriptionSeq exceptions; - TAO_String_Manager name; + TAO::String_Manager name; }; // TAO_IDL - Generated from @@ -1868,22 +1778,19 @@ namespace CORBA typedef TAO_VarSeq_Var_T< - ExtInitializerSeq, - ExtInitializer + ExtInitializerSeq > ExtInitializerSeq_var; typedef TAO_Seq_Out_T< - ExtInitializerSeq, - ExtInitializerSeq_var, - ExtInitializer + ExtInitializerSeq > ExtInitializerSeq_out; class TAO_IFR_Client_Export ExtInitializerSeq : public - TAO_Unbounded_Sequence< + TAO::unbounded_value_sequence< ExtInitializer > { @@ -1894,7 +1801,7 @@ namespace CORBA CORBA::ULong max, CORBA::ULong length, ExtInitializer* buffer, - CORBA::Boolean release = 0 + CORBA::Boolean release = false ); ExtInitializerSeq (const ExtInitializerSeq &); ~ExtInitializerSeq (void); @@ -1937,7 +1844,7 @@ namespace CORBA typedef UnionMember_var _var_type; static void _tao_any_destructor (void *); - TAO_String_Manager name; + TAO::String_Manager name; CORBA::Any label; CORBA::TypeCode_var type; CORBA::IDLType_var type_def; @@ -1958,22 +1865,19 @@ namespace CORBA typedef TAO_VarSeq_Var_T< - UnionMemberSeq, - UnionMember + UnionMemberSeq > UnionMemberSeq_var; typedef TAO_Seq_Out_T< - UnionMemberSeq, - UnionMemberSeq_var, - UnionMember + UnionMemberSeq > UnionMemberSeq_out; class TAO_IFR_Client_Export UnionMemberSeq : public - TAO_Unbounded_Sequence< + TAO::unbounded_value_sequence< UnionMember > { @@ -1984,7 +1888,7 @@ namespace CORBA CORBA::ULong max, CORBA::ULong length, UnionMember* buffer, - CORBA::Boolean release = 0 + CORBA::Boolean release = false ); UnionMemberSeq (const UnionMemberSeq &); ~UnionMemberSeq (void); @@ -2010,23 +1914,20 @@ namespace CORBA class EnumMemberSeq; typedef - TAO_MngSeq_Var_T< - EnumMemberSeq, - TAO_SeqElem_String_Manager + TAO_VarSeq_Var_T< + EnumMemberSeq > EnumMemberSeq_var; typedef - TAO_MngSeq_Out_T< - EnumMemberSeq, - EnumMemberSeq_var, - TAO_SeqElem_String_Manager + TAO_Seq_Out_T< + EnumMemberSeq > EnumMemberSeq_out; class TAO_IFR_Client_Export EnumMemberSeq : public - TAO_Unbounded_String_Sequence + TAO::unbounded_string_sequence { public: EnumMemberSeq (void); @@ -2035,7 +1936,7 @@ namespace CORBA CORBA::ULong max, CORBA::ULong length, char ** buffer, - CORBA::Boolean release = 0 + CORBA::Boolean release = false ); EnumMemberSeq (const EnumMemberSeq &); ~EnumMemberSeq (void); @@ -2151,8 +2052,8 @@ namespace CORBA typedef Description_var _var_type; static void _tao_any_destructor (void *); - ACE_NESTED_CLASS (CORBA, Contained_var) contained_object; - ACE_NESTED_CLASS (CORBA, DefinitionKind) kind; + ::CORBA::Contained_var contained_object; + ::CORBA::DefinitionKind kind; CORBA::Any value; }; @@ -2171,22 +2072,19 @@ namespace CORBA typedef TAO_VarSeq_Var_T< - DescriptionSeq, - Description + DescriptionSeq > DescriptionSeq_var; typedef TAO_Seq_Out_T< - DescriptionSeq, - DescriptionSeq_var, - Description + DescriptionSeq > DescriptionSeq_out; class TAO_IFR_Client_Export DescriptionSeq : public - TAO_Unbounded_Sequence< + TAO::unbounded_value_sequence< Description > { @@ -2197,7 +2095,7 @@ namespace CORBA CORBA::ULong max, CORBA::ULong length, Description* buffer, - CORBA::Boolean release = 0 + CORBA::Boolean release = false ); DescriptionSeq (const DescriptionSeq &); ~DescriptionSeq (void); @@ -2720,10 +2618,10 @@ namespace CORBA typedef TypeDescription_var _var_type; static void _tao_any_destructor (void *); - TAO_String_Manager name; - TAO_String_Manager id; - TAO_String_Manager defined_in; - TAO_String_Manager version; + TAO::String_Manager name; + TAO::String_Manager id; + TAO::String_Manager defined_in; + TAO::String_Manager version; CORBA::TypeCode_var type; }; diff --git a/TAO/tao/IFR_Client/IFR_BaseC.inl b/TAO/tao/IFR_Client/IFR_BaseC.inl index c7be5ed5427..ac770e58826 100644 --- a/TAO/tao/IFR_Client/IFR_BaseC.inl +++ b/TAO/tao/IFR_Client/IFR_BaseC.inl @@ -41,7 +41,7 @@ CORBA::IRObject::IRObject ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -57,7 +57,7 @@ CORBA::IRObject::IRObject ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_IRObject_Proxy_Broker_ (0) { } @@ -77,7 +77,7 @@ CORBA::Contained::Contained ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -93,7 +93,7 @@ CORBA::Contained::Contained ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_Contained_Proxy_Broker_ (0) { } @@ -113,7 +113,7 @@ CORBA::Container::Container ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -129,7 +129,7 @@ CORBA::Container::Container ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_Container_Proxy_Broker_ (0) { } @@ -149,7 +149,7 @@ CORBA::IDLType::IDLType ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -165,7 +165,7 @@ CORBA::IDLType::IDLType ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_IDLType_Proxy_Broker_ (0) { } @@ -185,7 +185,7 @@ CORBA::TypedefDef::TypedefDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -201,7 +201,7 @@ CORBA::TypedefDef::TypedefDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_TypedefDef_Proxy_Broker_ (0) { } diff --git a/TAO/tao/IFR_Client/IFR_BasicC.cpp b/TAO/tao/IFR_Client/IFR_BasicC.cpp index 73a0a993997..bcaf1168857 100644 --- a/TAO/tao/IFR_Client/IFR_BasicC.cpp +++ b/TAO/tao/IFR_Client/IFR_BasicC.cpp @@ -646,7 +646,7 @@ TAO::Objref_Traits<CORBA::Repository>::release ( CORBA::Repository_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::Repository_ptr @@ -683,7 +683,7 @@ TAO::Collocation_Proxy_Broker * { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_Repository_Proxy_Broker_ == 0) @@ -728,7 +728,7 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_Repository_Proxy_Broker_ == 0) @@ -773,7 +773,7 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_Repository_Proxy_Broker_ == 0) @@ -818,7 +818,7 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_Repository_Proxy_Broker_ == 0) @@ -863,7 +863,7 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_Repository_Proxy_Broker_ == 0) @@ -909,7 +909,7 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_Repository_Proxy_Broker_ == 0) @@ -957,7 +957,7 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_Repository_Proxy_Broker_ == 0) @@ -1005,7 +1005,7 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_Repository_Proxy_Broker_ == 0) @@ -1065,7 +1065,7 @@ CORBA::Repository::_tao_any_destructor (void *_tao_void_pointer) { Repository *_tao_tmp_pointer = static_cast<Repository *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::Repository_ptr @@ -1101,7 +1101,7 @@ CORBA::Repository::_unchecked_narrow ( CORBA::Repository_ptr CORBA::Repository::_duplicate (Repository_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } @@ -1112,7 +1112,7 @@ CORBA::Repository::_duplicate (Repository_ptr obj) void CORBA::Repository::_tao_release (Repository_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -1144,7 +1144,7 @@ CORBA::Repository::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -1198,7 +1198,7 @@ TAO::Objref_Traits<CORBA::ModuleDef>::release ( CORBA::ModuleDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::ModuleDef_ptr @@ -1249,7 +1249,7 @@ CORBA::ModuleDef::_tao_any_destructor (void *_tao_void_pointer) { ModuleDef *_tao_tmp_pointer = static_cast<ModuleDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::ModuleDef_ptr @@ -1285,7 +1285,7 @@ CORBA::ModuleDef::_unchecked_narrow ( CORBA::ModuleDef_ptr CORBA::ModuleDef::_duplicate (ModuleDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } @@ -1296,7 +1296,7 @@ CORBA::ModuleDef::_duplicate (ModuleDef_ptr obj) void CORBA::ModuleDef::_tao_release (ModuleDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -1332,7 +1332,7 @@ CORBA::ModuleDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -1429,7 +1429,7 @@ TAO::Objref_Traits<CORBA::ConstantDef>::release ( CORBA::ConstantDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::ConstantDef_ptr @@ -1465,7 +1465,7 @@ CORBA::TypeCode_ptr CORBA::ConstantDef::type ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_ConstantDef_Proxy_Broker_ == 0) @@ -1507,7 +1507,7 @@ CORBA::TypeCode_ptr CORBA::ConstantDef::type ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_ConstantDef_Proxy_Broker_ == 0) @@ -1550,7 +1550,7 @@ void CORBA::ConstantDef::type_def ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_ConstantDef_Proxy_Broker_ == 0) @@ -1592,7 +1592,7 @@ CORBA::Any * CORBA::ConstantDef::value ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_ConstantDef_Proxy_Broker_ == 0) @@ -1635,7 +1635,7 @@ void CORBA::ConstantDef::value ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_ConstantDef_Proxy_Broker_ == 0) @@ -1691,7 +1691,7 @@ CORBA::ConstantDef::_tao_any_destructor (void *_tao_void_pointer) { ConstantDef *_tao_tmp_pointer = static_cast<ConstantDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::ConstantDef_ptr @@ -1727,7 +1727,7 @@ CORBA::ConstantDef::_unchecked_narrow ( CORBA::ConstantDef_ptr CORBA::ConstantDef::_duplicate (ConstantDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } @@ -1738,7 +1738,7 @@ CORBA::ConstantDef::_duplicate (ConstantDef_ptr obj) void CORBA::ConstantDef::_tao_release (ConstantDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -1770,7 +1770,7 @@ CORBA::ConstantDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -1869,7 +1869,7 @@ TAO::Objref_Traits<CORBA::StructDef>::release ( CORBA::StructDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::StructDef_ptr @@ -1905,7 +1905,7 @@ TAO::Collocation_Proxy_Broker * { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_StructDef_Proxy_Broker_ == 0) @@ -1948,7 +1948,7 @@ void CORBA::StructDef::members ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_StructDef_Proxy_Broker_ == 0) @@ -2005,7 +2005,7 @@ CORBA::StructDef::_tao_any_destructor (void *_tao_void_pointer) { StructDef *_tao_tmp_pointer = static_cast<StructDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::StructDef_ptr @@ -2041,7 +2041,7 @@ CORBA::StructDef::_unchecked_narrow ( CORBA::StructDef_ptr CORBA::StructDef::_duplicate (StructDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } @@ -2052,7 +2052,7 @@ CORBA::StructDef::_duplicate (StructDef_ptr obj) void CORBA::StructDef::_tao_release (StructDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -2096,7 +2096,7 @@ CORBA::StructDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -2150,7 +2150,7 @@ TAO::Objref_Traits<CORBA::UnionDef>::release ( CORBA::UnionDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::UnionDef_ptr @@ -2186,7 +2186,7 @@ CORBA::TypeCode_ptr CORBA::UnionDef::discriminator_type ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_UnionDef_Proxy_Broker_ == 0) @@ -2228,7 +2228,7 @@ CORBA::TypeCode_ptr CORBA::UnionDef::discriminator_type ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_UnionDef_Proxy_Broker_ == 0) @@ -2271,7 +2271,7 @@ void CORBA::UnionDef::discriminator_type_def ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_UnionDef_Proxy_Broker_ == 0) @@ -2313,7 +2313,7 @@ void CORBA::UnionDef::discriminator_type_def ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_UnionDef_Proxy_Broker_ == 0) @@ -2356,7 +2356,7 @@ void CORBA::UnionDef::members ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_UnionDef_Proxy_Broker_ == 0) @@ -2413,7 +2413,7 @@ CORBA::UnionDef::_tao_any_destructor (void *_tao_void_pointer) { UnionDef *_tao_tmp_pointer = static_cast<UnionDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::UnionDef_ptr @@ -2449,7 +2449,7 @@ CORBA::UnionDef::_unchecked_narrow ( CORBA::UnionDef_ptr CORBA::UnionDef::_duplicate (UnionDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } @@ -2460,7 +2460,7 @@ CORBA::UnionDef::_duplicate (UnionDef_ptr obj) void CORBA::UnionDef::_tao_release (UnionDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -2504,7 +2504,7 @@ CORBA::UnionDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -2558,7 +2558,7 @@ TAO::Objref_Traits<CORBA::EnumDef>::release ( CORBA::EnumDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::EnumDef_ptr @@ -2594,7 +2594,7 @@ TAO::Collocation_Proxy_Broker * { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_EnumDef_Proxy_Broker_ == 0) @@ -2637,7 +2637,7 @@ void CORBA::EnumDef::members ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_EnumDef_Proxy_Broker_ == 0) @@ -2693,7 +2693,7 @@ CORBA::EnumDef::_tao_any_destructor (void *_tao_void_pointer) { EnumDef *_tao_tmp_pointer = static_cast<EnumDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::EnumDef_ptr @@ -2729,7 +2729,7 @@ CORBA::EnumDef::_unchecked_narrow ( CORBA::EnumDef_ptr CORBA::EnumDef::_duplicate (EnumDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } @@ -2740,7 +2740,7 @@ CORBA::EnumDef::_duplicate (EnumDef_ptr obj) void CORBA::EnumDef::_tao_release (EnumDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -2780,7 +2780,7 @@ CORBA::EnumDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -2834,7 +2834,7 @@ TAO::Objref_Traits<CORBA::AliasDef>::release ( CORBA::AliasDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::AliasDef_ptr @@ -2870,7 +2870,7 @@ TAO::Collocation_Proxy_Broker * { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_AliasDef_Proxy_Broker_ == 0) @@ -2913,7 +2913,7 @@ void CORBA::AliasDef::original_type_def ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_AliasDef_Proxy_Broker_ == 0) @@ -2969,7 +2969,7 @@ CORBA::AliasDef::_tao_any_destructor (void *_tao_void_pointer) { AliasDef *_tao_tmp_pointer = static_cast<AliasDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::AliasDef_ptr @@ -3005,7 +3005,7 @@ CORBA::AliasDef::_unchecked_narrow ( CORBA::AliasDef_ptr CORBA::AliasDef::_duplicate (AliasDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } @@ -3016,7 +3016,7 @@ CORBA::AliasDef::_duplicate (AliasDef_ptr obj) void CORBA::AliasDef::_tao_release (AliasDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -3056,7 +3056,7 @@ CORBA::AliasDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -3110,7 +3110,7 @@ TAO::Objref_Traits<CORBA::NativeDef>::release ( CORBA::NativeDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::NativeDef_ptr @@ -3160,7 +3160,7 @@ CORBA::NativeDef::_tao_any_destructor (void *_tao_void_pointer) { NativeDef *_tao_tmp_pointer = static_cast<NativeDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::NativeDef_ptr @@ -3196,7 +3196,7 @@ CORBA::NativeDef::_unchecked_narrow ( CORBA::NativeDef_ptr CORBA::NativeDef::_duplicate (NativeDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } @@ -3207,7 +3207,7 @@ CORBA::NativeDef::_duplicate (NativeDef_ptr obj) void CORBA::NativeDef::_tao_release (NativeDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -3247,7 +3247,7 @@ CORBA::NativeDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -3301,7 +3301,7 @@ TAO::Objref_Traits<CORBA::PrimitiveDef>::release ( CORBA::PrimitiveDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::PrimitiveDef_ptr @@ -3337,7 +3337,7 @@ TAO::Collocation_Proxy_Broker * { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_PrimitiveDef_Proxy_Broker_ == 0) @@ -3393,7 +3393,7 @@ CORBA::PrimitiveDef::_tao_any_destructor (void *_tao_void_pointer) { PrimitiveDef *_tao_tmp_pointer = static_cast<PrimitiveDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::PrimitiveDef_ptr @@ -3429,7 +3429,7 @@ CORBA::PrimitiveDef::_unchecked_narrow ( CORBA::PrimitiveDef_ptr CORBA::PrimitiveDef::_duplicate (PrimitiveDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } @@ -3440,7 +3440,7 @@ CORBA::PrimitiveDef::_duplicate (PrimitiveDef_ptr obj) void CORBA::PrimitiveDef::_tao_release (PrimitiveDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -3472,7 +3472,7 @@ CORBA::PrimitiveDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -3526,7 +3526,7 @@ TAO::Objref_Traits<CORBA::StringDef>::release ( CORBA::StringDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::StringDef_ptr @@ -3562,7 +3562,7 @@ CORBA::ULong CORBA::StringDef::bound ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_StringDef_Proxy_Broker_ == 0) @@ -3605,7 +3605,7 @@ void CORBA::StringDef::bound ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_StringDef_Proxy_Broker_ == 0) @@ -3661,7 +3661,7 @@ CORBA::StringDef::_tao_any_destructor (void *_tao_void_pointer) { StringDef *_tao_tmp_pointer = static_cast<StringDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::StringDef_ptr @@ -3697,7 +3697,7 @@ CORBA::StringDef::_unchecked_narrow ( CORBA::StringDef_ptr CORBA::StringDef::_duplicate (StringDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } @@ -3708,7 +3708,7 @@ CORBA::StringDef::_duplicate (StringDef_ptr obj) void CORBA::StringDef::_tao_release (StringDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -3740,7 +3740,7 @@ CORBA::StringDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -3794,7 +3794,7 @@ TAO::Objref_Traits<CORBA::WstringDef>::release ( CORBA::WstringDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::WstringDef_ptr @@ -3830,7 +3830,7 @@ CORBA::ULong CORBA::WstringDef::bound ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_WstringDef_Proxy_Broker_ == 0) @@ -3873,7 +3873,7 @@ void CORBA::WstringDef::bound ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_WstringDef_Proxy_Broker_ == 0) @@ -3929,7 +3929,7 @@ CORBA::WstringDef::_tao_any_destructor (void *_tao_void_pointer) { WstringDef *_tao_tmp_pointer = static_cast<WstringDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::WstringDef_ptr @@ -3965,7 +3965,7 @@ CORBA::WstringDef::_unchecked_narrow ( CORBA::WstringDef_ptr CORBA::WstringDef::_duplicate (WstringDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } @@ -3976,7 +3976,7 @@ CORBA::WstringDef::_duplicate (WstringDef_ptr obj) void CORBA::WstringDef::_tao_release (WstringDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -4008,7 +4008,7 @@ CORBA::WstringDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -4062,7 +4062,7 @@ TAO::Objref_Traits<CORBA::SequenceDef>::release ( CORBA::SequenceDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::SequenceDef_ptr @@ -4098,7 +4098,7 @@ CORBA::ULong CORBA::SequenceDef::bound ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_SequenceDef_Proxy_Broker_ == 0) @@ -4141,7 +4141,7 @@ void CORBA::SequenceDef::bound ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_SequenceDef_Proxy_Broker_ == 0) @@ -4183,7 +4183,7 @@ CORBA::TypeCode_ptr CORBA::SequenceDef::element_type ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_SequenceDef_Proxy_Broker_ == 0) @@ -4225,7 +4225,7 @@ CORBA::TypeCode_ptr CORBA::SequenceDef::element_type ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_SequenceDef_Proxy_Broker_ == 0) @@ -4268,7 +4268,7 @@ void CORBA::SequenceDef::element_type_def ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_SequenceDef_Proxy_Broker_ == 0) @@ -4324,7 +4324,7 @@ CORBA::SequenceDef::_tao_any_destructor (void *_tao_void_pointer) { SequenceDef *_tao_tmp_pointer = static_cast<SequenceDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::SequenceDef_ptr @@ -4360,7 +4360,7 @@ CORBA::SequenceDef::_unchecked_narrow ( CORBA::SequenceDef_ptr CORBA::SequenceDef::_duplicate (SequenceDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } @@ -4371,7 +4371,7 @@ CORBA::SequenceDef::_duplicate (SequenceDef_ptr obj) void CORBA::SequenceDef::_tao_release (SequenceDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -4403,7 +4403,7 @@ CORBA::SequenceDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -4457,7 +4457,7 @@ TAO::Objref_Traits<CORBA::ArrayDef>::release ( CORBA::ArrayDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::ArrayDef_ptr @@ -4493,7 +4493,7 @@ CORBA::ULong CORBA::ArrayDef::length ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_ArrayDef_Proxy_Broker_ == 0) @@ -4536,7 +4536,7 @@ void CORBA::ArrayDef::length ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_ArrayDef_Proxy_Broker_ == 0) @@ -4578,7 +4578,7 @@ CORBA::TypeCode_ptr CORBA::ArrayDef::element_type ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_ArrayDef_Proxy_Broker_ == 0) @@ -4620,7 +4620,7 @@ CORBA::TypeCode_ptr CORBA::ArrayDef::element_type ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_ArrayDef_Proxy_Broker_ == 0) @@ -4663,7 +4663,7 @@ void CORBA::ArrayDef::element_type_def ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_ArrayDef_Proxy_Broker_ == 0) @@ -4719,7 +4719,7 @@ CORBA::ArrayDef::_tao_any_destructor (void *_tao_void_pointer) { ArrayDef *_tao_tmp_pointer = static_cast<ArrayDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::ArrayDef_ptr @@ -4755,7 +4755,7 @@ CORBA::ArrayDef::_unchecked_narrow ( CORBA::ArrayDef_ptr CORBA::ArrayDef::_duplicate (ArrayDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } @@ -4766,7 +4766,7 @@ CORBA::ArrayDef::_duplicate (ArrayDef_ptr obj) void CORBA::ArrayDef::_tao_release (ArrayDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -4798,7 +4798,7 @@ CORBA::ArrayDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -4852,7 +4852,7 @@ TAO::Objref_Traits<CORBA::ExceptionDef>::release ( CORBA::ExceptionDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::ExceptionDef_ptr @@ -4888,7 +4888,7 @@ CORBA::TypeCode_ptr CORBA::ExceptionDef::type ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_ExceptionDef_Proxy_Broker_ == 0) @@ -4930,7 +4930,7 @@ CORBA::TypeCode_ptr CORBA::ExceptionDef::type ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_ExceptionDef_Proxy_Broker_ == 0) @@ -4973,7 +4973,7 @@ void CORBA::ExceptionDef::members ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_ExceptionDef_Proxy_Broker_ == 0) @@ -5030,7 +5030,7 @@ CORBA::ExceptionDef::_tao_any_destructor (void *_tao_void_pointer) { ExceptionDef *_tao_tmp_pointer = static_cast<ExceptionDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::ExceptionDef_ptr @@ -5066,7 +5066,7 @@ CORBA::ExceptionDef::_unchecked_narrow ( CORBA::ExceptionDef_ptr CORBA::ExceptionDef::_duplicate (ExceptionDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } @@ -5077,7 +5077,7 @@ CORBA::ExceptionDef::_duplicate (ExceptionDef_ptr obj) void CORBA::ExceptionDef::_tao_release (ExceptionDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -5113,7 +5113,7 @@ CORBA::ExceptionDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -5161,7 +5161,7 @@ CORBA::ExceptionDefSeq::ExceptionDefSeq (void) CORBA::ExceptionDefSeq::ExceptionDefSeq ( CORBA::ULong max ) - : TAO_Unbounded_Object_Sequence< + : TAO::unbounded_object_reference_sequence< ExceptionDef, ExceptionDef_var > @@ -5174,7 +5174,7 @@ CORBA::ExceptionDefSeq::ExceptionDefSeq ( CORBA::ExceptionDef_ptr * buffer, CORBA::Boolean release ) - : TAO_Unbounded_Object_Sequence< + : TAO::unbounded_object_reference_sequence< ExceptionDef, ExceptionDef_var > @@ -5184,7 +5184,7 @@ CORBA::ExceptionDefSeq::ExceptionDefSeq ( CORBA::ExceptionDefSeq::ExceptionDefSeq ( const ExceptionDefSeq &seq ) - : TAO_Unbounded_Object_Sequence< + : TAO::unbounded_object_reference_sequence< ExceptionDef, ExceptionDef_var > @@ -5298,7 +5298,7 @@ TAO::Objref_Traits<CORBA::AttributeDef>::release ( CORBA::AttributeDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::AttributeDef_ptr @@ -5334,7 +5334,7 @@ CORBA::TypeCode_ptr CORBA::AttributeDef::type ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_AttributeDef_Proxy_Broker_ == 0) @@ -5376,7 +5376,7 @@ CORBA::TypeCode_ptr CORBA::AttributeDef::type ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_AttributeDef_Proxy_Broker_ == 0) @@ -5419,7 +5419,7 @@ void CORBA::AttributeDef::type_def ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_AttributeDef_Proxy_Broker_ == 0) @@ -5461,7 +5461,7 @@ void CORBA::AttributeDef::type_def ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_AttributeDef_Proxy_Broker_ == 0) @@ -5504,7 +5504,7 @@ void CORBA::AttributeDef::mode ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_AttributeDef_Proxy_Broker_ == 0) @@ -5560,7 +5560,7 @@ CORBA::AttributeDef::_tao_any_destructor (void *_tao_void_pointer) { AttributeDef *_tao_tmp_pointer = static_cast<AttributeDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::AttributeDef_ptr @@ -5596,7 +5596,7 @@ CORBA::AttributeDef::_unchecked_narrow ( CORBA::AttributeDef_ptr CORBA::AttributeDef::_duplicate (AttributeDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } @@ -5607,7 +5607,7 @@ CORBA::AttributeDef::_duplicate (AttributeDef_ptr obj) void CORBA::AttributeDef::_tao_release (AttributeDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -5639,7 +5639,7 @@ CORBA::AttributeDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -5799,7 +5799,7 @@ TAO::Objref_Traits<CORBA::ExtAttributeDef>::release ( CORBA::ExtAttributeDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::ExtAttributeDef_ptr @@ -5835,7 +5835,7 @@ TAO::Collocation_Proxy_Broker * { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_ExtAttributeDef_Proxy_Broker_ == 0) @@ -5878,7 +5878,7 @@ void CORBA::ExtAttributeDef::get_exceptions ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_ExtAttributeDef_Proxy_Broker_ == 0) @@ -5920,7 +5920,7 @@ void CORBA::ExtAttributeDef::get_exceptions ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_ExtAttributeDef_Proxy_Broker_ == 0) @@ -5963,7 +5963,7 @@ void CORBA::ExtAttributeDef::set_exceptions ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_ExtAttributeDef_Proxy_Broker_ == 0) @@ -6005,7 +6005,7 @@ void CORBA::ExtAttributeDef::set_exceptions ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } if (this->the_TAO_ExtAttributeDef_Proxy_Broker_ == 0) @@ -6061,7 +6061,7 @@ CORBA::ExtAttributeDef::_tao_any_destructor (void *_tao_void_pointer) { ExtAttributeDef *_tao_tmp_pointer = static_cast<ExtAttributeDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::ExtAttributeDef_ptr @@ -6097,7 +6097,7 @@ CORBA::ExtAttributeDef::_unchecked_narrow ( CORBA::ExtAttributeDef_ptr CORBA::ExtAttributeDef::_duplicate (ExtAttributeDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } @@ -6108,7 +6108,7 @@ CORBA::ExtAttributeDef::_duplicate (ExtAttributeDef_ptr obj) void CORBA::ExtAttributeDef::_tao_release (ExtAttributeDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -6144,7 +6144,7 @@ CORBA::ExtAttributeDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -6250,7 +6250,7 @@ CORBA::ParameterDescription::_tao_any_destructor ( delete _tao_tmp_pointer; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_CORBA_PARDESCRIPTIONSEQ_CS_) @@ -6262,7 +6262,7 @@ CORBA::ParDescriptionSeq::ParDescriptionSeq (void) CORBA::ParDescriptionSeq::ParDescriptionSeq ( CORBA::ULong max ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< ParameterDescription > (max) @@ -6274,7 +6274,7 @@ CORBA::ParDescriptionSeq::ParDescriptionSeq ( CORBA::ParameterDescription * buffer, CORBA::Boolean release ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< ParameterDescription > (max, length, buffer, release) @@ -6283,7 +6283,7 @@ CORBA::ParDescriptionSeq::ParDescriptionSeq ( CORBA::ParDescriptionSeq::ParDescriptionSeq ( const ParDescriptionSeq &seq ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< ParameterDescription > (seq) @@ -6324,10 +6324,10 @@ namespace TAO CORBA::tk_sequence, &CORBA::_tc_ParameterDescription, 0U); - + ::CORBA::TypeCode_ptr const tc_CORBA_ParDescriptionSeq_0 = &CORBA_ParDescriptionSeq_0; - + } } @@ -6342,7 +6342,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/CORBA/ParDescriptionSeq:1.0", "ParDescriptionSeq", &TAO::TypeCode::tc_CORBA_ParDescriptionSeq_0); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_ParDescriptionSeq = @@ -6362,7 +6362,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/CORBA/ContextIdentifier:1.0", "ContextIdentifier", &CORBA::_tc_Identifier); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_ContextIdentifier = @@ -6371,7 +6371,7 @@ namespace CORBA -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_CORBA_CONTEXTIDSEQ_CS_) @@ -6383,7 +6383,7 @@ CORBA::ContextIdSeq::ContextIdSeq (void) CORBA::ContextIdSeq::ContextIdSeq ( CORBA::ULong max ) - : TAO_Unbounded_String_Sequence + : TAO::unbounded_string_sequence (max) {} @@ -6393,14 +6393,14 @@ CORBA::ContextIdSeq::ContextIdSeq ( char * * buffer, CORBA::Boolean release ) - : TAO_Unbounded_String_Sequence + : TAO::unbounded_string_sequence (max, length, buffer, release) {} CORBA::ContextIdSeq::ContextIdSeq ( const ContextIdSeq &seq ) - : TAO_Unbounded_String_Sequence + : TAO::unbounded_string_sequence (seq) {} @@ -6439,10 +6439,10 @@ namespace TAO CORBA::tk_sequence, &CORBA::_tc_ContextIdentifier, 0U); - + ::CORBA::TypeCode_ptr const tc_CORBA_ContextIdSeq_0 = &CORBA_ContextIdSeq_0; - + } } @@ -6457,7 +6457,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/CORBA/ContextIdSeq:1.0", "ContextIdSeq", &TAO::TypeCode::tc_CORBA_ContextIdSeq_0); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_ContextIdSeq = @@ -6484,7 +6484,7 @@ TAO::Objref_Traits<CORBA::OperationDef>::release ( CORBA::OperationDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::OperationDef_ptr @@ -6503,7 +6503,7 @@ TAO::Objref_Traits<CORBA::OperationDef>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA__TAO_OperationDef_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -6520,21 +6520,21 @@ CORBA::TypeCode_ptr CORBA::OperationDef::result ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_OperationDef_Proxy_Broker_ == 0) { CORBA_OperationDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -6543,10 +6543,10 @@ CORBA::TypeCode_ptr CORBA::OperationDef::result ( 11, this->the_TAO_OperationDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -6562,21 +6562,21 @@ CORBA::TypeCode_ptr CORBA::OperationDef::result ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_OperationDef_Proxy_Broker_ == 0) { CORBA_OperationDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::IDLType>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -6585,10 +6585,10 @@ CORBA::TypeCode_ptr CORBA::OperationDef::result ( 15, this->the_TAO_OperationDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -6605,23 +6605,23 @@ void CORBA::OperationDef::result_def ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_OperationDef_Proxy_Broker_ == 0) { CORBA_OperationDef_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_result_def (result_def); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_result_def }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -6630,7 +6630,7 @@ void CORBA::OperationDef::result_def ( 15, this->the_TAO_OperationDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -6647,21 +6647,21 @@ void CORBA::OperationDef::result_def ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_OperationDef_Proxy_Broker_ == 0) { CORBA_OperationDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::ParDescriptionSeq>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -6670,10 +6670,10 @@ void CORBA::OperationDef::result_def ( 11, this->the_TAO_OperationDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -6690,23 +6690,23 @@ void CORBA::OperationDef::params ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_OperationDef_Proxy_Broker_ == 0) { CORBA_OperationDef_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_params }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -6715,7 +6715,7 @@ void CORBA::OperationDef::params ( 11, this->the_TAO_OperationDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -6732,21 +6732,21 @@ void CORBA::OperationDef::params ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_OperationDef_Proxy_Broker_ == 0) { CORBA_OperationDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::OperationMode>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -6755,10 +6755,10 @@ void CORBA::OperationDef::params ( 9, this->the_TAO_OperationDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -6775,23 +6775,23 @@ void CORBA::OperationDef::mode ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_OperationDef_Proxy_Broker_ == 0) { CORBA_OperationDef_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::OperationMode>::in_arg_val _tao_mode (mode); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_mode }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -6800,7 +6800,7 @@ void CORBA::OperationDef::mode ( 9, this->the_TAO_OperationDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -6817,21 +6817,21 @@ void CORBA::OperationDef::mode ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_OperationDef_Proxy_Broker_ == 0) { CORBA_OperationDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::ContextIdSeq>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -6840,10 +6840,10 @@ void CORBA::OperationDef::mode ( 13, this->the_TAO_OperationDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -6860,23 +6860,23 @@ void CORBA::OperationDef::contexts ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_OperationDef_Proxy_Broker_ == 0) { CORBA_OperationDef_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::ContextIdSeq>::in_arg_val _tao_contexts (contexts); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_contexts }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -6885,7 +6885,7 @@ void CORBA::OperationDef::contexts ( 13, this->the_TAO_OperationDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -6902,21 +6902,21 @@ void CORBA::OperationDef::contexts ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_OperationDef_Proxy_Broker_ == 0) { CORBA_OperationDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -6925,10 +6925,10 @@ void CORBA::OperationDef::contexts ( 15, this->the_TAO_OperationDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -6945,23 +6945,23 @@ void CORBA::OperationDef::exceptions ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_OperationDef_Proxy_Broker_ == 0) { CORBA_OperationDef_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_exceptions }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -6970,7 +6970,7 @@ void CORBA::OperationDef::exceptions ( 15, this->the_TAO_OperationDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -6989,19 +6989,19 @@ CORBA::OperationDef::CORBA_OperationDef_setup_collocation () this->the_TAO_OperationDef_Proxy_Broker_ = ::CORBA__TAO_OperationDef_Proxy_Broker_Factory_function_pointer (this); } - + this->CORBA_Contained_setup_collocation (); } CORBA::OperationDef::~OperationDef (void) {} -void +void CORBA::OperationDef::_tao_any_destructor (void *_tao_void_pointer) { OperationDef *_tao_tmp_pointer = static_cast<OperationDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::OperationDef_ptr @@ -7037,18 +7037,18 @@ CORBA::OperationDef::_unchecked_narrow ( CORBA::OperationDef_ptr CORBA::OperationDef::_duplicate (OperationDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void CORBA::OperationDef::_tao_release (OperationDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -7080,7 +7080,7 @@ CORBA::OperationDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -7107,7 +7107,7 @@ static TAO::TypeCode::Objref<char const *, CORBA::tk_objref, "IDL:omg.org/CORBA/OperationDef:1.0", "OperationDef"); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_OperationDef = @@ -7145,7 +7145,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co { "contexts", &CORBA::_tc_ContextIdSeq }, { "parameters", &CORBA::_tc_ParDescriptionSeq }, { "exceptions", &CORBA::_tc_ExcDescriptionSeq } - + }; static TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *, @@ -7157,7 +7157,7 @@ static TAO::TypeCode::Struct<char const *, "OperationDescription", _tao_fields_CORBA_OperationDescription, 9); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_OperationDescription = @@ -7166,10 +7166,10 @@ namespace CORBA -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/structure_cs.cpp:66 -void +void CORBA::OperationDescription::_tao_any_destructor ( void *_tao_void_pointer ) @@ -7179,7 +7179,7 @@ CORBA::OperationDescription::_tao_any_destructor ( delete _tao_tmp_pointer; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_CORBA_REPOSITORYIDSEQ_CS_) @@ -7191,7 +7191,7 @@ CORBA::RepositoryIdSeq::RepositoryIdSeq (void) CORBA::RepositoryIdSeq::RepositoryIdSeq ( CORBA::ULong max ) - : TAO_Unbounded_String_Sequence + : TAO::unbounded_string_sequence (max) {} @@ -7201,14 +7201,14 @@ CORBA::RepositoryIdSeq::RepositoryIdSeq ( char * * buffer, CORBA::Boolean release ) - : TAO_Unbounded_String_Sequence + : TAO::unbounded_string_sequence (max, length, buffer, release) {} CORBA::RepositoryIdSeq::RepositoryIdSeq ( const RepositoryIdSeq &seq ) - : TAO_Unbounded_String_Sequence + : TAO::unbounded_string_sequence (seq) {} @@ -7247,10 +7247,10 @@ namespace TAO CORBA::tk_sequence, &CORBA::_tc_RepositoryId, 0U); - + ::CORBA::TypeCode_ptr const tc_CORBA_RepositoryIdSeq_0 = &CORBA_RepositoryIdSeq_0; - + } } @@ -7265,7 +7265,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/CORBA/RepositoryIdSeq:1.0", "RepositoryIdSeq", &TAO::TypeCode::tc_CORBA_RepositoryIdSeq_0); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_RepositoryIdSeq = @@ -7274,7 +7274,7 @@ namespace CORBA -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_CORBA_OPDESCRIPTIONSEQ_CS_) @@ -7286,7 +7286,7 @@ CORBA::OpDescriptionSeq::OpDescriptionSeq (void) CORBA::OpDescriptionSeq::OpDescriptionSeq ( CORBA::ULong max ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< OperationDescription > (max) @@ -7298,7 +7298,7 @@ CORBA::OpDescriptionSeq::OpDescriptionSeq ( CORBA::OperationDescription * buffer, CORBA::Boolean release ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< OperationDescription > (max, length, buffer, release) @@ -7307,7 +7307,7 @@ CORBA::OpDescriptionSeq::OpDescriptionSeq ( CORBA::OpDescriptionSeq::OpDescriptionSeq ( const OpDescriptionSeq &seq ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< OperationDescription > (seq) @@ -7348,10 +7348,10 @@ namespace TAO CORBA::tk_sequence, &CORBA::_tc_OperationDescription, 0U); - + ::CORBA::TypeCode_ptr const tc_CORBA_OpDescriptionSeq_0 = &CORBA_OpDescriptionSeq_0; - + } } @@ -7366,7 +7366,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/CORBA/OpDescriptionSeq:1.0", "OpDescriptionSeq", &TAO::TypeCode::tc_CORBA_OpDescriptionSeq_0); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_OpDescriptionSeq = @@ -7375,7 +7375,7 @@ namespace CORBA -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_CORBA_ATTRDESCRIPTIONSEQ_CS_) @@ -7387,7 +7387,7 @@ CORBA::AttrDescriptionSeq::AttrDescriptionSeq (void) CORBA::AttrDescriptionSeq::AttrDescriptionSeq ( CORBA::ULong max ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< AttributeDescription > (max) @@ -7399,7 +7399,7 @@ CORBA::AttrDescriptionSeq::AttrDescriptionSeq ( CORBA::AttributeDescription * buffer, CORBA::Boolean release ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< AttributeDescription > (max, length, buffer, release) @@ -7408,7 +7408,7 @@ CORBA::AttrDescriptionSeq::AttrDescriptionSeq ( CORBA::AttrDescriptionSeq::AttrDescriptionSeq ( const AttrDescriptionSeq &seq ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< AttributeDescription > (seq) @@ -7449,10 +7449,10 @@ namespace TAO CORBA::tk_sequence, &CORBA::_tc_AttributeDescription, 0U); - + ::CORBA::TypeCode_ptr const tc_CORBA_AttrDescriptionSeq_0 = &CORBA_AttrDescriptionSeq_0; - + } } @@ -7467,7 +7467,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/CORBA/AttrDescriptionSeq:1.0", "AttrDescriptionSeq", &TAO::TypeCode::tc_CORBA_AttrDescriptionSeq_0); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_AttrDescriptionSeq = @@ -7476,7 +7476,7 @@ namespace CORBA -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_CORBA_EXTATTRDESCRIPTIONSEQ_CS_) @@ -7488,7 +7488,7 @@ CORBA::ExtAttrDescriptionSeq::ExtAttrDescriptionSeq (void) CORBA::ExtAttrDescriptionSeq::ExtAttrDescriptionSeq ( CORBA::ULong max ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< ExtAttributeDescription > (max) @@ -7500,7 +7500,7 @@ CORBA::ExtAttrDescriptionSeq::ExtAttrDescriptionSeq ( CORBA::ExtAttributeDescription * buffer, CORBA::Boolean release ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< ExtAttributeDescription > (max, length, buffer, release) @@ -7509,7 +7509,7 @@ CORBA::ExtAttrDescriptionSeq::ExtAttrDescriptionSeq ( CORBA::ExtAttrDescriptionSeq::ExtAttrDescriptionSeq ( const ExtAttrDescriptionSeq &seq ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< ExtAttributeDescription > (seq) @@ -7550,10 +7550,10 @@ namespace TAO CORBA::tk_sequence, &CORBA::_tc_ExtAttributeDescription, 0U); - + ::CORBA::TypeCode_ptr const tc_CORBA_ExtAttrDescriptionSeq_0 = &CORBA_ExtAttrDescriptionSeq_0; - + } } @@ -7568,7 +7568,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/CORBA/ExtAttrDescriptionSeq:1.0", "ExtAttrDescriptionSeq", &TAO::TypeCode::tc_CORBA_ExtAttrDescriptionSeq_0); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_ExtAttrDescriptionSeq = @@ -7595,7 +7595,7 @@ TAO::Objref_Traits<CORBA::InterfaceDef>::release ( CORBA::InterfaceDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::InterfaceDef_ptr @@ -7614,7 +7614,7 @@ TAO::Objref_Traits<CORBA::InterfaceDef>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -7631,21 +7631,21 @@ TAO::Collocation_Proxy_Broker * { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_InterfaceDef_Proxy_Broker_ == 0) { CORBA_InterfaceDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -7654,10 +7654,10 @@ TAO::Collocation_Proxy_Broker * 20, this->the_TAO_InterfaceDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -7674,23 +7674,23 @@ void CORBA::InterfaceDef::base_interfaces ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_InterfaceDef_Proxy_Broker_ == 0) { CORBA_InterfaceDef_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces (base_interfaces); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_base_interfaces }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -7699,7 +7699,7 @@ void CORBA::InterfaceDef::base_interfaces ( 20, this->the_TAO_InterfaceDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -7717,23 +7717,23 @@ CORBA::Boolean CORBA::InterfaceDef::is_a ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_InterfaceDef_Proxy_Broker_ == 0) { CORBA_InterfaceDef_setup_collocation (); } - + TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_interface_id (interface_id); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_interface_id }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -7742,10 +7742,10 @@ CORBA::Boolean CORBA::InterfaceDef::is_a ( 4, this->the_TAO_InterfaceDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -7777,7 +7777,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co { "attributes", &CORBA::_tc_AttrDescriptionSeq }, { "base_interfaces", &CORBA::_tc_RepositoryIdSeq }, { "type", &CORBA::_tc_TypeCode } - + }; static TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *, @@ -7789,14 +7789,14 @@ static TAO::TypeCode::Struct<char const *, "FullInterfaceDescription", _tao_fields_CORBA_InterfaceDef_FullInterfaceDescription, 8); - + ::CORBA::TypeCode_ptr const CORBA::InterfaceDef::_tc_FullInterfaceDescription = &_tao_tc_CORBA_InterfaceDef_FullInterfaceDescription; -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/structure_cs.cpp:66 -void +void CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor ( void *_tao_void_pointer ) @@ -7818,21 +7818,21 @@ CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_InterfaceDef_Proxy_Broker_ == 0) { CORBA_InterfaceDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::InterfaceDef::FullInterfaceDescription>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -7841,10 +7841,10 @@ CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor ( 18, this->the_TAO_InterfaceDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -7865,21 +7865,21 @@ CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_InterfaceDef_Proxy_Broker_ == 0) { CORBA_InterfaceDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::AttributeDef>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id); TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name); TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version); TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type (type); TAO::Arg_Traits< ::CORBA::AttributeMode>::in_arg_val _tao_mode (mode); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -7889,7 +7889,7 @@ CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor ( &_tao_type, &_tao_mode }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -7898,10 +7898,10 @@ CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor ( 16, this->the_TAO_InterfaceDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -7925,14 +7925,14 @@ CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_InterfaceDef_Proxy_Broker_ == 0) { CORBA_InterfaceDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::OperationDef>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id); TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name); @@ -7942,7 +7942,7 @@ CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor ( TAO::Arg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params); TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions); TAO::Arg_Traits< ::CORBA::ContextIdSeq>::in_arg_val _tao_contexts (contexts); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -7955,7 +7955,7 @@ CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor ( &_tao_exceptions, &_tao_contexts }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -7964,10 +7964,10 @@ CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor ( 16, this->the_TAO_InterfaceDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -7985,7 +7985,7 @@ CORBA::InterfaceDef::CORBA_InterfaceDef_setup_collocation () this->the_TAO_InterfaceDef_Proxy_Broker_ = ::CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer (this); } - + this->CORBA_Container_setup_collocation (); this->CORBA_Contained_setup_collocation (); this->CORBA_IDLType_setup_collocation (); @@ -7994,12 +7994,12 @@ CORBA::InterfaceDef::CORBA_InterfaceDef_setup_collocation () CORBA::InterfaceDef::~InterfaceDef (void) {} -void +void CORBA::InterfaceDef::_tao_any_destructor (void *_tao_void_pointer) { InterfaceDef *_tao_tmp_pointer = static_cast<InterfaceDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::InterfaceDef_ptr @@ -8035,18 +8035,18 @@ CORBA::InterfaceDef::_unchecked_narrow ( CORBA::InterfaceDef_ptr CORBA::InterfaceDef::_duplicate (InterfaceDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void CORBA::InterfaceDef::_tao_release (InterfaceDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -8086,7 +8086,7 @@ CORBA::InterfaceDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -8113,7 +8113,7 @@ static TAO::TypeCode::Objref<char const *, CORBA::tk_objref, "IDL:omg.org/CORBA/InterfaceDef:1.0", "InterfaceDef"); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_InterfaceDef = @@ -8137,7 +8137,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co { "defined_in", &CORBA::_tc_RepositoryId }, { "version", &CORBA::_tc_VersionSpec }, { "base_interfaces", &CORBA::_tc_RepositoryIdSeq } - + }; static TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *, @@ -8149,7 +8149,7 @@ static TAO::TypeCode::Struct<char const *, "InterfaceDescription", _tao_fields_CORBA_InterfaceDescription, 5); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_InterfaceDescription = @@ -8158,10 +8158,10 @@ namespace CORBA -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/structure_cs.cpp:66 -void +void CORBA::InterfaceDescription::_tao_any_destructor ( void *_tao_void_pointer ) @@ -8189,7 +8189,7 @@ TAO::Objref_Traits<CORBA::InterfaceAttrExtension>::release ( CORBA::InterfaceAttrExtension_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::InterfaceAttrExtension_ptr @@ -8208,7 +8208,7 @@ TAO::Objref_Traits<CORBA::InterfaceAttrExtension>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -8241,7 +8241,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co { "attributes", &CORBA::_tc_ExtAttrDescriptionSeq }, { "base_interfaces", &CORBA::_tc_RepositoryIdSeq }, { "type", &CORBA::_tc_TypeCode } - + }; static TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *, @@ -8253,14 +8253,14 @@ static TAO::TypeCode::Struct<char const *, "ExtFullInterfaceDescription", _tao_fields_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescription, 8); - + ::CORBA::TypeCode_ptr const CORBA::InterfaceAttrExtension::_tc_ExtFullInterfaceDescription = &_tao_tc_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescription; -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/structure_cs.cpp:66 -void +void CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destructor ( void *_tao_void_pointer ) @@ -8282,21 +8282,21 @@ CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destructor { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_InterfaceAttrExtension_Proxy_Broker_ == 0) { CORBA_InterfaceAttrExtension_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -8305,10 +8305,10 @@ CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destructor 22, this->the_TAO_InterfaceAttrExtension_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -8331,14 +8331,14 @@ CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destructor { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_InterfaceAttrExtension_Proxy_Broker_ == 0) { CORBA_InterfaceAttrExtension_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::ExtAttributeDef>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id); TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name); @@ -8347,7 +8347,7 @@ CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destructor TAO::Arg_Traits< ::CORBA::AttributeMode>::in_arg_val _tao_mode (mode); TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_get_exceptions (get_exceptions); TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_set_exceptions (set_exceptions); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -8359,7 +8359,7 @@ CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destructor &_tao_get_exceptions, &_tao_set_exceptions }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -8368,10 +8368,10 @@ CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destructor 20, this->the_TAO_InterfaceAttrExtension_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -8394,12 +8394,12 @@ CORBA::InterfaceAttrExtension::CORBA_InterfaceAttrExtension_setup_collocation () CORBA::InterfaceAttrExtension::~InterfaceAttrExtension (void) {} -void +void CORBA::InterfaceAttrExtension::_tao_any_destructor (void *_tao_void_pointer) { InterfaceAttrExtension *_tao_tmp_pointer = static_cast<InterfaceAttrExtension *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::InterfaceAttrExtension_ptr @@ -8435,18 +8435,18 @@ CORBA::InterfaceAttrExtension::_unchecked_narrow ( CORBA::InterfaceAttrExtension_ptr CORBA::InterfaceAttrExtension::_duplicate (InterfaceAttrExtension_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void CORBA::InterfaceAttrExtension::_tao_release (InterfaceAttrExtension_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -8470,7 +8470,7 @@ CORBA::InterfaceAttrExtension::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -8497,7 +8497,7 @@ static TAO::TypeCode::Objref<char const *, CORBA::tk_objref, "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0", "InterfaceAttrExtension"); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_InterfaceAttrExtension = @@ -8524,7 +8524,7 @@ TAO::Objref_Traits<CORBA::ExtInterfaceDef>::release ( CORBA::ExtInterfaceDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::ExtInterfaceDef_ptr @@ -8543,7 +8543,7 @@ TAO::Objref_Traits<CORBA::ExtInterfaceDef>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -8562,7 +8562,7 @@ CORBA::ExtInterfaceDef::CORBA_ExtInterfaceDef_setup_collocation () this->the_TAO_ExtInterfaceDef_Proxy_Broker_ = ::CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_function_pointer (this); } - + this->CORBA_InterfaceDef_setup_collocation (); this->CORBA_InterfaceAttrExtension_setup_collocation (); } @@ -8570,12 +8570,12 @@ CORBA::ExtInterfaceDef::CORBA_ExtInterfaceDef_setup_collocation () CORBA::ExtInterfaceDef::~ExtInterfaceDef (void) {} -void +void CORBA::ExtInterfaceDef::_tao_any_destructor (void *_tao_void_pointer) { ExtInterfaceDef *_tao_tmp_pointer = static_cast<ExtInterfaceDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::ExtInterfaceDef_ptr @@ -8611,18 +8611,18 @@ CORBA::ExtInterfaceDef::_unchecked_narrow ( CORBA::ExtInterfaceDef_ptr CORBA::ExtInterfaceDef::_duplicate (ExtInterfaceDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void CORBA::ExtInterfaceDef::_tao_release (ExtInterfaceDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -8670,7 +8670,7 @@ CORBA::ExtInterfaceDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -8697,7 +8697,7 @@ static TAO::TypeCode::Objref<char const *, CORBA::tk_objref, "IDL:omg.org/CORBA/ExtInterfaceDef:1.0", "ExtInterfaceDef"); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_ExtInterfaceDef = @@ -8724,7 +8724,7 @@ TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::release ( CORBA::AbstractInterfaceDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::AbstractInterfaceDef_ptr @@ -8743,7 +8743,7 @@ TAO::Objref_Traits<CORBA::AbstractInterfaceDef>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -8762,19 +8762,19 @@ CORBA::AbstractInterfaceDef::CORBA_AbstractInterfaceDef_setup_collocation () this->the_TAO_AbstractInterfaceDef_Proxy_Broker_ = ::CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function_pointer (this); } - + this->CORBA_InterfaceDef_setup_collocation (); } CORBA::AbstractInterfaceDef::~AbstractInterfaceDef (void) {} -void +void CORBA::AbstractInterfaceDef::_tao_any_destructor (void *_tao_void_pointer) { AbstractInterfaceDef *_tao_tmp_pointer = static_cast<AbstractInterfaceDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::AbstractInterfaceDef_ptr @@ -8810,18 +8810,18 @@ CORBA::AbstractInterfaceDef::_unchecked_narrow ( CORBA::AbstractInterfaceDef_ptr CORBA::AbstractInterfaceDef::_duplicate (AbstractInterfaceDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void CORBA::AbstractInterfaceDef::_tao_release (AbstractInterfaceDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -8865,7 +8865,7 @@ CORBA::AbstractInterfaceDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -8892,7 +8892,7 @@ static TAO::TypeCode::Objref<char const *, CORBA::tk_objref, "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0", "AbstractInterfaceDef"); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_AbstractInterfaceDef = @@ -8919,7 +8919,7 @@ TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::release ( CORBA::ExtAbstractInterfaceDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::ExtAbstractInterfaceDef_ptr @@ -8938,7 +8938,7 @@ TAO::Objref_Traits<CORBA::ExtAbstractInterfaceDef>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -8957,7 +8957,7 @@ CORBA::ExtAbstractInterfaceDef::CORBA_ExtAbstractInterfaceDef_setup_collocation this->the_TAO_ExtAbstractInterfaceDef_Proxy_Broker_ = ::CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_function_pointer (this); } - + this->CORBA_AbstractInterfaceDef_setup_collocation (); this->CORBA_InterfaceAttrExtension_setup_collocation (); } @@ -8965,12 +8965,12 @@ CORBA::ExtAbstractInterfaceDef::CORBA_ExtAbstractInterfaceDef_setup_collocation CORBA::ExtAbstractInterfaceDef::~ExtAbstractInterfaceDef (void) {} -void +void CORBA::ExtAbstractInterfaceDef::_tao_any_destructor (void *_tao_void_pointer) { ExtAbstractInterfaceDef *_tao_tmp_pointer = static_cast<ExtAbstractInterfaceDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::ExtAbstractInterfaceDef_ptr @@ -9006,18 +9006,18 @@ CORBA::ExtAbstractInterfaceDef::_unchecked_narrow ( CORBA::ExtAbstractInterfaceDef_ptr CORBA::ExtAbstractInterfaceDef::_duplicate (ExtAbstractInterfaceDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void CORBA::ExtAbstractInterfaceDef::_tao_release (ExtAbstractInterfaceDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -9069,7 +9069,7 @@ CORBA::ExtAbstractInterfaceDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -9096,7 +9096,7 @@ static TAO::TypeCode::Objref<char const *, CORBA::tk_objref, "IDL:omg.org/CORBA/ExtAbstractInterfaceDef:1.0", "ExtAbstractInterfaceDef"); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_ExtAbstractInterfaceDef = @@ -9123,7 +9123,7 @@ TAO::Objref_Traits<CORBA::LocalInterfaceDef>::release ( CORBA::LocalInterfaceDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::LocalInterfaceDef_ptr @@ -9142,7 +9142,7 @@ TAO::Objref_Traits<CORBA::LocalInterfaceDef>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -9161,19 +9161,19 @@ CORBA::LocalInterfaceDef::CORBA_LocalInterfaceDef_setup_collocation () this->the_TAO_LocalInterfaceDef_Proxy_Broker_ = ::CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function_pointer (this); } - + this->CORBA_InterfaceDef_setup_collocation (); } CORBA::LocalInterfaceDef::~LocalInterfaceDef (void) {} -void +void CORBA::LocalInterfaceDef::_tao_any_destructor (void *_tao_void_pointer) { LocalInterfaceDef *_tao_tmp_pointer = static_cast<LocalInterfaceDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::LocalInterfaceDef_ptr @@ -9209,18 +9209,18 @@ CORBA::LocalInterfaceDef::_unchecked_narrow ( CORBA::LocalInterfaceDef_ptr CORBA::LocalInterfaceDef::_duplicate (LocalInterfaceDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void CORBA::LocalInterfaceDef::_tao_release (LocalInterfaceDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -9264,7 +9264,7 @@ CORBA::LocalInterfaceDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -9291,7 +9291,7 @@ static TAO::TypeCode::Objref<char const *, CORBA::tk_objref, "IDL:omg.org/CORBA/LocalInterfaceDef:1.0", "LocalInterfaceDef"); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_LocalInterfaceDef = @@ -9318,7 +9318,7 @@ TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::release ( CORBA::ExtLocalInterfaceDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::ExtLocalInterfaceDef_ptr @@ -9337,7 +9337,7 @@ TAO::Objref_Traits<CORBA::ExtLocalInterfaceDef>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -9356,7 +9356,7 @@ CORBA::ExtLocalInterfaceDef::CORBA_ExtLocalInterfaceDef_setup_collocation () this->the_TAO_ExtLocalInterfaceDef_Proxy_Broker_ = ::CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_function_pointer (this); } - + this->CORBA_LocalInterfaceDef_setup_collocation (); this->CORBA_InterfaceAttrExtension_setup_collocation (); } @@ -9364,12 +9364,12 @@ CORBA::ExtLocalInterfaceDef::CORBA_ExtLocalInterfaceDef_setup_collocation () CORBA::ExtLocalInterfaceDef::~ExtLocalInterfaceDef (void) {} -void +void CORBA::ExtLocalInterfaceDef::_tao_any_destructor (void *_tao_void_pointer) { ExtLocalInterfaceDef *_tao_tmp_pointer = static_cast<ExtLocalInterfaceDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::ExtLocalInterfaceDef_ptr @@ -9405,18 +9405,18 @@ CORBA::ExtLocalInterfaceDef::_unchecked_narrow ( CORBA::ExtLocalInterfaceDef_ptr CORBA::ExtLocalInterfaceDef::_duplicate (ExtLocalInterfaceDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void CORBA::ExtLocalInterfaceDef::_tao_release (ExtLocalInterfaceDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -9468,7 +9468,7 @@ CORBA::ExtLocalInterfaceDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -9495,7 +9495,7 @@ static TAO::TypeCode::Objref<char const *, CORBA::tk_objref, "IDL:omg.org/CORBA/ExtLocalInterfaceDef:1.0", "ExtLocalInterfaceDef"); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_ExtLocalInterfaceDef = @@ -9528,7 +9528,7 @@ CORBA::Boolean operator>>= ( TAO::Any_Basic_Impl_T<CORBA::PrimitiveKind>::extract ( _tao_any, CORBA::_tc_PrimitiveKind, - _tao_elem + _tao_elem ); } @@ -9648,7 +9648,7 @@ operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -9764,7 +9764,7 @@ operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -10460,7 +10460,7 @@ operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/any_op_cs.cpp:54 @@ -10543,7 +10543,7 @@ CORBA::Boolean operator>>= ( TAO::Any_Basic_Impl_T<CORBA::AttributeMode>::extract ( _tao_any, CORBA::_tc_AttributeMode, - _tao_elem + _tao_elem ); } @@ -10605,7 +10605,7 @@ operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -10663,7 +10663,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -10803,11 +10803,11 @@ CORBA::Boolean operator>>= ( TAO::Any_Basic_Impl_T<CORBA::OperationMode>::extract ( _tao_any, CORBA::_tc_OperationMode, - _tao_elem + _tao_elem ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -10865,7 +10865,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/any_op_cs.cpp:54 @@ -10924,7 +10924,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/any_op_cs.cpp:54 @@ -11041,7 +11041,7 @@ operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -11099,7 +11099,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/any_op_cs.cpp:54 @@ -11158,7 +11158,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/any_op_cs.cpp:54 @@ -11217,7 +11217,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/any_op_cs.cpp:54 @@ -11276,7 +11276,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/any_op_cs.cpp:54 @@ -11393,7 +11393,7 @@ operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -11451,7 +11451,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -11567,7 +11567,7 @@ operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -11927,12 +11927,12 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, CORBA::PrimitiveKind & _tao_enum { CORBA::ULong _tao_temp = 0; CORBA::Boolean const _tao_success = strm >> _tao_temp; - + if (_tao_success) { _tao_enumerator = static_cast<CORBA::PrimitiveKind> (_tao_temp); } - + return _tao_success; } @@ -11954,21 +11954,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::Repository RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_Repository_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -11990,21 +11990,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::ModuleDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -12053,21 +12053,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::ConstantDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_ConstantDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -12120,21 +12120,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::StructDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_StructDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -12156,21 +12156,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::UnionDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_UnionDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -12192,21 +12192,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::EnumDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_EnumDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -12228,21 +12228,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::AliasDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_AliasDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -12264,21 +12264,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::NativeDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_NativeDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -12300,21 +12300,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::PrimitiveDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -12336,21 +12336,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::StringDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_StringDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -12372,21 +12372,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::WstringDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_WstringDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -12408,21 +12408,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::SequenceDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_SequenceDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -12444,21 +12444,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::ArrayDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_ArrayDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -12480,21 +12480,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::ExceptionDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -12509,25 +12509,7 @@ CORBA::Boolean operator<< ( const CORBA::ExceptionDefSeq &_tao_sequence ) { - const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = - TAO::Objref_Traits<CORBA::ExceptionDef>::marshal ( - _tao_sequence[i].in (), strm - ); - } - - return _tao_marshal_flag; - } - - return false; + return TAO::marshal_sequence(strm, _tao_sequence); } CORBA::Boolean operator>> ( @@ -12535,40 +12517,7 @@ CORBA::Boolean operator>> ( CORBA::ExceptionDefSeq &_tao_sequence ) { - CORBA::ULong _tao_seq_len; - - if (strm >> _tao_seq_len) - { - // Add a check to the length of the sequence - // to make sure it does not exceed the length - // of the stream. (See bug 58.) - if (_tao_seq_len > strm.length ()) - { - return false; - } - - // Set the length of the sequence. - _tao_sequence.length (_tao_seq_len); - - // If length is 0 we return true. - if (0 >= _tao_seq_len) - { - return true; - } - - // Retrieve all the elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm >> _tao_sequence[i].out ()); - } - - return _tao_marshal_flag; - - } - - return false; + return TAO::demarshal_sequence(strm, _tao_sequence); } #endif /* _TAO_CDR_OP_CORBA_ExceptionDefSeq_CPP_ */ @@ -12585,12 +12534,12 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, CORBA::AttributeMode & _tao_enum { CORBA::ULong _tao_temp = 0; CORBA::Boolean const _tao_success = strm >> _tao_temp; - + if (_tao_success) { _tao_enumerator = static_cast<CORBA::AttributeMode> (_tao_temp); } - + return _tao_success; } @@ -12612,21 +12561,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::AttributeDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_AttributeDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -12714,21 +12663,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::ExtAttributeDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -12744,12 +12693,12 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, CORBA::OperationMode & _tao_enum { CORBA::ULong _tao_temp = 0; CORBA::Boolean const _tao_success = strm >> _tao_temp; - + if (_tao_success) { _tao_enumerator = static_cast<CORBA::OperationMode> (_tao_temp); } - + return _tao_success; } @@ -12794,22 +12743,7 @@ CORBA::Boolean operator<< ( const CORBA::ParDescriptionSeq &_tao_sequence ) { - const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm << _tao_sequence[i]); - } - - return _tao_marshal_flag; - } - - return false; + return TAO::marshal_sequence(strm, _tao_sequence); } CORBA::Boolean operator>> ( @@ -12817,40 +12751,7 @@ CORBA::Boolean operator>> ( CORBA::ParDescriptionSeq &_tao_sequence ) { - CORBA::ULong _tao_seq_len; - - if (strm >> _tao_seq_len) - { - // Add a check to the length of the sequence - // to make sure it does not exceed the length - // of the stream. (See bug 58.) - if (_tao_seq_len > strm.length ()) - { - return false; - } - - // Set the length of the sequence. - _tao_sequence.length (_tao_seq_len); - - // If length is 0 we return true. - if (0 >= _tao_seq_len) - { - return true; - } - - // Retrieve all the elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm >> _tao_sequence[i]); - } - - return _tao_marshal_flag; - - } - - return false; + return TAO::demarshal_sequence(strm, _tao_sequence); } #endif /* _TAO_CDR_OP_CORBA_ParDescriptionSeq_CPP_ */ @@ -12866,22 +12767,7 @@ CORBA::Boolean operator<< ( const CORBA::ContextIdSeq &_tao_sequence ) { - const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm << _tao_sequence[i].in ()); - } - - return _tao_marshal_flag; - } - - return false; + return TAO::marshal_sequence(strm, _tao_sequence); } CORBA::Boolean operator>> ( @@ -12889,41 +12775,7 @@ CORBA::Boolean operator>> ( CORBA::ContextIdSeq &_tao_sequence ) { - CORBA::ULong _tao_seq_len; - - if (strm >> _tao_seq_len) - { - // Add a check to the length of the sequence - // to make sure it does not exceed the length - // of the stream. (See bug 58.) - if (_tao_seq_len > strm.length ()) - { - return false; - } - - // Set the length of the sequence. - _tao_sequence.length (_tao_seq_len); - - // If length is 0 we return true. - if (0 >= _tao_seq_len) - { - return true; - } - - // Retrieve all the elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm >> _tao_sequence[i].out ()); - - } - - return _tao_marshal_flag; - - } - -return false; + return TAO::demarshal_sequence(strm, _tao_sequence); } #endif /* _TAO_CDR_OP_CORBA_ContextIdSeq_CPP_ */ @@ -12946,21 +12798,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::OperationDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_OperationDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -13012,22 +12864,7 @@ CORBA::Boolean operator<< ( const CORBA::RepositoryIdSeq &_tao_sequence ) { - const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm << _tao_sequence[i].in ()); - } - - return _tao_marshal_flag; - } - - return false; + return TAO::marshal_sequence(strm, _tao_sequence); } CORBA::Boolean operator>> ( @@ -13035,41 +12872,7 @@ CORBA::Boolean operator>> ( CORBA::RepositoryIdSeq &_tao_sequence ) { - CORBA::ULong _tao_seq_len; - - if (strm >> _tao_seq_len) - { - // Add a check to the length of the sequence - // to make sure it does not exceed the length - // of the stream. (See bug 58.) - if (_tao_seq_len > strm.length ()) - { - return false; - } - - // Set the length of the sequence. - _tao_sequence.length (_tao_seq_len); - - // If length is 0 we return true. - if (0 >= _tao_seq_len) - { - return true; - } - - // Retrieve all the elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm >> _tao_sequence[i].out ()); - - } - - return _tao_marshal_flag; - - } - -return false; + return TAO::demarshal_sequence(strm, _tao_sequence); } #endif /* _TAO_CDR_OP_CORBA_RepositoryIdSeq_CPP_ */ @@ -13085,22 +12888,7 @@ CORBA::Boolean operator<< ( const CORBA::OpDescriptionSeq &_tao_sequence ) { - const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm << _tao_sequence[i]); - } - - return _tao_marshal_flag; - } - - return false; + return TAO::marshal_sequence(strm, _tao_sequence); } CORBA::Boolean operator>> ( @@ -13108,40 +12896,7 @@ CORBA::Boolean operator>> ( CORBA::OpDescriptionSeq &_tao_sequence ) { - CORBA::ULong _tao_seq_len; - - if (strm >> _tao_seq_len) - { - // Add a check to the length of the sequence - // to make sure it does not exceed the length - // of the stream. (See bug 58.) - if (_tao_seq_len > strm.length ()) - { - return false; - } - - // Set the length of the sequence. - _tao_sequence.length (_tao_seq_len); - - // If length is 0 we return true. - if (0 >= _tao_seq_len) - { - return true; - } - - // Retrieve all the elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm >> _tao_sequence[i]); - } - - return _tao_marshal_flag; - - } - - return false; + return TAO::demarshal_sequence(strm, _tao_sequence); } #endif /* _TAO_CDR_OP_CORBA_OpDescriptionSeq_CPP_ */ @@ -13157,22 +12912,7 @@ CORBA::Boolean operator<< ( const CORBA::AttrDescriptionSeq &_tao_sequence ) { - const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm << _tao_sequence[i]); - } - - return _tao_marshal_flag; - } - - return false; + return TAO::marshal_sequence(strm, _tao_sequence); } CORBA::Boolean operator>> ( @@ -13180,40 +12920,7 @@ CORBA::Boolean operator>> ( CORBA::AttrDescriptionSeq &_tao_sequence ) { - CORBA::ULong _tao_seq_len; - - if (strm >> _tao_seq_len) - { - // Add a check to the length of the sequence - // to make sure it does not exceed the length - // of the stream. (See bug 58.) - if (_tao_seq_len > strm.length ()) - { - return false; - } - - // Set the length of the sequence. - _tao_sequence.length (_tao_seq_len); - - // If length is 0 we return true. - if (0 >= _tao_seq_len) - { - return true; - } - - // Retrieve all the elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm >> _tao_sequence[i]); - } - - return _tao_marshal_flag; - - } - - return false; + return TAO::demarshal_sequence(strm, _tao_sequence); } #endif /* _TAO_CDR_OP_CORBA_AttrDescriptionSeq_CPP_ */ @@ -13229,22 +12936,7 @@ CORBA::Boolean operator<< ( const CORBA::ExtAttrDescriptionSeq &_tao_sequence ) { - const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm << _tao_sequence[i]); - } - - return _tao_marshal_flag; - } - - return false; + return TAO::marshal_sequence(strm, _tao_sequence); } CORBA::Boolean operator>> ( @@ -13252,40 +12944,7 @@ CORBA::Boolean operator>> ( CORBA::ExtAttrDescriptionSeq &_tao_sequence ) { - CORBA::ULong _tao_seq_len; - - if (strm >> _tao_seq_len) - { - // Add a check to the length of the sequence - // to make sure it does not exceed the length - // of the stream. (See bug 58.) - if (_tao_seq_len > strm.length ()) - { - return false; - } - - // Set the length of the sequence. - _tao_sequence.length (_tao_seq_len); - - // If length is 0 we return true. - if (0 >= _tao_seq_len) - { - return true; - } - - // Retrieve all the elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm >> _tao_sequence[i]); - } - - return _tao_marshal_flag; - - } - - return false; + return TAO::demarshal_sequence(strm, _tao_sequence); } #endif /* _TAO_CDR_OP_CORBA_ExtAttrDescriptionSeq_CPP_ */ @@ -13343,21 +13002,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::InterfaceDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -13443,21 +13102,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::InterfaceAttrExtension RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -13479,21 +13138,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::ExtInterfaceDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -13515,21 +13174,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::AbstractInterfaceDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -13551,21 +13210,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::ExtAbstractInterfaceDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -13587,21 +13246,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::LocalInterfaceDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -13623,21 +13282,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::ExtLocalInterfaceDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } diff --git a/TAO/tao/IFR_Client/IFR_BasicC.h b/TAO/tao/IFR_Client/IFR_BasicC.h index 268be82f290..f9ca9d2ec73 100644 --- a/TAO/tao/IFR_Client/IFR_BasicC.h +++ b/TAO/tao/IFR_Client/IFR_BasicC.h @@ -74,7 +74,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_root/root_ch.cpp:62 namespace TAO @@ -88,22 +88,22 @@ namespace TAO namespace CORBA { - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_PRIMITIVEDEF__VAR_OUT_CH_) #define _CORBA_PRIMITIVEDEF__VAR_OUT_CH_ - + class PrimitiveDef; typedef PrimitiveDef *PrimitiveDef_ptr; - + typedef TAO_Objref_Var_T< PrimitiveDef > PrimitiveDef_var; - + typedef TAO_Objref_Out_T< PrimitiveDef @@ -111,22 +111,22 @@ namespace CORBA PrimitiveDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_STRINGDEF__VAR_OUT_CH_) #define _CORBA_STRINGDEF__VAR_OUT_CH_ - + class StringDef; typedef StringDef *StringDef_ptr; - + typedef TAO_Objref_Var_T< StringDef > StringDef_var; - + typedef TAO_Objref_Out_T< StringDef @@ -134,22 +134,22 @@ namespace CORBA StringDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_SEQUENCEDEF__VAR_OUT_CH_) #define _CORBA_SEQUENCEDEF__VAR_OUT_CH_ - + class SequenceDef; typedef SequenceDef *SequenceDef_ptr; - + typedef TAO_Objref_Var_T< SequenceDef > SequenceDef_var; - + typedef TAO_Objref_Out_T< SequenceDef @@ -157,22 +157,22 @@ namespace CORBA SequenceDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_ARRAYDEF__VAR_OUT_CH_) #define _CORBA_ARRAYDEF__VAR_OUT_CH_ - + class ArrayDef; typedef ArrayDef *ArrayDef_ptr; - + typedef TAO_Objref_Var_T< ArrayDef > ArrayDef_var; - + typedef TAO_Objref_Out_T< ArrayDef @@ -180,22 +180,22 @@ namespace CORBA ArrayDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_WSTRINGDEF__VAR_OUT_CH_) #define _CORBA_WSTRINGDEF__VAR_OUT_CH_ - + class WstringDef; typedef WstringDef *WstringDef_ptr; - + typedef TAO_Objref_Var_T< WstringDef > WstringDef_var; - + typedef TAO_Objref_Out_T< WstringDef @@ -203,22 +203,22 @@ namespace CORBA WstringDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_FIXEDDEF__VAR_OUT_CH_) #define _CORBA_FIXEDDEF__VAR_OUT_CH_ - + class FixedDef; typedef FixedDef *FixedDef_ptr; - + typedef TAO_Objref_Var_T< FixedDef > FixedDef_var; - + typedef TAO_Objref_Out_T< FixedDef @@ -226,10 +226,10 @@ namespace CORBA FixedDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_enum/enum_ch.cpp:57 - + enum PrimitiveKind { pk_null, @@ -255,29 +255,29 @@ namespace CORBA pk_wstring, pk_value_base }; - + typedef PrimitiveKind &PrimitiveKind_out; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_PrimitiveKind; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_REPOSITORY__VAR_OUT_CH_) #define _CORBA_REPOSITORY__VAR_OUT_CH_ - + class Repository; typedef Repository *Repository_ptr; - + typedef TAO_Objref_Var_T< Repository > Repository_var; - + typedef TAO_Objref_Out_T< Repository @@ -285,13 +285,13 @@ namespace CORBA Repository_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_REPOSITORY_CH_) #define _CORBA_REPOSITORY_CH_ - + class TAO_IFR_Client_Export Repository : public virtual ::CORBA::Container { @@ -299,32 +299,32 @@ namespace CORBA friend class TAO::Narrow_Utils<Repository>; typedef Repository_ptr _ptr_type; typedef Repository_var _var_type; - + // The static operations. static Repository_ptr _duplicate (Repository_ptr obj); - + static void _tao_release (Repository_ptr obj); - + static Repository_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Repository_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Repository_ptr _nil (void) { return static_cast<Repository_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::Contained_ptr lookup_id ( const char * search_id ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -332,10 +332,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::TypeCode_ptr get_canonical_typecode ( ::CORBA::TypeCode_ptr tc ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -343,10 +343,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::PrimitiveDef_ptr get_primitive ( ::CORBA::PrimitiveKind kind ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -354,10 +354,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::StringDef_ptr create_string ( ::CORBA::ULong bound ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -365,10 +365,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::WstringDef_ptr create_wstring ( ::CORBA::ULong bound ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -376,10 +376,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::SequenceDef_ptr create_sequence ( ::CORBA::ULong bound, ::CORBA::IDLType_ptr element_type @@ -388,10 +388,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::ArrayDef_ptr create_array ( ::CORBA::ULong length, ::CORBA::IDLType_ptr element_type @@ -400,10 +400,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::FixedDef_ptr create_fixed ( ::CORBA::UShort digits, ::CORBA::Short scale @@ -412,34 +412,34 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_Repository_Proxy_Broker_; - + protected: // Concrete interface only. Repository (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_Repository_setup_collocation (void); - + // Concrete non-local interface only. Repository ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. Repository ( TAO_Stub *objref, @@ -447,38 +447,38 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~Repository (void); - + private: // Private and unimplemented for concrete interfaces. Repository (const Repository &); - + void operator= (const Repository &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_Repository; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_MODULEDEF__VAR_OUT_CH_) #define _CORBA_MODULEDEF__VAR_OUT_CH_ - + class ModuleDef; typedef ModuleDef *ModuleDef_ptr; - + typedef TAO_Objref_Var_T< ModuleDef > ModuleDef_var; - + typedef TAO_Objref_Out_T< ModuleDef @@ -486,13 +486,13 @@ namespace CORBA ModuleDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_MODULEDEF_CH_) #define _CORBA_MODULEDEF_CH_ - + class TAO_IFR_Client_Export ModuleDef : public virtual ::CORBA::Container, public virtual ::CORBA::Contained @@ -501,56 +501,56 @@ namespace CORBA friend class TAO::Narrow_Utils<ModuleDef>; typedef ModuleDef_ptr _ptr_type; typedef ModuleDef_var _var_type; - + // The static operations. static ModuleDef_ptr _duplicate (ModuleDef_ptr obj); - + static void _tao_release (ModuleDef_ptr obj); - + static ModuleDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ModuleDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ModuleDef_ptr _nil (void) { return static_cast<ModuleDef_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_ModuleDef_Proxy_Broker_; - + protected: // Concrete interface only. ModuleDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_ModuleDef_setup_collocation (void); - + // Concrete non-local interface only. ModuleDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. ModuleDef ( TAO_Stub *objref, @@ -558,75 +558,75 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~ModuleDef (void); - + private: // Private and unimplemented for concrete interfaces. ModuleDef (const ModuleDef &); - + void operator= (const ModuleDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ModuleDef; - + // TAO_IDL - Generated from // be\be_type.cpp:258 - + struct ModuleDescription; - + typedef TAO_Var_Var_T< ModuleDescription > ModuleDescription_var; - + typedef TAO_Out_T< ModuleDescription, ModuleDescription_var > ModuleDescription_out; - + // TAO_IDL - Generated from // be\be_visitor_structure/structure_ch.cpp:57 - + struct TAO_IFR_Client_Export ModuleDescription { typedef ModuleDescription_var _var_type; - + static void _tao_any_destructor (void *); - TAO_String_Manager name; - TAO_String_Manager id; - TAO_String_Manager defined_in; - TAO_String_Manager version; + TAO::String_Manager name; + TAO::String_Manager id; + TAO::String_Manager defined_in; + TAO::String_Manager version; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ModuleDescription; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_CONSTANTDEF__VAR_OUT_CH_) #define _CORBA_CONSTANTDEF__VAR_OUT_CH_ - + class ConstantDef; typedef ConstantDef *ConstantDef_ptr; - + typedef TAO_Objref_Var_T< ConstantDef > ConstantDef_var; - + typedef TAO_Objref_Out_T< ConstantDef @@ -634,13 +634,13 @@ namespace CORBA ConstantDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_CONSTANTDEF_CH_) #define _CORBA_CONSTANTDEF_CH_ - + class TAO_IFR_Client_Export ConstantDef : public virtual ::CORBA::Contained { @@ -648,52 +648,52 @@ namespace CORBA friend class TAO::Narrow_Utils<ConstantDef>; typedef ConstantDef_ptr _ptr_type; typedef ConstantDef_var _var_type; - + // The static operations. static ConstantDef_ptr _duplicate (ConstantDef_ptr obj); - + static void _tao_release (ConstantDef_ptr obj); - + static ConstantDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ConstantDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ConstantDef_ptr _nil (void) { return static_cast<ConstantDef_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::TypeCode_ptr type ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::IDLType_ptr type_def ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void type_def ( ::CORBA::IDLType_ptr type_def ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -701,20 +701,20 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Any * value ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void value ( const ::CORBA::Any & value ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -722,34 +722,34 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_ConstantDef_Proxy_Broker_; - + protected: // Concrete interface only. ConstantDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_ConstantDef_setup_collocation (void); - + // Concrete non-local interface only. ConstantDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. ConstantDef ( TAO_Stub *objref, @@ -757,77 +757,77 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~ConstantDef (void); - + private: // Private and unimplemented for concrete interfaces. ConstantDef (const ConstantDef &); - + void operator= (const ConstantDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ConstantDef; - + // TAO_IDL - Generated from // be\be_type.cpp:258 - + struct ConstantDescription; - + typedef TAO_Var_Var_T< ConstantDescription > ConstantDescription_var; - + typedef TAO_Out_T< ConstantDescription, ConstantDescription_var > ConstantDescription_out; - + // TAO_IDL - Generated from // be\be_visitor_structure/structure_ch.cpp:57 - + struct TAO_IFR_Client_Export ConstantDescription { typedef ConstantDescription_var _var_type; - + static void _tao_any_destructor (void *); - TAO_String_Manager name; - TAO_String_Manager id; - TAO_String_Manager defined_in; - TAO_String_Manager version; + TAO::String_Manager name; + TAO::String_Manager id; + TAO::String_Manager defined_in; + TAO::String_Manager version; CORBA::TypeCode_var type; CORBA::Any value; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ConstantDescription; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_STRUCTDEF__VAR_OUT_CH_) #define _CORBA_STRUCTDEF__VAR_OUT_CH_ - + class StructDef; typedef StructDef *StructDef_ptr; - + typedef TAO_Objref_Var_T< StructDef > StructDef_var; - + typedef TAO_Objref_Out_T< StructDef @@ -835,13 +835,13 @@ namespace CORBA StructDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_STRUCTDEF_CH_) #define _CORBA_STRUCTDEF_CH_ - + class TAO_IFR_Client_Export StructDef : public virtual ::CORBA::TypedefDef, public virtual ::CORBA::Container @@ -850,42 +850,42 @@ namespace CORBA friend class TAO::Narrow_Utils<StructDef>; typedef StructDef_ptr _ptr_type; typedef StructDef_var _var_type; - + // The static operations. static StructDef_ptr _duplicate (StructDef_ptr obj); - + static void _tao_release (StructDef_ptr obj); - + static StructDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static StructDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static StructDef_ptr _nil (void) { return static_cast<StructDef_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::StructMemberSeq * members ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void members ( const ::CORBA::StructMemberSeq & members ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -893,34 +893,34 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_StructDef_Proxy_Broker_; - + protected: // Concrete interface only. StructDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_StructDef_setup_collocation (void); - + // Concrete non-local interface only. StructDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. StructDef ( TAO_Stub *objref, @@ -928,38 +928,38 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~StructDef (void); - + private: // Private and unimplemented for concrete interfaces. StructDef (const StructDef &); - + void operator= (const StructDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_StructDef; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_UNIONDEF__VAR_OUT_CH_) #define _CORBA_UNIONDEF__VAR_OUT_CH_ - + class UnionDef; typedef UnionDef *UnionDef_ptr; - + typedef TAO_Objref_Var_T< UnionDef > UnionDef_var; - + typedef TAO_Objref_Out_T< UnionDef @@ -967,13 +967,13 @@ namespace CORBA UnionDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_UNIONDEF_CH_) #define _CORBA_UNIONDEF_CH_ - + class TAO_IFR_Client_Export UnionDef : public virtual ::CORBA::TypedefDef, public virtual ::CORBA::Container @@ -982,52 +982,52 @@ namespace CORBA friend class TAO::Narrow_Utils<UnionDef>; typedef UnionDef_ptr _ptr_type; typedef UnionDef_var _var_type; - + // The static operations. static UnionDef_ptr _duplicate (UnionDef_ptr obj); - + static void _tao_release (UnionDef_ptr obj); - + static UnionDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static UnionDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static UnionDef_ptr _nil (void) { return static_cast<UnionDef_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::TypeCode_ptr discriminator_type ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::IDLType_ptr discriminator_type_def ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void discriminator_type_def ( ::CORBA::IDLType_ptr discriminator_type_def ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1035,20 +1035,20 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::UnionMemberSeq * members ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void members ( const ::CORBA::UnionMemberSeq & members ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1056,34 +1056,34 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_UnionDef_Proxy_Broker_; - + protected: // Concrete interface only. UnionDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_UnionDef_setup_collocation (void); - + // Concrete non-local interface only. UnionDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. UnionDef ( TAO_Stub *objref, @@ -1091,38 +1091,38 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~UnionDef (void); - + private: // Private and unimplemented for concrete interfaces. UnionDef (const UnionDef &); - + void operator= (const UnionDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_UnionDef; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_ENUMDEF__VAR_OUT_CH_) #define _CORBA_ENUMDEF__VAR_OUT_CH_ - + class EnumDef; typedef EnumDef *EnumDef_ptr; - + typedef TAO_Objref_Var_T< EnumDef > EnumDef_var; - + typedef TAO_Objref_Out_T< EnumDef @@ -1130,13 +1130,13 @@ namespace CORBA EnumDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_ENUMDEF_CH_) #define _CORBA_ENUMDEF_CH_ - + class TAO_IFR_Client_Export EnumDef : public virtual ::CORBA::TypedefDef { @@ -1144,42 +1144,42 @@ namespace CORBA friend class TAO::Narrow_Utils<EnumDef>; typedef EnumDef_ptr _ptr_type; typedef EnumDef_var _var_type; - + // The static operations. static EnumDef_ptr _duplicate (EnumDef_ptr obj); - + static void _tao_release (EnumDef_ptr obj); - + static EnumDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static EnumDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static EnumDef_ptr _nil (void) { return static_cast<EnumDef_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::EnumMemberSeq * members ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void members ( const ::CORBA::EnumMemberSeq & members ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1187,34 +1187,34 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_EnumDef_Proxy_Broker_; - + protected: // Concrete interface only. EnumDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_EnumDef_setup_collocation (void); - + // Concrete non-local interface only. EnumDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. EnumDef ( TAO_Stub *objref, @@ -1222,38 +1222,38 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~EnumDef (void); - + private: // Private and unimplemented for concrete interfaces. EnumDef (const EnumDef &); - + void operator= (const EnumDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_EnumDef; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_ALIASDEF__VAR_OUT_CH_) #define _CORBA_ALIASDEF__VAR_OUT_CH_ - + class AliasDef; typedef AliasDef *AliasDef_ptr; - + typedef TAO_Objref_Var_T< AliasDef > AliasDef_var; - + typedef TAO_Objref_Out_T< AliasDef @@ -1261,13 +1261,13 @@ namespace CORBA AliasDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_ALIASDEF_CH_) #define _CORBA_ALIASDEF_CH_ - + class TAO_IFR_Client_Export AliasDef : public virtual ::CORBA::TypedefDef { @@ -1275,42 +1275,42 @@ namespace CORBA friend class TAO::Narrow_Utils<AliasDef>; typedef AliasDef_ptr _ptr_type; typedef AliasDef_var _var_type; - + // The static operations. static AliasDef_ptr _duplicate (AliasDef_ptr obj); - + static void _tao_release (AliasDef_ptr obj); - + static AliasDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static AliasDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static AliasDef_ptr _nil (void) { return static_cast<AliasDef_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::IDLType_ptr original_type_def ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void original_type_def ( ::CORBA::IDLType_ptr original_type_def ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1318,34 +1318,34 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_AliasDef_Proxy_Broker_; - + protected: // Concrete interface only. AliasDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_AliasDef_setup_collocation (void); - + // Concrete non-local interface only. AliasDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. AliasDef ( TAO_Stub *objref, @@ -1353,38 +1353,38 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~AliasDef (void); - + private: // Private and unimplemented for concrete interfaces. AliasDef (const AliasDef &); - + void operator= (const AliasDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_AliasDef; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_NATIVEDEF__VAR_OUT_CH_) #define _CORBA_NATIVEDEF__VAR_OUT_CH_ - + class NativeDef; typedef NativeDef *NativeDef_ptr; - + typedef TAO_Objref_Var_T< NativeDef > NativeDef_var; - + typedef TAO_Objref_Out_T< NativeDef @@ -1392,13 +1392,13 @@ namespace CORBA NativeDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_NATIVEDEF_CH_) #define _CORBA_NATIVEDEF_CH_ - + class TAO_IFR_Client_Export NativeDef : public virtual ::CORBA::TypedefDef { @@ -1406,56 +1406,56 @@ namespace CORBA friend class TAO::Narrow_Utils<NativeDef>; typedef NativeDef_ptr _ptr_type; typedef NativeDef_var _var_type; - + // The static operations. static NativeDef_ptr _duplicate (NativeDef_ptr obj); - + static void _tao_release (NativeDef_ptr obj); - + static NativeDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static NativeDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static NativeDef_ptr _nil (void) { return static_cast<NativeDef_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_NativeDef_Proxy_Broker_; - + protected: // Concrete interface only. NativeDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_NativeDef_setup_collocation (void); - + // Concrete non-local interface only. NativeDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. NativeDef ( TAO_Stub *objref, @@ -1463,29 +1463,29 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~NativeDef (void); - + private: // Private and unimplemented for concrete interfaces. NativeDef (const NativeDef &); - + void operator= (const NativeDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_NativeDef; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_PRIMITIVEDEF_CH_) #define _CORBA_PRIMITIVEDEF_CH_ - + class TAO_IFR_Client_Export PrimitiveDef : public virtual ::CORBA::IDLType { @@ -1493,66 +1493,66 @@ namespace CORBA friend class TAO::Narrow_Utils<PrimitiveDef>; typedef PrimitiveDef_ptr _ptr_type; typedef PrimitiveDef_var _var_type; - + // The static operations. static PrimitiveDef_ptr _duplicate (PrimitiveDef_ptr obj); - + static void _tao_release (PrimitiveDef_ptr obj); - + static PrimitiveDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static PrimitiveDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static PrimitiveDef_ptr _nil (void) { return static_cast<PrimitiveDef_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::PrimitiveKind kind ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_PrimitiveDef_Proxy_Broker_; - + protected: // Concrete interface only. PrimitiveDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_PrimitiveDef_setup_collocation (void); - + // Concrete non-local interface only. PrimitiveDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. PrimitiveDef ( TAO_Stub *objref, @@ -1560,29 +1560,29 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~PrimitiveDef (void); - + private: // Private and unimplemented for concrete interfaces. PrimitiveDef (const PrimitiveDef &); - + void operator= (const PrimitiveDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_PrimitiveDef; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_STRINGDEF_CH_) #define _CORBA_STRINGDEF_CH_ - + class TAO_IFR_Client_Export StringDef : public virtual ::CORBA::IDLType { @@ -1590,42 +1590,42 @@ namespace CORBA friend class TAO::Narrow_Utils<StringDef>; typedef StringDef_ptr _ptr_type; typedef StringDef_var _var_type; - + // The static operations. static StringDef_ptr _duplicate (StringDef_ptr obj); - + static void _tao_release (StringDef_ptr obj); - + static StringDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static StringDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static StringDef_ptr _nil (void) { return static_cast<StringDef_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::ULong bound ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void bound ( ::CORBA::ULong bound ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1633,34 +1633,34 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_StringDef_Proxy_Broker_; - + protected: // Concrete interface only. StringDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_StringDef_setup_collocation (void); - + // Concrete non-local interface only. StringDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. StringDef ( TAO_Stub *objref, @@ -1668,29 +1668,29 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~StringDef (void); - + private: // Private and unimplemented for concrete interfaces. StringDef (const StringDef &); - + void operator= (const StringDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_StringDef; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_WSTRINGDEF_CH_) #define _CORBA_WSTRINGDEF_CH_ - + class TAO_IFR_Client_Export WstringDef : public virtual ::CORBA::IDLType { @@ -1698,42 +1698,42 @@ namespace CORBA friend class TAO::Narrow_Utils<WstringDef>; typedef WstringDef_ptr _ptr_type; typedef WstringDef_var _var_type; - + // The static operations. static WstringDef_ptr _duplicate (WstringDef_ptr obj); - + static void _tao_release (WstringDef_ptr obj); - + static WstringDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static WstringDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static WstringDef_ptr _nil (void) { return static_cast<WstringDef_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::ULong bound ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void bound ( ::CORBA::ULong bound ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1741,34 +1741,34 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_WstringDef_Proxy_Broker_; - + protected: // Concrete interface only. WstringDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_WstringDef_setup_collocation (void); - + // Concrete non-local interface only. WstringDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. WstringDef ( TAO_Stub *objref, @@ -1776,29 +1776,29 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~WstringDef (void); - + private: // Private and unimplemented for concrete interfaces. WstringDef (const WstringDef &); - + void operator= (const WstringDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_WstringDef; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_SEQUENCEDEF_CH_) #define _CORBA_SEQUENCEDEF_CH_ - + class TAO_IFR_Client_Export SequenceDef : public virtual ::CORBA::IDLType { @@ -1806,42 +1806,42 @@ namespace CORBA friend class TAO::Narrow_Utils<SequenceDef>; typedef SequenceDef_ptr _ptr_type; typedef SequenceDef_var _var_type; - + // The static operations. static SequenceDef_ptr _duplicate (SequenceDef_ptr obj); - + static void _tao_release (SequenceDef_ptr obj); - + static SequenceDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static SequenceDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static SequenceDef_ptr _nil (void) { return static_cast<SequenceDef_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::ULong bound ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void bound ( ::CORBA::ULong bound ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1849,30 +1849,30 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::TypeCode_ptr element_type ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::IDLType_ptr element_type_def ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void element_type_def ( ::CORBA::IDLType_ptr element_type_def ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1880,34 +1880,34 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_SequenceDef_Proxy_Broker_; - + protected: // Concrete interface only. SequenceDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_SequenceDef_setup_collocation (void); - + // Concrete non-local interface only. SequenceDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. SequenceDef ( TAO_Stub *objref, @@ -1915,29 +1915,29 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~SequenceDef (void); - + private: // Private and unimplemented for concrete interfaces. SequenceDef (const SequenceDef &); - + void operator= (const SequenceDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_SequenceDef; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_ARRAYDEF_CH_) #define _CORBA_ARRAYDEF_CH_ - + class TAO_IFR_Client_Export ArrayDef : public virtual ::CORBA::IDLType { @@ -1945,42 +1945,42 @@ namespace CORBA friend class TAO::Narrow_Utils<ArrayDef>; typedef ArrayDef_ptr _ptr_type; typedef ArrayDef_var _var_type; - + // The static operations. static ArrayDef_ptr _duplicate (ArrayDef_ptr obj); - + static void _tao_release (ArrayDef_ptr obj); - + static ArrayDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ArrayDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ArrayDef_ptr _nil (void) { return static_cast<ArrayDef_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::ULong length ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void length ( ::CORBA::ULong length ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1988,30 +1988,30 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::TypeCode_ptr element_type ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::IDLType_ptr element_type_def ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void element_type_def ( ::CORBA::IDLType_ptr element_type_def ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -2019,34 +2019,34 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_ArrayDef_Proxy_Broker_; - + protected: // Concrete interface only. ArrayDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_ArrayDef_setup_collocation (void); - + // Concrete non-local interface only. ArrayDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. ArrayDef ( TAO_Stub *objref, @@ -2054,38 +2054,38 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~ArrayDef (void); - + private: // Private and unimplemented for concrete interfaces. ArrayDef (const ArrayDef &); - + void operator= (const ArrayDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ArrayDef; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_EXCEPTIONDEF__VAR_OUT_CH_) #define _CORBA_EXCEPTIONDEF__VAR_OUT_CH_ - + class ExceptionDef; typedef ExceptionDef *ExceptionDef_ptr; - + typedef TAO_Objref_Var_T< ExceptionDef > ExceptionDef_var; - + typedef TAO_Objref_Out_T< ExceptionDef @@ -2093,13 +2093,13 @@ namespace CORBA ExceptionDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_EXCEPTIONDEF_CH_) #define _CORBA_EXCEPTIONDEF_CH_ - + class TAO_IFR_Client_Export ExceptionDef : public virtual ::CORBA::Contained, public virtual ::CORBA::Container @@ -2108,52 +2108,52 @@ namespace CORBA friend class TAO::Narrow_Utils<ExceptionDef>; typedef ExceptionDef_ptr _ptr_type; typedef ExceptionDef_var _var_type; - + // The static operations. static ExceptionDef_ptr _duplicate (ExceptionDef_ptr obj); - + static void _tao_release (ExceptionDef_ptr obj); - + static ExceptionDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ExceptionDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ExceptionDef_ptr _nil (void) { return static_cast<ExceptionDef_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::TypeCode_ptr type ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::StructMemberSeq * members ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void members ( const ::CORBA::StructMemberSeq & members ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -2161,34 +2161,34 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_ExceptionDef_Proxy_Broker_; - + protected: // Concrete interface only. ExceptionDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_ExceptionDef_setup_collocation (void); - + // Concrete non-local interface only. ExceptionDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. ExceptionDef ( TAO_Stub *objref, @@ -2196,55 +2196,46 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~ExceptionDef (void); - + private: // Private and unimplemented for concrete interfaces. ExceptionDef (const ExceptionDef &); - + void operator= (const ExceptionDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExceptionDef; - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_CORBA_EXCEPTIONDEFSEQ_CH_) #define _CORBA_EXCEPTIONDEFSEQ_CH_ - + class ExceptionDefSeq; - + typedef - TAO_MngSeq_Var_T< - ExceptionDefSeq, - TAO_Object_Manager< - ExceptionDef, - ExceptionDef_var - > + TAO_VarSeq_Var_T< + ExceptionDefSeq > ExceptionDefSeq_var; - + typedef - TAO_MngSeq_Out_T< - ExceptionDefSeq, - ExceptionDefSeq_var, - TAO_Object_Manager< - ExceptionDef, - ExceptionDef_var - > + TAO_Seq_Out_T< + ExceptionDefSeq > ExceptionDefSeq_out; - + class TAO_IFR_Client_Export ExceptionDefSeq : public - TAO_Unbounded_Object_Sequence< + TAO::unbounded_object_reference_sequence< ExceptionDef, ExceptionDef_var > @@ -2255,55 +2246,55 @@ namespace CORBA ExceptionDefSeq ( CORBA::ULong max, CORBA::ULong length, - ExceptionDef_ptr* buffer, - CORBA::Boolean release = 0 + ExceptionDef_ptr* buffer, + CORBA::Boolean release = false ); ExceptionDefSeq (const ExceptionDefSeq &); ~ExceptionDefSeq (void); - + static void _tao_any_destructor (void *); - + typedef ExceptionDefSeq_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExceptionDefSeq; - + // TAO_IDL - Generated from // be\be_visitor_enum/enum_ch.cpp:57 - + enum AttributeMode { ATTR_NORMAL, ATTR_READONLY }; - + typedef AttributeMode &AttributeMode_out; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_AttributeMode; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_ATTRIBUTEDEF__VAR_OUT_CH_) #define _CORBA_ATTRIBUTEDEF__VAR_OUT_CH_ - + class AttributeDef; typedef AttributeDef *AttributeDef_ptr; - + typedef TAO_Objref_Var_T< AttributeDef > AttributeDef_var; - + typedef TAO_Objref_Out_T< AttributeDef @@ -2311,13 +2302,13 @@ namespace CORBA AttributeDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_ATTRIBUTEDEF_CH_) #define _CORBA_ATTRIBUTEDEF_CH_ - + class TAO_IFR_Client_Export AttributeDef : public virtual ::CORBA::Contained { @@ -2325,52 +2316,52 @@ namespace CORBA friend class TAO::Narrow_Utils<AttributeDef>; typedef AttributeDef_ptr _ptr_type; typedef AttributeDef_var _var_type; - + // The static operations. static AttributeDef_ptr _duplicate (AttributeDef_ptr obj); - + static void _tao_release (AttributeDef_ptr obj); - + static AttributeDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static AttributeDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static AttributeDef_ptr _nil (void) { return static_cast<AttributeDef_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::TypeCode_ptr type ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::IDLType_ptr type_def ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void type_def ( ::CORBA::IDLType_ptr type_def ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -2378,20 +2369,20 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::AttributeMode mode ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void mode ( ::CORBA::AttributeMode mode ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -2399,34 +2390,34 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_AttributeDef_Proxy_Broker_; - + protected: // Concrete interface only. AttributeDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_AttributeDef_setup_collocation (void); - + // Concrete non-local interface only. AttributeDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. AttributeDef ( TAO_Stub *objref, @@ -2434,118 +2425,118 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~AttributeDef (void); - + private: // Private and unimplemented for concrete interfaces. AttributeDef (const AttributeDef &); - + void operator= (const AttributeDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_AttributeDef; - + // TAO_IDL - Generated from // be\be_type.cpp:258 - + struct AttributeDescription; - + typedef TAO_Var_Var_T< AttributeDescription > AttributeDescription_var; - + typedef TAO_Out_T< AttributeDescription, AttributeDescription_var > AttributeDescription_out; - + // TAO_IDL - Generated from // be\be_visitor_structure/structure_ch.cpp:57 - + struct TAO_IFR_Client_Export AttributeDescription { typedef AttributeDescription_var _var_type; - + static void _tao_any_destructor (void *); - TAO_String_Manager name; - TAO_String_Manager id; - TAO_String_Manager defined_in; - TAO_String_Manager version; + TAO::String_Manager name; + TAO::String_Manager id; + TAO::String_Manager defined_in; + TAO::String_Manager version; CORBA::TypeCode_var type; CORBA::AttributeMode mode; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_AttributeDescription; - + // TAO_IDL - Generated from // be\be_type.cpp:258 - + struct ExtAttributeDescription; - + typedef TAO_Var_Var_T< ExtAttributeDescription > ExtAttributeDescription_var; - + typedef TAO_Out_T< ExtAttributeDescription, ExtAttributeDescription_var > ExtAttributeDescription_out; - + // TAO_IDL - Generated from // be\be_visitor_structure/structure_ch.cpp:57 - + struct TAO_IFR_Client_Export ExtAttributeDescription { typedef ExtAttributeDescription_var _var_type; - + static void _tao_any_destructor (void *); - TAO_String_Manager name; - TAO_String_Manager id; - TAO_String_Manager defined_in; - TAO_String_Manager version; + TAO::String_Manager name; + TAO::String_Manager id; + TAO::String_Manager defined_in; + TAO::String_Manager version; CORBA::TypeCode_var type; CORBA::AttributeMode mode; CORBA::ExcDescriptionSeq get_exceptions; CORBA::ExcDescriptionSeq put_exceptions; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtAttributeDescription; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_EXTATTRIBUTEDEF__VAR_OUT_CH_) #define _CORBA_EXTATTRIBUTEDEF__VAR_OUT_CH_ - + class ExtAttributeDef; typedef ExtAttributeDef *ExtAttributeDef_ptr; - + typedef TAO_Objref_Var_T< ExtAttributeDef > ExtAttributeDef_var; - + typedef TAO_Objref_Out_T< ExtAttributeDef @@ -2553,13 +2544,13 @@ namespace CORBA ExtAttributeDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_EXTATTRIBUTEDEF_CH_) #define _CORBA_EXTATTRIBUTEDEF_CH_ - + class TAO_IFR_Client_Export ExtAttributeDef : public virtual ::CORBA::AttributeDef { @@ -2567,42 +2558,42 @@ namespace CORBA friend class TAO::Narrow_Utils<ExtAttributeDef>; typedef ExtAttributeDef_ptr _ptr_type; typedef ExtAttributeDef_var _var_type; - + // The static operations. static ExtAttributeDef_ptr _duplicate (ExtAttributeDef_ptr obj); - + static void _tao_release (ExtAttributeDef_ptr obj); - + static ExtAttributeDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ExtAttributeDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ExtAttributeDef_ptr _nil (void) { return static_cast<ExtAttributeDef_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::ExcDescriptionSeq * get_exceptions ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void get_exceptions ( const ::CORBA::ExcDescriptionSeq & get_exceptions ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -2610,20 +2601,20 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::ExcDescriptionSeq * set_exceptions ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void set_exceptions ( const ::CORBA::ExcDescriptionSeq & set_exceptions ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -2631,44 +2622,44 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::ExtAttributeDescription * describe_attribute ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_ExtAttributeDef_Proxy_Broker_; - + protected: // Concrete interface only. ExtAttributeDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_ExtAttributeDef_setup_collocation (void); - + // Concrete non-local interface only. ExtAttributeDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. ExtAttributeDef ( TAO_Stub *objref, @@ -2676,102 +2667,99 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~ExtAttributeDef (void); - + private: // Private and unimplemented for concrete interfaces. ExtAttributeDef (const ExtAttributeDef &); - + void operator= (const ExtAttributeDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtAttributeDef; - + // TAO_IDL - Generated from // be\be_visitor_enum/enum_ch.cpp:57 - + enum OperationMode { OP_NORMAL, OP_ONEWAY }; - + typedef OperationMode &OperationMode_out; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_OperationMode; - + // TAO_IDL - Generated from // be\be_type.cpp:258 - + struct ParameterDescription; - + typedef TAO_Var_Var_T< ParameterDescription > ParameterDescription_var; - + typedef TAO_Out_T< ParameterDescription, ParameterDescription_var > ParameterDescription_out; - + // TAO_IDL - Generated from // be\be_visitor_structure/structure_ch.cpp:57 - + struct TAO_IFR_Client_Export ParameterDescription { typedef ParameterDescription_var _var_type; - + static void _tao_any_destructor (void *); - TAO_String_Manager name; + TAO::String_Manager name; CORBA::TypeCode_var type; CORBA::IDLType_var type_def; CORBA::ParameterMode mode; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ParameterDescription; - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_CORBA_PARDESCRIPTIONSEQ_CH_) #define _CORBA_PARDESCRIPTIONSEQ_CH_ - + class ParDescriptionSeq; - + typedef TAO_VarSeq_Var_T< - ParDescriptionSeq, - ParameterDescription + ParDescriptionSeq > ParDescriptionSeq_var; - + typedef TAO_Seq_Out_T< - ParDescriptionSeq, - ParDescriptionSeq_var, - ParameterDescription + ParDescriptionSeq > ParDescriptionSeq_out; - + class TAO_IFR_Client_Export ParDescriptionSeq : public - TAO_Unbounded_Sequence< + TAO::unbounded_value_sequence< ParameterDescription > { @@ -2781,62 +2769,59 @@ namespace CORBA ParDescriptionSeq ( CORBA::ULong max, CORBA::ULong length, - ParameterDescription* buffer, - CORBA::Boolean release = 0 + ParameterDescription* buffer, + CORBA::Boolean release = false ); ParDescriptionSeq (const ParDescriptionSeq &); ~ParDescriptionSeq (void); - + static void _tao_any_destructor (void *); - + typedef ParDescriptionSeq_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ParDescriptionSeq; - + // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:413 - + typedef char * ContextIdentifier; typedef CORBA::String_var ContextIdentifier_var; typedef CORBA::String_out ContextIdentifier_out; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ContextIdentifier; - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_CORBA_CONTEXTIDSEQ_CH_) #define _CORBA_CONTEXTIDSEQ_CH_ - + class ContextIdSeq; - + typedef - TAO_MngSeq_Var_T< - ContextIdSeq, - TAO_SeqElem_String_Manager + TAO_VarSeq_Var_T< + ContextIdSeq > ContextIdSeq_var; - + typedef - TAO_MngSeq_Out_T< - ContextIdSeq, - ContextIdSeq_var, - TAO_SeqElem_String_Manager + TAO_Seq_Out_T< + ContextIdSeq > ContextIdSeq_out; - + class TAO_IFR_Client_Export ContextIdSeq : public - TAO_Unbounded_String_Sequence + TAO::unbounded_string_sequence { public: ContextIdSeq (void); @@ -2844,39 +2829,39 @@ namespace CORBA ContextIdSeq ( CORBA::ULong max, CORBA::ULong length, - char ** buffer, - CORBA::Boolean release = 0 + char ** buffer, + CORBA::Boolean release = false ); ContextIdSeq (const ContextIdSeq &); ~ContextIdSeq (void); - + static void _tao_any_destructor (void *); - + typedef ContextIdSeq_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ContextIdSeq; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_OPERATIONDEF__VAR_OUT_CH_) #define _CORBA_OPERATIONDEF__VAR_OUT_CH_ - + class OperationDef; typedef OperationDef *OperationDef_ptr; - + typedef TAO_Objref_Var_T< OperationDef > OperationDef_var; - + typedef TAO_Objref_Out_T< OperationDef @@ -2884,13 +2869,13 @@ namespace CORBA OperationDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_OPERATIONDEF_CH_) #define _CORBA_OPERATIONDEF_CH_ - + class TAO_IFR_Client_Export OperationDef : public virtual ::CORBA::Contained { @@ -2898,52 +2883,52 @@ namespace CORBA friend class TAO::Narrow_Utils<OperationDef>; typedef OperationDef_ptr _ptr_type; typedef OperationDef_var _var_type; - + // The static operations. static OperationDef_ptr _duplicate (OperationDef_ptr obj); - + static void _tao_release (OperationDef_ptr obj); - + static OperationDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static OperationDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static OperationDef_ptr _nil (void) { return static_cast<OperationDef_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::TypeCode_ptr result ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::IDLType_ptr result_def ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void result_def ( ::CORBA::IDLType_ptr result_def ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -2951,20 +2936,20 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::ParDescriptionSeq * params ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void params ( const ::CORBA::ParDescriptionSeq & params ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -2972,20 +2957,20 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::OperationMode mode ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void mode ( ::CORBA::OperationMode mode ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -2993,20 +2978,20 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::ContextIdSeq * contexts ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void contexts ( const ::CORBA::ContextIdSeq & contexts ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -3014,20 +2999,20 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::ExceptionDefSeq * exceptions ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void exceptions ( const ::CORBA::ExceptionDefSeq & exceptions ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -3035,34 +3020,34 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_OperationDef_Proxy_Broker_; - + protected: // Concrete interface only. OperationDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_OperationDef_setup_collocation (void); - + // Concrete non-local interface only. OperationDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. OperationDef ( TAO_Stub *objref, @@ -3070,91 +3055,88 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~OperationDef (void); - + private: // Private and unimplemented for concrete interfaces. OperationDef (const OperationDef &); - + void operator= (const OperationDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_OperationDef; - + // TAO_IDL - Generated from // be\be_type.cpp:258 - + struct OperationDescription; - + typedef TAO_Var_Var_T< OperationDescription > OperationDescription_var; - + typedef TAO_Out_T< OperationDescription, OperationDescription_var > OperationDescription_out; - + // TAO_IDL - Generated from // be\be_visitor_structure/structure_ch.cpp:57 - + struct TAO_IFR_Client_Export OperationDescription { typedef OperationDescription_var _var_type; - + static void _tao_any_destructor (void *); - TAO_String_Manager name; - TAO_String_Manager id; - TAO_String_Manager defined_in; - TAO_String_Manager version; + TAO::String_Manager name; + TAO::String_Manager id; + TAO::String_Manager defined_in; + TAO::String_Manager version; CORBA::TypeCode_var result; CORBA::OperationMode mode; CORBA::ContextIdSeq contexts; CORBA::ParDescriptionSeq parameters; CORBA::ExcDescriptionSeq exceptions; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_OperationDescription; - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_CORBA_REPOSITORYIDSEQ_CH_) #define _CORBA_REPOSITORYIDSEQ_CH_ - + class RepositoryIdSeq; - + typedef - TAO_MngSeq_Var_T< - RepositoryIdSeq, - TAO_SeqElem_String_Manager + TAO_VarSeq_Var_T< + RepositoryIdSeq > RepositoryIdSeq_var; - + typedef - TAO_MngSeq_Out_T< - RepositoryIdSeq, - RepositoryIdSeq_var, - TAO_SeqElem_String_Manager + TAO_Seq_Out_T< + RepositoryIdSeq > RepositoryIdSeq_out; - + class TAO_IFR_Client_Export RepositoryIdSeq : public - TAO_Unbounded_String_Sequence + TAO::unbounded_string_sequence { public: RepositoryIdSeq (void); @@ -3162,50 +3144,47 @@ namespace CORBA RepositoryIdSeq ( CORBA::ULong max, CORBA::ULong length, - char ** buffer, - CORBA::Boolean release = 0 + char ** buffer, + CORBA::Boolean release = false ); RepositoryIdSeq (const RepositoryIdSeq &); ~RepositoryIdSeq (void); - + static void _tao_any_destructor (void *); - + typedef RepositoryIdSeq_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_RepositoryIdSeq; - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_CORBA_OPDESCRIPTIONSEQ_CH_) #define _CORBA_OPDESCRIPTIONSEQ_CH_ - + class OpDescriptionSeq; - + typedef TAO_VarSeq_Var_T< - OpDescriptionSeq, - OperationDescription + OpDescriptionSeq > OpDescriptionSeq_var; - + typedef TAO_Seq_Out_T< - OpDescriptionSeq, - OpDescriptionSeq_var, - OperationDescription + OpDescriptionSeq > OpDescriptionSeq_out; - + class TAO_IFR_Client_Export OpDescriptionSeq : public - TAO_Unbounded_Sequence< + TAO::unbounded_value_sequence< OperationDescription > { @@ -3215,50 +3194,47 @@ namespace CORBA OpDescriptionSeq ( CORBA::ULong max, CORBA::ULong length, - OperationDescription* buffer, - CORBA::Boolean release = 0 + OperationDescription* buffer, + CORBA::Boolean release = false ); OpDescriptionSeq (const OpDescriptionSeq &); ~OpDescriptionSeq (void); - + static void _tao_any_destructor (void *); - + typedef OpDescriptionSeq_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_OpDescriptionSeq; - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_CORBA_ATTRDESCRIPTIONSEQ_CH_) #define _CORBA_ATTRDESCRIPTIONSEQ_CH_ - + class AttrDescriptionSeq; - + typedef TAO_VarSeq_Var_T< - AttrDescriptionSeq, - AttributeDescription + AttrDescriptionSeq > AttrDescriptionSeq_var; - + typedef TAO_Seq_Out_T< - AttrDescriptionSeq, - AttrDescriptionSeq_var, - AttributeDescription + AttrDescriptionSeq > AttrDescriptionSeq_out; - + class TAO_IFR_Client_Export AttrDescriptionSeq : public - TAO_Unbounded_Sequence< + TAO::unbounded_value_sequence< AttributeDescription > { @@ -3268,50 +3244,47 @@ namespace CORBA AttrDescriptionSeq ( CORBA::ULong max, CORBA::ULong length, - AttributeDescription* buffer, - CORBA::Boolean release = 0 + AttributeDescription* buffer, + CORBA::Boolean release = false ); AttrDescriptionSeq (const AttrDescriptionSeq &); ~AttrDescriptionSeq (void); - + static void _tao_any_destructor (void *); - + typedef AttrDescriptionSeq_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_AttrDescriptionSeq; - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_CORBA_EXTATTRDESCRIPTIONSEQ_CH_) #define _CORBA_EXTATTRDESCRIPTIONSEQ_CH_ - + class ExtAttrDescriptionSeq; - + typedef TAO_VarSeq_Var_T< - ExtAttrDescriptionSeq, - ExtAttributeDescription + ExtAttrDescriptionSeq > ExtAttrDescriptionSeq_var; - + typedef TAO_Seq_Out_T< - ExtAttrDescriptionSeq, - ExtAttrDescriptionSeq_var, - ExtAttributeDescription + ExtAttrDescriptionSeq > ExtAttrDescriptionSeq_out; - + class TAO_IFR_Client_Export ExtAttrDescriptionSeq : public - TAO_Unbounded_Sequence< + TAO::unbounded_value_sequence< ExtAttributeDescription > { @@ -3321,39 +3294,39 @@ namespace CORBA ExtAttrDescriptionSeq ( CORBA::ULong max, CORBA::ULong length, - ExtAttributeDescription* buffer, - CORBA::Boolean release = 0 + ExtAttributeDescription* buffer, + CORBA::Boolean release = false ); ExtAttrDescriptionSeq (const ExtAttrDescriptionSeq &); ~ExtAttrDescriptionSeq (void); - + static void _tao_any_destructor (void *); - + typedef ExtAttrDescriptionSeq_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtAttrDescriptionSeq; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_INTERFACEDEF__VAR_OUT_CH_) #define _CORBA_INTERFACEDEF__VAR_OUT_CH_ - + class InterfaceDef; typedef InterfaceDef *InterfaceDef_ptr; - + typedef TAO_Objref_Var_T< InterfaceDef > InterfaceDef_var; - + typedef TAO_Objref_Out_T< InterfaceDef @@ -3361,13 +3334,13 @@ namespace CORBA InterfaceDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_INTERFACEDEF_CH_) #define _CORBA_INTERFACEDEF_CH_ - + class TAO_IFR_Client_Export InterfaceDef : public virtual ::CORBA::Container, public virtual ::CORBA::Contained, @@ -3377,42 +3350,42 @@ namespace CORBA friend class TAO::Narrow_Utils<InterfaceDef>; typedef InterfaceDef_ptr _ptr_type; typedef InterfaceDef_var _var_type; - + // The static operations. static InterfaceDef_ptr _duplicate (InterfaceDef_ptr obj); - + static void _tao_release (InterfaceDef_ptr obj); - + static InterfaceDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static InterfaceDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static InterfaceDef_ptr _nil (void) { return static_cast<InterfaceDef_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::InterfaceDefSeq * base_interfaces ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void base_interfaces ( const ::CORBA::InterfaceDefSeq & base_interfaces ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -3420,10 +3393,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Boolean is_a ( const char * interface_id ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -3431,61 +3404,61 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_type.cpp:258 - + struct FullInterfaceDescription; - + typedef TAO_Var_Var_T< FullInterfaceDescription > FullInterfaceDescription_var; - + typedef TAO_Out_T< FullInterfaceDescription, FullInterfaceDescription_var > FullInterfaceDescription_out; - + // TAO_IDL - Generated from // be\be_visitor_structure/structure_ch.cpp:57 - + struct TAO_IFR_Client_Export FullInterfaceDescription { typedef FullInterfaceDescription_var _var_type; - + static void _tao_any_destructor (void *); - TAO_String_Manager name; - TAO_String_Manager id; - TAO_String_Manager defined_in; - TAO_String_Manager version; - ACE_NESTED_CLASS (CORBA, OpDescriptionSeq) operations; - ACE_NESTED_CLASS (CORBA, AttrDescriptionSeq) attributes; - ACE_NESTED_CLASS (CORBA, RepositoryIdSeq) base_interfaces; - ACE_NESTED_CLASS (CORBA, TypeCode_var) type; + TAO::String_Manager name; + TAO::String_Manager id; + TAO::String_Manager defined_in; + TAO::String_Manager version; + ::CORBA::OpDescriptionSeq operations; + ::CORBA::AttrDescriptionSeq attributes; + ::CORBA::RepositoryIdSeq base_interfaces; + ::CORBA::TypeCode_var type; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + static ::CORBA::TypeCode_ptr const _tc_FullInterfaceDescription; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::InterfaceDef::FullInterfaceDescription * describe_interface ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::AttributeDef_ptr create_attribute ( const char * id, const char * name, @@ -3497,10 +3470,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::OperationDef_ptr create_operation ( const char * id, const char * name, @@ -3515,34 +3488,34 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_InterfaceDef_Proxy_Broker_; - + protected: // Concrete interface only. InterfaceDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_InterfaceDef_setup_collocation (void); - + // Concrete non-local interface only. InterfaceDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. InterfaceDef ( TAO_Stub *objref, @@ -3550,76 +3523,76 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~InterfaceDef (void); - + private: // Private and unimplemented for concrete interfaces. InterfaceDef (const InterfaceDef &); - + void operator= (const InterfaceDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_InterfaceDef; - + // TAO_IDL - Generated from // be\be_type.cpp:258 - + struct InterfaceDescription; - + typedef TAO_Var_Var_T< InterfaceDescription > InterfaceDescription_var; - + typedef TAO_Out_T< InterfaceDescription, InterfaceDescription_var > InterfaceDescription_out; - + // TAO_IDL - Generated from // be\be_visitor_structure/structure_ch.cpp:57 - + struct TAO_IFR_Client_Export InterfaceDescription { typedef InterfaceDescription_var _var_type; - + static void _tao_any_destructor (void *); - TAO_String_Manager name; - TAO_String_Manager id; - TAO_String_Manager defined_in; - TAO_String_Manager version; + TAO::String_Manager name; + TAO::String_Manager id; + TAO::String_Manager defined_in; + TAO::String_Manager version; CORBA::RepositoryIdSeq base_interfaces; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_InterfaceDescription; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_INTERFACEATTREXTENSION__VAR_OUT_CH_) #define _CORBA_INTERFACEATTREXTENSION__VAR_OUT_CH_ - + class InterfaceAttrExtension; typedef InterfaceAttrExtension *InterfaceAttrExtension_ptr; - + typedef TAO_Objref_Var_T< InterfaceAttrExtension > InterfaceAttrExtension_var; - + typedef TAO_Objref_Out_T< InterfaceAttrExtension @@ -3627,13 +3600,13 @@ namespace CORBA InterfaceAttrExtension_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_INTERFACEATTREXTENSION_CH_) #define _CORBA_INTERFACEATTREXTENSION_CH_ - + class TAO_IFR_Client_Export InterfaceAttrExtension : public virtual CORBA::Object { @@ -3641,83 +3614,83 @@ namespace CORBA friend class TAO::Narrow_Utils<InterfaceAttrExtension>; typedef InterfaceAttrExtension_ptr _ptr_type; typedef InterfaceAttrExtension_var _var_type; - + // The static operations. static InterfaceAttrExtension_ptr _duplicate (InterfaceAttrExtension_ptr obj); - + static void _tao_release (InterfaceAttrExtension_ptr obj); - + static InterfaceAttrExtension_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static InterfaceAttrExtension_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static InterfaceAttrExtension_ptr _nil (void) { return static_cast<InterfaceAttrExtension_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_type.cpp:258 - + struct ExtFullInterfaceDescription; - + typedef TAO_Var_Var_T< ExtFullInterfaceDescription > ExtFullInterfaceDescription_var; - + typedef TAO_Out_T< ExtFullInterfaceDescription, ExtFullInterfaceDescription_var > ExtFullInterfaceDescription_out; - + // TAO_IDL - Generated from // be\be_visitor_structure/structure_ch.cpp:57 - + struct TAO_IFR_Client_Export ExtFullInterfaceDescription { typedef ExtFullInterfaceDescription_var _var_type; - + static void _tao_any_destructor (void *); - TAO_String_Manager name; - TAO_String_Manager id; - TAO_String_Manager defined_in; - TAO_String_Manager version; - ACE_NESTED_CLASS (CORBA, OpDescriptionSeq) operations; - ACE_NESTED_CLASS (CORBA, ExtAttrDescriptionSeq) attributes; - ACE_NESTED_CLASS (CORBA, RepositoryIdSeq) base_interfaces; - ACE_NESTED_CLASS (CORBA, TypeCode_var) type; + TAO::String_Manager name; + TAO::String_Manager id; + TAO::String_Manager defined_in; + TAO::String_Manager version; + ::CORBA::OpDescriptionSeq operations; + ::CORBA::ExtAttrDescriptionSeq attributes; + ::CORBA::RepositoryIdSeq base_interfaces; + ::CORBA::TypeCode_var type; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + static ::CORBA::TypeCode_ptr const _tc_ExtFullInterfaceDescription; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription * describe_ext_interface ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::ExtAttributeDef_ptr create_ext_attribute ( const char * id, const char * name, @@ -3731,34 +3704,34 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_InterfaceAttrExtension_Proxy_Broker_; - + protected: // Concrete interface only. InterfaceAttrExtension (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_InterfaceAttrExtension_setup_collocation (void); - + // Concrete non-local interface only. InterfaceAttrExtension ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. InterfaceAttrExtension ( TAO_Stub *objref, @@ -3766,38 +3739,38 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~InterfaceAttrExtension (void); - + private: // Private and unimplemented for concrete interfaces. InterfaceAttrExtension (const InterfaceAttrExtension &); - + void operator= (const InterfaceAttrExtension &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_InterfaceAttrExtension; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_EXTINTERFACEDEF__VAR_OUT_CH_) #define _CORBA_EXTINTERFACEDEF__VAR_OUT_CH_ - + class ExtInterfaceDef; typedef ExtInterfaceDef *ExtInterfaceDef_ptr; - + typedef TAO_Objref_Var_T< ExtInterfaceDef > ExtInterfaceDef_var; - + typedef TAO_Objref_Out_T< ExtInterfaceDef @@ -3805,13 +3778,13 @@ namespace CORBA ExtInterfaceDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_EXTINTERFACEDEF_CH_) #define _CORBA_EXTINTERFACEDEF_CH_ - + class TAO_IFR_Client_Export ExtInterfaceDef : public virtual ::CORBA::InterfaceDef, public virtual ::CORBA::InterfaceAttrExtension @@ -3820,56 +3793,56 @@ namespace CORBA friend class TAO::Narrow_Utils<ExtInterfaceDef>; typedef ExtInterfaceDef_ptr _ptr_type; typedef ExtInterfaceDef_var _var_type; - + // The static operations. static ExtInterfaceDef_ptr _duplicate (ExtInterfaceDef_ptr obj); - + static void _tao_release (ExtInterfaceDef_ptr obj); - + static ExtInterfaceDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ExtInterfaceDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ExtInterfaceDef_ptr _nil (void) { return static_cast<ExtInterfaceDef_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_ExtInterfaceDef_Proxy_Broker_; - + protected: // Concrete interface only. ExtInterfaceDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_ExtInterfaceDef_setup_collocation (void); - + // Concrete non-local interface only. ExtInterfaceDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. ExtInterfaceDef ( TAO_Stub *objref, @@ -3877,38 +3850,38 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~ExtInterfaceDef (void); - + private: // Private and unimplemented for concrete interfaces. ExtInterfaceDef (const ExtInterfaceDef &); - + void operator= (const ExtInterfaceDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtInterfaceDef; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_ABSTRACTINTERFACEDEF__VAR_OUT_CH_) #define _CORBA_ABSTRACTINTERFACEDEF__VAR_OUT_CH_ - + class AbstractInterfaceDef; typedef AbstractInterfaceDef *AbstractInterfaceDef_ptr; - + typedef TAO_Objref_Var_T< AbstractInterfaceDef > AbstractInterfaceDef_var; - + typedef TAO_Objref_Out_T< AbstractInterfaceDef @@ -3916,13 +3889,13 @@ namespace CORBA AbstractInterfaceDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_ABSTRACTINTERFACEDEF_CH_) #define _CORBA_ABSTRACTINTERFACEDEF_CH_ - + class TAO_IFR_Client_Export AbstractInterfaceDef : public virtual ::CORBA::InterfaceDef { @@ -3930,56 +3903,56 @@ namespace CORBA friend class TAO::Narrow_Utils<AbstractInterfaceDef>; typedef AbstractInterfaceDef_ptr _ptr_type; typedef AbstractInterfaceDef_var _var_type; - + // The static operations. static AbstractInterfaceDef_ptr _duplicate (AbstractInterfaceDef_ptr obj); - + static void _tao_release (AbstractInterfaceDef_ptr obj); - + static AbstractInterfaceDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static AbstractInterfaceDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static AbstractInterfaceDef_ptr _nil (void) { return static_cast<AbstractInterfaceDef_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_AbstractInterfaceDef_Proxy_Broker_; - + protected: // Concrete interface only. AbstractInterfaceDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_AbstractInterfaceDef_setup_collocation (void); - + // Concrete non-local interface only. AbstractInterfaceDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. AbstractInterfaceDef ( TAO_Stub *objref, @@ -3987,38 +3960,38 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~AbstractInterfaceDef (void); - + private: // Private and unimplemented for concrete interfaces. AbstractInterfaceDef (const AbstractInterfaceDef &); - + void operator= (const AbstractInterfaceDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_AbstractInterfaceDef; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_EXTABSTRACTINTERFACEDEF__VAR_OUT_CH_) #define _CORBA_EXTABSTRACTINTERFACEDEF__VAR_OUT_CH_ - + class ExtAbstractInterfaceDef; typedef ExtAbstractInterfaceDef *ExtAbstractInterfaceDef_ptr; - + typedef TAO_Objref_Var_T< ExtAbstractInterfaceDef > ExtAbstractInterfaceDef_var; - + typedef TAO_Objref_Out_T< ExtAbstractInterfaceDef @@ -4026,13 +3999,13 @@ namespace CORBA ExtAbstractInterfaceDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_EXTABSTRACTINTERFACEDEF_CH_) #define _CORBA_EXTABSTRACTINTERFACEDEF_CH_ - + class TAO_IFR_Client_Export ExtAbstractInterfaceDef : public virtual ::CORBA::AbstractInterfaceDef, public virtual ::CORBA::InterfaceAttrExtension @@ -4041,56 +4014,56 @@ namespace CORBA friend class TAO::Narrow_Utils<ExtAbstractInterfaceDef>; typedef ExtAbstractInterfaceDef_ptr _ptr_type; typedef ExtAbstractInterfaceDef_var _var_type; - + // The static operations. static ExtAbstractInterfaceDef_ptr _duplicate (ExtAbstractInterfaceDef_ptr obj); - + static void _tao_release (ExtAbstractInterfaceDef_ptr obj); - + static ExtAbstractInterfaceDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ExtAbstractInterfaceDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ExtAbstractInterfaceDef_ptr _nil (void) { return static_cast<ExtAbstractInterfaceDef_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_ExtAbstractInterfaceDef_Proxy_Broker_; - + protected: // Concrete interface only. ExtAbstractInterfaceDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_ExtAbstractInterfaceDef_setup_collocation (void); - + // Concrete non-local interface only. ExtAbstractInterfaceDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. ExtAbstractInterfaceDef ( TAO_Stub *objref, @@ -4098,38 +4071,38 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~ExtAbstractInterfaceDef (void); - + private: // Private and unimplemented for concrete interfaces. ExtAbstractInterfaceDef (const ExtAbstractInterfaceDef &); - + void operator= (const ExtAbstractInterfaceDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtAbstractInterfaceDef; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_LOCALINTERFACEDEF__VAR_OUT_CH_) #define _CORBA_LOCALINTERFACEDEF__VAR_OUT_CH_ - + class LocalInterfaceDef; typedef LocalInterfaceDef *LocalInterfaceDef_ptr; - + typedef TAO_Objref_Var_T< LocalInterfaceDef > LocalInterfaceDef_var; - + typedef TAO_Objref_Out_T< LocalInterfaceDef @@ -4137,13 +4110,13 @@ namespace CORBA LocalInterfaceDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_LOCALINTERFACEDEF_CH_) #define _CORBA_LOCALINTERFACEDEF_CH_ - + class TAO_IFR_Client_Export LocalInterfaceDef : public virtual ::CORBA::InterfaceDef { @@ -4151,56 +4124,56 @@ namespace CORBA friend class TAO::Narrow_Utils<LocalInterfaceDef>; typedef LocalInterfaceDef_ptr _ptr_type; typedef LocalInterfaceDef_var _var_type; - + // The static operations. static LocalInterfaceDef_ptr _duplicate (LocalInterfaceDef_ptr obj); - + static void _tao_release (LocalInterfaceDef_ptr obj); - + static LocalInterfaceDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static LocalInterfaceDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static LocalInterfaceDef_ptr _nil (void) { return static_cast<LocalInterfaceDef_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_LocalInterfaceDef_Proxy_Broker_; - + protected: // Concrete interface only. LocalInterfaceDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_LocalInterfaceDef_setup_collocation (void); - + // Concrete non-local interface only. LocalInterfaceDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. LocalInterfaceDef ( TAO_Stub *objref, @@ -4208,38 +4181,38 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~LocalInterfaceDef (void); - + private: // Private and unimplemented for concrete interfaces. LocalInterfaceDef (const LocalInterfaceDef &); - + void operator= (const LocalInterfaceDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_LocalInterfaceDef; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_EXTLOCALINTERFACEDEF__VAR_OUT_CH_) #define _CORBA_EXTLOCALINTERFACEDEF__VAR_OUT_CH_ - + class ExtLocalInterfaceDef; typedef ExtLocalInterfaceDef *ExtLocalInterfaceDef_ptr; - + typedef TAO_Objref_Var_T< ExtLocalInterfaceDef > ExtLocalInterfaceDef_var; - + typedef TAO_Objref_Out_T< ExtLocalInterfaceDef @@ -4247,13 +4220,13 @@ namespace CORBA ExtLocalInterfaceDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_EXTLOCALINTERFACEDEF_CH_) #define _CORBA_EXTLOCALINTERFACEDEF_CH_ - + class TAO_IFR_Client_Export ExtLocalInterfaceDef : public virtual ::CORBA::LocalInterfaceDef, public virtual ::CORBA::InterfaceAttrExtension @@ -4262,56 +4235,56 @@ namespace CORBA friend class TAO::Narrow_Utils<ExtLocalInterfaceDef>; typedef ExtLocalInterfaceDef_ptr _ptr_type; typedef ExtLocalInterfaceDef_var _var_type; - + // The static operations. static ExtLocalInterfaceDef_ptr _duplicate (ExtLocalInterfaceDef_ptr obj); - + static void _tao_release (ExtLocalInterfaceDef_ptr obj); - + static ExtLocalInterfaceDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ExtLocalInterfaceDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ExtLocalInterfaceDef_ptr _nil (void) { return static_cast<ExtLocalInterfaceDef_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_ExtLocalInterfaceDef_Proxy_Broker_; - + protected: // Concrete interface only. ExtLocalInterfaceDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_ExtLocalInterfaceDef_setup_collocation (void); - + // Concrete non-local interface only. ExtLocalInterfaceDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. ExtLocalInterfaceDef ( TAO_Stub *objref, @@ -4319,21 +4292,21 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~ExtLocalInterfaceDef (void); - + private: // Private and unimplemented for concrete interfaces. ExtLocalInterfaceDef (const ExtLocalInterfaceDef &); - + void operator= (const ExtLocalInterfaceDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtLocalInterfaceDef; // TAO_IDL - Generated from @@ -4499,7 +4472,7 @@ namespace TAO #if !defined (_CORBA_FIXEDDEF__TRAITS_) #define _CORBA_FIXEDDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::FixedDef> { @@ -4520,7 +4493,7 @@ namespace TAO #if !defined (_CORBA_REPOSITORY__TRAITS_) #define _CORBA_REPOSITORY__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::Repository> { @@ -4541,7 +4514,7 @@ namespace TAO #if !defined (_CORBA_MODULEDEF__TRAITS_) #define _CORBA_MODULEDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ModuleDef> { @@ -4562,7 +4535,7 @@ namespace TAO #if !defined (_CORBA_CONSTANTDEF__TRAITS_) #define _CORBA_CONSTANTDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ConstantDef> { @@ -4583,7 +4556,7 @@ namespace TAO #if !defined (_CORBA_STRUCTDEF__TRAITS_) #define _CORBA_STRUCTDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::StructDef> { @@ -4604,7 +4577,7 @@ namespace TAO #if !defined (_CORBA_UNIONDEF__TRAITS_) #define _CORBA_UNIONDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::UnionDef> { @@ -4625,7 +4598,7 @@ namespace TAO #if !defined (_CORBA_ENUMDEF__TRAITS_) #define _CORBA_ENUMDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::EnumDef> { @@ -4646,7 +4619,7 @@ namespace TAO #if !defined (_CORBA_ALIASDEF__TRAITS_) #define _CORBA_ALIASDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::AliasDef> { @@ -4667,7 +4640,7 @@ namespace TAO #if !defined (_CORBA_NATIVEDEF__TRAITS_) #define _CORBA_NATIVEDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::NativeDef> { @@ -4688,7 +4661,7 @@ namespace TAO #if !defined (_CORBA_PRIMITIVEDEF__TRAITS_) #define _CORBA_PRIMITIVEDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::PrimitiveDef> { @@ -4709,7 +4682,7 @@ namespace TAO #if !defined (_CORBA_STRINGDEF__TRAITS_) #define _CORBA_STRINGDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::StringDef> { @@ -4730,7 +4703,7 @@ namespace TAO #if !defined (_CORBA_WSTRINGDEF__TRAITS_) #define _CORBA_WSTRINGDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::WstringDef> { @@ -4751,7 +4724,7 @@ namespace TAO #if !defined (_CORBA_SEQUENCEDEF__TRAITS_) #define _CORBA_SEQUENCEDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::SequenceDef> { @@ -4772,7 +4745,7 @@ namespace TAO #if !defined (_CORBA_ARRAYDEF__TRAITS_) #define _CORBA_ARRAYDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ArrayDef> { @@ -4793,7 +4766,7 @@ namespace TAO #if !defined (_CORBA_EXCEPTIONDEF__TRAITS_) #define _CORBA_EXCEPTIONDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExceptionDef> { @@ -4814,7 +4787,7 @@ namespace TAO #if !defined (_CORBA_ATTRIBUTEDEF__TRAITS_) #define _CORBA_ATTRIBUTEDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::AttributeDef> { @@ -4835,7 +4808,7 @@ namespace TAO #if !defined (_CORBA_EXTATTRIBUTEDEF__TRAITS_) #define _CORBA_EXTATTRIBUTEDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtAttributeDef> { @@ -4856,7 +4829,7 @@ namespace TAO #if !defined (_CORBA_OPERATIONDEF__TRAITS_) #define _CORBA_OPERATIONDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::OperationDef> { @@ -4877,7 +4850,7 @@ namespace TAO #if !defined (_CORBA_INTERFACEDEF__TRAITS_) #define _CORBA_INTERFACEDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::InterfaceDef> { @@ -4898,7 +4871,7 @@ namespace TAO #if !defined (_CORBA_INTERFACEATTREXTENSION__TRAITS_) #define _CORBA_INTERFACEATTREXTENSION__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::InterfaceAttrExtension> { @@ -4919,7 +4892,7 @@ namespace TAO #if !defined (_CORBA_EXTINTERFACEDEF__TRAITS_) #define _CORBA_EXTINTERFACEDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtInterfaceDef> { @@ -4940,7 +4913,7 @@ namespace TAO #if !defined (_CORBA_ABSTRACTINTERFACEDEF__TRAITS_) #define _CORBA_ABSTRACTINTERFACEDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::AbstractInterfaceDef> { @@ -4961,7 +4934,7 @@ namespace TAO #if !defined (_CORBA_EXTABSTRACTINTERFACEDEF__TRAITS_) #define _CORBA_EXTABSTRACTINTERFACEDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtAbstractInterfaceDef> { @@ -4982,7 +4955,7 @@ namespace TAO #if !defined (_CORBA_LOCALINTERFACEDEF__TRAITS_) #define _CORBA_LOCALINTERFACEDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::LocalInterfaceDef> { @@ -5003,7 +4976,7 @@ namespace TAO #if !defined (_CORBA_EXTLOCALINTERFACEDEF__TRAITS_) #define _CORBA_EXTLOCALINTERFACEDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtLocalInterfaceDef> { diff --git a/TAO/tao/IFR_Client/IFR_BasicC.inl b/TAO/tao/IFR_Client/IFR_BasicC.inl index 8f36b619375..2cdaff7f308 100644 --- a/TAO/tao/IFR_Client/IFR_BasicC.inl +++ b/TAO/tao/IFR_Client/IFR_BasicC.inl @@ -41,7 +41,7 @@ CORBA::Repository::Repository ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -57,7 +57,7 @@ CORBA::Repository::Repository ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_Repository_Proxy_Broker_ (0) { } @@ -77,7 +77,7 @@ CORBA::ModuleDef::ModuleDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -93,7 +93,7 @@ CORBA::ModuleDef::ModuleDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_ModuleDef_Proxy_Broker_ (0) { } @@ -113,7 +113,7 @@ CORBA::ConstantDef::ConstantDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -129,7 +129,7 @@ CORBA::ConstantDef::ConstantDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_ConstantDef_Proxy_Broker_ (0) { } @@ -149,7 +149,7 @@ CORBA::StructDef::StructDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -165,7 +165,7 @@ CORBA::StructDef::StructDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_StructDef_Proxy_Broker_ (0) { } @@ -185,7 +185,7 @@ CORBA::UnionDef::UnionDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -201,7 +201,7 @@ CORBA::UnionDef::UnionDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_UnionDef_Proxy_Broker_ (0) { } @@ -221,7 +221,7 @@ CORBA::EnumDef::EnumDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -237,7 +237,7 @@ CORBA::EnumDef::EnumDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_EnumDef_Proxy_Broker_ (0) { } @@ -257,7 +257,7 @@ CORBA::AliasDef::AliasDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -273,7 +273,7 @@ CORBA::AliasDef::AliasDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_AliasDef_Proxy_Broker_ (0) { } @@ -293,7 +293,7 @@ CORBA::NativeDef::NativeDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -309,7 +309,7 @@ CORBA::NativeDef::NativeDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_NativeDef_Proxy_Broker_ (0) { } @@ -329,7 +329,7 @@ CORBA::PrimitiveDef::PrimitiveDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -345,7 +345,7 @@ CORBA::PrimitiveDef::PrimitiveDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_PrimitiveDef_Proxy_Broker_ (0) { } @@ -365,7 +365,7 @@ CORBA::StringDef::StringDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -381,7 +381,7 @@ CORBA::StringDef::StringDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_StringDef_Proxy_Broker_ (0) { } @@ -401,7 +401,7 @@ CORBA::WstringDef::WstringDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -417,7 +417,7 @@ CORBA::WstringDef::WstringDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_WstringDef_Proxy_Broker_ (0) { } @@ -437,7 +437,7 @@ CORBA::SequenceDef::SequenceDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -453,7 +453,7 @@ CORBA::SequenceDef::SequenceDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_SequenceDef_Proxy_Broker_ (0) { } @@ -473,7 +473,7 @@ CORBA::ArrayDef::ArrayDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -489,7 +489,7 @@ CORBA::ArrayDef::ArrayDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_ArrayDef_Proxy_Broker_ (0) { } @@ -509,7 +509,7 @@ CORBA::ExceptionDef::ExceptionDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -525,7 +525,7 @@ CORBA::ExceptionDef::ExceptionDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_ExceptionDef_Proxy_Broker_ (0) { } @@ -545,7 +545,7 @@ CORBA::AttributeDef::AttributeDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -561,7 +561,7 @@ CORBA::AttributeDef::AttributeDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_AttributeDef_Proxy_Broker_ (0) { } @@ -581,7 +581,7 @@ CORBA::ExtAttributeDef::ExtAttributeDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -597,7 +597,7 @@ CORBA::ExtAttributeDef::ExtAttributeDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_ExtAttributeDef_Proxy_Broker_ (0) { } @@ -617,7 +617,7 @@ CORBA::OperationDef::OperationDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -633,7 +633,7 @@ CORBA::OperationDef::OperationDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_OperationDef_Proxy_Broker_ (0) { } @@ -653,7 +653,7 @@ CORBA::InterfaceDef::InterfaceDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -669,7 +669,7 @@ CORBA::InterfaceDef::InterfaceDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_InterfaceDef_Proxy_Broker_ (0) { } @@ -689,7 +689,7 @@ CORBA::InterfaceAttrExtension::InterfaceAttrExtension ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -705,7 +705,7 @@ CORBA::InterfaceAttrExtension::InterfaceAttrExtension ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_InterfaceAttrExtension_Proxy_Broker_ (0) { } @@ -725,7 +725,7 @@ CORBA::ExtInterfaceDef::ExtInterfaceDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -741,7 +741,7 @@ CORBA::ExtInterfaceDef::ExtInterfaceDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_ExtInterfaceDef_Proxy_Broker_ (0) { } @@ -761,7 +761,7 @@ CORBA::AbstractInterfaceDef::AbstractInterfaceDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -777,7 +777,7 @@ CORBA::AbstractInterfaceDef::AbstractInterfaceDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_AbstractInterfaceDef_Proxy_Broker_ (0) { } @@ -797,7 +797,7 @@ CORBA::ExtAbstractInterfaceDef::ExtAbstractInterfaceDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -813,7 +813,7 @@ CORBA::ExtAbstractInterfaceDef::ExtAbstractInterfaceDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_ExtAbstractInterfaceDef_Proxy_Broker_ (0) { } @@ -833,7 +833,7 @@ CORBA::LocalInterfaceDef::LocalInterfaceDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -849,7 +849,7 @@ CORBA::LocalInterfaceDef::LocalInterfaceDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_LocalInterfaceDef_Proxy_Broker_ (0) { } @@ -869,7 +869,7 @@ CORBA::ExtLocalInterfaceDef::ExtLocalInterfaceDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -885,7 +885,7 @@ CORBA::ExtLocalInterfaceDef::ExtLocalInterfaceDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_ExtLocalInterfaceDef_Proxy_Broker_ (0) { } diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp index 2afc5ef4960..636c1adecd0 100644 --- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp +++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp @@ -60,7 +60,7 @@ TAO_IFR_Client_Adapter_Impl::dispose ( CORBA::InterfaceDef_ptr orphan ) { - CORBA::release (orphan); + ::CORBA::release (orphan); } CORBA::InterfaceDef_ptr diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp index a6c2ff11eed..6ff269545c4 100644 --- a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp +++ b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp @@ -212,13 +212,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:118 #if !defined (_CORBA_COMPONENTIR_COMPONENTDEF__ARG_TRAITS_) #define _CORBA_COMPONENTIR_COMPONENTDEF__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::ComponentIR::ComponentDef> : public @@ -233,13 +233,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:118 #if !defined (_CORBA_COMPONENTIR_HOMEDEF__ARG_TRAITS_) #define _CORBA_COMPONENTIR_HOMEDEF__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::ComponentIR::HomeDef> : public @@ -254,13 +254,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:118 #if !defined (_CORBA_COMPONENTIR_EVENTDEF__ARG_TRAITS_) #define _CORBA_COMPONENTIR_EVENTDEF__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::ComponentIR::EventDef> : public @@ -275,13 +275,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:118 #if !defined (_CORBA_COMPONENTIR_PROVIDESDEF__ARG_TRAITS_) #define _CORBA_COMPONENTIR_PROVIDESDEF__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::ComponentIR::ProvidesDef> : public @@ -296,13 +296,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:118 #if !defined (_CORBA_COMPONENTIR_USESDEF__ARG_TRAITS_) #define _CORBA_COMPONENTIR_USESDEF__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::ComponentIR::UsesDef> : public @@ -317,13 +317,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:118 #if !defined (_CORBA_COMPONENTIR_EMITSDEF__ARG_TRAITS_) #define _CORBA_COMPONENTIR_EMITSDEF__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::ComponentIR::EmitsDef> : public @@ -338,13 +338,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:118 #if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF__ARG_TRAITS_) #define _CORBA_COMPONENTIR_PUBLISHESDEF__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::ComponentIR::PublishesDef> : public @@ -359,13 +359,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:118 #if !defined (_CORBA_COMPONENTIR_CONSUMESDEF__ARG_TRAITS_) #define _CORBA_COMPONENTIR_CONSUMESDEF__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::ComponentIR::ConsumesDef> : public @@ -380,13 +380,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:118 #if !defined (_CORBA_COMPONENTIR_FACTORYDEF__ARG_TRAITS_) #define _CORBA_COMPONENTIR_FACTORYDEF__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::ComponentIR::FactoryDef> : public @@ -401,13 +401,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:118 #if !defined (_CORBA_COMPONENTIR_FINDERDEF__ARG_TRAITS_) #define _CORBA_COMPONENTIR_FINDERDEF__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::ComponentIR::FinderDef> : public @@ -443,7 +443,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::EventDef>::release ( CORBA::ComponentIR::EventDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::ComponentIR::EventDef_ptr @@ -462,7 +462,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::EventDef>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -481,19 +481,19 @@ CORBA::ComponentIR::EventDef::CORBA_ComponentIR_EventDef_setup_collocation () this->the_TAO_EventDef_Proxy_Broker_ = ::CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function_pointer (this); } - + this->CORBA_ExtValueDef_setup_collocation (); } CORBA::ComponentIR::EventDef::~EventDef (void) {} -void +void CORBA::ComponentIR::EventDef::_tao_any_destructor (void *_tao_void_pointer) { EventDef *_tao_tmp_pointer = static_cast<EventDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::ComponentIR::EventDef_ptr @@ -529,18 +529,18 @@ CORBA::ComponentIR::EventDef::_unchecked_narrow ( CORBA::ComponentIR::EventDef_ptr CORBA::ComponentIR::EventDef::_duplicate (EventDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void CORBA::ComponentIR::EventDef::_tao_release (EventDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -588,7 +588,7 @@ CORBA::ComponentIR::EventDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -615,7 +615,7 @@ static TAO::TypeCode::Objref<char const *, CORBA::tk_objref, "IDL:omg.org/CORBA/ComponentIR/EventDef:1.0", "EventDef"); - + namespace CORBA { namespace ComponentIR @@ -645,7 +645,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::Container>::release ( CORBA::ComponentIR::Container_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::ComponentIR::Container_ptr @@ -664,7 +664,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::Container>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -686,21 +686,21 @@ TAO::Collocation_Proxy_Broker * { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_Container_Proxy_Broker_ == 0) { CORBA_ComponentIR_Container_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id); TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name); TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version); TAO::Arg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_base_component (base_component); TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supports_interfaces (supports_interfaces); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -710,7 +710,7 @@ TAO::Collocation_Proxy_Broker * &_tao_base_component, &_tao_supports_interfaces }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -719,10 +719,10 @@ TAO::Collocation_Proxy_Broker * 16, this->the_TAO_Container_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -745,14 +745,14 @@ TAO::Collocation_Proxy_Broker * { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_Container_Proxy_Broker_ == 0) { CORBA_ComponentIR_Container_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::ComponentIR::HomeDef>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id); TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name); @@ -761,7 +761,7 @@ TAO::Collocation_Proxy_Broker * TAO::Arg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_managed_component (managed_component); TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supports_interfaces (supports_interfaces); TAO::Arg_Traits< ::CORBA::ValueDef>::in_arg_val _tao_primary_key (primary_key); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -773,7 +773,7 @@ TAO::Collocation_Proxy_Broker * &_tao_supports_interfaces, &_tao_primary_key }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -782,10 +782,10 @@ TAO::Collocation_Proxy_Broker * 11, this->the_TAO_Container_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -811,14 +811,14 @@ TAO::Collocation_Proxy_Broker * { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_Container_Proxy_Broker_ == 0) { CORBA_ComponentIR_Container_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::ComponentIR::EventDef>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id); TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name); @@ -830,7 +830,7 @@ TAO::Collocation_Proxy_Broker * TAO::Arg_Traits< ::CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values (abstract_base_values); TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces); TAO::Arg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_val _tao_initializers (initializers); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -845,7 +845,7 @@ TAO::Collocation_Proxy_Broker * &_tao_supported_interfaces, &_tao_initializers }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -854,10 +854,10 @@ TAO::Collocation_Proxy_Broker * 12, this->the_TAO_Container_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -875,19 +875,19 @@ CORBA::ComponentIR::Container::CORBA_ComponentIR_Container_setup_collocation () this->the_TAO_Container_Proxy_Broker_ = ::CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_function_pointer (this); } - + this->CORBA_Container_setup_collocation (); } CORBA::ComponentIR::Container::~Container (void) {} -void +void CORBA::ComponentIR::Container::_tao_any_destructor (void *_tao_void_pointer) { Container *_tao_tmp_pointer = static_cast<Container *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::ComponentIR::Container_ptr @@ -923,18 +923,18 @@ CORBA::ComponentIR::Container::_unchecked_narrow ( CORBA::ComponentIR::Container_ptr CORBA::ComponentIR::Container::_duplicate (Container_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void CORBA::ComponentIR::Container::_tao_release (Container_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -966,7 +966,7 @@ CORBA::ComponentIR::Container::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -993,7 +993,7 @@ static TAO::TypeCode::Objref<char const *, CORBA::tk_objref, "IDL:omg.org/CORBA/ComponentIR/Container:1.0", "Container"); - + namespace CORBA { namespace ComponentIR @@ -1023,7 +1023,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::ModuleDef>::release ( CORBA::ComponentIR::ModuleDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::ComponentIR::ModuleDef_ptr @@ -1042,7 +1042,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::ModuleDef>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -1061,7 +1061,7 @@ CORBA::ComponentIR::ModuleDef::CORBA_ComponentIR_ModuleDef_setup_collocation () this->the_TAO_ModuleDef_Proxy_Broker_ = ::CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer (this); } - + this->CORBA_ModuleDef_setup_collocation (); this->CORBA_ComponentIR_Container_setup_collocation (); } @@ -1069,12 +1069,12 @@ CORBA::ComponentIR::ModuleDef::CORBA_ComponentIR_ModuleDef_setup_collocation () CORBA::ComponentIR::ModuleDef::~ModuleDef (void) {} -void +void CORBA::ComponentIR::ModuleDef::_tao_any_destructor (void *_tao_void_pointer) { ModuleDef *_tao_tmp_pointer = static_cast<ModuleDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::ComponentIR::ModuleDef_ptr @@ -1110,18 +1110,18 @@ CORBA::ComponentIR::ModuleDef::_unchecked_narrow ( CORBA::ComponentIR::ModuleDef_ptr CORBA::ComponentIR::ModuleDef::_duplicate (ModuleDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void CORBA::ComponentIR::ModuleDef::_tao_release (ModuleDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -1165,7 +1165,7 @@ CORBA::ComponentIR::ModuleDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -1192,7 +1192,7 @@ static TAO::TypeCode::Objref<char const *, CORBA::tk_objref, "IDL:omg.org/CORBA/ComponentIR/ModuleDef:1.0", "ModuleDef"); - + namespace CORBA { namespace ComponentIR @@ -1222,7 +1222,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::Repository>::release ( CORBA::ComponentIR::Repository_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::ComponentIR::Repository_ptr @@ -1241,7 +1241,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::Repository>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -1260,7 +1260,7 @@ CORBA::ComponentIR::Repository::CORBA_ComponentIR_Repository_setup_collocation ( this->the_TAO_Repository_Proxy_Broker_ = ::CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_function_pointer (this); } - + this->CORBA_Repository_setup_collocation (); this->CORBA_ComponentIR_Container_setup_collocation (); } @@ -1268,12 +1268,12 @@ CORBA::ComponentIR::Repository::CORBA_ComponentIR_Repository_setup_collocation ( CORBA::ComponentIR::Repository::~Repository (void) {} -void +void CORBA::ComponentIR::Repository::_tao_any_destructor (void *_tao_void_pointer) { Repository *_tao_tmp_pointer = static_cast<Repository *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::ComponentIR::Repository_ptr @@ -1309,18 +1309,18 @@ CORBA::ComponentIR::Repository::_unchecked_narrow ( CORBA::ComponentIR::Repository_ptr CORBA::ComponentIR::Repository::_duplicate (Repository_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void CORBA::ComponentIR::Repository::_tao_release (Repository_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -1360,7 +1360,7 @@ CORBA::ComponentIR::Repository::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -1387,7 +1387,7 @@ static TAO::TypeCode::Objref<char const *, CORBA::tk_objref, "IDL:omg.org/CORBA/ComponentIR/Repository:1.0", "Repository"); - + namespace CORBA { namespace ComponentIR @@ -1417,7 +1417,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>::release ( CORBA::ComponentIR::ProvidesDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::ComponentIR::ProvidesDef_ptr @@ -1436,7 +1436,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -1453,21 +1453,21 @@ TAO::Collocation_Proxy_Broker * { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ProvidesDef_Proxy_Broker_ == 0) { CORBA_ComponentIR_ProvidesDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::InterfaceDef>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -1476,10 +1476,10 @@ TAO::Collocation_Proxy_Broker * 19, this->the_TAO_ProvidesDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -1496,23 +1496,23 @@ void CORBA::ComponentIR::ProvidesDef::interface_type ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ProvidesDef_Proxy_Broker_ == 0) { CORBA_ComponentIR_ProvidesDef_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::InterfaceDef>::in_arg_val _tao_interface_type (interface_type); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_interface_type }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -1521,7 +1521,7 @@ void CORBA::ComponentIR::ProvidesDef::interface_type ( 19, this->the_TAO_ProvidesDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -1540,19 +1540,19 @@ CORBA::ComponentIR::ProvidesDef::CORBA_ComponentIR_ProvidesDef_setup_collocation this->the_TAO_ProvidesDef_Proxy_Broker_ = ::CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer (this); } - + this->CORBA_Contained_setup_collocation (); } CORBA::ComponentIR::ProvidesDef::~ProvidesDef (void) {} -void +void CORBA::ComponentIR::ProvidesDef::_tao_any_destructor (void *_tao_void_pointer) { ProvidesDef *_tao_tmp_pointer = static_cast<ProvidesDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::ComponentIR::ProvidesDef_ptr @@ -1588,18 +1588,18 @@ CORBA::ComponentIR::ProvidesDef::_unchecked_narrow ( CORBA::ComponentIR::ProvidesDef_ptr CORBA::ComponentIR::ProvidesDef::_duplicate (ProvidesDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void CORBA::ComponentIR::ProvidesDef::_tao_release (ProvidesDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -1631,7 +1631,7 @@ CORBA::ComponentIR::ProvidesDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -1658,7 +1658,7 @@ static TAO::TypeCode::Objref<char const *, CORBA::tk_objref, "IDL:omg.org/CORBA/ComponentIR/ProvidesDef:1.0", "ProvidesDef"); - + namespace CORBA { namespace ComponentIR @@ -1680,7 +1680,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co { "defined_in", &CORBA::_tc_RepositoryId }, { "version", &CORBA::_tc_VersionSpec }, { "interface_type", &CORBA::_tc_RepositoryId } - + }; static TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *, @@ -1692,7 +1692,7 @@ static TAO::TypeCode::Struct<char const *, "ProvidesDescription", _tao_fields_CORBA_ComponentIR_ProvidesDescription, 5); - + namespace CORBA { namespace ComponentIR @@ -1704,10 +1704,10 @@ namespace CORBA -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/structure_cs.cpp:66 -void +void CORBA::ComponentIR::ProvidesDescription::_tao_any_destructor ( void *_tao_void_pointer ) @@ -1735,7 +1735,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>::release ( CORBA::ComponentIR::UsesDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::ComponentIR::UsesDef_ptr @@ -1754,7 +1754,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -1771,21 +1771,21 @@ TAO::Collocation_Proxy_Broker * { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_UsesDef_Proxy_Broker_ == 0) { CORBA_ComponentIR_UsesDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::InterfaceDef>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -1794,10 +1794,10 @@ TAO::Collocation_Proxy_Broker * 19, this->the_TAO_UsesDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -1814,23 +1814,23 @@ void CORBA::ComponentIR::UsesDef::interface_type ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_UsesDef_Proxy_Broker_ == 0) { CORBA_ComponentIR_UsesDef_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::InterfaceDef>::in_arg_val _tao_interface_type (interface_type); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_interface_type }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -1839,7 +1839,7 @@ void CORBA::ComponentIR::UsesDef::interface_type ( 19, this->the_TAO_UsesDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -1856,21 +1856,21 @@ CORBA::Boolean CORBA::ComponentIR::UsesDef::is_multiple ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_UsesDef_Proxy_Broker_ == 0) { CORBA_ComponentIR_UsesDef_setup_collocation (); } - + TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -1879,10 +1879,10 @@ CORBA::Boolean CORBA::ComponentIR::UsesDef::is_multiple ( 16, this->the_TAO_UsesDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -1899,23 +1899,23 @@ void CORBA::ComponentIR::UsesDef::is_multiple ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_UsesDef_Proxy_Broker_ == 0) { CORBA_ComponentIR_UsesDef_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_multiple (is_multiple); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_is_multiple }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -1924,7 +1924,7 @@ void CORBA::ComponentIR::UsesDef::is_multiple ( 16, this->the_TAO_UsesDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -1943,19 +1943,19 @@ CORBA::ComponentIR::UsesDef::CORBA_ComponentIR_UsesDef_setup_collocation () this->the_TAO_UsesDef_Proxy_Broker_ = ::CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer (this); } - + this->CORBA_Contained_setup_collocation (); } CORBA::ComponentIR::UsesDef::~UsesDef (void) {} -void +void CORBA::ComponentIR::UsesDef::_tao_any_destructor (void *_tao_void_pointer) { UsesDef *_tao_tmp_pointer = static_cast<UsesDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::ComponentIR::UsesDef_ptr @@ -1991,18 +1991,18 @@ CORBA::ComponentIR::UsesDef::_unchecked_narrow ( CORBA::ComponentIR::UsesDef_ptr CORBA::ComponentIR::UsesDef::_duplicate (UsesDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void CORBA::ComponentIR::UsesDef::_tao_release (UsesDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -2034,7 +2034,7 @@ CORBA::ComponentIR::UsesDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -2061,7 +2061,7 @@ static TAO::TypeCode::Objref<char const *, CORBA::tk_objref, "IDL:omg.org/CORBA/ComponentIR/UsesDef:1.0", "UsesDef"); - + namespace CORBA { namespace ComponentIR @@ -2084,7 +2084,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co { "version", &CORBA::_tc_VersionSpec }, { "interface_type", &CORBA::_tc_RepositoryId }, { "is_multiple", &CORBA::_tc_boolean } - + }; static TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *, @@ -2096,7 +2096,7 @@ static TAO::TypeCode::Struct<char const *, "UsesDescription", _tao_fields_CORBA_ComponentIR_UsesDescription, 6); - + namespace CORBA { namespace ComponentIR @@ -2108,10 +2108,10 @@ namespace CORBA -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/structure_cs.cpp:66 -void +void CORBA::ComponentIR::UsesDescription::_tao_any_destructor ( void *_tao_void_pointer ) @@ -2139,7 +2139,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::EventPortDef>::release ( CORBA::ComponentIR::EventPortDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::ComponentIR::EventPortDef_ptr @@ -2158,7 +2158,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::EventPortDef>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -2175,21 +2175,21 @@ TAO::Collocation_Proxy_Broker * { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_EventPortDef_Proxy_Broker_ == 0) { CORBA_ComponentIR_EventPortDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::ComponentIR::EventDef>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -2198,10 +2198,10 @@ TAO::Collocation_Proxy_Broker * 10, this->the_TAO_EventPortDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -2218,23 +2218,23 @@ void CORBA::ComponentIR::EventPortDef::event ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_EventPortDef_Proxy_Broker_ == 0) { CORBA_ComponentIR_EventPortDef_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_val _tao_event (event); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_event }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -2243,7 +2243,7 @@ void CORBA::ComponentIR::EventPortDef::event ( 10, this->the_TAO_EventPortDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -2261,23 +2261,23 @@ CORBA::Boolean CORBA::ComponentIR::EventPortDef::is_a ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_EventPortDef_Proxy_Broker_ == 0) { CORBA_ComponentIR_EventPortDef_setup_collocation (); } - + TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_event_id (event_id); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_event_id }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -2286,10 +2286,10 @@ CORBA::Boolean CORBA::ComponentIR::EventPortDef::is_a ( 4, this->the_TAO_EventPortDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -2307,19 +2307,19 @@ CORBA::ComponentIR::EventPortDef::CORBA_ComponentIR_EventPortDef_setup_collocati this->the_TAO_EventPortDef_Proxy_Broker_ = ::CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_function_pointer (this); } - + this->CORBA_Contained_setup_collocation (); } CORBA::ComponentIR::EventPortDef::~EventPortDef (void) {} -void +void CORBA::ComponentIR::EventPortDef::_tao_any_destructor (void *_tao_void_pointer) { EventPortDef *_tao_tmp_pointer = static_cast<EventPortDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::ComponentIR::EventPortDef_ptr @@ -2355,18 +2355,18 @@ CORBA::ComponentIR::EventPortDef::_unchecked_narrow ( CORBA::ComponentIR::EventPortDef_ptr CORBA::ComponentIR::EventPortDef::_duplicate (EventPortDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void CORBA::ComponentIR::EventPortDef::_tao_release (EventPortDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -2398,7 +2398,7 @@ CORBA::ComponentIR::EventPortDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -2425,7 +2425,7 @@ static TAO::TypeCode::Objref<char const *, CORBA::tk_objref, "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0", "EventPortDef"); - + namespace CORBA { namespace ComponentIR @@ -2447,7 +2447,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co { "defined_in", &CORBA::_tc_RepositoryId }, { "version", &CORBA::_tc_VersionSpec }, { "event", &CORBA::_tc_RepositoryId } - + }; static TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *, @@ -2459,7 +2459,7 @@ static TAO::TypeCode::Struct<char const *, "EventPortDescription", _tao_fields_CORBA_ComponentIR_EventPortDescription, 5); - + namespace CORBA { namespace ComponentIR @@ -2471,10 +2471,10 @@ namespace CORBA -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/structure_cs.cpp:66 -void +void CORBA::ComponentIR::EventPortDescription::_tao_any_destructor ( void *_tao_void_pointer ) @@ -2502,7 +2502,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>::release ( CORBA::ComponentIR::EmitsDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::ComponentIR::EmitsDef_ptr @@ -2521,7 +2521,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -2540,19 +2540,19 @@ CORBA::ComponentIR::EmitsDef::CORBA_ComponentIR_EmitsDef_setup_collocation () this->the_TAO_EmitsDef_Proxy_Broker_ = ::CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer (this); } - + this->CORBA_ComponentIR_EventPortDef_setup_collocation (); } CORBA::ComponentIR::EmitsDef::~EmitsDef (void) {} -void +void CORBA::ComponentIR::EmitsDef::_tao_any_destructor (void *_tao_void_pointer) { EmitsDef *_tao_tmp_pointer = static_cast<EmitsDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::ComponentIR::EmitsDef_ptr @@ -2588,18 +2588,18 @@ CORBA::ComponentIR::EmitsDef::_unchecked_narrow ( CORBA::ComponentIR::EmitsDef_ptr CORBA::ComponentIR::EmitsDef::_duplicate (EmitsDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void CORBA::ComponentIR::EmitsDef::_tao_release (EmitsDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -2635,7 +2635,7 @@ CORBA::ComponentIR::EmitsDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -2662,7 +2662,7 @@ static TAO::TypeCode::Objref<char const *, CORBA::tk_objref, "IDL:omg.org/CORBA/ComponentIR/EmitsDef:1.0", "EmitsDef"); - + namespace CORBA { namespace ComponentIR @@ -2692,7 +2692,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>::release ( CORBA::ComponentIR::PublishesDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::ComponentIR::PublishesDef_ptr @@ -2711,7 +2711,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -2730,19 +2730,19 @@ CORBA::ComponentIR::PublishesDef::CORBA_ComponentIR_PublishesDef_setup_collocati this->the_TAO_PublishesDef_Proxy_Broker_ = ::CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer (this); } - + this->CORBA_ComponentIR_EventPortDef_setup_collocation (); } CORBA::ComponentIR::PublishesDef::~PublishesDef (void) {} -void +void CORBA::ComponentIR::PublishesDef::_tao_any_destructor (void *_tao_void_pointer) { PublishesDef *_tao_tmp_pointer = static_cast<PublishesDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::ComponentIR::PublishesDef_ptr @@ -2778,18 +2778,18 @@ CORBA::ComponentIR::PublishesDef::_unchecked_narrow ( CORBA::ComponentIR::PublishesDef_ptr CORBA::ComponentIR::PublishesDef::_duplicate (PublishesDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void CORBA::ComponentIR::PublishesDef::_tao_release (PublishesDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -2825,7 +2825,7 @@ CORBA::ComponentIR::PublishesDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -2852,7 +2852,7 @@ static TAO::TypeCode::Objref<char const *, CORBA::tk_objref, "IDL:omg.org/CORBA/ComponentIR/PublishesDef:1.0", "PublishesDef"); - + namespace CORBA { namespace ComponentIR @@ -2882,7 +2882,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>::release ( CORBA::ComponentIR::ConsumesDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::ComponentIR::ConsumesDef_ptr @@ -2901,7 +2901,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -2920,19 +2920,19 @@ CORBA::ComponentIR::ConsumesDef::CORBA_ComponentIR_ConsumesDef_setup_collocation this->the_TAO_ConsumesDef_Proxy_Broker_ = ::CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer (this); } - + this->CORBA_ComponentIR_EventPortDef_setup_collocation (); } CORBA::ComponentIR::ConsumesDef::~ConsumesDef (void) {} -void +void CORBA::ComponentIR::ConsumesDef::_tao_any_destructor (void *_tao_void_pointer) { ConsumesDef *_tao_tmp_pointer = static_cast<ConsumesDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::ComponentIR::ConsumesDef_ptr @@ -2968,18 +2968,18 @@ CORBA::ComponentIR::ConsumesDef::_unchecked_narrow ( CORBA::ComponentIR::ConsumesDef_ptr CORBA::ComponentIR::ConsumesDef::_duplicate (ConsumesDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void CORBA::ComponentIR::ConsumesDef::_tao_release (ConsumesDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -3015,7 +3015,7 @@ CORBA::ComponentIR::ConsumesDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -3042,7 +3042,7 @@ static TAO::TypeCode::Objref<char const *, CORBA::tk_objref, "IDL:omg.org/CORBA/ComponentIR/ConsumesDef:1.0", "ConsumesDef"); - + namespace CORBA { namespace ComponentIR @@ -3072,7 +3072,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>::release ( CORBA::ComponentIR::ComponentDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::ComponentIR::ComponentDef_ptr @@ -3091,7 +3091,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -3108,21 +3108,21 @@ TAO::Collocation_Proxy_Broker * { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ComponentDef_Proxy_Broker_ == 0) { CORBA_ComponentIR_ComponentDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -3131,10 +3131,10 @@ TAO::Collocation_Proxy_Broker * 19, this->the_TAO_ComponentDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -3151,23 +3151,23 @@ void CORBA::ComponentIR::ComponentDef::base_component ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ComponentDef_Proxy_Broker_ == 0) { CORBA_ComponentIR_ComponentDef_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_base_component (base_component); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_base_component }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -3176,7 +3176,7 @@ void CORBA::ComponentIR::ComponentDef::base_component ( 19, this->the_TAO_ComponentDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -3193,21 +3193,21 @@ void CORBA::ComponentIR::ComponentDef::base_component ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ComponentDef_Proxy_Broker_ == 0) { CORBA_ComponentIR_ComponentDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -3216,10 +3216,10 @@ void CORBA::ComponentIR::ComponentDef::base_component ( 25, this->the_TAO_ComponentDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -3236,23 +3236,23 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ComponentDef_Proxy_Broker_ == 0) { CORBA_ComponentIR_ComponentDef_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_supported_interfaces }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -3261,7 +3261,7 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces ( 25, this->the_TAO_ComponentDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -3282,20 +3282,20 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ComponentDef_Proxy_Broker_ == 0) { CORBA_ComponentIR_ComponentDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::ComponentIR::ProvidesDef>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id); TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name); TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version); TAO::Arg_Traits< ::CORBA::InterfaceDef>::in_arg_val _tao_interface_type (interface_type); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -3304,7 +3304,7 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces ( &_tao_version, &_tao_interface_type }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -3313,10 +3313,10 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces ( 15, this->the_TAO_ComponentDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -3337,21 +3337,21 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ComponentDef_Proxy_Broker_ == 0) { CORBA_ComponentIR_ComponentDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::ComponentIR::UsesDef>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id); TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name); TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version); TAO::Arg_Traits< ::CORBA::InterfaceDef>::in_arg_val _tao_interface_type (interface_type); TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_multiple (is_multiple); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -3361,7 +3361,7 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces ( &_tao_interface_type, &_tao_is_multiple }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -3370,10 +3370,10 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces ( 11, this->the_TAO_ComponentDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -3393,20 +3393,20 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ComponentDef_Proxy_Broker_ == 0) { CORBA_ComponentIR_ComponentDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::ComponentIR::EmitsDef>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id); TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name); TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version); TAO::Arg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_val _tao_event (event); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -3415,7 +3415,7 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces ( &_tao_version, &_tao_event }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -3424,10 +3424,10 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces ( 12, this->the_TAO_ComponentDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -3447,20 +3447,20 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ComponentDef_Proxy_Broker_ == 0) { CORBA_ComponentIR_ComponentDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::ComponentIR::PublishesDef>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id); TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name); TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version); TAO::Arg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_val _tao_event (event); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -3469,7 +3469,7 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces ( &_tao_version, &_tao_event }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -3478,10 +3478,10 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces ( 16, this->the_TAO_ComponentDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -3501,20 +3501,20 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ComponentDef_Proxy_Broker_ == 0) { CORBA_ComponentIR_ComponentDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::ComponentIR::ConsumesDef>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id); TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name); TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version); TAO::Arg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_val _tao_event (event); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -3523,7 +3523,7 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces ( &_tao_version, &_tao_event }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -3532,10 +3532,10 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces ( 15, this->the_TAO_ComponentDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -3553,19 +3553,19 @@ CORBA::ComponentIR::ComponentDef::CORBA_ComponentIR_ComponentDef_setup_collocati this->the_TAO_ComponentDef_Proxy_Broker_ = ::CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer (this); } - + this->CORBA_ExtInterfaceDef_setup_collocation (); } CORBA::ComponentIR::ComponentDef::~ComponentDef (void) {} -void +void CORBA::ComponentIR::ComponentDef::_tao_any_destructor (void *_tao_void_pointer) { ComponentDef *_tao_tmp_pointer = static_cast<ComponentDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::ComponentIR::ComponentDef_ptr @@ -3601,18 +3601,18 @@ CORBA::ComponentIR::ComponentDef::_unchecked_narrow ( CORBA::ComponentIR::ComponentDef_ptr CORBA::ComponentIR::ComponentDef::_duplicate (ComponentDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void CORBA::ComponentIR::ComponentDef::_tao_release (ComponentDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -3664,7 +3664,7 @@ CORBA::ComponentIR::ComponentDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -3691,7 +3691,7 @@ static TAO::TypeCode::Objref<char const *, CORBA::tk_objref, "IDL:omg.org/CORBA/ComponentIR/ComponentDef:1.0", "ComponentDef"); - + namespace CORBA { namespace ComponentIR @@ -3703,7 +3703,7 @@ namespace CORBA -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ_CS_) @@ -3715,7 +3715,7 @@ CORBA::ComponentIR::ProvidesDescriptionSeq::ProvidesDescriptionSeq (void) CORBA::ComponentIR::ProvidesDescriptionSeq::ProvidesDescriptionSeq ( CORBA::ULong max ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< ProvidesDescription > (max) @@ -3727,7 +3727,7 @@ CORBA::ComponentIR::ProvidesDescriptionSeq::ProvidesDescriptionSeq ( CORBA::ComponentIR::ProvidesDescription * buffer, CORBA::Boolean release ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< ProvidesDescription > (max, length, buffer, release) @@ -3736,7 +3736,7 @@ CORBA::ComponentIR::ProvidesDescriptionSeq::ProvidesDescriptionSeq ( CORBA::ComponentIR::ProvidesDescriptionSeq::ProvidesDescriptionSeq ( const ProvidesDescriptionSeq &seq ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< ProvidesDescription > (seq) @@ -3777,10 +3777,10 @@ namespace TAO CORBA::tk_sequence, &CORBA::ComponentIR::_tc_ProvidesDescription, 0U); - + ::CORBA::TypeCode_ptr const tc_CORBA_ComponentIR_ProvidesDescriptionSeq_0 = &CORBA_ComponentIR_ProvidesDescriptionSeq_0; - + } } @@ -3795,7 +3795,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/CORBA/ComponentIR/ProvidesDescriptionSeq:1.0", "ProvidesDescriptionSeq", &TAO::TypeCode::tc_CORBA_ComponentIR_ProvidesDescriptionSeq_0); - + namespace CORBA { namespace ComponentIR @@ -3807,7 +3807,7 @@ namespace CORBA -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_CORBA_COMPONENTIR_USESDESCRIPTIONSEQ_CS_) @@ -3819,7 +3819,7 @@ CORBA::ComponentIR::UsesDescriptionSeq::UsesDescriptionSeq (void) CORBA::ComponentIR::UsesDescriptionSeq::UsesDescriptionSeq ( CORBA::ULong max ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< UsesDescription > (max) @@ -3831,7 +3831,7 @@ CORBA::ComponentIR::UsesDescriptionSeq::UsesDescriptionSeq ( CORBA::ComponentIR::UsesDescription * buffer, CORBA::Boolean release ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< UsesDescription > (max, length, buffer, release) @@ -3840,7 +3840,7 @@ CORBA::ComponentIR::UsesDescriptionSeq::UsesDescriptionSeq ( CORBA::ComponentIR::UsesDescriptionSeq::UsesDescriptionSeq ( const UsesDescriptionSeq &seq ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< UsesDescription > (seq) @@ -3881,10 +3881,10 @@ namespace TAO CORBA::tk_sequence, &CORBA::ComponentIR::_tc_UsesDescription, 0U); - + ::CORBA::TypeCode_ptr const tc_CORBA_ComponentIR_UsesDescriptionSeq_0 = &CORBA_ComponentIR_UsesDescriptionSeq_0; - + } } @@ -3899,7 +3899,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/CORBA/ComponentIR/UsesDescriptionSeq:1.0", "UsesDescriptionSeq", &TAO::TypeCode::tc_CORBA_ComponentIR_UsesDescriptionSeq_0); - + namespace CORBA { namespace ComponentIR @@ -3911,7 +3911,7 @@ namespace CORBA -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ_CS_) @@ -3923,7 +3923,7 @@ CORBA::ComponentIR::EventPortDescriptionSeq::EventPortDescriptionSeq (void) CORBA::ComponentIR::EventPortDescriptionSeq::EventPortDescriptionSeq ( CORBA::ULong max ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< EventPortDescription > (max) @@ -3935,7 +3935,7 @@ CORBA::ComponentIR::EventPortDescriptionSeq::EventPortDescriptionSeq ( CORBA::ComponentIR::EventPortDescription * buffer, CORBA::Boolean release ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< EventPortDescription > (max, length, buffer, release) @@ -3944,7 +3944,7 @@ CORBA::ComponentIR::EventPortDescriptionSeq::EventPortDescriptionSeq ( CORBA::ComponentIR::EventPortDescriptionSeq::EventPortDescriptionSeq ( const EventPortDescriptionSeq &seq ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< EventPortDescription > (seq) @@ -3985,10 +3985,10 @@ namespace TAO CORBA::tk_sequence, &CORBA::ComponentIR::_tc_EventPortDescription, 0U); - + ::CORBA::TypeCode_ptr const tc_CORBA_ComponentIR_EventPortDescriptionSeq_0 = &CORBA_ComponentIR_EventPortDescriptionSeq_0; - + } } @@ -4003,7 +4003,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/CORBA/ComponentIR/EventPortDescriptionSeq:1.0", "EventPortDescriptionSeq", &TAO::TypeCode::tc_CORBA_ComponentIR_EventPortDescriptionSeq_0); - + namespace CORBA { namespace ComponentIR @@ -4068,7 +4068,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co { "consumes_events", &CORBA::ComponentIR::_tc_EventPortDescriptionSeq }, { "attributes", &CORBA::_tc_ExtAttrDescriptionSeq }, { "type", &CORBA::_tc_TypeCode } - + }; static TAO::TypeCode::Recursive_Type< TAO::TypeCode::Struct<char const *, @@ -4084,7 +4084,7 @@ static TAO::TypeCode::Recursive_Type< "ComponentDescription", _tao_fields_CORBA_ComponentIR_ComponentDescription, 13); - + namespace CORBA { namespace ComponentIR @@ -4096,10 +4096,10 @@ namespace CORBA -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/structure_cs.cpp:66 -void +void CORBA::ComponentIR::ComponentDescription::_tao_any_destructor ( void *_tao_void_pointer ) @@ -4127,7 +4127,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>::release ( CORBA::ComponentIR::FactoryDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::ComponentIR::FactoryDef_ptr @@ -4146,7 +4146,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -4165,19 +4165,19 @@ CORBA::ComponentIR::FactoryDef::CORBA_ComponentIR_FactoryDef_setup_collocation ( this->the_TAO_FactoryDef_Proxy_Broker_ = ::CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer (this); } - + this->CORBA_OperationDef_setup_collocation (); } CORBA::ComponentIR::FactoryDef::~FactoryDef (void) {} -void +void CORBA::ComponentIR::FactoryDef::_tao_any_destructor (void *_tao_void_pointer) { FactoryDef *_tao_tmp_pointer = static_cast<FactoryDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::ComponentIR::FactoryDef_ptr @@ -4213,18 +4213,18 @@ CORBA::ComponentIR::FactoryDef::_unchecked_narrow ( CORBA::ComponentIR::FactoryDef_ptr CORBA::ComponentIR::FactoryDef::_duplicate (FactoryDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void CORBA::ComponentIR::FactoryDef::_tao_release (FactoryDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -4260,7 +4260,7 @@ CORBA::ComponentIR::FactoryDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -4287,7 +4287,7 @@ static TAO::TypeCode::Objref<char const *, CORBA::tk_objref, "IDL:omg.org/CORBA/ComponentIR/FactoryDef:1.0", "FactoryDef"); - + namespace CORBA { namespace ComponentIR @@ -4317,7 +4317,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>::release ( CORBA::ComponentIR::FinderDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::ComponentIR::FinderDef_ptr @@ -4336,7 +4336,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -4355,19 +4355,19 @@ CORBA::ComponentIR::FinderDef::CORBA_ComponentIR_FinderDef_setup_collocation () this->the_TAO_FinderDef_Proxy_Broker_ = ::CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer (this); } - + this->CORBA_OperationDef_setup_collocation (); } CORBA::ComponentIR::FinderDef::~FinderDef (void) {} -void +void CORBA::ComponentIR::FinderDef::_tao_any_destructor (void *_tao_void_pointer) { FinderDef *_tao_tmp_pointer = static_cast<FinderDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::ComponentIR::FinderDef_ptr @@ -4403,18 +4403,18 @@ CORBA::ComponentIR::FinderDef::_unchecked_narrow ( CORBA::ComponentIR::FinderDef_ptr CORBA::ComponentIR::FinderDef::_duplicate (FinderDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void CORBA::ComponentIR::FinderDef::_tao_release (FinderDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -4450,7 +4450,7 @@ CORBA::ComponentIR::FinderDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -4477,7 +4477,7 @@ static TAO::TypeCode::Objref<char const *, CORBA::tk_objref, "IDL:omg.org/CORBA/ComponentIR/FinderDef:1.0", "FinderDef"); - + namespace CORBA { namespace ComponentIR @@ -4507,7 +4507,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>::release ( CORBA::ComponentIR::HomeDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::ComponentIR::HomeDef_ptr @@ -4526,7 +4526,7 @@ TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -4543,21 +4543,21 @@ TAO::Collocation_Proxy_Broker * { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_HomeDef_Proxy_Broker_ == 0) { CORBA_ComponentIR_HomeDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::ComponentIR::HomeDef>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -4566,10 +4566,10 @@ TAO::Collocation_Proxy_Broker * 14, this->the_TAO_HomeDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -4586,23 +4586,23 @@ void CORBA::ComponentIR::HomeDef::base_home ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_HomeDef_Proxy_Broker_ == 0) { CORBA_ComponentIR_HomeDef_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::ComponentIR::HomeDef>::in_arg_val _tao_base_home (base_home); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_base_home }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -4611,7 +4611,7 @@ void CORBA::ComponentIR::HomeDef::base_home ( 14, this->the_TAO_HomeDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -4628,21 +4628,21 @@ void CORBA::ComponentIR::HomeDef::base_home ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_HomeDef_Proxy_Broker_ == 0) { CORBA_ComponentIR_HomeDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -4651,10 +4651,10 @@ void CORBA::ComponentIR::HomeDef::base_home ( 25, this->the_TAO_HomeDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -4671,23 +4671,23 @@ void CORBA::ComponentIR::HomeDef::supported_interfaces ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_HomeDef_Proxy_Broker_ == 0) { CORBA_ComponentIR_HomeDef_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_supported_interfaces }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -4696,7 +4696,7 @@ void CORBA::ComponentIR::HomeDef::supported_interfaces ( 25, this->the_TAO_HomeDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -4713,21 +4713,21 @@ void CORBA::ComponentIR::HomeDef::supported_interfaces ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_HomeDef_Proxy_Broker_ == 0) { CORBA_ComponentIR_HomeDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -4736,10 +4736,10 @@ void CORBA::ComponentIR::HomeDef::supported_interfaces ( 22, this->the_TAO_HomeDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -4756,23 +4756,23 @@ void CORBA::ComponentIR::HomeDef::managed_component ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_HomeDef_Proxy_Broker_ == 0) { CORBA_ComponentIR_HomeDef_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_managed_component (managed_component); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_managed_component }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -4781,7 +4781,7 @@ void CORBA::ComponentIR::HomeDef::managed_component ( 22, this->the_TAO_HomeDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -4798,21 +4798,21 @@ void CORBA::ComponentIR::HomeDef::managed_component ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_HomeDef_Proxy_Broker_ == 0) { CORBA_ComponentIR_HomeDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::ValueDef>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -4821,10 +4821,10 @@ void CORBA::ComponentIR::HomeDef::managed_component ( 16, this->the_TAO_HomeDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -4841,23 +4841,23 @@ void CORBA::ComponentIR::HomeDef::primary_key ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_HomeDef_Proxy_Broker_ == 0) { CORBA_ComponentIR_HomeDef_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::ValueDef>::in_arg_val _tao_primary_key (primary_key); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_primary_key }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -4866,7 +4866,7 @@ void CORBA::ComponentIR::HomeDef::primary_key ( 16, this->the_TAO_HomeDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -4888,21 +4888,21 @@ void CORBA::ComponentIR::HomeDef::primary_key ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_HomeDef_Proxy_Broker_ == 0) { CORBA_ComponentIR_HomeDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::ComponentIR::FactoryDef>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id); TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name); TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version); TAO::Arg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params); TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -4912,7 +4912,7 @@ void CORBA::ComponentIR::HomeDef::primary_key ( &_tao_params, &_tao_exceptions }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -4921,10 +4921,10 @@ void CORBA::ComponentIR::HomeDef::primary_key ( 14, this->the_TAO_HomeDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -4945,21 +4945,21 @@ void CORBA::ComponentIR::HomeDef::primary_key ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_HomeDef_Proxy_Broker_ == 0) { CORBA_ComponentIR_HomeDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::ComponentIR::FinderDef>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id); TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name); TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version); TAO::Arg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params); TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -4969,7 +4969,7 @@ void CORBA::ComponentIR::HomeDef::primary_key ( &_tao_params, &_tao_exceptions }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -4978,10 +4978,10 @@ void CORBA::ComponentIR::HomeDef::primary_key ( 13, this->the_TAO_HomeDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -4999,19 +4999,19 @@ CORBA::ComponentIR::HomeDef::CORBA_ComponentIR_HomeDef_setup_collocation () this->the_TAO_HomeDef_Proxy_Broker_ = ::CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer (this); } - + this->CORBA_ExtInterfaceDef_setup_collocation (); } CORBA::ComponentIR::HomeDef::~HomeDef (void) {} -void +void CORBA::ComponentIR::HomeDef::_tao_any_destructor (void *_tao_void_pointer) { HomeDef *_tao_tmp_pointer = static_cast<HomeDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::ComponentIR::HomeDef_ptr @@ -5047,18 +5047,18 @@ CORBA::ComponentIR::HomeDef::_unchecked_narrow ( CORBA::ComponentIR::HomeDef_ptr CORBA::ComponentIR::HomeDef::_duplicate (HomeDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void CORBA::ComponentIR::HomeDef::_tao_release (HomeDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -5110,7 +5110,7 @@ CORBA::ComponentIR::HomeDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -5137,7 +5137,7 @@ static TAO::TypeCode::Objref<char const *, CORBA::tk_objref, "IDL:omg.org/CORBA/ComponentIR/HomeDef:1.0", "HomeDef"); - + namespace CORBA { namespace ComponentIR @@ -5186,7 +5186,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co { "operations", &CORBA::_tc_OpDescriptionSeq }, { "attributes", &CORBA::_tc_ExtAttrDescriptionSeq }, { "type", &CORBA::_tc_TypeCode } - + }; static TAO::TypeCode::Recursive_Type< TAO::TypeCode::Struct<char const *, @@ -5202,7 +5202,7 @@ static TAO::TypeCode::Recursive_Type< "HomeDescription", _tao_fields_CORBA_ComponentIR_HomeDescription, 12); - + namespace CORBA { namespace ComponentIR @@ -5214,10 +5214,10 @@ namespace CORBA -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/structure_cs.cpp:66 -void +void CORBA::ComponentIR::HomeDescription::_tao_any_destructor ( void *_tao_void_pointer ) @@ -5517,7 +5517,7 @@ operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -5633,7 +5633,7 @@ operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -5749,7 +5749,7 @@ operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -6039,7 +6039,7 @@ operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/any_op_cs.cpp:54 @@ -6098,7 +6098,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/any_op_cs.cpp:54 @@ -6157,7 +6157,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/any_op_cs.cpp:54 @@ -6216,7 +6216,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -6448,7 +6448,7 @@ operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -6524,21 +6524,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::ComponentIR::EventDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -6560,21 +6560,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::ComponentIR::Container RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -6596,21 +6596,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::ComponentIR::ModuleDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -6632,21 +6632,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::ComponentIR::Repository RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -6668,21 +6668,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::ComponentIR::ProvidesDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -6733,21 +6733,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::ComponentIR::UsesDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -6800,21 +6800,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::ComponentIR::EventPortDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -6865,21 +6865,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::ComponentIR::EmitsDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -6901,21 +6901,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::ComponentIR::PublishesDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -6937,21 +6937,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::ComponentIR::ConsumesDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -6973,21 +6973,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::ComponentIR::ComponentDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -7002,22 +7002,7 @@ CORBA::Boolean operator<< ( const CORBA::ComponentIR::ProvidesDescriptionSeq &_tao_sequence ) { - const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm << _tao_sequence[i]); - } - - return _tao_marshal_flag; - } - - return false; + return TAO::marshal_sequence(strm, _tao_sequence); } CORBA::Boolean operator>> ( @@ -7025,40 +7010,7 @@ CORBA::Boolean operator>> ( CORBA::ComponentIR::ProvidesDescriptionSeq &_tao_sequence ) { - CORBA::ULong _tao_seq_len; - - if (strm >> _tao_seq_len) - { - // Add a check to the length of the sequence - // to make sure it does not exceed the length - // of the stream. (See bug 58.) - if (_tao_seq_len > strm.length ()) - { - return false; - } - - // Set the length of the sequence. - _tao_sequence.length (_tao_seq_len); - - // If length is 0 we return true. - if (0 >= _tao_seq_len) - { - return true; - } - - // Retrieve all the elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm >> _tao_sequence[i]); - } - - return _tao_marshal_flag; - - } - - return false; + return TAO::demarshal_sequence(strm, _tao_sequence); } #endif /* _TAO_CDR_OP_CORBA_ComponentIR_ProvidesDescriptionSeq_CPP_ */ @@ -7074,22 +7026,7 @@ CORBA::Boolean operator<< ( const CORBA::ComponentIR::UsesDescriptionSeq &_tao_sequence ) { - const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm << _tao_sequence[i]); - } - - return _tao_marshal_flag; - } - - return false; + return TAO::marshal_sequence(strm, _tao_sequence); } CORBA::Boolean operator>> ( @@ -7097,40 +7034,7 @@ CORBA::Boolean operator>> ( CORBA::ComponentIR::UsesDescriptionSeq &_tao_sequence ) { - CORBA::ULong _tao_seq_len; - - if (strm >> _tao_seq_len) - { - // Add a check to the length of the sequence - // to make sure it does not exceed the length - // of the stream. (See bug 58.) - if (_tao_seq_len > strm.length ()) - { - return false; - } - - // Set the length of the sequence. - _tao_sequence.length (_tao_seq_len); - - // If length is 0 we return true. - if (0 >= _tao_seq_len) - { - return true; - } - - // Retrieve all the elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm >> _tao_sequence[i]); - } - - return _tao_marshal_flag; - - } - - return false; + return TAO::demarshal_sequence(strm, _tao_sequence); } #endif /* _TAO_CDR_OP_CORBA_ComponentIR_UsesDescriptionSeq_CPP_ */ @@ -7146,22 +7050,7 @@ CORBA::Boolean operator<< ( const CORBA::ComponentIR::EventPortDescriptionSeq &_tao_sequence ) { - const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm << _tao_sequence[i]); - } - - return _tao_marshal_flag; - } - - return false; + return TAO::marshal_sequence(strm, _tao_sequence); } CORBA::Boolean operator>> ( @@ -7169,40 +7058,7 @@ CORBA::Boolean operator>> ( CORBA::ComponentIR::EventPortDescriptionSeq &_tao_sequence ) { - CORBA::ULong _tao_seq_len; - - if (strm >> _tao_seq_len) - { - // Add a check to the length of the sequence - // to make sure it does not exceed the length - // of the stream. (See bug 58.) - if (_tao_seq_len > strm.length ()) - { - return false; - } - - // Set the length of the sequence. - _tao_sequence.length (_tao_seq_len); - - // If length is 0 we return true. - if (0 >= _tao_seq_len) - { - return true; - } - - // Retrieve all the elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm >> _tao_sequence[i]); - } - - return _tao_marshal_flag; - - } - - return false; + return TAO::demarshal_sequence(strm, _tao_sequence); } #endif /* _TAO_CDR_OP_CORBA_ComponentIR_EventPortDescriptionSeq_CPP_ */ @@ -7270,21 +7126,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::ComponentIR::FactoryDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -7306,21 +7162,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::ComponentIR::FinderDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -7342,21 +7198,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::ComponentIR::HomeDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.h b/TAO/tao/IFR_Client/IFR_ComponentsC.h index f952df4b02e..69b379a161f 100644 --- a/TAO/tao/IFR_Client/IFR_ComponentsC.h +++ b/TAO/tao/IFR_Client/IFR_ComponentsC.h @@ -71,7 +71,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_root/root_ch.cpp:62 namespace TAO @@ -85,28 +85,28 @@ namespace TAO namespace CORBA { - + // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 - + namespace ComponentIR { - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_COMPONENTIR_COMPONENTDEF__VAR_OUT_CH_) #define _CORBA_COMPONENTIR_COMPONENTDEF__VAR_OUT_CH_ - + class ComponentDef; typedef ComponentDef *ComponentDef_ptr; - + typedef TAO_Objref_Var_T< ComponentDef > ComponentDef_var; - + typedef TAO_Objref_Out_T< ComponentDef @@ -114,22 +114,22 @@ namespace CORBA ComponentDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_COMPONENTIR_HOMEDEF__VAR_OUT_CH_) #define _CORBA_COMPONENTIR_HOMEDEF__VAR_OUT_CH_ - + class HomeDef; typedef HomeDef *HomeDef_ptr; - + typedef TAO_Objref_Var_T< HomeDef > HomeDef_var; - + typedef TAO_Objref_Out_T< HomeDef @@ -137,22 +137,22 @@ namespace CORBA HomeDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_COMPONENTIR_EVENTDEF__VAR_OUT_CH_) #define _CORBA_COMPONENTIR_EVENTDEF__VAR_OUT_CH_ - + class EventDef; typedef EventDef *EventDef_ptr; - + typedef TAO_Objref_Var_T< EventDef > EventDef_var; - + typedef TAO_Objref_Out_T< EventDef @@ -160,13 +160,13 @@ namespace CORBA EventDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_COMPONENTIR_EVENTDEF_CH_) #define _CORBA_COMPONENTIR_EVENTDEF_CH_ - + class TAO_IFR_Client_Export EventDef : public virtual ::CORBA::ExtValueDef { @@ -174,56 +174,56 @@ namespace CORBA friend class TAO::Narrow_Utils<EventDef>; typedef EventDef_ptr _ptr_type; typedef EventDef_var _var_type; - + // The static operations. static EventDef_ptr _duplicate (EventDef_ptr obj); - + static void _tao_release (EventDef_ptr obj); - + static EventDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static EventDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static EventDef_ptr _nil (void) { return static_cast<EventDef_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_EventDef_Proxy_Broker_; - + protected: // Concrete interface only. EventDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_ComponentIR_EventDef_setup_collocation (void); - + // Concrete non-local interface only. EventDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. EventDef ( TAO_Stub *objref, @@ -231,38 +231,38 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~EventDef (void); - + private: // Private and unimplemented for concrete interfaces. EventDef (const EventDef &); - + void operator= (const EventDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_EventDef; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_COMPONENTIR_CONTAINER__VAR_OUT_CH_) #define _CORBA_COMPONENTIR_CONTAINER__VAR_OUT_CH_ - + class Container; typedef Container *Container_ptr; - + typedef TAO_Objref_Var_T< Container > Container_var; - + typedef TAO_Objref_Out_T< Container @@ -270,13 +270,13 @@ namespace CORBA Container_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_COMPONENTIR_CONTAINER_CH_) #define _CORBA_COMPONENTIR_CONTAINER_CH_ - + class TAO_IFR_Client_Export Container : public virtual ::CORBA::Container { @@ -284,32 +284,32 @@ namespace CORBA friend class TAO::Narrow_Utils<Container>; typedef Container_ptr _ptr_type; typedef Container_var _var_type; - + // The static operations. static Container_ptr _duplicate (Container_ptr obj); - + static void _tao_release (Container_ptr obj); - + static Container_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Container_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Container_ptr _nil (void) { return static_cast<Container_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::ComponentIR::ComponentDef_ptr create_component ( const char * id, const char * name, @@ -321,10 +321,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::ComponentIR::HomeDef_ptr create_home ( const char * id, const char * name, @@ -338,10 +338,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::ComponentIR::EventDef_ptr create_event ( const char * id, const char * name, @@ -358,34 +358,34 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_Container_Proxy_Broker_; - + protected: // Concrete interface only. Container (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_ComponentIR_Container_setup_collocation (void); - + // Concrete non-local interface only. Container ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. Container ( TAO_Stub *objref, @@ -393,38 +393,38 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~Container (void); - + private: // Private and unimplemented for concrete interfaces. Container (const Container &); - + void operator= (const Container &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_Container; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_COMPONENTIR_MODULEDEF__VAR_OUT_CH_) #define _CORBA_COMPONENTIR_MODULEDEF__VAR_OUT_CH_ - + class ModuleDef; typedef ModuleDef *ModuleDef_ptr; - + typedef TAO_Objref_Var_T< ModuleDef > ModuleDef_var; - + typedef TAO_Objref_Out_T< ModuleDef @@ -432,13 +432,13 @@ namespace CORBA ModuleDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_COMPONENTIR_MODULEDEF_CH_) #define _CORBA_COMPONENTIR_MODULEDEF_CH_ - + class TAO_IFR_Client_Export ModuleDef : public virtual ::CORBA::ModuleDef, public virtual ::CORBA::ComponentIR::Container @@ -447,56 +447,56 @@ namespace CORBA friend class TAO::Narrow_Utils<ModuleDef>; typedef ModuleDef_ptr _ptr_type; typedef ModuleDef_var _var_type; - + // The static operations. static ModuleDef_ptr _duplicate (ModuleDef_ptr obj); - + static void _tao_release (ModuleDef_ptr obj); - + static ModuleDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ModuleDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ModuleDef_ptr _nil (void) { return static_cast<ModuleDef_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_ModuleDef_Proxy_Broker_; - + protected: // Concrete interface only. ModuleDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_ComponentIR_ModuleDef_setup_collocation (void); - + // Concrete non-local interface only. ModuleDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. ModuleDef ( TAO_Stub *objref, @@ -504,38 +504,38 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~ModuleDef (void); - + private: // Private and unimplemented for concrete interfaces. ModuleDef (const ModuleDef &); - + void operator= (const ModuleDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ModuleDef; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_COMPONENTIR_REPOSITORY__VAR_OUT_CH_) #define _CORBA_COMPONENTIR_REPOSITORY__VAR_OUT_CH_ - + class Repository; typedef Repository *Repository_ptr; - + typedef TAO_Objref_Var_T< Repository > Repository_var; - + typedef TAO_Objref_Out_T< Repository @@ -543,13 +543,13 @@ namespace CORBA Repository_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_COMPONENTIR_REPOSITORY_CH_) #define _CORBA_COMPONENTIR_REPOSITORY_CH_ - + class TAO_IFR_Client_Export Repository : public virtual ::CORBA::Repository, public virtual ::CORBA::ComponentIR::Container @@ -558,56 +558,56 @@ namespace CORBA friend class TAO::Narrow_Utils<Repository>; typedef Repository_ptr _ptr_type; typedef Repository_var _var_type; - + // The static operations. static Repository_ptr _duplicate (Repository_ptr obj); - + static void _tao_release (Repository_ptr obj); - + static Repository_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Repository_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Repository_ptr _nil (void) { return static_cast<Repository_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_Repository_Proxy_Broker_; - + protected: // Concrete interface only. Repository (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_ComponentIR_Repository_setup_collocation (void); - + // Concrete non-local interface only. Repository ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. Repository ( TAO_Stub *objref, @@ -615,38 +615,38 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~Repository (void); - + private: // Private and unimplemented for concrete interfaces. Repository (const Repository &); - + void operator= (const Repository &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_Repository; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_COMPONENTIR_PROVIDESDEF__VAR_OUT_CH_) #define _CORBA_COMPONENTIR_PROVIDESDEF__VAR_OUT_CH_ - + class ProvidesDef; typedef ProvidesDef *ProvidesDef_ptr; - + typedef TAO_Objref_Var_T< ProvidesDef > ProvidesDef_var; - + typedef TAO_Objref_Out_T< ProvidesDef @@ -654,13 +654,13 @@ namespace CORBA ProvidesDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_COMPONENTIR_PROVIDESDEF_CH_) #define _CORBA_COMPONENTIR_PROVIDESDEF_CH_ - + class TAO_IFR_Client_Export ProvidesDef : public virtual ::CORBA::Contained { @@ -668,42 +668,42 @@ namespace CORBA friend class TAO::Narrow_Utils<ProvidesDef>; typedef ProvidesDef_ptr _ptr_type; typedef ProvidesDef_var _var_type; - + // The static operations. static ProvidesDef_ptr _duplicate (ProvidesDef_ptr obj); - + static void _tao_release (ProvidesDef_ptr obj); - + static ProvidesDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ProvidesDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ProvidesDef_ptr _nil (void) { return static_cast<ProvidesDef_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::InterfaceDef_ptr interface_type ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void interface_type ( ::CORBA::InterfaceDef_ptr interface_type ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -711,34 +711,34 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_ProvidesDef_Proxy_Broker_; - + protected: // Concrete interface only. ProvidesDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_ComponentIR_ProvidesDef_setup_collocation (void); - + // Concrete non-local interface only. ProvidesDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. ProvidesDef ( TAO_Stub *objref, @@ -746,76 +746,76 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~ProvidesDef (void); - + private: // Private and unimplemented for concrete interfaces. ProvidesDef (const ProvidesDef &); - + void operator= (const ProvidesDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ProvidesDef; - + // TAO_IDL - Generated from // be\be_type.cpp:258 - + struct ProvidesDescription; - + typedef TAO_Var_Var_T< ProvidesDescription > ProvidesDescription_var; - + typedef TAO_Out_T< ProvidesDescription, ProvidesDescription_var > ProvidesDescription_out; - + // TAO_IDL - Generated from // be\be_visitor_structure/structure_ch.cpp:57 - + struct TAO_IFR_Client_Export ProvidesDescription { typedef ProvidesDescription_var _var_type; - + static void _tao_any_destructor (void *); - TAO_String_Manager name; - TAO_String_Manager id; - TAO_String_Manager defined_in; - TAO_String_Manager version; - TAO_String_Manager interface_type; + TAO::String_Manager name; + TAO::String_Manager id; + TAO::String_Manager defined_in; + TAO::String_Manager version; + TAO::String_Manager interface_type; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ProvidesDescription; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_COMPONENTIR_USESDEF__VAR_OUT_CH_) #define _CORBA_COMPONENTIR_USESDEF__VAR_OUT_CH_ - + class UsesDef; typedef UsesDef *UsesDef_ptr; - + typedef TAO_Objref_Var_T< UsesDef > UsesDef_var; - + typedef TAO_Objref_Out_T< UsesDef @@ -823,13 +823,13 @@ namespace CORBA UsesDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_COMPONENTIR_USESDEF_CH_) #define _CORBA_COMPONENTIR_USESDEF_CH_ - + class TAO_IFR_Client_Export UsesDef : public virtual ::CORBA::Contained { @@ -837,42 +837,42 @@ namespace CORBA friend class TAO::Narrow_Utils<UsesDef>; typedef UsesDef_ptr _ptr_type; typedef UsesDef_var _var_type; - + // The static operations. static UsesDef_ptr _duplicate (UsesDef_ptr obj); - + static void _tao_release (UsesDef_ptr obj); - + static UsesDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static UsesDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static UsesDef_ptr _nil (void) { return static_cast<UsesDef_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::InterfaceDef_ptr interface_type ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void interface_type ( ::CORBA::InterfaceDef_ptr interface_type ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -880,20 +880,20 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Boolean is_multiple ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void is_multiple ( ::CORBA::Boolean is_multiple ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -901,34 +901,34 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_UsesDef_Proxy_Broker_; - + protected: // Concrete interface only. UsesDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_ComponentIR_UsesDef_setup_collocation (void); - + // Concrete non-local interface only. UsesDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. UsesDef ( TAO_Stub *objref, @@ -936,77 +936,77 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~UsesDef (void); - + private: // Private and unimplemented for concrete interfaces. UsesDef (const UsesDef &); - + void operator= (const UsesDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_UsesDef; - + // TAO_IDL - Generated from // be\be_type.cpp:258 - + struct UsesDescription; - + typedef TAO_Var_Var_T< UsesDescription > UsesDescription_var; - + typedef TAO_Out_T< UsesDescription, UsesDescription_var > UsesDescription_out; - + // TAO_IDL - Generated from // be\be_visitor_structure/structure_ch.cpp:57 - + struct TAO_IFR_Client_Export UsesDescription { typedef UsesDescription_var _var_type; - + static void _tao_any_destructor (void *); - TAO_String_Manager name; - TAO_String_Manager id; - TAO_String_Manager defined_in; - TAO_String_Manager version; - TAO_String_Manager interface_type; + TAO::String_Manager name; + TAO::String_Manager id; + TAO::String_Manager defined_in; + TAO::String_Manager version; + TAO::String_Manager interface_type; CORBA::Boolean is_multiple; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_UsesDescription; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_COMPONENTIR_EVENTPORTDEF__VAR_OUT_CH_) #define _CORBA_COMPONENTIR_EVENTPORTDEF__VAR_OUT_CH_ - + class EventPortDef; typedef EventPortDef *EventPortDef_ptr; - + typedef TAO_Objref_Var_T< EventPortDef > EventPortDef_var; - + typedef TAO_Objref_Out_T< EventPortDef @@ -1014,13 +1014,13 @@ namespace CORBA EventPortDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_COMPONENTIR_EVENTPORTDEF_CH_) #define _CORBA_COMPONENTIR_EVENTPORTDEF_CH_ - + class TAO_IFR_Client_Export EventPortDef : public virtual ::CORBA::Contained { @@ -1028,42 +1028,42 @@ namespace CORBA friend class TAO::Narrow_Utils<EventPortDef>; typedef EventPortDef_ptr _ptr_type; typedef EventPortDef_var _var_type; - + // The static operations. static EventPortDef_ptr _duplicate (EventPortDef_ptr obj); - + static void _tao_release (EventPortDef_ptr obj); - + static EventPortDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static EventPortDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static EventPortDef_ptr _nil (void) { return static_cast<EventPortDef_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::ComponentIR::EventDef_ptr event ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void event ( ::CORBA::ComponentIR::EventDef_ptr event ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1071,10 +1071,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Boolean is_a ( const char * event_id ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1082,34 +1082,34 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_EventPortDef_Proxy_Broker_; - + protected: // Concrete interface only. EventPortDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_ComponentIR_EventPortDef_setup_collocation (void); - + // Concrete non-local interface only. EventPortDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. EventPortDef ( TAO_Stub *objref, @@ -1117,76 +1117,76 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~EventPortDef (void); - + private: // Private and unimplemented for concrete interfaces. EventPortDef (const EventPortDef &); - + void operator= (const EventPortDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_EventPortDef; - + // TAO_IDL - Generated from // be\be_type.cpp:258 - + struct EventPortDescription; - + typedef TAO_Var_Var_T< EventPortDescription > EventPortDescription_var; - + typedef TAO_Out_T< EventPortDescription, EventPortDescription_var > EventPortDescription_out; - + // TAO_IDL - Generated from // be\be_visitor_structure/structure_ch.cpp:57 - + struct TAO_IFR_Client_Export EventPortDescription { typedef EventPortDescription_var _var_type; - + static void _tao_any_destructor (void *); - TAO_String_Manager name; - TAO_String_Manager id; - TAO_String_Manager defined_in; - TAO_String_Manager version; - TAO_String_Manager event; + TAO::String_Manager name; + TAO::String_Manager id; + TAO::String_Manager defined_in; + TAO::String_Manager version; + TAO::String_Manager event; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_EventPortDescription; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_COMPONENTIR_EMITSDEF__VAR_OUT_CH_) #define _CORBA_COMPONENTIR_EMITSDEF__VAR_OUT_CH_ - + class EmitsDef; typedef EmitsDef *EmitsDef_ptr; - + typedef TAO_Objref_Var_T< EmitsDef > EmitsDef_var; - + typedef TAO_Objref_Out_T< EmitsDef @@ -1194,13 +1194,13 @@ namespace CORBA EmitsDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_COMPONENTIR_EMITSDEF_CH_) #define _CORBA_COMPONENTIR_EMITSDEF_CH_ - + class TAO_IFR_Client_Export EmitsDef : public virtual ::CORBA::ComponentIR::EventPortDef { @@ -1208,56 +1208,56 @@ namespace CORBA friend class TAO::Narrow_Utils<EmitsDef>; typedef EmitsDef_ptr _ptr_type; typedef EmitsDef_var _var_type; - + // The static operations. static EmitsDef_ptr _duplicate (EmitsDef_ptr obj); - + static void _tao_release (EmitsDef_ptr obj); - + static EmitsDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static EmitsDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static EmitsDef_ptr _nil (void) { return static_cast<EmitsDef_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_EmitsDef_Proxy_Broker_; - + protected: // Concrete interface only. EmitsDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_ComponentIR_EmitsDef_setup_collocation (void); - + // Concrete non-local interface only. EmitsDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. EmitsDef ( TAO_Stub *objref, @@ -1265,38 +1265,38 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~EmitsDef (void); - + private: // Private and unimplemented for concrete interfaces. EmitsDef (const EmitsDef &); - + void operator= (const EmitsDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_EmitsDef; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF__VAR_OUT_CH_) #define _CORBA_COMPONENTIR_PUBLISHESDEF__VAR_OUT_CH_ - + class PublishesDef; typedef PublishesDef *PublishesDef_ptr; - + typedef TAO_Objref_Var_T< PublishesDef > PublishesDef_var; - + typedef TAO_Objref_Out_T< PublishesDef @@ -1304,13 +1304,13 @@ namespace CORBA PublishesDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF_CH_) #define _CORBA_COMPONENTIR_PUBLISHESDEF_CH_ - + class TAO_IFR_Client_Export PublishesDef : public virtual ::CORBA::ComponentIR::EventPortDef { @@ -1318,56 +1318,56 @@ namespace CORBA friend class TAO::Narrow_Utils<PublishesDef>; typedef PublishesDef_ptr _ptr_type; typedef PublishesDef_var _var_type; - + // The static operations. static PublishesDef_ptr _duplicate (PublishesDef_ptr obj); - + static void _tao_release (PublishesDef_ptr obj); - + static PublishesDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static PublishesDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static PublishesDef_ptr _nil (void) { return static_cast<PublishesDef_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_PublishesDef_Proxy_Broker_; - + protected: // Concrete interface only. PublishesDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_ComponentIR_PublishesDef_setup_collocation (void); - + // Concrete non-local interface only. PublishesDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. PublishesDef ( TAO_Stub *objref, @@ -1375,38 +1375,38 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~PublishesDef (void); - + private: // Private and unimplemented for concrete interfaces. PublishesDef (const PublishesDef &); - + void operator= (const PublishesDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_PublishesDef; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_COMPONENTIR_CONSUMESDEF__VAR_OUT_CH_) #define _CORBA_COMPONENTIR_CONSUMESDEF__VAR_OUT_CH_ - + class ConsumesDef; typedef ConsumesDef *ConsumesDef_ptr; - + typedef TAO_Objref_Var_T< ConsumesDef > ConsumesDef_var; - + typedef TAO_Objref_Out_T< ConsumesDef @@ -1414,13 +1414,13 @@ namespace CORBA ConsumesDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_COMPONENTIR_CONSUMESDEF_CH_) #define _CORBA_COMPONENTIR_CONSUMESDEF_CH_ - + class TAO_IFR_Client_Export ConsumesDef : public virtual ::CORBA::ComponentIR::EventPortDef { @@ -1428,56 +1428,56 @@ namespace CORBA friend class TAO::Narrow_Utils<ConsumesDef>; typedef ConsumesDef_ptr _ptr_type; typedef ConsumesDef_var _var_type; - + // The static operations. static ConsumesDef_ptr _duplicate (ConsumesDef_ptr obj); - + static void _tao_release (ConsumesDef_ptr obj); - + static ConsumesDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ConsumesDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ConsumesDef_ptr _nil (void) { return static_cast<ConsumesDef_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_ConsumesDef_Proxy_Broker_; - + protected: // Concrete interface only. ConsumesDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_ComponentIR_ConsumesDef_setup_collocation (void); - + // Concrete non-local interface only. ConsumesDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. ConsumesDef ( TAO_Stub *objref, @@ -1485,29 +1485,29 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~ConsumesDef (void); - + private: // Private and unimplemented for concrete interfaces. ConsumesDef (const ConsumesDef &); - + void operator= (const ConsumesDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ConsumesDef; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_COMPONENTIR_COMPONENTDEF_CH_) #define _CORBA_COMPONENTIR_COMPONENTDEF_CH_ - + class TAO_IFR_Client_Export ComponentDef : public virtual ::CORBA::ExtInterfaceDef { @@ -1515,42 +1515,42 @@ namespace CORBA friend class TAO::Narrow_Utils<ComponentDef>; typedef ComponentDef_ptr _ptr_type; typedef ComponentDef_var _var_type; - + // The static operations. static ComponentDef_ptr _duplicate (ComponentDef_ptr obj); - + static void _tao_release (ComponentDef_ptr obj); - + static ComponentDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ComponentDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ComponentDef_ptr _nil (void) { return static_cast<ComponentDef_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::ComponentIR::ComponentDef_ptr base_component ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void base_component ( ::CORBA::ComponentIR::ComponentDef_ptr base_component ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1558,20 +1558,20 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::InterfaceDefSeq * supported_interfaces ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void supported_interfaces ( const ::CORBA::InterfaceDefSeq & supported_interfaces ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1579,10 +1579,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::ComponentIR::ProvidesDef_ptr create_provides ( const char * id, const char * name, @@ -1593,10 +1593,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::ComponentIR::UsesDef_ptr create_uses ( const char * id, const char * name, @@ -1608,10 +1608,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::ComponentIR::EmitsDef_ptr create_emits ( const char * id, const char * name, @@ -1622,10 +1622,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::ComponentIR::PublishesDef_ptr create_publishes ( const char * id, const char * name, @@ -1636,10 +1636,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::ComponentIR::ConsumesDef_ptr create_consumes ( const char * id, const char * name, @@ -1650,34 +1650,34 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_ComponentDef_Proxy_Broker_; - + protected: // Concrete interface only. ComponentDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_ComponentIR_ComponentDef_setup_collocation (void); - + // Concrete non-local interface only. ComponentDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. ComponentDef ( TAO_Stub *objref, @@ -1685,49 +1685,46 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~ComponentDef (void); - + private: // Private and unimplemented for concrete interfaces. ComponentDef (const ComponentDef &); - + void operator= (const ComponentDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ComponentDef; - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ_CH_) #define _CORBA_COMPONENTIR_PROVIDESDESCRIPTIONSEQ_CH_ - + class ProvidesDescriptionSeq; - + typedef TAO_VarSeq_Var_T< - ProvidesDescriptionSeq, - ProvidesDescription + ProvidesDescriptionSeq > ProvidesDescriptionSeq_var; - + typedef TAO_Seq_Out_T< - ProvidesDescriptionSeq, - ProvidesDescriptionSeq_var, - ProvidesDescription + ProvidesDescriptionSeq > ProvidesDescriptionSeq_out; - + class TAO_IFR_Client_Export ProvidesDescriptionSeq : public - TAO_Unbounded_Sequence< + TAO::unbounded_value_sequence< ProvidesDescription > { @@ -1737,50 +1734,47 @@ namespace CORBA ProvidesDescriptionSeq ( CORBA::ULong max, CORBA::ULong length, - ProvidesDescription* buffer, - CORBA::Boolean release = 0 + ProvidesDescription* buffer, + CORBA::Boolean release = false ); ProvidesDescriptionSeq (const ProvidesDescriptionSeq &); ~ProvidesDescriptionSeq (void); - + static void _tao_any_destructor (void *); - + typedef ProvidesDescriptionSeq_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ProvidesDescriptionSeq; - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_CORBA_COMPONENTIR_USESDESCRIPTIONSEQ_CH_) #define _CORBA_COMPONENTIR_USESDESCRIPTIONSEQ_CH_ - + class UsesDescriptionSeq; - + typedef TAO_VarSeq_Var_T< - UsesDescriptionSeq, - UsesDescription + UsesDescriptionSeq > UsesDescriptionSeq_var; - + typedef TAO_Seq_Out_T< - UsesDescriptionSeq, - UsesDescriptionSeq_var, - UsesDescription + UsesDescriptionSeq > UsesDescriptionSeq_out; - + class TAO_IFR_Client_Export UsesDescriptionSeq : public - TAO_Unbounded_Sequence< + TAO::unbounded_value_sequence< UsesDescription > { @@ -1790,50 +1784,47 @@ namespace CORBA UsesDescriptionSeq ( CORBA::ULong max, CORBA::ULong length, - UsesDescription* buffer, - CORBA::Boolean release = 0 + UsesDescription* buffer, + CORBA::Boolean release = false ); UsesDescriptionSeq (const UsesDescriptionSeq &); ~UsesDescriptionSeq (void); - + static void _tao_any_destructor (void *); - + typedef UsesDescriptionSeq_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_UsesDescriptionSeq; - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ_CH_) #define _CORBA_COMPONENTIR_EVENTPORTDESCRIPTIONSEQ_CH_ - + class EventPortDescriptionSeq; - + typedef TAO_VarSeq_Var_T< - EventPortDescriptionSeq, - EventPortDescription + EventPortDescriptionSeq > EventPortDescriptionSeq_var; - + typedef TAO_Seq_Out_T< - EventPortDescriptionSeq, - EventPortDescriptionSeq_var, - EventPortDescription + EventPortDescriptionSeq > EventPortDescriptionSeq_out; - + class TAO_IFR_Client_Export EventPortDescriptionSeq : public - TAO_Unbounded_Sequence< + TAO::unbounded_value_sequence< EventPortDescription > { @@ -1843,55 +1834,55 @@ namespace CORBA EventPortDescriptionSeq ( CORBA::ULong max, CORBA::ULong length, - EventPortDescription* buffer, - CORBA::Boolean release = 0 + EventPortDescription* buffer, + CORBA::Boolean release = false ); EventPortDescriptionSeq (const EventPortDescriptionSeq &); ~EventPortDescriptionSeq (void); - + static void _tao_any_destructor (void *); - + typedef EventPortDescriptionSeq_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_EventPortDescriptionSeq; - + // TAO_IDL - Generated from // be\be_type.cpp:258 - + struct ComponentDescription; - + typedef TAO_Var_Var_T< ComponentDescription > ComponentDescription_var; - + typedef TAO_Out_T< ComponentDescription, ComponentDescription_var > ComponentDescription_out; - + // TAO_IDL - Generated from // be\be_visitor_structure/structure_ch.cpp:57 - + struct TAO_IFR_Client_Export ComponentDescription { typedef ComponentDescription_var _var_type; - + static void _tao_any_destructor (void *); - TAO_String_Manager name; - TAO_String_Manager id; - TAO_String_Manager defined_in; - TAO_String_Manager version; - TAO_String_Manager base_component; + TAO::String_Manager name; + TAO::String_Manager id; + TAO::String_Manager defined_in; + TAO::String_Manager version; + TAO::String_Manager base_component; CORBA::RepositoryIdSeq supported_interfaces; CORBA::ComponentIR::ProvidesDescriptionSeq provided_interfaces; CORBA::ComponentIR::UsesDescriptionSeq used_interfaces; @@ -1901,27 +1892,27 @@ namespace CORBA CORBA::ExtAttrDescriptionSeq attributes; CORBA::TypeCode_var type; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ComponentDescription; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_COMPONENTIR_FACTORYDEF__VAR_OUT_CH_) #define _CORBA_COMPONENTIR_FACTORYDEF__VAR_OUT_CH_ - + class FactoryDef; typedef FactoryDef *FactoryDef_ptr; - + typedef TAO_Objref_Var_T< FactoryDef > FactoryDef_var; - + typedef TAO_Objref_Out_T< FactoryDef @@ -1929,13 +1920,13 @@ namespace CORBA FactoryDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_COMPONENTIR_FACTORYDEF_CH_) #define _CORBA_COMPONENTIR_FACTORYDEF_CH_ - + class TAO_IFR_Client_Export FactoryDef : public virtual ::CORBA::OperationDef { @@ -1943,56 +1934,56 @@ namespace CORBA friend class TAO::Narrow_Utils<FactoryDef>; typedef FactoryDef_ptr _ptr_type; typedef FactoryDef_var _var_type; - + // The static operations. static FactoryDef_ptr _duplicate (FactoryDef_ptr obj); - + static void _tao_release (FactoryDef_ptr obj); - + static FactoryDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static FactoryDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static FactoryDef_ptr _nil (void) { return static_cast<FactoryDef_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_FactoryDef_Proxy_Broker_; - + protected: // Concrete interface only. FactoryDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_ComponentIR_FactoryDef_setup_collocation (void); - + // Concrete non-local interface only. FactoryDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. FactoryDef ( TAO_Stub *objref, @@ -2000,38 +1991,38 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~FactoryDef (void); - + private: // Private and unimplemented for concrete interfaces. FactoryDef (const FactoryDef &); - + void operator= (const FactoryDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_FactoryDef; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_COMPONENTIR_FINDERDEF__VAR_OUT_CH_) #define _CORBA_COMPONENTIR_FINDERDEF__VAR_OUT_CH_ - + class FinderDef; typedef FinderDef *FinderDef_ptr; - + typedef TAO_Objref_Var_T< FinderDef > FinderDef_var; - + typedef TAO_Objref_Out_T< FinderDef @@ -2039,13 +2030,13 @@ namespace CORBA FinderDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_COMPONENTIR_FINDERDEF_CH_) #define _CORBA_COMPONENTIR_FINDERDEF_CH_ - + class TAO_IFR_Client_Export FinderDef : public virtual ::CORBA::OperationDef { @@ -2053,56 +2044,56 @@ namespace CORBA friend class TAO::Narrow_Utils<FinderDef>; typedef FinderDef_ptr _ptr_type; typedef FinderDef_var _var_type; - + // The static operations. static FinderDef_ptr _duplicate (FinderDef_ptr obj); - + static void _tao_release (FinderDef_ptr obj); - + static FinderDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static FinderDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static FinderDef_ptr _nil (void) { return static_cast<FinderDef_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_FinderDef_Proxy_Broker_; - + protected: // Concrete interface only. FinderDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_ComponentIR_FinderDef_setup_collocation (void); - + // Concrete non-local interface only. FinderDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. FinderDef ( TAO_Stub *objref, @@ -2110,29 +2101,29 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~FinderDef (void); - + private: // Private and unimplemented for concrete interfaces. FinderDef (const FinderDef &); - + void operator= (const FinderDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_FinderDef; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_COMPONENTIR_HOMEDEF_CH_) #define _CORBA_COMPONENTIR_HOMEDEF_CH_ - + class TAO_IFR_Client_Export HomeDef : public virtual ::CORBA::ExtInterfaceDef { @@ -2140,42 +2131,42 @@ namespace CORBA friend class TAO::Narrow_Utils<HomeDef>; typedef HomeDef_ptr _ptr_type; typedef HomeDef_var _var_type; - + // The static operations. static HomeDef_ptr _duplicate (HomeDef_ptr obj); - + static void _tao_release (HomeDef_ptr obj); - + static HomeDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static HomeDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static HomeDef_ptr _nil (void) { return static_cast<HomeDef_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::ComponentIR::HomeDef_ptr base_home ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void base_home ( ::CORBA::ComponentIR::HomeDef_ptr base_home ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -2183,20 +2174,20 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::InterfaceDefSeq * supported_interfaces ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void supported_interfaces ( const ::CORBA::InterfaceDefSeq & supported_interfaces ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -2204,20 +2195,20 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::ComponentIR::ComponentDef_ptr managed_component ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void managed_component ( ::CORBA::ComponentIR::ComponentDef_ptr managed_component ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -2225,20 +2216,20 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::ValueDef_ptr primary_key ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void primary_key ( ::CORBA::ValueDef_ptr primary_key ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -2246,10 +2237,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::ComponentIR::FactoryDef_ptr create_factory ( const char * id, const char * name, @@ -2261,10 +2252,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::ComponentIR::FinderDef_ptr create_finder ( const char * id, const char * name, @@ -2276,34 +2267,34 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_HomeDef_Proxy_Broker_; - + protected: // Concrete interface only. HomeDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_ComponentIR_HomeDef_setup_collocation (void); - + // Concrete non-local interface only. HomeDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. HomeDef ( TAO_Stub *objref, @@ -2311,55 +2302,55 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~HomeDef (void); - + private: // Private and unimplemented for concrete interfaces. HomeDef (const HomeDef &); - + void operator= (const HomeDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_HomeDef; - + // TAO_IDL - Generated from // be\be_type.cpp:258 - + struct HomeDescription; - + typedef TAO_Var_Var_T< HomeDescription > HomeDescription_var; - + typedef TAO_Out_T< HomeDescription, HomeDescription_var > HomeDescription_out; - + // TAO_IDL - Generated from // be\be_visitor_structure/structure_ch.cpp:57 - + struct TAO_IFR_Client_Export HomeDescription { typedef HomeDescription_var _var_type; - + static void _tao_any_destructor (void *); - TAO_String_Manager name; - TAO_String_Manager id; - TAO_String_Manager defined_in; - TAO_String_Manager version; - TAO_String_Manager base_home; - TAO_String_Manager managed_component; + TAO::String_Manager name; + TAO::String_Manager id; + TAO::String_Manager defined_in; + TAO::String_Manager version; + TAO::String_Manager base_home; + TAO::String_Manager managed_component; CORBA::ValueDescription primary_key; CORBA::OpDescriptionSeq factories; CORBA::OpDescriptionSeq finders; @@ -2367,15 +2358,15 @@ namespace CORBA CORBA::ExtAttrDescriptionSeq attributes; CORBA::TypeCode_var type; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_HomeDescription; - + // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 - + } // module CORBA::ComponentIR // TAO_IDL - Generated from @@ -2481,7 +2472,7 @@ namespace TAO #if !defined (_CORBA_COMPONENTIR_EVENTDEF__TRAITS_) #define _CORBA_COMPONENTIR_EVENTDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::EventDef> { @@ -2502,7 +2493,7 @@ namespace TAO #if !defined (_CORBA_COMPONENTIR_CONTAINER__TRAITS_) #define _CORBA_COMPONENTIR_CONTAINER__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::Container> { @@ -2523,7 +2514,7 @@ namespace TAO #if !defined (_CORBA_COMPONENTIR_MODULEDEF__TRAITS_) #define _CORBA_COMPONENTIR_MODULEDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::ModuleDef> { @@ -2544,7 +2535,7 @@ namespace TAO #if !defined (_CORBA_COMPONENTIR_REPOSITORY__TRAITS_) #define _CORBA_COMPONENTIR_REPOSITORY__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::Repository> { @@ -2565,7 +2556,7 @@ namespace TAO #if !defined (_CORBA_COMPONENTIR_PROVIDESDEF__TRAITS_) #define _CORBA_COMPONENTIR_PROVIDESDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::ProvidesDef> { @@ -2586,7 +2577,7 @@ namespace TAO #if !defined (_CORBA_COMPONENTIR_USESDEF__TRAITS_) #define _CORBA_COMPONENTIR_USESDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::UsesDef> { @@ -2607,7 +2598,7 @@ namespace TAO #if !defined (_CORBA_COMPONENTIR_EVENTPORTDEF__TRAITS_) #define _CORBA_COMPONENTIR_EVENTPORTDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::EventPortDef> { @@ -2628,7 +2619,7 @@ namespace TAO #if !defined (_CORBA_COMPONENTIR_EMITSDEF__TRAITS_) #define _CORBA_COMPONENTIR_EMITSDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::EmitsDef> { @@ -2649,7 +2640,7 @@ namespace TAO #if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF__TRAITS_) #define _CORBA_COMPONENTIR_PUBLISHESDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::PublishesDef> { @@ -2670,7 +2661,7 @@ namespace TAO #if !defined (_CORBA_COMPONENTIR_CONSUMESDEF__TRAITS_) #define _CORBA_COMPONENTIR_CONSUMESDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::ConsumesDef> { @@ -2691,7 +2682,7 @@ namespace TAO #if !defined (_CORBA_COMPONENTIR_COMPONENTDEF__TRAITS_) #define _CORBA_COMPONENTIR_COMPONENTDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::ComponentDef> { @@ -2712,7 +2703,7 @@ namespace TAO #if !defined (_CORBA_COMPONENTIR_FACTORYDEF__TRAITS_) #define _CORBA_COMPONENTIR_FACTORYDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::FactoryDef> { @@ -2733,7 +2724,7 @@ namespace TAO #if !defined (_CORBA_COMPONENTIR_FINDERDEF__TRAITS_) #define _CORBA_COMPONENTIR_FINDERDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::FinderDef> { @@ -2754,7 +2745,7 @@ namespace TAO #if !defined (_CORBA_COMPONENTIR_HOMEDEF__TRAITS_) #define _CORBA_COMPONENTIR_HOMEDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::HomeDef> { diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.inl b/TAO/tao/IFR_Client/IFR_ComponentsC.inl index 58217d7f6d4..9c51ea0e607 100644 --- a/TAO/tao/IFR_Client/IFR_ComponentsC.inl +++ b/TAO/tao/IFR_Client/IFR_ComponentsC.inl @@ -40,7 +40,7 @@ CORBA::ComponentIR::EventDef::EventDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -56,7 +56,7 @@ CORBA::ComponentIR::EventDef::EventDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_EventDef_Proxy_Broker_ (0) { } @@ -76,7 +76,7 @@ CORBA::ComponentIR::Container::Container ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -92,7 +92,7 @@ CORBA::ComponentIR::Container::Container ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_Container_Proxy_Broker_ (0) { } @@ -112,7 +112,7 @@ CORBA::ComponentIR::ModuleDef::ModuleDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -128,7 +128,7 @@ CORBA::ComponentIR::ModuleDef::ModuleDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_ModuleDef_Proxy_Broker_ (0) { } @@ -148,7 +148,7 @@ CORBA::ComponentIR::Repository::Repository ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -164,7 +164,7 @@ CORBA::ComponentIR::Repository::Repository ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_Repository_Proxy_Broker_ (0) { } @@ -184,7 +184,7 @@ CORBA::ComponentIR::ProvidesDef::ProvidesDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -200,7 +200,7 @@ CORBA::ComponentIR::ProvidesDef::ProvidesDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_ProvidesDef_Proxy_Broker_ (0) { } @@ -220,7 +220,7 @@ CORBA::ComponentIR::UsesDef::UsesDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -236,7 +236,7 @@ CORBA::ComponentIR::UsesDef::UsesDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_UsesDef_Proxy_Broker_ (0) { } @@ -256,7 +256,7 @@ CORBA::ComponentIR::EventPortDef::EventPortDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -272,7 +272,7 @@ CORBA::ComponentIR::EventPortDef::EventPortDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_EventPortDef_Proxy_Broker_ (0) { } @@ -292,7 +292,7 @@ CORBA::ComponentIR::EmitsDef::EmitsDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -308,7 +308,7 @@ CORBA::ComponentIR::EmitsDef::EmitsDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_EmitsDef_Proxy_Broker_ (0) { } @@ -328,7 +328,7 @@ CORBA::ComponentIR::PublishesDef::PublishesDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -344,7 +344,7 @@ CORBA::ComponentIR::PublishesDef::PublishesDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_PublishesDef_Proxy_Broker_ (0) { } @@ -364,7 +364,7 @@ CORBA::ComponentIR::ConsumesDef::ConsumesDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -380,7 +380,7 @@ CORBA::ComponentIR::ConsumesDef::ConsumesDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_ConsumesDef_Proxy_Broker_ (0) { } @@ -400,7 +400,7 @@ CORBA::ComponentIR::ComponentDef::ComponentDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -416,7 +416,7 @@ CORBA::ComponentIR::ComponentDef::ComponentDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_ComponentDef_Proxy_Broker_ (0) { } @@ -436,7 +436,7 @@ CORBA::ComponentIR::FactoryDef::FactoryDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -452,7 +452,7 @@ CORBA::ComponentIR::FactoryDef::FactoryDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_FactoryDef_Proxy_Broker_ (0) { } @@ -472,7 +472,7 @@ CORBA::ComponentIR::FinderDef::FinderDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -488,7 +488,7 @@ CORBA::ComponentIR::FinderDef::FinderDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_FinderDef_Proxy_Broker_ (0) { } @@ -508,7 +508,7 @@ CORBA::ComponentIR::HomeDef::HomeDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -524,7 +524,7 @@ CORBA::ComponentIR::HomeDef::HomeDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_HomeDef_Proxy_Broker_ (0) { } diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp index 934ef4659d8..5b316844590 100644 --- a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp +++ b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp @@ -213,13 +213,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:543 #if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_) #define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::ExtInitializerSeq> : public @@ -233,13 +233,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:543 #if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_) #define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::ExceptionDefSeq> : public @@ -253,13 +253,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:786 #if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_) #define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::AttributeMode> : public @@ -271,13 +271,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:118 #if !defined (_CORBA_ATTRIBUTEDEF__ARG_TRAITS_) #define _CORBA_ATTRIBUTEDEF__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::AttributeDef> : public @@ -292,13 +292,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:118 #if !defined (_CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_) #define _CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::ExtAttributeDef> : public @@ -313,13 +313,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:786 #if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_) #define _CORBA_OPERATIONMODE__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::OperationMode> : public @@ -331,13 +331,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:543 #if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_) #define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::ParDescriptionSeq> : public @@ -351,13 +351,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:543 #if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_) #define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::ContextIdSeq> : public @@ -371,13 +371,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:118 #if !defined (_CORBA_OPERATIONDEF__ARG_TRAITS_) #define _CORBA_OPERATIONDEF__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::OperationDef> : public @@ -392,13 +392,13 @@ namespace TAO }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:118 #if !defined (_CORBA_VALUEMEMBERDEF__ARG_TRAITS_) #define _CORBA_VALUEMEMBERDEF__ARG_TRAITS_ - + template<> class Arg_Traits<CORBA::ValueMemberDef> : public @@ -434,7 +434,7 @@ TAO::Objref_Traits<CORBA::FixedDef>::release ( CORBA::FixedDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::FixedDef_ptr @@ -453,7 +453,7 @@ TAO::Objref_Traits<CORBA::FixedDef>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA__TAO_FixedDef_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -470,21 +470,21 @@ CORBA::UShort CORBA::FixedDef::digits ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_FixedDef_Proxy_Broker_ == 0) { CORBA_FixedDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::UShort>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -493,10 +493,10 @@ CORBA::UShort CORBA::FixedDef::digits ( 11, this->the_TAO_FixedDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -513,23 +513,23 @@ void CORBA::FixedDef::digits ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_FixedDef_Proxy_Broker_ == 0) { CORBA_FixedDef_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::UShort>::in_arg_val _tao_digits (digits); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_digits }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -538,7 +538,7 @@ void CORBA::FixedDef::digits ( 11, this->the_TAO_FixedDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -555,21 +555,21 @@ CORBA::Short CORBA::FixedDef::scale ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_FixedDef_Proxy_Broker_ == 0) { CORBA_FixedDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::Short>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -578,10 +578,10 @@ CORBA::Short CORBA::FixedDef::scale ( 10, this->the_TAO_FixedDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -598,23 +598,23 @@ void CORBA::FixedDef::scale ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_FixedDef_Proxy_Broker_ == 0) { CORBA_FixedDef_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::Short>::in_arg_val _tao_scale (scale); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_scale }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -623,7 +623,7 @@ void CORBA::FixedDef::scale ( 10, this->the_TAO_FixedDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -642,19 +642,19 @@ CORBA::FixedDef::CORBA_FixedDef_setup_collocation () this->the_TAO_FixedDef_Proxy_Broker_ = ::CORBA__TAO_FixedDef_Proxy_Broker_Factory_function_pointer (this); } - + this->CORBA_IDLType_setup_collocation (); } CORBA::FixedDef::~FixedDef (void) {} -void +void CORBA::FixedDef::_tao_any_destructor (void *_tao_void_pointer) { FixedDef *_tao_tmp_pointer = static_cast<FixedDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::FixedDef_ptr @@ -690,18 +690,18 @@ CORBA::FixedDef::_unchecked_narrow ( CORBA::FixedDef_ptr CORBA::FixedDef::_duplicate (FixedDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void CORBA::FixedDef::_tao_release (FixedDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -733,7 +733,7 @@ CORBA::FixedDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -760,7 +760,7 @@ static TAO::TypeCode::Objref<char const *, CORBA::tk_objref, "IDL:omg.org/CORBA/FixedDef:1.0", "FixedDef"); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_FixedDef = @@ -781,7 +781,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co { "type", &CORBA::_tc_TypeCode }, { "type_def", &CORBA::_tc_IDLType }, { "access", &CORBA::_tc_Visibility } - + }; static TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *, @@ -793,7 +793,7 @@ static TAO::TypeCode::Struct<char const *, "ValueMember", _tao_fields_CORBA_ValueMember, 7); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_ValueMember = @@ -802,10 +802,10 @@ namespace CORBA -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/structure_cs.cpp:66 -void +void CORBA::ValueMember::_tao_any_destructor ( void *_tao_void_pointer ) @@ -815,7 +815,7 @@ CORBA::ValueMember::_tao_any_destructor ( delete _tao_tmp_pointer; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_CORBA_VALUEMEMBERSEQ_CS_) @@ -827,7 +827,7 @@ CORBA::ValueMemberSeq::ValueMemberSeq (void) CORBA::ValueMemberSeq::ValueMemberSeq ( CORBA::ULong max ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< ValueMember > (max) @@ -839,7 +839,7 @@ CORBA::ValueMemberSeq::ValueMemberSeq ( CORBA::ValueMember * buffer, CORBA::Boolean release ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< ValueMember > (max, length, buffer, release) @@ -848,7 +848,7 @@ CORBA::ValueMemberSeq::ValueMemberSeq ( CORBA::ValueMemberSeq::ValueMemberSeq ( const ValueMemberSeq &seq ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< ValueMember > (seq) @@ -889,10 +889,10 @@ namespace TAO CORBA::tk_sequence, &CORBA::_tc_ValueMember, 0U); - + ::CORBA::TypeCode_ptr const tc_CORBA_ValueMemberSeq_0 = &CORBA_ValueMemberSeq_0; - + } } @@ -907,7 +907,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/CORBA/ValueMemberSeq:1.0", "ValueMemberSeq", &TAO::TypeCode::tc_CORBA_ValueMemberSeq_0); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_ValueMemberSeq = @@ -934,7 +934,7 @@ TAO::Objref_Traits<CORBA::ValueMemberDef>::release ( CORBA::ValueMemberDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::ValueMemberDef_ptr @@ -953,7 +953,7 @@ TAO::Objref_Traits<CORBA::ValueMemberDef>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -970,21 +970,21 @@ CORBA::TypeCode_ptr CORBA::ValueMemberDef::type ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ValueMemberDef_Proxy_Broker_ == 0) { CORBA_ValueMemberDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -993,10 +993,10 @@ CORBA::TypeCode_ptr CORBA::ValueMemberDef::type ( 9, this->the_TAO_ValueMemberDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -1012,21 +1012,21 @@ CORBA::TypeCode_ptr CORBA::ValueMemberDef::type ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ValueMemberDef_Proxy_Broker_ == 0) { CORBA_ValueMemberDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::IDLType>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -1035,10 +1035,10 @@ CORBA::TypeCode_ptr CORBA::ValueMemberDef::type ( 13, this->the_TAO_ValueMemberDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -1055,23 +1055,23 @@ void CORBA::ValueMemberDef::type_def ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ValueMemberDef_Proxy_Broker_ == 0) { CORBA_ValueMemberDef_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type_def (type_def); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_type_def }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -1080,7 +1080,7 @@ void CORBA::ValueMemberDef::type_def ( 13, this->the_TAO_ValueMemberDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -1097,21 +1097,21 @@ CORBA::Visibility CORBA::ValueMemberDef::access ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ValueMemberDef_Proxy_Broker_ == 0) { CORBA_ValueMemberDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::Visibility>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -1120,10 +1120,10 @@ CORBA::Visibility CORBA::ValueMemberDef::access ( 11, this->the_TAO_ValueMemberDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -1140,23 +1140,23 @@ void CORBA::ValueMemberDef::access ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ValueMemberDef_Proxy_Broker_ == 0) { CORBA_ValueMemberDef_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::Visibility>::in_arg_val _tao_access (access); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_access }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -1165,7 +1165,7 @@ void CORBA::ValueMemberDef::access ( 11, this->the_TAO_ValueMemberDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -1184,19 +1184,19 @@ CORBA::ValueMemberDef::CORBA_ValueMemberDef_setup_collocation () this->the_TAO_ValueMemberDef_Proxy_Broker_ = ::CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer (this); } - + this->CORBA_Contained_setup_collocation (); } CORBA::ValueMemberDef::~ValueMemberDef (void) {} -void +void CORBA::ValueMemberDef::_tao_any_destructor (void *_tao_void_pointer) { ValueMemberDef *_tao_tmp_pointer = static_cast<ValueMemberDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::ValueMemberDef_ptr @@ -1232,18 +1232,18 @@ CORBA::ValueMemberDef::_unchecked_narrow ( CORBA::ValueMemberDef_ptr CORBA::ValueMemberDef::_duplicate (ValueMemberDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void CORBA::ValueMemberDef::_tao_release (ValueMemberDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -1275,7 +1275,7 @@ CORBA::ValueMemberDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -1302,7 +1302,7 @@ static TAO::TypeCode::Objref<char const *, CORBA::tk_objref, "IDL:omg.org/CORBA/ValueMemberDef:1.0", "ValueMemberDef"); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_ValueMemberDef = @@ -1329,7 +1329,7 @@ TAO::Objref_Traits<CORBA::ValueDef>::release ( CORBA::ValueDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::ValueDef_ptr @@ -1348,7 +1348,7 @@ TAO::Objref_Traits<CORBA::ValueDef>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA__TAO_ValueDef_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -1365,21 +1365,21 @@ TAO::Collocation_Proxy_Broker * { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ValueDef_Proxy_Broker_ == 0) { CORBA_ValueDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -1388,10 +1388,10 @@ TAO::Collocation_Proxy_Broker * 25, this->the_TAO_ValueDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -1408,23 +1408,23 @@ void CORBA::ValueDef::supported_interfaces ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ValueDef_Proxy_Broker_ == 0) { CORBA_ValueDef_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_supported_interfaces }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -1433,7 +1433,7 @@ void CORBA::ValueDef::supported_interfaces ( 25, this->the_TAO_ValueDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -1450,21 +1450,21 @@ void CORBA::ValueDef::supported_interfaces ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ValueDef_Proxy_Broker_ == 0) { CORBA_ValueDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::InitializerSeq>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -1473,10 +1473,10 @@ void CORBA::ValueDef::supported_interfaces ( 17, this->the_TAO_ValueDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -1493,23 +1493,23 @@ void CORBA::ValueDef::initializers ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ValueDef_Proxy_Broker_ == 0) { CORBA_ValueDef_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::InitializerSeq>::in_arg_val _tao_initializers (initializers); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_initializers }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -1518,7 +1518,7 @@ void CORBA::ValueDef::initializers ( 17, this->the_TAO_ValueDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -1535,21 +1535,21 @@ void CORBA::ValueDef::initializers ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ValueDef_Proxy_Broker_ == 0) { CORBA_ValueDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::ValueDef>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -1558,10 +1558,10 @@ void CORBA::ValueDef::initializers ( 15, this->the_TAO_ValueDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -1578,23 +1578,23 @@ void CORBA::ValueDef::base_value ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ValueDef_Proxy_Broker_ == 0) { CORBA_ValueDef_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::ValueDef>::in_arg_val _tao_base_value (base_value); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_base_value }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -1603,7 +1603,7 @@ void CORBA::ValueDef::base_value ( 15, this->the_TAO_ValueDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -1620,21 +1620,21 @@ void CORBA::ValueDef::base_value ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ValueDef_Proxy_Broker_ == 0) { CORBA_ValueDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::ValueDefSeq>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -1643,10 +1643,10 @@ void CORBA::ValueDef::base_value ( 25, this->the_TAO_ValueDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -1663,23 +1663,23 @@ void CORBA::ValueDef::abstract_base_values ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ValueDef_Proxy_Broker_ == 0) { CORBA_ValueDef_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values (abstract_base_values); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_abstract_base_values }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -1688,7 +1688,7 @@ void CORBA::ValueDef::abstract_base_values ( 25, this->the_TAO_ValueDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -1705,21 +1705,21 @@ CORBA::Boolean CORBA::ValueDef::is_abstract ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ValueDef_Proxy_Broker_ == 0) { CORBA_ValueDef_setup_collocation (); } - + TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -1728,10 +1728,10 @@ CORBA::Boolean CORBA::ValueDef::is_abstract ( 16, this->the_TAO_ValueDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -1748,23 +1748,23 @@ void CORBA::ValueDef::is_abstract ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ValueDef_Proxy_Broker_ == 0) { CORBA_ValueDef_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_abstract (is_abstract); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_is_abstract }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -1773,7 +1773,7 @@ void CORBA::ValueDef::is_abstract ( 16, this->the_TAO_ValueDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -1790,21 +1790,21 @@ CORBA::Boolean CORBA::ValueDef::is_custom ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ValueDef_Proxy_Broker_ == 0) { CORBA_ValueDef_setup_collocation (); } - + TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -1813,10 +1813,10 @@ CORBA::Boolean CORBA::ValueDef::is_custom ( 14, this->the_TAO_ValueDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -1833,23 +1833,23 @@ void CORBA::ValueDef::is_custom ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ValueDef_Proxy_Broker_ == 0) { CORBA_ValueDef_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_custom (is_custom); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_is_custom }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -1858,7 +1858,7 @@ void CORBA::ValueDef::is_custom ( 14, this->the_TAO_ValueDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -1875,21 +1875,21 @@ CORBA::Boolean CORBA::ValueDef::is_truncatable ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ValueDef_Proxy_Broker_ == 0) { CORBA_ValueDef_setup_collocation (); } - + TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -1898,10 +1898,10 @@ CORBA::Boolean CORBA::ValueDef::is_truncatable ( 19, this->the_TAO_ValueDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -1918,23 +1918,23 @@ void CORBA::ValueDef::is_truncatable ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ValueDef_Proxy_Broker_ == 0) { CORBA_ValueDef_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_truncatable (is_truncatable); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_is_truncatable }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -1943,7 +1943,7 @@ void CORBA::ValueDef::is_truncatable ( 19, this->the_TAO_ValueDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -1961,23 +1961,23 @@ CORBA::Boolean CORBA::ValueDef::is_a ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ValueDef_Proxy_Broker_ == 0) { CORBA_ValueDef_setup_collocation (); } - + TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_id }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -1986,10 +1986,10 @@ CORBA::Boolean CORBA::ValueDef::is_a ( 4, this->the_TAO_ValueDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -2043,7 +2043,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co { "is_truncatable", &CORBA::_tc_boolean }, { "base_value", &CORBA::_tc_RepositoryId }, { "type", &CORBA::_tc_TypeCode } - + }; static TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *, @@ -2055,14 +2055,14 @@ static TAO::TypeCode::Struct<char const *, "FullValueDescription", _tao_fields_CORBA_ValueDef_FullValueDescription, 15); - + ::CORBA::TypeCode_ptr const CORBA::ValueDef::_tc_FullValueDescription = &_tao_tc_CORBA_ValueDef_FullValueDescription; -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/structure_cs.cpp:66 -void +void CORBA::ValueDef::FullValueDescription::_tao_any_destructor ( void *_tao_void_pointer ) @@ -2084,21 +2084,21 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ValueDef_Proxy_Broker_ == 0) { CORBA_ValueDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::ValueDef::FullValueDescription>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -2107,10 +2107,10 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor ( 14, this->the_TAO_ValueDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -2131,21 +2131,21 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ValueDef_Proxy_Broker_ == 0) { CORBA_ValueDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::ValueMemberDef>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id); TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name); TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version); TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type (type); TAO::Arg_Traits< ::CORBA::Visibility>::in_arg_val _tao_access (access); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -2155,7 +2155,7 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor ( &_tao_type, &_tao_access }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -2164,10 +2164,10 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor ( 19, this->the_TAO_ValueDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -2188,21 +2188,21 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ValueDef_Proxy_Broker_ == 0) { CORBA_ValueDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::AttributeDef>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id); TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name); TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version); TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type (type); TAO::Arg_Traits< ::CORBA::AttributeMode>::in_arg_val _tao_mode (mode); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -2212,7 +2212,7 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor ( &_tao_type, &_tao_mode }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -2221,10 +2221,10 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor ( 16, this->the_TAO_ValueDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -2248,14 +2248,14 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ValueDef_Proxy_Broker_ == 0) { CORBA_ValueDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::OperationDef>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id); TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name); @@ -2265,7 +2265,7 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor ( TAO::Arg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params); TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions); TAO::Arg_Traits< ::CORBA::ContextIdSeq>::in_arg_val _tao_contexts (contexts); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -2278,7 +2278,7 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor ( &_tao_exceptions, &_tao_contexts }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -2287,10 +2287,10 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor ( 16, this->the_TAO_ValueDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -2308,7 +2308,7 @@ CORBA::ValueDef::CORBA_ValueDef_setup_collocation () this->the_TAO_ValueDef_Proxy_Broker_ = ::CORBA__TAO_ValueDef_Proxy_Broker_Factory_function_pointer (this); } - + this->CORBA_Container_setup_collocation (); this->CORBA_Contained_setup_collocation (); this->CORBA_IDLType_setup_collocation (); @@ -2317,12 +2317,12 @@ CORBA::ValueDef::CORBA_ValueDef_setup_collocation () CORBA::ValueDef::~ValueDef (void) {} -void +void CORBA::ValueDef::_tao_any_destructor (void *_tao_void_pointer) { ValueDef *_tao_tmp_pointer = static_cast<ValueDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::ValueDef_ptr @@ -2358,18 +2358,18 @@ CORBA::ValueDef::_unchecked_narrow ( CORBA::ValueDef_ptr CORBA::ValueDef::_duplicate (ValueDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void CORBA::ValueDef::_tao_release (ValueDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -2409,7 +2409,7 @@ CORBA::ValueDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -2436,7 +2436,7 @@ static TAO::TypeCode::Objref<char const *, CORBA::tk_objref, "IDL:omg.org/CORBA/ValueDef:1.0", "ValueDef"); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_ValueDef = @@ -2470,7 +2470,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co { "abstract_base_values", &CORBA::_tc_RepositoryIdSeq }, { "is_truncatable", &CORBA::_tc_boolean }, { "base_value", &CORBA::_tc_RepositoryId } - + }; static TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *, @@ -2482,7 +2482,7 @@ static TAO::TypeCode::Struct<char const *, "ValueDescription", _tao_fields_CORBA_ValueDescription, 10); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_ValueDescription = @@ -2491,10 +2491,10 @@ namespace CORBA -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/structure_cs.cpp:66 -void +void CORBA::ValueDescription::_tao_any_destructor ( void *_tao_void_pointer ) @@ -2522,7 +2522,7 @@ TAO::Objref_Traits<CORBA::ExtValueDef>::release ( CORBA::ExtValueDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::ExtValueDef_ptr @@ -2541,7 +2541,7 @@ TAO::Objref_Traits<CORBA::ExtValueDef>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -2558,21 +2558,21 @@ TAO::Collocation_Proxy_Broker * { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ExtValueDef_Proxy_Broker_ == 0) { CORBA_ExtValueDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::ExtInitializerSeq>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -2581,10 +2581,10 @@ TAO::Collocation_Proxy_Broker * 21, this->the_TAO_ExtValueDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -2601,23 +2601,23 @@ void CORBA::ExtValueDef::ext_initializers ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ExtValueDef_Proxy_Broker_ == 0) { CORBA_ExtValueDef_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_val _tao_ext_initializers (ext_initializers); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_ext_initializers }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -2626,7 +2626,7 @@ void CORBA::ExtValueDef::ext_initializers ( 21, this->the_TAO_ExtValueDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -2681,7 +2681,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co { "is_truncatable", &CORBA::_tc_boolean }, { "base_value", &CORBA::_tc_RepositoryId }, { "type", &CORBA::_tc_TypeCode } - + }; static TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *, @@ -2693,14 +2693,14 @@ static TAO::TypeCode::Struct<char const *, "ExtFullValueDescription", _tao_fields_CORBA_ExtValueDef_ExtFullValueDescription, 15); - + ::CORBA::TypeCode_ptr const CORBA::ExtValueDef::_tc_ExtFullValueDescription = &_tao_tc_CORBA_ExtValueDef_ExtFullValueDescription; -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/structure_cs.cpp:66 -void +void CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor ( void *_tao_void_pointer ) @@ -2722,21 +2722,21 @@ CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ExtValueDef_Proxy_Broker_ == 0) { CORBA_ExtValueDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::ExtValueDef::ExtFullValueDescription>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -2745,10 +2745,10 @@ CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor ( 18, this->the_TAO_ExtValueDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -2771,14 +2771,14 @@ CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ExtValueDef_Proxy_Broker_ == 0) { CORBA_ExtValueDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::ExtAttributeDef>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id); TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name); @@ -2787,7 +2787,7 @@ CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor ( TAO::Arg_Traits< ::CORBA::AttributeMode>::in_arg_val _tao_mode (mode); TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_get_exceptions (get_exceptions); TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_set_exceptions (set_exceptions); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, @@ -2799,7 +2799,7 @@ CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor ( &_tao_get_exceptions, &_tao_set_exceptions }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -2808,10 +2808,10 @@ CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor ( 20, this->the_TAO_ExtValueDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -2829,19 +2829,19 @@ CORBA::ExtValueDef::CORBA_ExtValueDef_setup_collocation () this->the_TAO_ExtValueDef_Proxy_Broker_ = ::CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function_pointer (this); } - + this->CORBA_ValueDef_setup_collocation (); } CORBA::ExtValueDef::~ExtValueDef (void) {} -void +void CORBA::ExtValueDef::_tao_any_destructor (void *_tao_void_pointer) { ExtValueDef *_tao_tmp_pointer = static_cast<ExtValueDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::ExtValueDef_ptr @@ -2877,18 +2877,18 @@ CORBA::ExtValueDef::_unchecked_narrow ( CORBA::ExtValueDef_ptr CORBA::ExtValueDef::_duplicate (ExtValueDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void CORBA::ExtValueDef::_tao_release (ExtValueDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -2932,7 +2932,7 @@ CORBA::ExtValueDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -2959,7 +2959,7 @@ static TAO::TypeCode::Objref<char const *, CORBA::tk_objref, "IDL:omg.org/CORBA/ExtValueDef:1.0", "ExtValueDef"); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_ExtValueDef = @@ -2986,7 +2986,7 @@ TAO::Objref_Traits<CORBA::ValueBoxDef>::release ( CORBA::ValueBoxDef_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::ValueBoxDef_ptr @@ -3005,7 +3005,7 @@ TAO::Objref_Traits<CORBA::ValueBoxDef>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -3022,21 +3022,21 @@ TAO::Collocation_Proxy_Broker * { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ValueBoxDef_Proxy_Broker_ == 0) { CORBA_ValueBoxDef_setup_collocation (); } - + TAO::Arg_Traits< ::CORBA::IDLType>::ret_val _tao_retval; - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -3045,10 +3045,10 @@ TAO::Collocation_Proxy_Broker * 22, this->the_TAO_ValueBoxDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval.excp ()); - + return _tao_retval.retn (); } @@ -3065,23 +3065,23 @@ void CORBA::ValueBoxDef::original_type_def ( { if (!this->is_evaluated ()) { - ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); + ::CORBA::Object::tao_object_initialize (this); } - + if (this->the_TAO_ValueBoxDef_Proxy_Broker_ == 0) { CORBA_ValueBoxDef_setup_collocation (); } - + TAO::Arg_Traits< void>::ret_val _tao_retval; TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_original_type_def (original_type_def); - + TAO::Argument *_the_tao_operation_signature [] = { &_tao_retval, &_tao_original_type_def }; - + TAO::Invocation_Adapter _tao_call ( this, _the_tao_operation_signature, @@ -3090,7 +3090,7 @@ void CORBA::ValueBoxDef::original_type_def ( 22, this->the_TAO_ValueBoxDef_Proxy_Broker_ ); - + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -3109,19 +3109,19 @@ CORBA::ValueBoxDef::CORBA_ValueBoxDef_setup_collocation () this->the_TAO_ValueBoxDef_Proxy_Broker_ = ::CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer (this); } - + this->CORBA_TypedefDef_setup_collocation (); } CORBA::ValueBoxDef::~ValueBoxDef (void) {} -void +void CORBA::ValueBoxDef::_tao_any_destructor (void *_tao_void_pointer) { ValueBoxDef *_tao_tmp_pointer = static_cast<ValueBoxDef *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::ValueBoxDef_ptr @@ -3157,18 +3157,18 @@ CORBA::ValueBoxDef::_unchecked_narrow ( CORBA::ValueBoxDef_ptr CORBA::ValueBoxDef::_duplicate (ValueBoxDef_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void CORBA::ValueBoxDef::_tao_release (ValueBoxDef_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -3208,7 +3208,7 @@ CORBA::ValueBoxDef::_is_a ( } else { - return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -3235,7 +3235,7 @@ static TAO::TypeCode::Objref<char const *, CORBA::tk_objref, "IDL:omg.org/CORBA/ValueBoxDef:1.0", "ValueBoxDef"); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_ValueBoxDef = @@ -3302,7 +3302,7 @@ operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -3360,7 +3360,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/any_op_cs.cpp:54 @@ -3535,7 +3535,7 @@ operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -3593,7 +3593,7 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -3709,7 +3709,7 @@ operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -3843,21 +3843,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::FixedDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_FixedDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -3908,22 +3908,7 @@ CORBA::Boolean operator<< ( const CORBA::ValueMemberSeq &_tao_sequence ) { - const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm << _tao_sequence[i]); - } - - return _tao_marshal_flag; - } - - return false; + return TAO::marshal_sequence(strm, _tao_sequence); } CORBA::Boolean operator>> ( @@ -3931,40 +3916,7 @@ CORBA::Boolean operator>> ( CORBA::ValueMemberSeq &_tao_sequence ) { - CORBA::ULong _tao_seq_len; - - if (strm >> _tao_seq_len) - { - // Add a check to the length of the sequence - // to make sure it does not exceed the length - // of the stream. (See bug 58.) - if (_tao_seq_len > strm.length ()) - { - return false; - } - - // Set the length of the sequence. - _tao_sequence.length (_tao_seq_len); - - // If length is 0 we return true. - if (0 >= _tao_seq_len) - { - return true; - } - - // Retrieve all the elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm >> _tao_sequence[i]); - } - - return _tao_marshal_flag; - - } - - return false; + return TAO::demarshal_sequence(strm, _tao_sequence); } #endif /* _TAO_CDR_OP_CORBA_ValueMemberSeq_CPP_ */ @@ -3987,21 +3939,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::ValueMemberDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -4072,21 +4024,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::ValueDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_ValueDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -4196,21 +4148,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::ExtValueDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } @@ -4232,21 +4184,21 @@ CORBA::Boolean operator>> ( ) { CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::CORBA::ValueBoxDef RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer ); - + return 1; } diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.h b/TAO/tao/IFR_Client/IFR_ExtendedC.h index 45d3c8e1a9b..c20ee8060aa 100644 --- a/TAO/tao/IFR_Client/IFR_ExtendedC.h +++ b/TAO/tao/IFR_Client/IFR_ExtendedC.h @@ -73,7 +73,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_root/root_ch.cpp:62 namespace TAO @@ -87,22 +87,22 @@ namespace TAO namespace CORBA { - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_FIXEDDEF__VAR_OUT_CH_) #define _CORBA_FIXEDDEF__VAR_OUT_CH_ - + class FixedDef; typedef FixedDef *FixedDef_ptr; - + typedef TAO_Objref_Var_T< FixedDef > FixedDef_var; - + typedef TAO_Objref_Out_T< FixedDef @@ -110,13 +110,13 @@ namespace CORBA FixedDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_FIXEDDEF_CH_) #define _CORBA_FIXEDDEF_CH_ - + class TAO_IFR_Client_Export FixedDef : public virtual ::CORBA::IDLType { @@ -124,42 +124,42 @@ namespace CORBA friend class TAO::Narrow_Utils<FixedDef>; typedef FixedDef_ptr _ptr_type; typedef FixedDef_var _var_type; - + // The static operations. static FixedDef_ptr _duplicate (FixedDef_ptr obj); - + static void _tao_release (FixedDef_ptr obj); - + static FixedDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static FixedDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static FixedDef_ptr _nil (void) { return static_cast<FixedDef_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::UShort digits ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void digits ( ::CORBA::UShort digits ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -167,20 +167,20 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Short scale ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void scale ( ::CORBA::Short scale ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -188,34 +188,34 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_FixedDef_Proxy_Broker_; - + protected: // Concrete interface only. FixedDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_FixedDef_setup_collocation (void); - + // Concrete non-local interface only. FixedDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. FixedDef ( TAO_Stub *objref, @@ -223,89 +223,86 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~FixedDef (void); - + private: // Private and unimplemented for concrete interfaces. FixedDef (const FixedDef &); - + void operator= (const FixedDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_FixedDef; - + // TAO_IDL - Generated from // be\be_type.cpp:258 - + struct ValueMember; - + typedef TAO_Var_Var_T< ValueMember > ValueMember_var; - + typedef TAO_Out_T< ValueMember, ValueMember_var > ValueMember_out; - + // TAO_IDL - Generated from // be\be_visitor_structure/structure_ch.cpp:57 - + struct TAO_IFR_Client_Export ValueMember { typedef ValueMember_var _var_type; - + static void _tao_any_destructor (void *); - TAO_String_Manager name; - TAO_String_Manager id; - TAO_String_Manager defined_in; - TAO_String_Manager version; + TAO::String_Manager name; + TAO::String_Manager id; + TAO::String_Manager defined_in; + TAO::String_Manager version; CORBA::TypeCode_var type; CORBA::IDLType_var type_def; CORBA::Visibility access; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ValueMember; - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_CORBA_VALUEMEMBERSEQ_CH_) #define _CORBA_VALUEMEMBERSEQ_CH_ - + class ValueMemberSeq; - + typedef TAO_VarSeq_Var_T< - ValueMemberSeq, - ValueMember + ValueMemberSeq > ValueMemberSeq_var; - + typedef TAO_Seq_Out_T< - ValueMemberSeq, - ValueMemberSeq_var, - ValueMember + ValueMemberSeq > ValueMemberSeq_out; - + class TAO_IFR_Client_Export ValueMemberSeq : public - TAO_Unbounded_Sequence< + TAO::unbounded_value_sequence< ValueMember > { @@ -315,39 +312,39 @@ namespace CORBA ValueMemberSeq ( CORBA::ULong max, CORBA::ULong length, - ValueMember* buffer, - CORBA::Boolean release = 0 + ValueMember* buffer, + CORBA::Boolean release = false ); ValueMemberSeq (const ValueMemberSeq &); ~ValueMemberSeq (void); - + static void _tao_any_destructor (void *); - + typedef ValueMemberSeq_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ValueMemberSeq; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_VALUEMEMBERDEF__VAR_OUT_CH_) #define _CORBA_VALUEMEMBERDEF__VAR_OUT_CH_ - + class ValueMemberDef; typedef ValueMemberDef *ValueMemberDef_ptr; - + typedef TAO_Objref_Var_T< ValueMemberDef > ValueMemberDef_var; - + typedef TAO_Objref_Out_T< ValueMemberDef @@ -355,13 +352,13 @@ namespace CORBA ValueMemberDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_VALUEMEMBERDEF_CH_) #define _CORBA_VALUEMEMBERDEF_CH_ - + class TAO_IFR_Client_Export ValueMemberDef : public virtual ::CORBA::Contained { @@ -369,52 +366,52 @@ namespace CORBA friend class TAO::Narrow_Utils<ValueMemberDef>; typedef ValueMemberDef_ptr _ptr_type; typedef ValueMemberDef_var _var_type; - + // The static operations. static ValueMemberDef_ptr _duplicate (ValueMemberDef_ptr obj); - + static void _tao_release (ValueMemberDef_ptr obj); - + static ValueMemberDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ValueMemberDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ValueMemberDef_ptr _nil (void) { return static_cast<ValueMemberDef_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::TypeCode_ptr type ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::IDLType_ptr type_def ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void type_def ( ::CORBA::IDLType_ptr type_def ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -422,20 +419,20 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Visibility access ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void access ( ::CORBA::Visibility access ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -443,34 +440,34 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_ValueMemberDef_Proxy_Broker_; - + protected: // Concrete interface only. ValueMemberDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_ValueMemberDef_setup_collocation (void); - + // Concrete non-local interface only. ValueMemberDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. ValueMemberDef ( TAO_Stub *objref, @@ -478,38 +475,38 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~ValueMemberDef (void); - + private: // Private and unimplemented for concrete interfaces. ValueMemberDef (const ValueMemberDef &); - + void operator= (const ValueMemberDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ValueMemberDef; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_VALUEDEF__VAR_OUT_CH_) #define _CORBA_VALUEDEF__VAR_OUT_CH_ - + class ValueDef; typedef ValueDef *ValueDef_ptr; - + typedef TAO_Objref_Var_T< ValueDef > ValueDef_var; - + typedef TAO_Objref_Out_T< ValueDef @@ -517,13 +514,13 @@ namespace CORBA ValueDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_VALUEDEF_CH_) #define _CORBA_VALUEDEF_CH_ - + class TAO_IFR_Client_Export ValueDef : public virtual ::CORBA::Container, public virtual ::CORBA::Contained, @@ -533,42 +530,42 @@ namespace CORBA friend class TAO::Narrow_Utils<ValueDef>; typedef ValueDef_ptr _ptr_type; typedef ValueDef_var _var_type; - + // The static operations. static ValueDef_ptr _duplicate (ValueDef_ptr obj); - + static void _tao_release (ValueDef_ptr obj); - + static ValueDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ValueDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ValueDef_ptr _nil (void) { return static_cast<ValueDef_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::InterfaceDefSeq * supported_interfaces ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void supported_interfaces ( const ::CORBA::InterfaceDefSeq & supported_interfaces ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -576,20 +573,20 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::InitializerSeq * initializers ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void initializers ( const ::CORBA::InitializerSeq & initializers ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -597,20 +594,20 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::ValueDef_ptr base_value ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void base_value ( ::CORBA::ValueDef_ptr base_value ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -618,20 +615,20 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::ValueDefSeq * abstract_base_values ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void abstract_base_values ( const ::CORBA::ValueDefSeq & abstract_base_values ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -639,20 +636,20 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Boolean is_abstract ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void is_abstract ( ::CORBA::Boolean is_abstract ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -660,20 +657,20 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Boolean is_custom ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void is_custom ( ::CORBA::Boolean is_custom ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -681,20 +678,20 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Boolean is_truncatable ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void is_truncatable ( ::CORBA::Boolean is_truncatable ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -702,10 +699,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Boolean is_a ( const char * id ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -713,68 +710,68 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_type.cpp:258 - + struct FullValueDescription; - + typedef TAO_Var_Var_T< FullValueDescription > FullValueDescription_var; - + typedef TAO_Out_T< FullValueDescription, FullValueDescription_var > FullValueDescription_out; - + // TAO_IDL - Generated from // be\be_visitor_structure/structure_ch.cpp:57 - + struct TAO_IFR_Client_Export FullValueDescription { typedef FullValueDescription_var _var_type; - + static void _tao_any_destructor (void *); - TAO_String_Manager name; - TAO_String_Manager id; + TAO::String_Manager name; + TAO::String_Manager id; CORBA::Boolean is_abstract; CORBA::Boolean is_custom; - TAO_String_Manager defined_in; - TAO_String_Manager version; - ACE_NESTED_CLASS (CORBA, OpDescriptionSeq) operations; - ACE_NESTED_CLASS (CORBA, AttrDescriptionSeq) attributes; - ACE_NESTED_CLASS (CORBA, ValueMemberSeq) members; - ACE_NESTED_CLASS (CORBA, InitializerSeq) initializers; - ACE_NESTED_CLASS (CORBA, RepositoryIdSeq) supported_interfaces; - ACE_NESTED_CLASS (CORBA, RepositoryIdSeq) abstract_base_values; + TAO::String_Manager defined_in; + TAO::String_Manager version; + CORBA::OpDescriptionSeq operations; + CORBA::AttrDescriptionSeq attributes; + CORBA::ValueMemberSeq members; + CORBA::InitializerSeq initializers; + CORBA::RepositoryIdSeq supported_interfaces; + CORBA::RepositoryIdSeq abstract_base_values; CORBA::Boolean is_truncatable; - TAO_String_Manager base_value; - ACE_NESTED_CLASS (CORBA, TypeCode_var) type; + TAO::String_Manager base_value; + CORBA::TypeCode_var type; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + static ::CORBA::TypeCode_ptr const _tc_FullValueDescription; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::ValueDef::FullValueDescription * describe_value ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::ValueMemberDef_ptr create_value_member ( const char * id, const char * name, @@ -786,10 +783,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::AttributeDef_ptr create_attribute ( const char * id, const char * name, @@ -801,10 +798,10 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::OperationDef_ptr create_operation ( const char * id, const char * name, @@ -819,34 +816,34 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_ValueDef_Proxy_Broker_; - + protected: // Concrete interface only. ValueDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_ValueDef_setup_collocation (void); - + // Concrete non-local interface only. ValueDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. ValueDef ( TAO_Stub *objref, @@ -854,81 +851,81 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~ValueDef (void); - + private: // Private and unimplemented for concrete interfaces. ValueDef (const ValueDef &); - + void operator= (const ValueDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ValueDef; - + // TAO_IDL - Generated from // be\be_type.cpp:258 - + struct ValueDescription; - + typedef TAO_Var_Var_T< ValueDescription > ValueDescription_var; - + typedef TAO_Out_T< ValueDescription, ValueDescription_var > ValueDescription_out; - + // TAO_IDL - Generated from // be\be_visitor_structure/structure_ch.cpp:57 - + struct TAO_IFR_Client_Export ValueDescription { typedef ValueDescription_var _var_type; - + static void _tao_any_destructor (void *); - TAO_String_Manager name; - TAO_String_Manager id; + TAO::String_Manager name; + TAO::String_Manager id; CORBA::Boolean is_abstract; CORBA::Boolean is_custom; - TAO_String_Manager defined_in; - TAO_String_Manager version; + TAO::String_Manager defined_in; + TAO::String_Manager version; CORBA::RepositoryIdSeq supported_interfaces; CORBA::RepositoryIdSeq abstract_base_values; CORBA::Boolean is_truncatable; - TAO_String_Manager base_value; + TAO::String_Manager base_value; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ValueDescription; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_EXTVALUEDEF__VAR_OUT_CH_) #define _CORBA_EXTVALUEDEF__VAR_OUT_CH_ - + class ExtValueDef; typedef ExtValueDef *ExtValueDef_ptr; - + typedef TAO_Objref_Var_T< ExtValueDef > ExtValueDef_var; - + typedef TAO_Objref_Out_T< ExtValueDef @@ -936,13 +933,13 @@ namespace CORBA ExtValueDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_EXTVALUEDEF_CH_) #define _CORBA_EXTVALUEDEF_CH_ - + class TAO_IFR_Client_Export ExtValueDef : public virtual ::CORBA::ValueDef { @@ -950,42 +947,42 @@ namespace CORBA friend class TAO::Narrow_Utils<ExtValueDef>; typedef ExtValueDef_ptr _ptr_type; typedef ExtValueDef_var _var_type; - + // The static operations. static ExtValueDef_ptr _duplicate (ExtValueDef_ptr obj); - + static void _tao_release (ExtValueDef_ptr obj); - + static ExtValueDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ExtValueDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ExtValueDef_ptr _nil (void) { return static_cast<ExtValueDef_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::ExtInitializerSeq * ext_initializers ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void ext_initializers ( const ::CORBA::ExtInitializerSeq & ext_initializers ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -993,68 +990,68 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_type.cpp:258 - + struct ExtFullValueDescription; - + typedef TAO_Var_Var_T< ExtFullValueDescription > ExtFullValueDescription_var; - + typedef TAO_Out_T< ExtFullValueDescription, ExtFullValueDescription_var > ExtFullValueDescription_out; - + // TAO_IDL - Generated from // be\be_visitor_structure/structure_ch.cpp:57 - + struct TAO_IFR_Client_Export ExtFullValueDescription { typedef ExtFullValueDescription_var _var_type; - + static void _tao_any_destructor (void *); - TAO_String_Manager name; - TAO_String_Manager id; + TAO::String_Manager name; + TAO::String_Manager id; CORBA::Boolean is_abstract; CORBA::Boolean is_custom; - TAO_String_Manager defined_in; - TAO_String_Manager version; - ACE_NESTED_CLASS (CORBA, OpDescriptionSeq) operations; - ACE_NESTED_CLASS (CORBA, ExtAttrDescriptionSeq) attributes; - ACE_NESTED_CLASS (CORBA, ValueMemberSeq) members; - ACE_NESTED_CLASS (CORBA, ExtInitializerSeq) initializers; - ACE_NESTED_CLASS (CORBA, RepositoryIdSeq) supported_interfaces; - ACE_NESTED_CLASS (CORBA, RepositoryIdSeq) abstract_base_values; + TAO::String_Manager defined_in; + TAO::String_Manager version; + CORBA::OpDescriptionSeq operations; + CORBA::ExtAttrDescriptionSeq attributes; + CORBA::ValueMemberSeq members; + CORBA::ExtInitializerSeq initializers; + CORBA::RepositoryIdSeq supported_interfaces; + CORBA::RepositoryIdSeq abstract_base_values; CORBA::Boolean is_truncatable; - TAO_String_Manager base_value; - ACE_NESTED_CLASS (CORBA, TypeCode_var) type; + TAO::String_Manager base_value; + CORBA::TypeCode_var type; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + static ::CORBA::TypeCode_ptr const _tc_ExtFullValueDescription; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::ExtValueDef::ExtFullValueDescription * describe_ext_value ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::ExtAttributeDef_ptr create_ext_attribute ( const char * id, const char * name, @@ -1068,34 +1065,34 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_ExtValueDef_Proxy_Broker_; - + protected: // Concrete interface only. ExtValueDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_ExtValueDef_setup_collocation (void); - + // Concrete non-local interface only. ExtValueDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. ExtValueDef ( TAO_Stub *objref, @@ -1103,38 +1100,38 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~ExtValueDef (void); - + private: // Private and unimplemented for concrete interfaces. ExtValueDef (const ExtValueDef &); - + void operator= (const ExtValueDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtValueDef; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_CORBA_VALUEBOXDEF__VAR_OUT_CH_) #define _CORBA_VALUEBOXDEF__VAR_OUT_CH_ - + class ValueBoxDef; typedef ValueBoxDef *ValueBoxDef_ptr; - + typedef TAO_Objref_Var_T< ValueBoxDef > ValueBoxDef_var; - + typedef TAO_Objref_Out_T< ValueBoxDef @@ -1142,13 +1139,13 @@ namespace CORBA ValueBoxDef_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_VALUEBOXDEF_CH_) #define _CORBA_VALUEBOXDEF_CH_ - + class TAO_IFR_Client_Export ValueBoxDef : public virtual ::CORBA::TypedefDef { @@ -1156,42 +1153,42 @@ namespace CORBA friend class TAO::Narrow_Utils<ValueBoxDef>; typedef ValueBoxDef_ptr _ptr_type; typedef ValueBoxDef_var _var_type; - + // The static operations. static ValueBoxDef_ptr _duplicate (ValueBoxDef_ptr obj); - + static void _tao_release (ValueBoxDef_ptr obj); - + static ValueBoxDef_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ValueBoxDef_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ValueBoxDef_ptr _nil (void) { return static_cast<ValueBoxDef_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::IDLType_ptr original_type_def ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void original_type_def ( ::CORBA::IDLType_ptr original_type_def ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1199,34 +1196,34 @@ namespace CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); private: TAO::Collocation_Proxy_Broker *the_TAO_ValueBoxDef_Proxy_Broker_; - + protected: // Concrete interface only. ValueBoxDef (void); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_ValueBoxDef_setup_collocation (void); - + // Concrete non-local interface only. ValueBoxDef ( IOP::IOR *ior, TAO_ORB_Core *orb_core = 0 ); - + // Non-local interface only. ValueBoxDef ( TAO_Stub *objref, @@ -1234,21 +1231,21 @@ namespace CORBA TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); - + virtual ~ValueBoxDef (void); - + private: // Private and unimplemented for concrete interfaces. ValueBoxDef (const ValueBoxDef &); - + void operator= (const ValueBoxDef &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ValueBoxDef; // TAO_IDL - Generated from @@ -1300,7 +1297,7 @@ namespace TAO #if !defined (_CORBA_FIXEDDEF__TRAITS_) #define _CORBA_FIXEDDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::FixedDef> { @@ -1321,7 +1318,7 @@ namespace TAO #if !defined (_CORBA_VALUEMEMBERDEF__TRAITS_) #define _CORBA_VALUEMEMBERDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ValueMemberDef> { @@ -1342,7 +1339,7 @@ namespace TAO #if !defined (_CORBA_VALUEDEF__TRAITS_) #define _CORBA_VALUEDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ValueDef> { @@ -1363,7 +1360,7 @@ namespace TAO #if !defined (_CORBA_EXTVALUEDEF__TRAITS_) #define _CORBA_EXTVALUEDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtValueDef> { @@ -1384,7 +1381,7 @@ namespace TAO #if !defined (_CORBA_VALUEBOXDEF__TRAITS_) #define _CORBA_VALUEBOXDEF__TRAITS_ - + template<> struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ValueBoxDef> { diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.inl b/TAO/tao/IFR_Client/IFR_ExtendedC.inl index ee480033bf6..de6fecd779e 100644 --- a/TAO/tao/IFR_Client/IFR_ExtendedC.inl +++ b/TAO/tao/IFR_Client/IFR_ExtendedC.inl @@ -40,7 +40,7 @@ CORBA::FixedDef::FixedDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -56,7 +56,7 @@ CORBA::FixedDef::FixedDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_FixedDef_Proxy_Broker_ (0) { } @@ -76,7 +76,7 @@ CORBA::ValueMemberDef::ValueMemberDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -92,7 +92,7 @@ CORBA::ValueMemberDef::ValueMemberDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_ValueMemberDef_Proxy_Broker_ (0) { } @@ -112,7 +112,7 @@ CORBA::ValueDef::ValueDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -128,7 +128,7 @@ CORBA::ValueDef::ValueDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_ValueDef_Proxy_Broker_ (0) { } @@ -148,7 +148,7 @@ CORBA::ExtValueDef::ExtValueDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -164,7 +164,7 @@ CORBA::ExtValueDef::ExtValueDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_ExtValueDef_Proxy_Broker_ (0) { } @@ -184,7 +184,7 @@ CORBA::ValueBoxDef::ValueBoxDef ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -200,7 +200,7 @@ CORBA::ValueBoxDef::ValueBoxDef ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_ValueBoxDef_Proxy_Broker_ (0) { } diff --git a/TAO/tao/IORManipulation/IORC.cpp b/TAO/tao/IORManipulation/IORC.cpp index b30c619e153..b90f2877f73 100644 --- a/TAO/tao/IORManipulation/IORC.cpp +++ b/TAO/tao/IORManipulation/IORC.cpp @@ -48,7 +48,7 @@ namespace TAO } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 TAO_IOP::EmptyProfileList::EmptyProfileList (void) @@ -74,7 +74,7 @@ TAO_IOP::EmptyProfileList::EmptyProfileList (const ::TAO_IOP::EmptyProfileList & TAO_IOP::EmptyProfileList& TAO_IOP::EmptyProfileList::operator= (const ::TAO_IOP::EmptyProfileList &_tao_excp) { - this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp); + this->::CORBA::UserException::operator= (_tao_excp); return *this; } @@ -130,7 +130,7 @@ void TAO_IOP::EmptyProfileList::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -143,7 +143,7 @@ void TAO_IOP::EmptyProfileList::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -153,7 +153,7 @@ CORBA::TypeCode_ptr TAO_IOP::EmptyProfileList::_tao_type (void) const return ::TAO_IOP::_tc_EmptyProfileList; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 TAO_IOP::NotFound::NotFound (void) @@ -179,7 +179,7 @@ TAO_IOP::NotFound::NotFound (const ::TAO_IOP::NotFound &_tao_excp) TAO_IOP::NotFound& TAO_IOP::NotFound::operator= (const ::TAO_IOP::NotFound &_tao_excp) { - this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp); + this->::CORBA::UserException::operator= (_tao_excp); return *this; } @@ -235,7 +235,7 @@ void TAO_IOP::NotFound::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -248,7 +248,7 @@ void TAO_IOP::NotFound::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -258,7 +258,7 @@ CORBA::TypeCode_ptr TAO_IOP::NotFound::_tao_type (void) const return ::TAO_IOP::_tc_NotFound; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 TAO_IOP::Duplicate::Duplicate (void) @@ -284,7 +284,7 @@ TAO_IOP::Duplicate::Duplicate (const ::TAO_IOP::Duplicate &_tao_excp) TAO_IOP::Duplicate& TAO_IOP::Duplicate::operator= (const ::TAO_IOP::Duplicate &_tao_excp) { - this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp); + this->::CORBA::UserException::operator= (_tao_excp); return *this; } @@ -340,7 +340,7 @@ void TAO_IOP::Duplicate::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -353,7 +353,7 @@ void TAO_IOP::Duplicate::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -363,7 +363,7 @@ CORBA::TypeCode_ptr TAO_IOP::Duplicate::_tao_type (void) const return ::TAO_IOP::_tc_Duplicate; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 TAO_IOP::Invalid_IOR::Invalid_IOR (void) @@ -389,7 +389,7 @@ TAO_IOP::Invalid_IOR::Invalid_IOR (const ::TAO_IOP::Invalid_IOR &_tao_excp) TAO_IOP::Invalid_IOR& TAO_IOP::Invalid_IOR::operator= (const ::TAO_IOP::Invalid_IOR &_tao_excp) { - this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp); + this->::CORBA::UserException::operator= (_tao_excp); return *this; } @@ -445,7 +445,7 @@ void TAO_IOP::Invalid_IOR::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -458,7 +458,7 @@ void TAO_IOP::Invalid_IOR::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -468,7 +468,7 @@ CORBA::TypeCode_ptr TAO_IOP::Invalid_IOR::_tao_type (void) const return ::TAO_IOP::_tc_Invalid_IOR; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 TAO_IOP::MultiProfileList::MultiProfileList (void) @@ -494,7 +494,7 @@ TAO_IOP::MultiProfileList::MultiProfileList (const ::TAO_IOP::MultiProfileList & TAO_IOP::MultiProfileList& TAO_IOP::MultiProfileList::operator= (const ::TAO_IOP::MultiProfileList &_tao_excp) { - this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp); + this->::CORBA::UserException::operator= (_tao_excp); return *this; } @@ -550,7 +550,7 @@ void TAO_IOP::MultiProfileList::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -563,7 +563,7 @@ void TAO_IOP::MultiProfileList::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -591,7 +591,7 @@ TAO::Objref_Traits<TAO_IOP::TAO_IOR_Property>::release ( TAO_IOP::TAO_IOR_Property_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } TAO_IOP::TAO_IOR_Property_ptr @@ -615,12 +615,12 @@ TAO_IOP::TAO_IOR_Property::TAO_IOR_Property (void) TAO_IOP::TAO_IOR_Property::~TAO_IOR_Property (void) {} -void +void TAO_IOP::TAO_IOR_Property::_tao_any_destructor (void *_tao_void_pointer) { TAO_IOR_Property *_tao_tmp_pointer = static_cast<TAO_IOR_Property *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } TAO_IOP::TAO_IOR_Property_ptr @@ -633,10 +633,10 @@ TAO_IOP::TAO_IOR_Property::_narrow ( { return TAO_IOR_Property::_nil (); } - + TAO_IOR_Property_ptr proxy = dynamic_cast<TAO_IOR_Property_ptr> (_tao_objref); - + return TAO_IOR_Property::_duplicate (proxy); } @@ -650,28 +650,28 @@ TAO_IOP::TAO_IOR_Property::_unchecked_narrow ( { return TAO_IOR_Property::_nil (); } - + TAO_IOR_Property_ptr proxy = dynamic_cast<TAO_IOR_Property_ptr> (_tao_objref); - + return TAO_IOR_Property::_duplicate (proxy); } TAO_IOP::TAO_IOR_Property_ptr TAO_IOP::TAO_IOR_Property::_duplicate (TAO_IOR_Property_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void TAO_IOP::TAO_IOR_Property::_tao_release (TAO_IOR_Property_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -732,7 +732,7 @@ TAO::Objref_Traits<TAO_IOP::TAO_IOR_Manipulation>::release ( TAO_IOP::TAO_IOR_Manipulation_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } TAO_IOP::TAO_IOR_Manipulation_ptr @@ -750,7 +750,7 @@ TAO::Objref_Traits<TAO_IOP::TAO_IOR_Manipulation>::marshal ( return CORBA::Object::marshal (p, cdr); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CS_) @@ -762,8 +762,9 @@ TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (void) TAO_IOP::TAO_IOR_Manipulation::IORList::IORList ( CORBA::ULong max ) - : TAO_Unbounded_Pseudo_Sequence< - CORBA::Object + : TAO::unbounded_object_reference_sequence< + CORBA::Object, + CORBA::Object_var > (max) {} @@ -774,8 +775,9 @@ TAO_IOP::TAO_IOR_Manipulation::IORList::IORList ( CORBA::Object_ptr * buffer, CORBA::Boolean release ) - : TAO_Unbounded_Pseudo_Sequence< - CORBA::Object + : TAO::unbounded_object_reference_sequence< + CORBA::Object, + CORBA::Object_var > (max, length, buffer, release) {} @@ -783,8 +785,9 @@ TAO_IOP::TAO_IOR_Manipulation::IORList::IORList ( TAO_IOP::TAO_IOR_Manipulation::IORList::IORList ( const IORList &seq ) - : TAO_Unbounded_Pseudo_Sequence< - CORBA::Object + : TAO::unbounded_object_reference_sequence< + CORBA::Object, + CORBA::Object_var > (seq) {} @@ -809,12 +812,12 @@ TAO_IOP::TAO_IOR_Manipulation::TAO_IOR_Manipulation (void) TAO_IOP::TAO_IOR_Manipulation::~TAO_IOR_Manipulation (void) {} -void +void TAO_IOP::TAO_IOR_Manipulation::_tao_any_destructor (void *_tao_void_pointer) { TAO_IOR_Manipulation *_tao_tmp_pointer = static_cast<TAO_IOR_Manipulation *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } TAO_IOP::TAO_IOR_Manipulation_ptr @@ -827,10 +830,10 @@ TAO_IOP::TAO_IOR_Manipulation::_narrow ( { return TAO_IOR_Manipulation::_nil (); } - + TAO_IOR_Manipulation_ptr proxy = dynamic_cast<TAO_IOR_Manipulation_ptr> (_tao_objref); - + return TAO_IOR_Manipulation::_duplicate (proxy); } @@ -844,28 +847,28 @@ TAO_IOP::TAO_IOR_Manipulation::_unchecked_narrow ( { return TAO_IOR_Manipulation::_nil (); } - + TAO_IOR_Manipulation_ptr proxy = dynamic_cast<TAO_IOR_Manipulation_ptr> (_tao_objref); - + return TAO_IOR_Manipulation::_duplicate (proxy); } TAO_IOP::TAO_IOR_Manipulation_ptr TAO_IOP::TAO_IOR_Manipulation::_duplicate (TAO_IOR_Manipulation_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void TAO_IOP::TAO_IOR_Manipulation::_tao_release (TAO_IOR_Manipulation_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean diff --git a/TAO/tao/IORManipulation/IORC.h b/TAO/tao/IORManipulation/IORC.h index 2c6bb305c61..52751b81503 100644 --- a/TAO/tao/IORManipulation/IORC.h +++ b/TAO/tao/IORManipulation/IORC.h @@ -75,30 +75,30 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_IOP { - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_TAO_IOP_EMPTYPROFILELIST_CH_) #define _TAO_IOP_EMPTYPROFILELIST_CH_ - + class TAO_IORManip_Export EmptyProfileList : public CORBA::UserException { public: - + EmptyProfileList (void); EmptyProfileList (const EmptyProfileList &); ~EmptyProfileList (void); EmptyProfileList &operator= (const EmptyProfileList &); - + static void _tao_any_destructor (void *); - + static EmptyProfileList *_downcast (CORBA::Exception *); static const EmptyProfileList *_downcast (CORBA::Exception const *); - + static CORBA::Exception *_alloc (void); - + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void) const; @@ -107,48 +107,48 @@ namespace TAO_IOP TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:127 - + virtual CORBA::TypeCode_ptr _tao_type (void) const; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + extern TAO_IORManip_Export ::CORBA::TypeCode_ptr const _tc_EmptyProfileList; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_TAO_IOP_NOTFOUND_CH_) #define _TAO_IOP_NOTFOUND_CH_ - + class TAO_IORManip_Export NotFound : public CORBA::UserException { public: - + NotFound (void); NotFound (const NotFound &); ~NotFound (void); NotFound &operator= (const NotFound &); - + static void _tao_any_destructor (void *); - + static NotFound *_downcast (CORBA::Exception *); static const NotFound *_downcast (CORBA::Exception const *); - + static CORBA::Exception *_alloc (void); - + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void) const; @@ -157,48 +157,48 @@ namespace TAO_IOP TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:127 - + virtual CORBA::TypeCode_ptr _tao_type (void) const; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + extern TAO_IORManip_Export ::CORBA::TypeCode_ptr const _tc_NotFound; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_TAO_IOP_DUPLICATE_CH_) #define _TAO_IOP_DUPLICATE_CH_ - + class TAO_IORManip_Export Duplicate : public CORBA::UserException { public: - + Duplicate (void); Duplicate (const Duplicate &); ~Duplicate (void); Duplicate &operator= (const Duplicate &); - + static void _tao_any_destructor (void *); - + static Duplicate *_downcast (CORBA::Exception *); static const Duplicate *_downcast (CORBA::Exception const *); - + static CORBA::Exception *_alloc (void); - + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void) const; @@ -207,48 +207,48 @@ namespace TAO_IOP TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:127 - + virtual CORBA::TypeCode_ptr _tao_type (void) const; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + extern TAO_IORManip_Export ::CORBA::TypeCode_ptr const _tc_Duplicate; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_TAO_IOP_INVALID_IOR_CH_) #define _TAO_IOP_INVALID_IOR_CH_ - + class TAO_IORManip_Export Invalid_IOR : public CORBA::UserException { public: - + Invalid_IOR (void); Invalid_IOR (const Invalid_IOR &); ~Invalid_IOR (void); Invalid_IOR &operator= (const Invalid_IOR &); - + static void _tao_any_destructor (void *); - + static Invalid_IOR *_downcast (CORBA::Exception *); static const Invalid_IOR *_downcast (CORBA::Exception const *); - + static CORBA::Exception *_alloc (void); - + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void) const; @@ -257,48 +257,48 @@ namespace TAO_IOP TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:127 - + virtual CORBA::TypeCode_ptr _tao_type (void) const; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + extern TAO_IORManip_Export ::CORBA::TypeCode_ptr const _tc_Invalid_IOR; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_TAO_IOP_MULTIPROFILELIST_CH_) #define _TAO_IOP_MULTIPROFILELIST_CH_ - + class TAO_IORManip_Export MultiProfileList : public CORBA::UserException { public: - + MultiProfileList (void); MultiProfileList (const MultiProfileList &); ~MultiProfileList (void); MultiProfileList &operator= (const MultiProfileList &); - + static void _tao_any_destructor (void *); - + static MultiProfileList *_downcast (CORBA::Exception *); static const MultiProfileList *_downcast (CORBA::Exception const *); - + static CORBA::Exception *_alloc (void); - + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void) const; @@ -307,40 +307,40 @@ namespace TAO_IOP TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:127 - + virtual CORBA::TypeCode_ptr _tao_type (void) const; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + extern TAO_IORManip_Export ::CORBA::TypeCode_ptr const _tc_MultiProfileList; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_TAO_IOP_TAO_IOR_PROPERTY__VAR_OUT_CH_) #define _TAO_IOP_TAO_IOR_PROPERTY__VAR_OUT_CH_ - + class TAO_IOR_Property; typedef TAO_IOR_Property *TAO_IOR_Property_ptr; - + typedef TAO_Objref_Var_T< TAO_IOR_Property > TAO_IOR_Property_var; - + typedef TAO_Objref_Out_T< TAO_IOR_Property @@ -348,45 +348,45 @@ namespace TAO_IOP TAO_IOR_Property_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_TAO_IOP_TAO_IOR_PROPERTY_CH_) #define _TAO_IOP_TAO_IOR_PROPERTY_CH_ - + class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA::Object { public: typedef TAO_IOR_Property_ptr _ptr_type; typedef TAO_IOR_Property_var _var_type; - + // The static operations. static TAO_IOR_Property_ptr _duplicate (TAO_IOR_Property_ptr obj); - + static void _tao_release (TAO_IOR_Property_ptr obj); - + static TAO_IOR_Property_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static TAO_IOR_Property_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static TAO_IOR_Property_ptr _nil (void) { return static_cast<TAO_IOR_Property_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Boolean set_property ( ::CORBA::Object_ptr & ior ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -395,10 +395,10 @@ namespace TAO_IOP CORBA::SystemException, ::TAO_IOP::Invalid_IOR )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Boolean set_primary ( ::CORBA::Object_ptr & ior1, ::CORBA::Object_ptr ior2 @@ -409,10 +409,10 @@ namespace TAO_IOP ::TAO_IOP::Duplicate, ::TAO_IOP::NotFound )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Object_ptr get_primary ( ::CORBA::Object_ptr ior ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -421,10 +421,10 @@ namespace TAO_IOP CORBA::SystemException, ::TAO_IOP::NotFound )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Boolean is_primary_set ( ::CORBA::Object_ptr ior ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -432,10 +432,10 @@ namespace TAO_IOP ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Boolean remove_primary_tag ( ::CORBA::Object_ptr & iogr ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -444,53 +444,53 @@ namespace TAO_IOP CORBA::SystemException, ::TAO_IOP::NotFound )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. TAO_IOR_Property (void); - + virtual ~TAO_IOR_Property (void); - + private: // Private and unimplemented for concrete interfaces. TAO_IOR_Property (const TAO_IOR_Property &); - + void operator= (const TAO_IOR_Property &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + extern TAO_IORManip_Export ::CORBA::TypeCode_ptr const _tc_TAO_IOR_Property; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION__VAR_OUT_CH_) #define _TAO_IOP_TAO_IOR_MANIPULATION__VAR_OUT_CH_ - + class TAO_IOR_Manipulation; typedef TAO_IOR_Manipulation *TAO_IOR_Manipulation_ptr; - + typedef TAO_Objref_Var_T< TAO_IOR_Manipulation > TAO_IOR_Manipulation_var; - + typedef TAO_Objref_Out_T< TAO_IOR_Manipulation @@ -498,73 +498,67 @@ namespace TAO_IOP TAO_IOR_Manipulation_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_CH_) #define _TAO_IOP_TAO_IOR_MANIPULATION_CH_ - + class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA::Object { public: typedef TAO_IOR_Manipulation_ptr _ptr_type; typedef TAO_IOR_Manipulation_var _var_type; - + // The static operations. static TAO_IOR_Manipulation_ptr _duplicate (TAO_IOR_Manipulation_ptr obj); - + static void _tao_release (TAO_IOR_Manipulation_ptr obj); - + static TAO_IOR_Manipulation_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static TAO_IOR_Manipulation_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static TAO_IOR_Manipulation_ptr _nil (void) { return static_cast<TAO_IOR_Manipulation_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_) #define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_ - + class IORList; - + typedef - TAO_MngSeq_Var_T< - IORList, - TAO_Pseudo_Object_Manager< - CORBA::Object - > + TAO_VarSeq_Var_T< + IORList > IORList_var; - + typedef - TAO_MngSeq_Out_T< - IORList, - IORList_var, - TAO_Pseudo_Object_Manager< - CORBA::Object - > + TAO_Seq_Out_T< + IORList > IORList_out; - + class TAO_IORManip_Export IORList : public - TAO_Unbounded_Pseudo_Sequence< - CORBA::Object + TAO::unbounded_object_reference_sequence< + CORBA::Object, + CORBA::Object_var > { public: @@ -573,27 +567,27 @@ namespace TAO_IOP IORList ( CORBA::ULong max, CORBA::ULong length, - CORBA::Object_ptr* buffer, - CORBA::Boolean release = 0 + CORBA::Object_ptr* buffer, + CORBA::Boolean release = false ); IORList (const IORList &); ~IORList (void); - + static void _tao_any_destructor (void *); - + typedef IORList_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + static ::CORBA::TypeCode_ptr const _tc_IORList; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Object_ptr merge_iors ( const ::TAO_IOP::TAO_IOR_Manipulation::IORList & iors ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -604,10 +598,10 @@ namespace TAO_IOP ::TAO_IOP::Duplicate, ::TAO_IOP::Invalid_IOR )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Object_ptr add_profiles ( ::CORBA::Object_ptr ior1, ::CORBA::Object_ptr ior2 @@ -619,10 +613,10 @@ namespace TAO_IOP ::TAO_IOP::Duplicate, ::TAO_IOP::Invalid_IOR )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Object_ptr remove_profiles ( ::CORBA::Object_ptr ior1, ::CORBA::Object_ptr ior2 @@ -634,10 +628,10 @@ namespace TAO_IOP ::TAO_IOP::EmptyProfileList, ::TAO_IOP::NotFound )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Boolean set_property ( ::TAO_IOP::TAO_IOR_Property_ptr prop, ::CORBA::Object_ptr ior @@ -648,10 +642,10 @@ namespace TAO_IOP ::TAO_IOP::Invalid_IOR, ::TAO_IOP::Duplicate )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Boolean set_primary ( ::TAO_IOP::TAO_IOR_Property_ptr prop, ::CORBA::Object_ptr ior1, @@ -665,10 +659,10 @@ namespace TAO_IOP ::TAO_IOP::MultiProfileList, ::TAO_IOP::NotFound )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Boolean remove_primary_tag ( ::TAO_IOP::TAO_IOR_Property_ptr prop, ::CORBA::Object_ptr ior @@ -677,10 +671,10 @@ namespace TAO_IOP ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Object_ptr get_primary ( ::TAO_IOP::TAO_IOR_Property_ptr prop, ::CORBA::Object_ptr ior @@ -690,10 +684,10 @@ namespace TAO_IOP CORBA::SystemException, ::TAO_IOP::NotFound )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Boolean is_primary_set ( ::TAO_IOP::TAO_IOR_Property_ptr prop, ::CORBA::Object_ptr ior @@ -702,10 +696,10 @@ namespace TAO_IOP ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::ULong is_in_ior ( ::CORBA::Object_ptr ior1, ::CORBA::Object_ptr ior2 @@ -715,10 +709,10 @@ namespace TAO_IOP CORBA::SystemException, ::TAO_IOP::NotFound )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::ULong get_profile_count ( ::CORBA::Object_ptr ior ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -727,36 +721,36 @@ namespace TAO_IOP CORBA::SystemException, ::TAO_IOP::EmptyProfileList )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. TAO_IOR_Manipulation (void); - + virtual ~TAO_IOR_Manipulation (void); - + private: // Private and unimplemented for concrete interfaces. TAO_IOR_Manipulation (const TAO_IOR_Manipulation &); - + void operator= (const TAO_IOR_Manipulation &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + extern TAO_IORManip_Export ::CORBA::TypeCode_ptr const _tc_TAO_IOR_Manipulation; // TAO_IDL - Generated from @@ -773,7 +767,7 @@ namespace TAO #if !defined (_TAO_IOP_TAO_IOR_PROPERTY__TRAITS_CH_) #define _TAO_IOP_TAO_IOR_PROPERTY__TRAITS_CH_ - + template<> struct TAO_IORManip_Export Objref_Traits< ::TAO_IOP::TAO_IOR_Property> { @@ -794,7 +788,7 @@ namespace TAO #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION__TRAITS_CH_) #define _TAO_IOP_TAO_IOR_MANIPULATION__TRAITS_CH_ - + template<> struct TAO_IORManip_Export Objref_Traits< ::TAO_IOP::TAO_IOR_Manipulation> { diff --git a/TAO/tao/IORManipulation/IORManipulation.cpp b/TAO/tao/IORManipulation/IORManipulation.cpp index 079f942eee2..dcc9217a1fb 100644 --- a/TAO/tao/IORManipulation/IORManipulation.cpp +++ b/TAO/tao/IORManipulation/IORManipulation.cpp @@ -189,7 +189,7 @@ TAO_IOR_Manipulation_impl::remove_profiles ( // immediately like before, // because it could result in an // Object Reference with 0 profile. And it would not pass - // the CORBA::is_nil() evaluation. + // the ::CORBA::is_nil() evaluation. // Instead, we create the Object Reference right here, which is // earlier than before.(Actually, I just moved some code // from below up to here). diff --git a/TAO/tao/IORTable/IORTableC.cpp b/TAO/tao/IORTable/IORTableC.cpp index ce5ed991f03..677c159c773 100644 --- a/TAO/tao/IORTable/IORTableC.cpp +++ b/TAO/tao/IORTable/IORTableC.cpp @@ -48,7 +48,7 @@ namespace TAO } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 IORTable::AlreadyBound::AlreadyBound (void) @@ -74,7 +74,7 @@ IORTable::AlreadyBound::AlreadyBound (const ::IORTable::AlreadyBound &_tao_excp) IORTable::AlreadyBound& IORTable::AlreadyBound::operator= (const ::IORTable::AlreadyBound &_tao_excp) { - this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp); + this->::CORBA::UserException::operator= (_tao_excp); return *this; } @@ -123,7 +123,7 @@ void IORTable::AlreadyBound::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -136,13 +136,13 @@ void IORTable::AlreadyBound::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 IORTable::NotFound::NotFound (void) @@ -168,7 +168,7 @@ IORTable::NotFound::NotFound (const ::IORTable::NotFound &_tao_excp) IORTable::NotFound& IORTable::NotFound::operator= (const ::IORTable::NotFound &_tao_excp) { - this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp); + this->::CORBA::UserException::operator= (_tao_excp); return *this; } @@ -217,7 +217,7 @@ void IORTable::NotFound::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -230,7 +230,7 @@ void IORTable::NotFound::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -254,7 +254,7 @@ TAO::Objref_Traits<IORTable::Table>::release ( IORTable::Table_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } IORTable::Table_ptr @@ -288,10 +288,10 @@ IORTable::Table::_narrow ( { return Table::_nil (); } - + Table_ptr proxy = dynamic_cast<Table_ptr> (_tao_objref); - + return Table::_duplicate (proxy); } @@ -305,28 +305,28 @@ IORTable::Table::_unchecked_narrow ( { return Table::_nil (); } - + Table_ptr proxy = dynamic_cast<Table_ptr> (_tao_objref); - + return Table::_duplicate (proxy); } IORTable::Table_ptr IORTable::Table::_duplicate (Table_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void IORTable::Table::_tao_release (Table_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -387,7 +387,7 @@ TAO::Objref_Traits<IORTable::Locator>::release ( IORTable::Locator_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } IORTable::Locator_ptr @@ -421,10 +421,10 @@ IORTable::Locator::_narrow ( { return Locator::_nil (); } - + Locator_ptr proxy = dynamic_cast<Locator_ptr> (_tao_objref); - + return Locator::_duplicate (proxy); } @@ -438,28 +438,28 @@ IORTable::Locator::_unchecked_narrow ( { return Locator::_nil (); } - + Locator_ptr proxy = dynamic_cast<Locator_ptr> (_tao_objref); - + return Locator::_duplicate (proxy); } IORTable::Locator_ptr IORTable::Locator::_duplicate (Locator_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void IORTable::Locator::_tao_release (Locator_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean diff --git a/TAO/tao/IORTable/Table_Adapter.cpp b/TAO/tao/IORTable/Table_Adapter.cpp index dbfbc20990a..18e9873d933 100644 --- a/TAO/tao/IORTable/Table_Adapter.cpp +++ b/TAO/tao/IORTable/Table_Adapter.cpp @@ -29,7 +29,7 @@ TAO_Table_Adapter::TAO_Table_Adapter (TAO_ORB_Core *orb_core) TAO_Table_Adapter::~TAO_Table_Adapter (void) { - CORBA::release (this->root_); + ::CORBA::release (this->root_); } void @@ -44,7 +44,7 @@ TAO_Table_Adapter::open (ACE_ENV_SINGLE_ARG_DECL) void TAO_Table_Adapter::close (int ACE_ENV_ARG_DECL_NOT_USED) { - CORBA::release (this->root_); + ::CORBA::release (this->root_); this->root_ = 0; } diff --git a/TAO/tao/IORTable/Table_Adapter.h b/TAO/tao/IORTable/Table_Adapter.h index f01ebe13e64..9f6ad395279 100644 --- a/TAO/tao/IORTable/Table_Adapter.h +++ b/TAO/tao/IORTable/Table_Adapter.h @@ -66,7 +66,7 @@ private: ACE_THROW_SPEC ((CORBA::SystemException)); /// The ORB Core we belong to - TAO_ORB_Core *orb_core_; + TAO_ORB_Core * const orb_core_; /// The table implementation TAO_IOR_Table_Impl *root_; diff --git a/TAO/tao/Messaging/AMH_Response_Handler.h b/TAO/tao/Messaging/AMH_Response_Handler.h index 738afa35200..585ed1defea 100644 --- a/TAO/tao/Messaging/AMH_Response_Handler.h +++ b/TAO/tao/Messaging/AMH_Response_Handler.h @@ -140,7 +140,7 @@ private: /// A pointer to the ORB Core for the context where the request was /// created. - TAO_ORB_Core *orb_core_; + TAO_ORB_Core * orb_core_; /// The reply service context TAO_Service_Context reply_service_context_; diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp index 4eaaa3bdc12..d17338aae9c 100644 --- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp +++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp @@ -16,9 +16,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ConnectionTimeoutPolicy::TAO_ConnectionTimeoutPolicy ( const TimeBase::TimeT& relative_expiry) - : ACE_NESTED_CLASS (CORBA, Object) () - , ACE_NESTED_CLASS (CORBA, Policy) () - , ACE_NESTED_CLASS (CORBA, LocalObject) () + : ::CORBA::Object () + , ::CORBA::Policy () + , ::CORBA::LocalObject () , TAO::ConnectionTimeoutPolicy () , TAO_Local_RefCounted_Object () , relative_expiry_ (relative_expiry) @@ -27,9 +27,9 @@ TAO_ConnectionTimeoutPolicy::TAO_ConnectionTimeoutPolicy ( TAO_ConnectionTimeoutPolicy::TAO_ConnectionTimeoutPolicy ( const TAO_ConnectionTimeoutPolicy &rhs) - : ACE_NESTED_CLASS (CORBA, Object) () - , ACE_NESTED_CLASS (CORBA, Policy) () - , ACE_NESTED_CLASS (CORBA, LocalObject) () + : ::CORBA::Object () + , ::CORBA::Policy () + , ::CORBA::LocalObject () , TAO::ConnectionTimeoutPolicy () , TAO_Local_RefCounted_Object () , relative_expiry_ (rhs.relative_expiry_) diff --git a/TAO/tao/Messaging/ExceptionHolderA.cpp b/TAO/tao/Messaging/ExceptionHolderA.cpp index 99273a726d0..cdfa65d9f3f 100644 --- a/TAO/tao/Messaging/ExceptionHolderA.cpp +++ b/TAO/tao/Messaging/ExceptionHolderA.cpp @@ -41,8 +41,6 @@ #include "tao/AnyTypeCode/Any_Impl_T.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -#if !defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER) - TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_IDL - Generated from @@ -194,4 +192,3 @@ operator>>= ( TAO_END_VERSIONED_NAMESPACE_DECL -#endif diff --git a/TAO/tao/Messaging/ExceptionHolderA.h b/TAO/tao/Messaging/ExceptionHolderA.h index 2efc2998af0..b72bb462fb2 100644 --- a/TAO/tao/Messaging/ExceptionHolderA.h +++ b/TAO/tao/Messaging/ExceptionHolderA.h @@ -39,8 +39,6 @@ #include "tao/AnyTypeCode/DynamicA.h" -#if !defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER) - // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 @@ -83,8 +81,6 @@ TAO_Messaging_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, Messagi TAO_END_VERSIONED_NAMESPACE_DECL -#endif - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/Messaging/ExceptionHolderC.cpp b/TAO/tao/Messaging/ExceptionHolderC.cpp index 3673c01c5a8..00e311d86b2 100644 --- a/TAO/tao/Messaging/ExceptionHolderC.cpp +++ b/TAO/tao/Messaging/ExceptionHolderC.cpp @@ -35,8 +35,6 @@ #include "tao/ORB_Core.h" #include "ace/OS_NS_string.h" -#if !defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER) - #if !defined (__ACE_INLINE__) #include "tao/Messaging/ExceptionHolderC.inl" #endif /* !defined INLINE */ @@ -308,4 +306,3 @@ OBV_Messaging::ExceptionHolder::_tao_unmarshal_state (TAO_InputCDR &strm) TAO_END_VERSIONED_NAMESPACE_DECL -#endif diff --git a/TAO/tao/Messaging/ExceptionHolderC.h b/TAO/tao/Messaging/ExceptionHolderC.h index 37848e2adcf..f862bfd3d18 100644 --- a/TAO/tao/Messaging/ExceptionHolderC.h +++ b/TAO/tao/Messaging/ExceptionHolderC.h @@ -56,8 +56,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Messaging_Export -#if !defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER) - // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 @@ -289,8 +287,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/Messaging/ExceptionHolderC.inl" #endif /* defined INLINE */ -#endif - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/Messaging/ExceptionHolderC.inl b/TAO/tao/Messaging/ExceptionHolderC.inl index cabe51e8d9f..11cb115f908 100644 --- a/TAO/tao/Messaging/ExceptionHolderC.inl +++ b/TAO/tao/Messaging/ExceptionHolderC.inl @@ -29,8 +29,6 @@ // TAO_IDL - Generated from // be\be_visitor_valuetype/valuetype_ci.cpp:56 -#if !defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER) - TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE @@ -45,4 +43,3 @@ Messaging::ExceptionHolder::_tao_obv_static_repository_id () TAO_END_VERSIONED_NAMESPACE_DECL -#endif diff --git a/TAO/tao/Messaging/ExceptionHolder_i.cpp b/TAO/tao/Messaging/ExceptionHolder_i.cpp index 880f31b6d7d..a6a52699ebc 100644 --- a/TAO/tao/Messaging/ExceptionHolder_i.cpp +++ b/TAO/tao/Messaging/ExceptionHolder_i.cpp @@ -7,8 +7,6 @@ ACE_RCSID (Messaging, ExceptionHolder_i, "$Id$") -#if !defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER) - #include "tao/Messaging/Messaging.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -64,6 +62,25 @@ namespace TAO this->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER); } + CORBA::ValueBase* + ExceptionHolder::_copy_value (void) + { + TAO::ExceptionHolder* ret_val = 0; + ACE_NEW_THROW_EX (ret_val, + ExceptionHolder, + CORBA::NO_MEMORY ()); + ACE_CHECK_RETURN (0); + + // @todo According to the latest corba spec we should be able to + // pass this to the ExceptionHolder constructor but the TAO_IDL + // compiler doesn't seem to generate this. + ret_val->is_system_exception (this->is_system_exception ()); + ret_val->byte_order (this->byte_order ()); + ret_val->marshaled_exception (this->marshaled_exception ()); + + return ret_val; + } + CORBA::ValueBase * ExceptionHolderFactory::create_for_unmarshal ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) @@ -81,4 +98,3 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL -#endif diff --git a/TAO/tao/Messaging/ExceptionHolder_i.h b/TAO/tao/Messaging/ExceptionHolder_i.h index c80a5a23141..c77d78e1e28 100644 --- a/TAO/tao/Messaging/ExceptionHolder_i.h +++ b/TAO/tao/Messaging/ExceptionHolder_i.h @@ -22,8 +22,6 @@ #include "tao/orbconf.h" -#if !defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER) - #include "tao/Messaging/ExceptionHolderA.h" #include "tao/Messaging/ExceptionHolderC.h" #include "tao/Valuetype/ValueFactory.h" @@ -65,6 +63,8 @@ namespace TAO const ::Dynamic::ExceptionList & exc_list ACE_ENV_ARG_DECL_WITH_DEFAULTS ); + virtual CORBA::ValueBase* _copy_value (void); + protected: virtual ~ExceptionHolder (void); @@ -95,8 +95,6 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL -#endif - #include /**/ "ace/post.h" #endif /* TAO_MESSAGING_EXCEPTIONHOLDER_I_H */ diff --git a/TAO/tao/Messaging/Messaging.cpp b/TAO/tao/Messaging/Messaging.cpp index 6f34e95f288..9f0c1f164cf 100644 --- a/TAO/tao/Messaging/Messaging.cpp +++ b/TAO/tao/Messaging/Messaging.cpp @@ -59,7 +59,7 @@ exception_holder_raise (TAO::Exception_Data *exception_data, CORBA::COMPLETED_MAYBE)); CORBA::SystemException* exception = - TAO_Exceptions::create_system_exception (type_id.in ()); + TAO::create_system_exception (type_id.in ()); if (exception == 0) { diff --git a/TAO/tao/Messaging/MessagingA.h b/TAO/tao/Messaging/MessagingA.h index 05db49af523..9d9ddfbdaea 100644 --- a/TAO/tao/Messaging/MessagingA.h +++ b/TAO/tao/Messaging/MessagingA.h @@ -38,11 +38,7 @@ #include "tao/Messaging/Messaging_SyncScope_PolicyA.h" #include "tao/Messaging/Messaging_RT_PolicyA.h" #include "tao/Messaging/Messaging_No_ImplA.h" -#if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER) -#include "tao/Messaging/OldExceptionHolderA.h" -#else #include "tao/Messaging/ExceptionHolderA.h" -#endif // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 diff --git a/TAO/tao/Messaging/MessagingC.cpp b/TAO/tao/Messaging/MessagingC.cpp index e8c429787c5..a6db499d6e0 100644 --- a/TAO/tao/Messaging/MessagingC.cpp +++ b/TAO/tao/Messaging/MessagingC.cpp @@ -67,7 +67,7 @@ TAO::Objref_Traits<Messaging::ReplyHandler>::release ( Messaging::ReplyHandler_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } Messaging::ReplyHandler_ptr @@ -86,7 +86,7 @@ TAO::Objref_Traits<Messaging::ReplyHandler>::marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function_pointer) ( ::CORBA::Object_ptr obj ) = 0; @@ -110,12 +110,12 @@ Messaging::ReplyHandler::Messaging_ReplyHandler_setup_collocation () Messaging::ReplyHandler::~ReplyHandler (void) {} -void +void Messaging::ReplyHandler::_tao_any_destructor (void *_tao_void_pointer) { ReplyHandler *_tao_tmp_pointer = static_cast<ReplyHandler *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } Messaging::ReplyHandler_ptr @@ -151,18 +151,18 @@ Messaging::ReplyHandler::_unchecked_narrow ( Messaging::ReplyHandler_ptr Messaging::ReplyHandler::_duplicate (ReplyHandler_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void Messaging::ReplyHandler::_tao_release (ReplyHandler_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } ::CORBA::Boolean @@ -186,7 +186,7 @@ Messaging::ReplyHandler::_is_a ( } else { - return this->ACE_NESTED_CLASS ( ::CORBA, Object)::_is_a ( + return this->::CORBA::Object::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -222,21 +222,21 @@ Messaging::ReplyHandler::marshal (TAO_OutputCDR &cdr) ) { ::CORBA::Object_var obj; - + if (!(strm >> obj.inout ())) { return false; } - + typedef ::Messaging::ReplyHandler RHS_SCOPED_NAME; - + // Narrow to the right type. _tao_objref = TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( obj.in (), Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function_pointer ); - + return 1; } diff --git a/TAO/tao/Messaging/MessagingC.h b/TAO/tao/Messaging/MessagingC.h index ed12276ef97..d9ca0057868 100644 --- a/TAO/tao/Messaging/MessagingC.h +++ b/TAO/tao/Messaging/MessagingC.h @@ -55,11 +55,7 @@ #include "tao/Messaging/Messaging_RT_PolicyC.h" #include "tao/Messaging/Messaging_No_ImplC.h" #include "tao/Messaging/PollableC.h" -#if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER) -#include "tao/Messaging/OldExceptionHolderC.h" -#else #include "tao/Messaging/ExceptionHolderC.h" -#endif #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -213,7 +209,7 @@ namespace TAO #if !defined (_MESSAGING_REPLYHANDLER__TRAITS_) #define _MESSAGING_REPLYHANDLER__TRAITS_ - + template<> struct TAO_Messaging_Export Objref_Traits< ::Messaging::ReplyHandler> { diff --git a/TAO/tao/Messaging/MessagingC.inl b/TAO/tao/Messaging/MessagingC.inl index ee8e47e7f57..8ecf720126a 100644 --- a/TAO/tao/Messaging/MessagingC.inl +++ b/TAO/tao/Messaging/MessagingC.inl @@ -40,7 +40,7 @@ Messaging::ReplyHandler::ReplyHandler ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) ( + : ::CORBA::Object ( objref, _tao_collocated, servant, @@ -56,7 +56,7 @@ Messaging::ReplyHandler::ReplyHandler ( IOP::IOR *ior, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS ( ::CORBA, Object) (ior, oc), + : ::CORBA::Object (ior, oc), the_TAO_ReplyHandler_Proxy_Broker_ (0) { } diff --git a/TAO/tao/Messaging/MessagingS_T.h b/TAO/tao/Messaging/MessagingS_T.h index c111885476a..6c0a6279ac8 100644 --- a/TAO/tao/Messaging/MessagingS_T.h +++ b/TAO/tao/Messaging/MessagingS_T.h @@ -35,15 +35,15 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_root/root_sth.cpp:116 namespace POA_Messaging { - + // TAO_IDL - Generated from // be\be_visitor_interface/tie_sh.cpp:87 - + // TIE class: Refer to CORBA v2.2, Section 20.34.4 template <class T> class ReplyHandler_tie : public ReplyHandler @@ -58,41 +58,41 @@ namespace POA_Messaging ReplyHandler_tie ( T *tp, PortableServer::POA_ptr poa, - ::CORBA::Boolean release = 1 + ::CORBA::Boolean release = true ); // ctor with T*, ownership flag and a POA ~ReplyHandler_tie (void); // dtor - + // TIE specific functions T *_tied_object (void); // return the underlying object void _tied_object (T &obj); // set the underlying object - void _tied_object (T *obj, ::CORBA::Boolean release = 1); + void _tied_object (T *obj, ::CORBA::Boolean release = true); // set the underlying object and the ownership flag ::CORBA::Boolean _is_owner (void); // do we own it void _is_owner ( ::CORBA::Boolean b); // set the ownership - + // overridden ServantBase operations PortableServer::POA_ptr _default_POA ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ); - + private: T *ptr_; PortableServer::POA_var poa_; ::CORBA::Boolean rel_; - + // copy and assignment are not allowed ReplyHandler_tie (const ReplyHandler_tie &); void operator= (const ReplyHandler_tie &); }; } // module Messaging -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_codegen.cpp:1165 TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.cpp b/TAO/tao/Messaging/Messaging_No_ImplC.cpp index 9615102b4f1..456e69837f8 100644 --- a/TAO/tao/Messaging/Messaging_No_ImplC.cpp +++ b/TAO/tao/Messaging/Messaging_No_ImplC.cpp @@ -62,7 +62,7 @@ TAO::Objref_Traits<Messaging::RebindPolicy>::release ( Messaging::RebindPolicy_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } Messaging::RebindPolicy_ptr @@ -111,18 +111,18 @@ Messaging::RebindPolicy::_unchecked_narrow ( Messaging::RebindPolicy_ptr Messaging::RebindPolicy::_duplicate (RebindPolicy_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void Messaging::RebindPolicy::_tao_release (RebindPolicy_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } ::CORBA::Boolean @@ -169,10 +169,10 @@ Messaging::RebindPolicy::marshal (TAO_OutputCDR &) return false; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/structure_cs.cpp:66 -void +void Messaging::PriorityRange::_tao_any_destructor ( void *_tao_void_pointer ) @@ -200,7 +200,7 @@ TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::release ( Messaging::RequestPriorityPolicy_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } Messaging::RequestPriorityPolicy_ptr @@ -249,18 +249,18 @@ Messaging::RequestPriorityPolicy::_unchecked_narrow ( Messaging::RequestPriorityPolicy_ptr Messaging::RequestPriorityPolicy::_duplicate (RequestPriorityPolicy_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void Messaging::RequestPriorityPolicy::_tao_release (RequestPriorityPolicy_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } ::CORBA::Boolean @@ -325,7 +325,7 @@ TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::release ( Messaging::ReplyPriorityPolicy_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } Messaging::ReplyPriorityPolicy_ptr @@ -374,18 +374,18 @@ Messaging::ReplyPriorityPolicy::_unchecked_narrow ( Messaging::ReplyPriorityPolicy_ptr Messaging::ReplyPriorityPolicy::_duplicate (ReplyPriorityPolicy_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void Messaging::ReplyPriorityPolicy::_tao_release (ReplyPriorityPolicy_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } ::CORBA::Boolean @@ -450,7 +450,7 @@ TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::release ( Messaging::RequestStartTimePolicy_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } Messaging::RequestStartTimePolicy_ptr @@ -499,18 +499,18 @@ Messaging::RequestStartTimePolicy::_unchecked_narrow ( Messaging::RequestStartTimePolicy_ptr Messaging::RequestStartTimePolicy::_duplicate (RequestStartTimePolicy_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void Messaging::RequestStartTimePolicy::_tao_release (RequestStartTimePolicy_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } ::CORBA::Boolean @@ -575,7 +575,7 @@ TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::release ( Messaging::RequestEndTimePolicy_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } Messaging::RequestEndTimePolicy_ptr @@ -624,18 +624,18 @@ Messaging::RequestEndTimePolicy::_unchecked_narrow ( Messaging::RequestEndTimePolicy_ptr Messaging::RequestEndTimePolicy::_duplicate (RequestEndTimePolicy_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void Messaging::RequestEndTimePolicy::_tao_release (RequestEndTimePolicy_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } ::CORBA::Boolean @@ -700,7 +700,7 @@ TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::release ( Messaging::ReplyStartTimePolicy_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } Messaging::ReplyStartTimePolicy_ptr @@ -749,18 +749,18 @@ Messaging::ReplyStartTimePolicy::_unchecked_narrow ( Messaging::ReplyStartTimePolicy_ptr Messaging::ReplyStartTimePolicy::_duplicate (ReplyStartTimePolicy_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void Messaging::ReplyStartTimePolicy::_tao_release (ReplyStartTimePolicy_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } ::CORBA::Boolean @@ -825,7 +825,7 @@ TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::release ( Messaging::ReplyEndTimePolicy_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } Messaging::ReplyEndTimePolicy_ptr @@ -874,18 +874,18 @@ Messaging::ReplyEndTimePolicy::_unchecked_narrow ( Messaging::ReplyEndTimePolicy_ptr Messaging::ReplyEndTimePolicy::_duplicate (ReplyEndTimePolicy_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void Messaging::ReplyEndTimePolicy::_tao_release (ReplyEndTimePolicy_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } ::CORBA::Boolean @@ -950,7 +950,7 @@ TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::release ( Messaging::RelativeRequestTimeoutPolicy_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } Messaging::RelativeRequestTimeoutPolicy_ptr @@ -999,18 +999,18 @@ Messaging::RelativeRequestTimeoutPolicy::_unchecked_narrow ( Messaging::RelativeRequestTimeoutPolicy_ptr Messaging::RelativeRequestTimeoutPolicy::_duplicate (RelativeRequestTimeoutPolicy_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void Messaging::RelativeRequestTimeoutPolicy::_tao_release (RelativeRequestTimeoutPolicy_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } ::CORBA::Boolean @@ -1057,10 +1057,10 @@ Messaging::RelativeRequestTimeoutPolicy::marshal (TAO_OutputCDR &) return false; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/structure_cs.cpp:66 -void +void Messaging::RoutingTypeRange::_tao_any_destructor ( void *_tao_void_pointer ) @@ -1088,7 +1088,7 @@ TAO::Objref_Traits<Messaging::RoutingPolicy>::release ( Messaging::RoutingPolicy_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } Messaging::RoutingPolicy_ptr @@ -1137,18 +1137,18 @@ Messaging::RoutingPolicy::_unchecked_narrow ( Messaging::RoutingPolicy_ptr Messaging::RoutingPolicy::_duplicate (RoutingPolicy_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void Messaging::RoutingPolicy::_tao_release (RoutingPolicy_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } ::CORBA::Boolean @@ -1213,7 +1213,7 @@ TAO::Objref_Traits<Messaging::MaxHopsPolicy>::release ( Messaging::MaxHopsPolicy_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } Messaging::MaxHopsPolicy_ptr @@ -1262,18 +1262,18 @@ Messaging::MaxHopsPolicy::_unchecked_narrow ( Messaging::MaxHopsPolicy_ptr Messaging::MaxHopsPolicy::_duplicate (MaxHopsPolicy_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void Messaging::MaxHopsPolicy::_tao_release (MaxHopsPolicy_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } ::CORBA::Boolean @@ -1338,7 +1338,7 @@ TAO::Objref_Traits<Messaging::QueueOrderPolicy>::release ( Messaging::QueueOrderPolicy_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } Messaging::QueueOrderPolicy_ptr @@ -1387,18 +1387,18 @@ Messaging::QueueOrderPolicy::_unchecked_narrow ( Messaging::QueueOrderPolicy_ptr Messaging::QueueOrderPolicy::_duplicate (QueueOrderPolicy_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void Messaging::QueueOrderPolicy::_tao_release (QueueOrderPolicy_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } ::CORBA::Boolean diff --git a/TAO/tao/Messaging/Messaging_ORBInitializer.cpp b/TAO/tao/Messaging/Messaging_ORBInitializer.cpp index 16196807c78..82a57e50c9e 100644 --- a/TAO/tao/Messaging/Messaging_ORBInitializer.cpp +++ b/TAO/tao/Messaging/Messaging_ORBInitializer.cpp @@ -58,9 +58,6 @@ TAO_Messaging_ORBInitializer::register_value_factory ( PortableInterceptor::ORBInitInfo_ptr info ACE_ENV_ARG_DECL) { -#if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER) - ACE_UNUSED_ARG (info); -#else // Narrow to a TAO_ORBInitInfo object to get access to the // orb_core() TAO extension. TAO_ORBInitInfo_var tao_info = @@ -90,7 +87,6 @@ TAO_Messaging_ORBInitializer::register_value_factory ( base_factory ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; -#endif } void TAO_Messaging_ORBInitializer::register_policy_factories ( diff --git a/TAO/tao/Messaging/Messaging_Policy_i.cpp b/TAO/tao/Messaging/Messaging_Policy_i.cpp index 025f6018620..dc98c862747 100644 --- a/TAO/tao/Messaging/Messaging_Policy_i.cpp +++ b/TAO/tao/Messaging/Messaging_Policy_i.cpp @@ -1,4 +1,5 @@ // $Id$ + #include "tao/Messaging/Messaging_Policy_i.h" #include "tao/Stub.h" #include "tao/ORB_Core.h" @@ -19,9 +20,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy ( const TimeBase::TimeT& relative_expiry) - : ACE_NESTED_CLASS (CORBA, Object) () - , ACE_NESTED_CLASS (CORBA, Policy) () - , ACE_NESTED_CLASS (CORBA, LocalObject) () + : ::CORBA::Object () + , ::CORBA::Policy () + , ::CORBA::LocalObject () , Messaging::RelativeRoundtripTimeoutPolicy () , TAO_Local_RefCounted_Object () , relative_expiry_ (relative_expiry) @@ -30,9 +31,9 @@ TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy ( TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy ( const TAO_RelativeRoundtripTimeoutPolicy &rhs) - : ACE_NESTED_CLASS (CORBA, Object) () - , ACE_NESTED_CLASS (CORBA, Policy) () - , ACE_NESTED_CLASS (CORBA, LocalObject) () + : ::CORBA::Object () + , ::CORBA::Policy () + , ::CORBA::LocalObject () , Messaging::RelativeRoundtripTimeoutPolicy () , TAO_Local_RefCounted_Object () , relative_expiry_ (rhs.relative_expiry_) @@ -129,7 +130,7 @@ TAO_RelativeRoundtripTimeoutPolicy::create (const CORBA::Any& val ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE), CORBA::Policy::_nil ()); - TAO_RelativeRoundtripTimeoutPolicy *tmp; + TAO_RelativeRoundtripTimeoutPolicy *tmp = 0; ACE_NEW_THROW_EX (tmp, TAO_RelativeRoundtripTimeoutPolicy (value), CORBA::NO_MEMORY (TAO::VMCID, @@ -202,9 +203,9 @@ TAO_RelativeRoundtripTimeoutPolicy::set_time_value (ACE_Time_Value &time_value) #if (TAO_HAS_SYNC_SCOPE_POLICY == 1) TAO_Sync_Scope_Policy::TAO_Sync_Scope_Policy (Messaging::SyncScope synchronization) - : ACE_NESTED_CLASS (CORBA, Object) () - , ACE_NESTED_CLASS (CORBA, Policy) () - , ACE_NESTED_CLASS (CORBA, LocalObject) () + : ::CORBA::Object () + , ::CORBA::Policy () + , ::CORBA::LocalObject () , Messaging::SyncScopePolicy () , TAO_Local_RefCounted_Object () , synchronization_ (synchronization) @@ -212,9 +213,9 @@ TAO_Sync_Scope_Policy::TAO_Sync_Scope_Policy (Messaging::SyncScope synchronizati } TAO_Sync_Scope_Policy::TAO_Sync_Scope_Policy (const TAO_Sync_Scope_Policy &rhs) - : ACE_NESTED_CLASS (CORBA, Object) () - , ACE_NESTED_CLASS (CORBA, Policy) () - , ACE_NESTED_CLASS (CORBA, LocalObject) () + : ::CORBA::Object () + , ::CORBA::Policy () + , ::CORBA::LocalObject () , Messaging::SyncScopePolicy () , TAO_Local_RefCounted_Object () , synchronization_ (rhs.synchronization_) diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp index 9fef86e1a69..bc5c33ca558 100644 --- a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp +++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp @@ -62,7 +62,7 @@ TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::release ( Messaging::RelativeRoundtripTimeoutPolicy_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } Messaging::RelativeRoundtripTimeoutPolicy_ptr @@ -111,18 +111,18 @@ Messaging::RelativeRoundtripTimeoutPolicy::_unchecked_narrow ( Messaging::RelativeRoundtripTimeoutPolicy_ptr Messaging::RelativeRoundtripTimeoutPolicy::_duplicate (RelativeRoundtripTimeoutPolicy_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void Messaging::RelativeRoundtripTimeoutPolicy::_tao_release (RelativeRoundtripTimeoutPolicy_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } ::CORBA::Boolean diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp index df474e3ac0e..8eee8c74403 100644 --- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp +++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp @@ -62,7 +62,7 @@ TAO::Objref_Traits<Messaging::SyncScopePolicy>::release ( Messaging::SyncScopePolicy_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } Messaging::SyncScopePolicy_ptr @@ -111,18 +111,18 @@ Messaging::SyncScopePolicy::_unchecked_narrow ( Messaging::SyncScopePolicy_ptr Messaging::SyncScopePolicy::_duplicate (SyncScopePolicy_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void Messaging::SyncScopePolicy::_tao_release (SyncScopePolicy_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } ::CORBA::Boolean diff --git a/TAO/tao/Messaging/OldExceptionHolder.pidl b/TAO/tao/Messaging/OldExceptionHolder.pidl deleted file mode 100644 index 3e3cab1ef2d..00000000000 --- a/TAO/tao/Messaging/OldExceptionHolder.pidl +++ /dev/null @@ -1,37 +0,0 @@ -// -*- IDL -*- - -//============================================================================= -/** - * @file OldExceptionHolder.pidl - * - * $Id$ - * - * tao_idl - * -o orig -Gp -Gd -Ge 1 -GA -SS - * -Wb,export_macro=TAO_Messaging_Export - * -Wb,export_include=messaging_export.h - * -Wb,pre_include="ace/pre.h" - * -Wb,post_include="ace/post.h" -I$(TAO_ROOT) - * OldExceptionHolder.pidl - * - */ -//============================================================================= - -#ifndef TAO_MESSAGING_OLDEXCEPTIONHOLDER_PIDL -#define TAO_MESSAGING_OLDEXCEPTIONHOLDER_PIDL - -#include "tao/OctetSeq.pidl" - -#pragma prefix "omg.org" - -module Messaging -{ - /// Exception Delivery in the Callback Model - valuetype ExceptionHolder { - public boolean is_system_exception; - public boolean byte_order; - public CORBA::OctetSeq marshaled_exception; - }; -}; - -#endif /* TAO_MESSAGING_OLDEXCEPTIONHOLDER_PIDL */ diff --git a/TAO/tao/Messaging/OldExceptionHolderA.cpp b/TAO/tao/Messaging/OldExceptionHolderA.cpp deleted file mode 100644 index 133a1701ad9..00000000000 --- a/TAO/tao/Messaging/OldExceptionHolderA.cpp +++ /dev/null @@ -1,194 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -#include "tao/Messaging/OldExceptionHolderA.h" -#include "tao/AnyTypeCode/Null_RefCount_Policy.h" -#include "tao/AnyTypeCode/TypeCode_Constants.h" -#include "tao/AnyTypeCode/Alias_TypeCode_Static.h" -#include "tao/AnyTypeCode/Value_TypeCode_Static.h" -#include "tao/AnyTypeCode/TypeCode_Value_Field.h" -#include "tao/AnyTypeCode/Recursive_Type_TypeCode.h" -#include "tao/AnyTypeCode/Any.h" -#include "tao/CDR.h" -#include "tao/AnyTypeCode/Any.h" -#include "tao/AnyTypeCode/Any_Impl_T.h" - -// TAO_IDL - Generated from -// be\be_visitor_typecode/value_typecode.cpp:63 - - -#if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER) - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -// TAO_IDL - Generated from -// be\be_visitor_typecode/typecode_defn.cpp:937 - -static TAO::TypeCode::Value_Field<char const *, ::CORBA::TypeCode_ptr const *> const _tao_fields_Messaging_ExceptionHolder[] = - { - { "is_system_exception", &CORBA::_tc_boolean, ::CORBA::PUBLIC_MEMBER }, - { "byte_order", &CORBA::_tc_boolean, ::CORBA::PUBLIC_MEMBER }, - { "marshaled_exception", &CORBA::_tc_OctetSeq, ::CORBA::PUBLIC_MEMBER } - - }; -static TAO::TypeCode::Value<char const *, - ::CORBA::TypeCode_ptr const *, - TAO::TypeCode::Value_Field<char const *, ::CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy> - _tao_tc_Messaging_ExceptionHolder ( - ::CORBA::tk_value, - "IDL:omg.org/Messaging/ExceptionHolder:1.0", - "ExceptionHolder", - ::CORBA::VM_NONE, - &::CORBA::_tc_null, - _tao_fields_Messaging_ExceptionHolder, - 3); - -namespace Messaging -{ - ::CORBA::TypeCode_ptr const _tc_ExceptionHolder = - &_tao_tc_Messaging_ExceptionHolder; -} - - - -// TAO_IDL - Generated from -// be\be_visitor_valuetype/any_op_cs.cpp:57 - -namespace TAO -{ - template<> - ::CORBA::Boolean - Any_Impl_T<Messaging::ExceptionHolder>::to_value ( - ::CORBA::ValueBase *&_tao_elem - ) const - { - ::CORBA::add_ref (this->value_); - _tao_elem = this->value_; - return 1; - } -} - - - -#if defined (ACE_ANY_OPS_USE_NAMESPACE) - -namespace Messaging -{ - // Copying insertion. - void - operator<<= ( - ::CORBA::Any &_tao_any, - ExceptionHolder *_tao_elem - ) - { - ::CORBA::add_ref (_tao_elem); - _tao_any <<= &_tao_elem; - } - - // Non-copying insertion. - void - operator<<= ( - ::CORBA::Any &_tao_any, - ExceptionHolder **_tao_elem - ) - { - TAO::Any_Impl_T<ExceptionHolder>::insert ( - _tao_any, - ExceptionHolder::_tao_any_destructor, - _tc_ExceptionHolder, - *_tao_elem - ); - } - - ::CORBA::Boolean - operator>>= ( - const ::CORBA::Any &_tao_any, - ExceptionHolder *&_tao_elem - ) - { - return - TAO::Any_Impl_T<ExceptionHolder>::extract ( - _tao_any, - ExceptionHolder::_tao_any_destructor, - _tc_ExceptionHolder, - _tao_elem - ); - } - - -} - -#else -// Copying insertion. -void -operator<<= ( - ::CORBA::Any &_tao_any, - Messaging::ExceptionHolder *_tao_elem - ) -{ - ::CORBA::add_ref (_tao_elem); - _tao_any <<= &_tao_elem; -} - -// Non-copying insertion. -void -operator<<= ( - ::CORBA::Any &_tao_any, - Messaging::ExceptionHolder **_tao_elem - ) -{ - TAO::Any_Impl_T<Messaging::ExceptionHolder>::insert ( - _tao_any, - Messaging::ExceptionHolder::_tao_any_destructor, - Messaging::_tc_ExceptionHolder, - *_tao_elem - ); -} - -::CORBA::Boolean -operator>>= ( - const ::CORBA::Any &_tao_any, - Messaging::ExceptionHolder *&_tao_elem - ) -{ - return - TAO::Any_Impl_T<Messaging::ExceptionHolder>::extract ( - _tao_any, - Messaging::ExceptionHolder::_tao_any_destructor, - Messaging::_tc_ExceptionHolder, - _tao_elem - ); -} - - - -#endif - -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* */ diff --git a/TAO/tao/Messaging/OldExceptionHolderA.h b/TAO/tao/Messaging/OldExceptionHolderA.h deleted file mode 100644 index 11613cef0bd..00000000000 --- a/TAO/tao/Messaging/OldExceptionHolderA.h +++ /dev/null @@ -1,88 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -// TAO_IDL - Generated from -// be\be_codegen.cpp:754 - -#ifndef _TAO_IDL_OLDEXCEPTIONHOLDERA_H_ -#define _TAO_IDL_OLDEXCEPTIONHOLDERA_H_ - -#include /**/ "ace/pre.h" - -#include "tao/Messaging/messaging_export.h" -#include "tao/Messaging/OldExceptionHolderC.h" -#include "tao/AnyTypeCode/OctetSeqA.h" - -#if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER) - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:59 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace Messaging -{ - - // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:49 - - extern TAO_Messaging_Export ::CORBA::TypeCode_ptr const _tc_ExceptionHolder; - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:86 - -} // module Messaging - -// TAO_IDL - Generated from -// be\be_visitor_valuetype/any_op_ch.cpp:55 - - - -#if defined (ACE_ANY_OPS_USE_NAMESPACE) - -namespace Messaging -{ - TAO_Messaging_Export void operator<<= ( ::CORBA::Any &, ExceptionHolder *); // copying - TAO_Messaging_Export void operator<<= ( ::CORBA::Any &, ExceptionHolder **); // non-copying - TAO_Messaging_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ExceptionHolder *&); -} - -#else - -TAO_Messaging_Export void operator<<= (::CORBA::Any &, Messaging::ExceptionHolder *); // copying -TAO_Messaging_Export void operator<<= (::CORBA::Any &, Messaging::ExceptionHolder **); // non-copying -TAO_Messaging_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, Messaging::ExceptionHolder *&); - -#endif - -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* */ - -#include /**/ "ace/post.h" - -#endif /* ifndef */ diff --git a/TAO/tao/Messaging/OldExceptionHolderC.cpp b/TAO/tao/Messaging/OldExceptionHolderC.cpp deleted file mode 100644 index e26cccea3c6..00000000000 --- a/TAO/tao/Messaging/OldExceptionHolderC.cpp +++ /dev/null @@ -1,344 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -// TAO_IDL - Generated from -// be\be_codegen.cpp:277 - - -#include "tao/Messaging/OldExceptionHolderC.h" -#include "tao/CDR.h" -#include "tao/ORB_Core.h" - -#if !defined (__ACE_INLINE__) -#include "tao/Messaging/OldExceptionHolderC.inl" -#endif /* !defined INLINE */ - -#if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER) - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -// TAO_IDL - Generated from -// be\be_visitor_arg_traits.cpp:70 - -// Arg traits specializations. -namespace TAO -{ -} - - -// TAO_IDL - Generated from -// be\be_visitor_valuetype/valuetype_cs.cpp:66 - -void -TAO::Value_Traits<Messaging::ExceptionHolder>::add_ref ( - Messaging::ExceptionHolder * p - ) -{ - ::CORBA::add_ref (p); -} - -void -TAO::Value_Traits<Messaging::ExceptionHolder>::remove_ref ( - Messaging::ExceptionHolder * p - ) -{ - ::CORBA::remove_ref (p); -} - -void -TAO::Value_Traits<Messaging::ExceptionHolder>::release ( - Messaging::ExceptionHolder * p - ) -{ - ::CORBA::remove_ref (p); -} - -Messaging::ExceptionHolder * -Messaging::ExceptionHolder::_downcast ( ::CORBA::ValueBase *v) -{ - return dynamic_cast< ::Messaging::ExceptionHolder * > (v); -} - -const char * -Messaging::ExceptionHolder::_tao_obv_repository_id (void) const -{ - return this->_tao_obv_static_repository_id (); -} - -void -Messaging::ExceptionHolder::_tao_any_destructor (void *_tao_void_pointer) -{ - ExceptionHolder *_tao_tmp_pointer = - static_cast<ExceptionHolder *> (_tao_void_pointer); - ::CORBA::remove_ref (_tao_tmp_pointer); -} - -Messaging::ExceptionHolder::~ExceptionHolder (void) -{} - -::CORBA::Boolean Messaging::ExceptionHolder::_tao_marshal_v (TAO_OutputCDR & strm) const -{ - return this->_tao_marshal__Messaging_ExceptionHolder (strm); -} - -::CORBA::Boolean Messaging::ExceptionHolder::_tao_unmarshal_v (TAO_InputCDR & strm) -{ - return this->_tao_unmarshal__Messaging_ExceptionHolder (strm); -} - -::CORBA::Boolean Messaging::ExceptionHolder::_tao_unmarshal ( - TAO_InputCDR &strm, - ExceptionHolder *&new_object - ) -{ - ::CORBA::ValueBase *base = 0; - ::CORBA::ValueFactory_var factory; - ::CORBA::Boolean retval = - ::CORBA::ValueBase::_tao_unmarshal_pre ( - strm, - factory.out (), - base, - ExceptionHolder::_tao_obv_static_repository_id () - ); - - if (retval == 0) - { - return 0; - } - - if (factory.in () != 0) - { - base = factory->create_for_unmarshal (); - - if (base == 0) - { - return 0; // %! except.? - } - - retval = base->_tao_unmarshal_v (strm); - - if (retval == 0) - { - return 0; - } - } - - // Now base must be null or point to the unmarshaled object. - // Align the pointer to the right subobject. - new_object = ExceptionHolder::_downcast (base); - return retval; -} - -// TAO_IDL - Generated from -// be\be_visitor_valuetype/valuetype_init_cs.cpp:85 - -Messaging::ExceptionHolder_init::ExceptionHolder_init (void) -{ -} - -Messaging::ExceptionHolder_init::~ExceptionHolder_init (void) -{ -} - -Messaging::ExceptionHolder_init * -Messaging::ExceptionHolder_init::_downcast ( ::CORBA::ValueFactoryBase *v) -{ - return dynamic_cast< ::Messaging::ExceptionHolder_init * > (v); -} - -const char* -Messaging::ExceptionHolder_init::tao_repository_id (void) -{ - return ::Messaging::ExceptionHolder::_tao_obv_static_repository_id (); -} - -::CORBA::ValueBase * -Messaging::ExceptionHolder_init::create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL) -{ - ::CORBA::ValueBase *ret_val = 0; - ACE_NEW_THROW_EX ( - ret_val, - OBV_Messaging::ExceptionHolder, - ::CORBA::NO_MEMORY () - ); - return ret_val; -} - -// TAO_IDL - Generated from -// be\be_visitor_valuetype/valuetype_obv_cs.cpp:58 - -OBV_Messaging::ExceptionHolder::ExceptionHolder (void) -{} - -OBV_Messaging::ExceptionHolder::~ExceptionHolder (void) -{} - -::CORBA::Boolean -OBV_Messaging::ExceptionHolder::_tao_marshal__Messaging_ExceptionHolder (TAO_OutputCDR &strm) const -{ - return _tao_marshal_state (strm); -} - -::CORBA::Boolean -OBV_Messaging::ExceptionHolder::_tao_unmarshal__Messaging_ExceptionHolder (TAO_InputCDR &strm) -{ - return _tao_unmarshal_state (strm); -} - -// TAO_IDL - Generated from -// be\be_visitor_valuetype/field_cs.cpp:592 - -// Accessor to set the member. -void -OBV_Messaging::ExceptionHolder::is_system_exception (CORBA::Boolean val) -{ - // Set the value. - this->_pd_is_system_exception = val; -} - -// Retrieve the member -::CORBA::Boolean -OBV_Messaging::ExceptionHolder::is_system_exception (void) const -{ - return this->_pd_is_system_exception; -} - -// TAO_IDL - Generated from -// be\be_visitor_valuetype/field_cs.cpp:592 - -// Accessor to set the member. -void -OBV_Messaging::ExceptionHolder::byte_order (CORBA::Boolean val) -{ - // Set the value. - this->_pd_byte_order = val; -} - -// Retrieve the member -::CORBA::Boolean -OBV_Messaging::ExceptionHolder::byte_order (void) const -{ - return this->_pd_byte_order; -} - -// TAO_IDL - Generated from -// be\be_visitor_valuetype/field_cs.cpp:763 - -// Accessor to set the member. -void -OBV_Messaging::ExceptionHolder::marshaled_exception (const CORBA::OctetSeq &val) -{ - this->_pd_marshaled_exception = val; -} - -// Readonly get method. -const CORBA::OctetSeq & -OBV_Messaging::ExceptionHolder::marshaled_exception (void) const -{ - return this->_pd_marshaled_exception; -} - -// Read/write get method. -CORBA::OctetSeq & -OBV_Messaging::ExceptionHolder::marshaled_exception (void) -{ - return this->_pd_marshaled_exception; -} - -// TAO_IDL - Generated from -// be\be_valuetype.cpp:487 - -void -CORBA::add_ref (Messaging::ExceptionHolder * vt) -{ - if (vt != 0) - { - vt->_add_ref (); - } -} - -void -CORBA::remove_ref (Messaging::ExceptionHolder * vt) -{ - if (vt != 0) - { - vt->_remove_ref (); - } -} - -// TAO_IDL - Generated from -// be\be_visitor_valuetype/cdr_op_cs.cpp:73 - -::CORBA::Boolean -operator<< ( - TAO_OutputCDR &strm, - const Messaging::ExceptionHolder *_tao_valuetype - ) -{ - return - ::CORBA::ValueBase::_tao_marshal ( - strm, - _tao_valuetype, - reinterpret_cast<ptrdiff_t> (&Messaging::ExceptionHolder::_downcast) - ); -} - -::CORBA::Boolean -operator>> ( - TAO_InputCDR &strm, - Messaging::ExceptionHolder *&_tao_valuetype - ) -{ - return Messaging::ExceptionHolder::_tao_unmarshal (strm, _tao_valuetype); -} - -// TAO_IDL - Generated from -// be\be_visitor_valuetype/marshal_cs.cpp:44 - -::CORBA::Boolean -OBV_Messaging::ExceptionHolder::_tao_marshal_state (TAO_OutputCDR &strm) const -{ - return ( - (strm << ::ACE_OutputCDR::from_boolean (_pd_is_system_exception)) && - (strm << ::ACE_OutputCDR::from_boolean (_pd_byte_order)) && - (strm << _pd_marshaled_exception) - ); -} - -::CORBA::Boolean -OBV_Messaging::ExceptionHolder::_tao_unmarshal_state (TAO_InputCDR &strm) -{ - return ( - (strm >> ::ACE_InputCDR::to_boolean (_pd_is_system_exception)) && - (strm >> ::ACE_InputCDR::to_boolean (_pd_byte_order)) && - (strm >> _pd_marshaled_exception) - ); -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* */ diff --git a/TAO/tao/Messaging/OldExceptionHolderC.h b/TAO/tao/Messaging/OldExceptionHolderC.h deleted file mode 100644 index a3bcc4ed8bb..00000000000 --- a/TAO/tao/Messaging/OldExceptionHolderC.h +++ /dev/null @@ -1,305 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -// TAO_IDL - Generated from -// be\be_codegen.cpp:154 - -#ifndef _TAO_IDL_OLDEXCEPTIONHOLDERC_H_ -#define _TAO_IDL_OLDEXCEPTIONHOLDERC_H_ - -#include /**/ "ace/pre.h" - - -#include "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/Messaging/messaging_export.h" -#include "tao/Valuetype/ValueBase.h" -#include "tao/Valuetype/Valuetype_Adapter_Impl.h" -#include "tao/Valuetype/ValueFactory.h" -#include "tao/ORB.h" -#include "tao/SystemException.h" -#include "tao/Environment.h" -#include "tao/Valuetype/Value_VarOut_T.h" - -#include "tao/OctetSeqC.h" - -#if defined (TAO_EXPORT_MACRO) -#undef TAO_EXPORT_MACRO -#endif -#define TAO_EXPORT_MACRO TAO_Messaging_Export - -#if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER) - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:49 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace Messaging -{ - - // TAO_IDL - Generated from - // be\be_valuetype.cpp:524 - - - -#if !defined (_MESSAGING_EXCEPTIONHOLDER__VAR_OUT_CH_) -#define _MESSAGING_EXCEPTIONHOLDER__VAR_OUT_CH_ - - class ExceptionHolder; - typedef - TAO_Value_Var_T< - ExceptionHolder - > - ExceptionHolder_var; - - typedef - TAO_Value_Out_T< - ExceptionHolder - > - ExceptionHolder_out; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be\be_visitor_valuetype/valuetype_ch.cpp:61 - -#if !defined (_MESSAGING_EXCEPTIONHOLDER_CH_) -#define _MESSAGING_EXCEPTIONHOLDER_CH_ - - class TAO_Messaging_Export ExceptionHolder - : public virtual ::CORBA::ValueBase - { - public: - typedef ExceptionHolder_var _var_type; - - static ExceptionHolder* _downcast ( ::CORBA::ValueBase *); - - // (TAO extensions or internals) - static ::CORBA::Boolean _tao_unmarshal ( - TAO_InputCDR &, - ExceptionHolder *& - ); - - virtual const char* _tao_obv_repository_id (void) const; - - static const char* _tao_obv_static_repository_id (void); - - static void _tao_any_destructor (void *); - - // TAO_IDL - Generated from - // be\be_visitor_valuetype/field_ch.cpp:469 - - virtual void is_system_exception (::CORBA::Boolean) = 0; - virtual ::CORBA::Boolean is_system_exception (void) const = 0; - - // TAO_IDL - Generated from - // be\be_visitor_valuetype/field_ch.cpp:469 - - virtual void byte_order (::CORBA::Boolean) = 0; - virtual ::CORBA::Boolean byte_order (void) const = 0; - - // TAO_IDL - Generated from - // be\be_visitor_valuetype/field_ch.cpp:542 - - virtual void marshaled_exception (const CORBA::OctetSeq &) = 0; - virtual const CORBA::OctetSeq &marshaled_exception (void) const = 0; - virtual CORBA::OctetSeq &marshaled_exception (void) = 0; - - // TAO_IDL - Generated from - // be\be_visitor_valuetype/valuetype_ch.cpp:251 - - protected: - ExceptionHolder (void); - - virtual ~ExceptionHolder (void); - - virtual ::CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &) const; - virtual ::CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &); - - private: - ExceptionHolder (const ExceptionHolder &); - void operator= (const ExceptionHolder &); - - protected: - virtual ::CORBA::Boolean - _tao_marshal__Messaging_ExceptionHolder (TAO_OutputCDR &) const = 0; - - virtual ::CORBA::Boolean - _tao_unmarshal__Messaging_ExceptionHolder (TAO_InputCDR &) = 0; - }; - -#endif /* end #if !defined */ - -#if !defined (_MESSAGING_EXCEPTIONHOLDER___INIT_CH_) -#define _MESSAGING_EXCEPTIONHOLDER___INIT_CH_ - - // TAO_IDL - Generated from - // be\be_visitor_valuetype/valuetype_init_ch.cpp:72 - - class TAO_Messaging_Export ExceptionHolder_init : public virtual ::CORBA::ValueFactoryBase - { - public: - ExceptionHolder_init (void); - - static ExceptionHolder_init* _downcast ( ::CORBA::ValueFactoryBase *); - - virtual ::CORBA::ValueBase * - create_for_unmarshal ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS - ); - - // TAO-specific extensions - public: - virtual const char* tao_repository_id (void); - - protected: - virtual ~ExceptionHolder_init (void); - }; - -#endif /* end #if !defined */ - -// TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:78 - -} // module Messaging - -// TAO_IDL - Generated from -// be\be_visitor_valuetype/obv_module.cpp:55 - -namespace OBV_Messaging -{ - - // TAO_IDL - Generated from - // be\be_visitor_valuetype/valuetype_obv_ch.cpp:58 - -#if !defined (_MESSAGING_EXCEPTIONHOLDER___OBV_CH_) -#define _MESSAGING_EXCEPTIONHOLDER___OBV_CH_ - - // OBV_ class - class TAO_Messaging_Export ExceptionHolder - : public virtual Messaging::ExceptionHolder, - public virtual ::CORBA::DefaultValueRefCountBase - { - public: - ExceptionHolder (void); - virtual ~ExceptionHolder (void); - - // TAO_IDL - Generated from - // be\be_visitor_valuetype/field_ch.cpp:469 - - virtual void is_system_exception (::CORBA::Boolean); - virtual ::CORBA::Boolean is_system_exception (void) const; - - // TAO_IDL - Generated from - // be\be_visitor_valuetype/field_ch.cpp:469 - - virtual void byte_order (::CORBA::Boolean); - virtual ::CORBA::Boolean byte_order (void) const; - - // TAO_IDL - Generated from - // be\be_visitor_valuetype/field_ch.cpp:542 - - virtual void marshaled_exception (const CORBA::OctetSeq &); - virtual const CORBA::OctetSeq &marshaled_exception (void) const; - virtual CORBA::OctetSeq &marshaled_exception (void); - - protected: - virtual ::CORBA::Boolean - _tao_marshal__Messaging_ExceptionHolder (TAO_OutputCDR &) const; - - virtual ::CORBA::Boolean - _tao_unmarshal__Messaging_ExceptionHolder (TAO_InputCDR &); - - ::CORBA::Boolean _tao_marshal_state (TAO_OutputCDR &) const; - ::CORBA::Boolean _tao_unmarshal_state (TAO_InputCDR &); - - private: - ::CORBA::Boolean _pd_is_system_exception; - ::CORBA::Boolean _pd_byte_order; - CORBA::OctetSeq _pd_marshaled_exception; - }; - -#endif /* end #if !defined */ -} - -// TAO_IDL - Generated from -// be\be_visitor_traits.cpp:61 - -// Traits specializations. -namespace TAO -{ - -#if !defined (_MESSAGING_EXCEPTIONHOLDER__TRAITS_) -#define _MESSAGING_EXCEPTIONHOLDER__TRAITS_ - - template<> - struct TAO_Messaging_Export Value_Traits<Messaging::ExceptionHolder> - { - static void add_ref (Messaging::ExceptionHolder *); - static void remove_ref (Messaging::ExceptionHolder *); - static void release (Messaging::ExceptionHolder *); - }; - -#endif /* end #if !defined */ -} - -// TAO_IDL - Generated from -// be\be_valuetype.cpp:431 - -namespace CORBA -{ - extern TAO_Messaging_Export void add_ref (Messaging::ExceptionHolder *); - extern TAO_Messaging_Export void remove_ref (Messaging::ExceptionHolder *); -} - -// TAO_IDL - Generated from -// be\be_visitor_valuetype/cdr_op_ch.cpp:61 - -TAO_Messaging_Export ::CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ExceptionHolder *); -TAO_Messaging_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ExceptionHolder *&); - -// TAO_IDL - Generated from -// be\be_codegen.cpp:1040 - -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined (__ACE_INLINE__) -#include "tao/Messaging/OldExceptionHolderC.inl" -#endif /* defined INLINE */ - -#endif /* */ - -#include /**/ "ace/post.h" - -#endif /* ifndef */ - - diff --git a/TAO/tao/Messaging/OldExceptionHolderC.inl b/TAO/tao/Messaging/OldExceptionHolderC.inl deleted file mode 100644 index c2586897783..00000000000 --- a/TAO/tao/Messaging/OldExceptionHolderC.inl +++ /dev/null @@ -1,48 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - - -// TAO_IDL - Generated from -// be\be_visitor_valuetype/valuetype_ci.cpp:56 - -#if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER) - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_INLINE -Messaging::ExceptionHolder::ExceptionHolder (void) -{} - -ACE_INLINE const char* -Messaging::ExceptionHolder::_tao_obv_static_repository_id () -{ - return "IDL:omg.org/Messaging/ExceptionHolder:1.0"; -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* */ diff --git a/TAO/tao/Messaging/OldExceptionHolderS.h b/TAO/tao/Messaging/OldExceptionHolderS.h deleted file mode 100644 index de1c8620033..00000000000 --- a/TAO/tao/Messaging/OldExceptionHolderS.h +++ /dev/null @@ -1,30 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -// TAO_IDL - Generated from -// be\be_codegen.cpp:373 - diff --git a/TAO/tao/Messaging/PollableC.cpp b/TAO/tao/Messaging/PollableC.cpp index 71789ae1651..37bf32a28f1 100644 --- a/TAO/tao/Messaging/PollableC.cpp +++ b/TAO/tao/Messaging/PollableC.cpp @@ -71,7 +71,7 @@ TAO::Objref_Traits<CORBA::Pollable>::release ( CORBA::Pollable_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::Pollable_ptr @@ -120,18 +120,18 @@ CORBA::Pollable::_unchecked_narrow ( CORBA::Pollable_ptr CORBA::Pollable::_duplicate (Pollable_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void CORBA::Pollable::_tao_release (Pollable_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } ::CORBA::Boolean @@ -183,7 +183,7 @@ static TAO::TypeCode::Objref<char const *, ::CORBA::tk_local_interface, "IDL:omg.org/CORBA/Pollable:1.0", "Pollable"); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_Pollable = @@ -210,7 +210,7 @@ TAO::Objref_Traits<CORBA::DIIPollable>::release ( CORBA::DIIPollable_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::DIIPollable_ptr @@ -259,18 +259,18 @@ CORBA::DIIPollable::_unchecked_narrow ( CORBA::DIIPollable_ptr CORBA::DIIPollable::_duplicate (DIIPollable_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void CORBA::DIIPollable::_tao_release (DIIPollable_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } ::CORBA::Boolean @@ -326,7 +326,7 @@ static TAO::TypeCode::Objref<char const *, ::CORBA::tk_local_interface, "IDL:omg.org/CORBA/DIIPollable:1.0", "DIIPollable"); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_DIIPollable = @@ -353,7 +353,7 @@ TAO::Objref_Traits<CORBA::PollableSet>::release ( CORBA::PollableSet_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::PollableSet_ptr @@ -371,7 +371,7 @@ TAO::Objref_Traits<CORBA::PollableSet>::marshal ( return ::CORBA::Object::marshal (p, cdr); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 CORBA::PollableSet::NoPossiblePollable::NoPossiblePollable (void) @@ -397,7 +397,7 @@ CORBA::PollableSet::NoPossiblePollable::NoPossiblePollable (const ::CORBA::Polla CORBA::PollableSet::NoPossiblePollable& CORBA::PollableSet::NoPossiblePollable::operator= (const ::CORBA::PollableSet::NoPossiblePollable &_tao_excp) { - this->ACE_NESTED_CLASS ( ::CORBA, UserException)::operator= (_tao_excp); + this->::CORBA::UserException::operator= (_tao_excp); return *this; } @@ -480,11 +480,11 @@ static TAO::TypeCode::Struct<char const *, "NoPossiblePollable", _tao_fields_CORBA_PollableSet_NoPossiblePollable, 0); - + ::CORBA::TypeCode_ptr const CORBA::PollableSet::_tc_NoPossiblePollable = &_tao_tc_CORBA_PollableSet_NoPossiblePollable; -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 CORBA::PollableSet::UnknownPollable::UnknownPollable (void) @@ -510,7 +510,7 @@ CORBA::PollableSet::UnknownPollable::UnknownPollable (const ::CORBA::PollableSet CORBA::PollableSet::UnknownPollable& CORBA::PollableSet::UnknownPollable::operator= (const ::CORBA::PollableSet::UnknownPollable &_tao_excp) { - this->ACE_NESTED_CLASS ( ::CORBA, UserException)::operator= (_tao_excp); + this->::CORBA::UserException::operator= (_tao_excp); return *this; } @@ -593,7 +593,7 @@ static TAO::TypeCode::Struct<char const *, "UnknownPollable", _tao_fields_CORBA_PollableSet_UnknownPollable, 0); - + ::CORBA::TypeCode_ptr const CORBA::PollableSet::_tc_UnknownPollable = &_tao_tc_CORBA_PollableSet_UnknownPollable; @@ -628,18 +628,18 @@ CORBA::PollableSet::_unchecked_narrow ( CORBA::PollableSet_ptr CORBA::PollableSet::_duplicate (PollableSet_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void CORBA::PollableSet::_tao_release (PollableSet_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } ::CORBA::Boolean @@ -691,7 +691,7 @@ static TAO::TypeCode::Objref<char const *, ::CORBA::tk_local_interface, "IDL:omg.org/CORBA/PollableSet:1.0", "PollableSet"); - + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_PollableSet = diff --git a/TAO/tao/Messaging/TAO_ExtC.cpp b/TAO/tao/Messaging/TAO_ExtC.cpp index 03b5f8f2aa8..f52f8dc6c07 100644 --- a/TAO/tao/Messaging/TAO_ExtC.cpp +++ b/TAO/tao/Messaging/TAO_ExtC.cpp @@ -62,7 +62,7 @@ TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::release ( TAO::ConnectionTimeoutPolicy_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } TAO::ConnectionTimeoutPolicy_ptr @@ -111,18 +111,18 @@ TAO::ConnectionTimeoutPolicy::_unchecked_narrow ( TAO::ConnectionTimeoutPolicy_ptr TAO::ConnectionTimeoutPolicy::_duplicate (ConnectionTimeoutPolicy_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void TAO::ConnectionTimeoutPolicy::_tao_release (ConnectionTimeoutPolicy_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } ::CORBA::Boolean diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp index 36ed1030c9d..1a419ab1be5 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp @@ -235,36 +235,36 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceTemplate::_tao_unmarshal ( base, ObjectReferenceTemplate::_tao_obv_static_repository_id () ); - + if (retval == 0) { return 0; } - + if (factory.in () != 0) { base = factory->create_for_unmarshal (); - + if (base == 0) { return 0; // %! except.? } - + retval = base->_tao_unmarshal_v (strm); - + if (retval == 0) { return 0; } } - + // Now base must be null or point to the unmarshaled object. // Align the pointer to the right subobject. new_object = ObjectReferenceTemplate::_downcast (base); return retval; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CS_) @@ -276,7 +276,7 @@ PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (voi PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq ( CORBA::ULong max ) - : TAO_Unbounded_Valuetype_Sequence< + : TAO::unbounded_valuetype_sequence< PortableInterceptor::ObjectReferenceTemplate, PortableInterceptor::ObjectReferenceTemplate_var > @@ -289,7 +289,7 @@ PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq ( PortableInterceptor::ObjectReferenceTemplate * * buffer, CORBA::Boolean release ) - : TAO_Unbounded_Valuetype_Sequence< + : TAO::unbounded_valuetype_sequence< PortableInterceptor::ObjectReferenceTemplate, PortableInterceptor::ObjectReferenceTemplate_var > @@ -299,7 +299,7 @@ PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq ( PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq ( const ObjectReferenceTemplateSeq &seq ) - : TAO_Unbounded_Valuetype_Sequence< + : TAO::unbounded_valuetype_sequence< PortableInterceptor::ObjectReferenceTemplate, PortableInterceptor::ObjectReferenceTemplate_var > @@ -429,22 +429,7 @@ CORBA::Boolean operator<< ( const PortableInterceptor::ObjectReferenceTemplateSeq &_tao_sequence ) { - const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm << _tao_sequence[i].in ()); - } - - return _tao_marshal_flag; - } - - return false; + return TAO::marshal_sequence(strm, _tao_sequence); } CORBA::Boolean operator>> ( @@ -452,40 +437,7 @@ CORBA::Boolean operator>> ( PortableInterceptor::ObjectReferenceTemplateSeq &_tao_sequence ) { - CORBA::ULong _tao_seq_len; - - if (strm >> _tao_seq_len) - { - // Add a check to the length of the sequence - // to make sure it does not exceed the length - // of the stream. (See bug 58.) - if (_tao_seq_len > strm.length ()) - { - return false; - } - - // Set the length of the sequence. - _tao_sequence.length (_tao_seq_len); - - // If length is 0 we return true. - if (0 >= _tao_seq_len) - { - return true; - } - - // Retrieve all the elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm >> _tao_sequence[i].out ()); - } - - return _tao_marshal_flag; - - } - - return false; + return TAO::demarshal_sequence(strm, _tao_sequence); } #endif /* _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_CPP_ */ diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h index 7c95d92555f..eab7a48e6b6 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h @@ -50,8 +50,8 @@ #include "tao/SystemException.h" #include "tao/Environment.h" #include "tao/Object.h" -#include "tao/Valuetype/Sequence_T.h" #include "tao/Sequence_T.h" +#include "tao/Valuetype/Sequence_T.h" #include "tao/Valuetype/Value_VarOut_T.h" #include "tao/Seq_Var_T.h" #include "tao/Seq_Out_T.h" @@ -79,22 +79,22 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace PortableInterceptor { - + // TAO_IDL - Generated from // be\be_valuetype.cpp:524 - - + + #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__VAR_OUT_CH_ - + class ObjectReferenceFactory; typedef TAO_Value_Var_T< ObjectReferenceFactory > ObjectReferenceFactory_var; - + typedef TAO_Value_Out_T< ObjectReferenceFactory @@ -102,78 +102,78 @@ namespace PortableInterceptor ObjectReferenceFactory_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_valuetype/valuetype_ch.cpp:56 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY_CH_ - + class TAO_ORT_Export ObjectReferenceFactory : public virtual CORBA::ValueBase { public: typedef ObjectReferenceFactory_var _var_type; - + static ObjectReferenceFactory* _downcast (CORBA::ValueBase *); - + // (TAO extensions or internals) static CORBA::Boolean _tao_unmarshal ( TAO_InputCDR &, ObjectReferenceFactory *& ); - + virtual const char* _tao_obv_repository_id (void) const; - + static const char* _tao_obv_static_repository_id (void); - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_valuetype/valuetype_ch.cpp:404 - + public: virtual CORBA::Object_ptr make_object ( const char *, const ::PortableInterceptor::ObjectId & ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; - + // TAO_IDL - Generated from // be\be_visitor_valuetype/valuetype_ch.cpp:246 - + protected: ObjectReferenceFactory (void); - + virtual ~ObjectReferenceFactory (void); - - + + private: ObjectReferenceFactory (const ObjectReferenceFactory &); void operator= (const ObjectReferenceFactory &); - + }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + extern TAO_ORT_Export ::CORBA::TypeCode_ptr const _tc_ObjectReferenceFactory; - + // TAO_IDL - Generated from // be\be_valuetype.cpp:524 - - + + #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__VAR_OUT_CH_ - + class ObjectReferenceTemplate; typedef TAO_Value_Var_T< ObjectReferenceTemplate > ObjectReferenceTemplate_var; - + typedef TAO_Value_Out_T< ObjectReferenceTemplate @@ -181,111 +181,102 @@ namespace PortableInterceptor ObjectReferenceTemplate_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_valuetype/valuetype_ch.cpp:56 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE_CH_ - + class TAO_ORT_Export ObjectReferenceTemplate : public virtual ObjectReferenceFactory { public: typedef ObjectReferenceTemplate_var _var_type; - + static ObjectReferenceTemplate* _downcast (CORBA::ValueBase *); - + // (TAO extensions or internals) static CORBA::Boolean _tao_unmarshal ( TAO_InputCDR &, ObjectReferenceTemplate *& ); - + virtual const char* _tao_obv_repository_id (void) const; - + static const char* _tao_obv_static_repository_id (void); - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_valuetype/valuetype_ch.cpp:404 - + public: virtual char * server_id ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) = 0; - + // TAO_IDL - Generated from // be\be_visitor_valuetype/valuetype_ch.cpp:404 - + public: virtual char * orb_id ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) = 0; - + // TAO_IDL - Generated from // be\be_visitor_valuetype/valuetype_ch.cpp:404 - + public: virtual ::PortableInterceptor::AdapterName * adapter_name ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) = 0; - + // TAO_IDL - Generated from // be\be_visitor_valuetype/valuetype_ch.cpp:246 - + protected: ObjectReferenceTemplate (void); - + virtual ~ObjectReferenceTemplate (void); - - + + private: ObjectReferenceTemplate (const ObjectReferenceTemplate &); void operator= (const ObjectReferenceTemplate &); - + }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + extern TAO_ORT_Export ::CORBA::TypeCode_ptr const _tc_ObjectReferenceTemplate; - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_ - + class ObjectReferenceTemplateSeq; - + typedef - TAO_MngSeq_Var_T< - ObjectReferenceTemplateSeq, - TAO_Valuetype_Manager< - ObjectReferenceTemplate, - ObjectReferenceTemplate_var - > + TAO_VarSeq_Var_T< + ObjectReferenceTemplateSeq > ObjectReferenceTemplateSeq_var; - + typedef - TAO_MngSeq_Out_T< - ObjectReferenceTemplateSeq, - ObjectReferenceTemplateSeq_var, - TAO_Valuetype_Manager< - ObjectReferenceTemplate, - ObjectReferenceTemplate_var - > + TAO_Seq_Out_T< + ObjectReferenceTemplateSeq > ObjectReferenceTemplateSeq_out; - + class TAO_ORT_Export ObjectReferenceTemplateSeq : public - TAO_Unbounded_Valuetype_Sequence< + TAO::unbounded_valuetype_sequence< ObjectReferenceTemplate, ObjectReferenceTemplate_var > @@ -296,22 +287,22 @@ namespace PortableInterceptor ObjectReferenceTemplateSeq ( CORBA::ULong max, CORBA::ULong length, - ObjectReferenceTemplate ** buffer, - CORBA::Boolean release = 0 + ObjectReferenceTemplate ** buffer, + CORBA::Boolean release = false ); ObjectReferenceTemplateSeq (const ObjectReferenceTemplateSeq &); ~ObjectReferenceTemplateSeq (void); - + static void _tao_any_destructor (void *); - + typedef ObjectReferenceTemplateSeq_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + extern TAO_ORT_Export ::CORBA::TypeCode_ptr const _tc_ObjectReferenceTemplateSeq; // TAO_IDL - Generated from @@ -335,7 +326,7 @@ namespace TAO #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__TRAITS_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__TRAITS_CH_ - + template<> struct TAO_ORT_Export Value_Traits<PortableInterceptor::ObjectReferenceFactory> { @@ -348,7 +339,7 @@ namespace TAO #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__TRAITS_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__TRAITS_CH_ - + template<> struct TAO_ORT_Export Value_Traits<PortableInterceptor::ObjectReferenceTemplate> { diff --git a/TAO/tao/PI/ClientRequestInfo.cpp b/TAO/tao/PI/ClientRequestInfo.cpp index c2d9ec79284..d11d48b1d2e 100644 --- a/TAO/tao/PI/ClientRequestInfo.cpp +++ b/TAO/tao/PI/ClientRequestInfo.cpp @@ -10,7 +10,6 @@ ACE_RCSID (PI, #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/ExceptionA.h" -#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/PI/PICurrent.h" #include "tao/PI/RequestInfo_Util.h" diff --git a/TAO/tao/PI/ClientRequestInfo.h b/TAO/tao/PI/ClientRequestInfo.h index 3634478a9b0..40c83ff4c70 100644 --- a/TAO/tao/PI/ClientRequestInfo.h +++ b/TAO/tao/PI/ClientRequestInfo.h @@ -31,6 +31,7 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/PI/ClientRequestInfoC.h" #include "tao/PI/PIForwardRequestC.h" #include "tao/PI/PICurrent_Impl.h" diff --git a/TAO/tao/PI_Server/ServerRequestInfo.h b/TAO/tao/PI_Server/ServerRequestInfo.h index afce3a85690..1ba2e9c0026 100644 --- a/TAO/tao/PI_Server/ServerRequestInfo.h +++ b/TAO/tao/PI_Server/ServerRequestInfo.h @@ -27,12 +27,13 @@ #if (TAO_HAS_INTERCEPTORS == 1) +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/PI_Server/ServerRequestInfoC.h" +#include "tao/PI/PIForwardRequestC.h" #include "tao/LocalObject.h" #include "tao/OctetSeqC.h" #include "tao/TAO_Server_Request.h" #include "tao/PortableInterceptorC.h" -#include "tao/PI/PIForwardRequestC.h" #if defined(_MSC_VER) #pragma warning(push) diff --git a/TAO/tao/RTCORBA/RTCORBAC.cpp b/TAO/tao/RTCORBA/RTCORBAC.cpp index 59f945ff53b..fa163250e7a 100644 --- a/TAO/tao/RTCORBA/RTCORBAC.cpp +++ b/TAO/tao/RTCORBA/RTCORBAC.cpp @@ -67,10 +67,10 @@ RTCORBA::ProtocolProperties::_tao_decode (TAO_InputCDR &) return 1; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/structure_cs.cpp:66 -void +void RTCORBA::ThreadpoolLane::_tao_any_destructor ( void *_tao_void_pointer ) @@ -80,7 +80,7 @@ RTCORBA::ThreadpoolLane::_tao_any_destructor ( delete _tao_tmp_pointer; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_RTCORBA_THREADPOOLLANES_CS_) @@ -92,7 +92,7 @@ RTCORBA::ThreadpoolLanes::ThreadpoolLanes (void) RTCORBA::ThreadpoolLanes::ThreadpoolLanes ( CORBA::ULong max ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< RTCORBA::ThreadpoolLane > (max) @@ -104,7 +104,7 @@ RTCORBA::ThreadpoolLanes::ThreadpoolLanes ( RTCORBA::ThreadpoolLane * buffer, CORBA::Boolean release ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< RTCORBA::ThreadpoolLane > (max, length, buffer, release) @@ -113,7 +113,7 @@ RTCORBA::ThreadpoolLanes::ThreadpoolLanes ( RTCORBA::ThreadpoolLanes::ThreadpoolLanes ( const ThreadpoolLanes &seq ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< RTCORBA::ThreadpoolLane > (seq) @@ -151,7 +151,7 @@ TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::release ( RTCORBA::PriorityModelPolicy_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } RTCORBA::PriorityModelPolicy_ptr @@ -175,12 +175,12 @@ RTCORBA::PriorityModelPolicy::PriorityModelPolicy (void) RTCORBA::PriorityModelPolicy::~PriorityModelPolicy (void) {} -void +void RTCORBA::PriorityModelPolicy::_tao_any_destructor (void *_tao_void_pointer) { PriorityModelPolicy *_tao_tmp_pointer = static_cast<PriorityModelPolicy *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } RTCORBA::PriorityModelPolicy_ptr @@ -208,18 +208,18 @@ RTCORBA::PriorityModelPolicy::_unchecked_narrow ( RTCORBA::PriorityModelPolicy_ptr RTCORBA::PriorityModelPolicy::_duplicate (PriorityModelPolicy_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void RTCORBA::PriorityModelPolicy::_tao_release (PriorityModelPolicy_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -284,7 +284,7 @@ TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::release ( RTCORBA::ThreadpoolPolicy_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } RTCORBA::ThreadpoolPolicy_ptr @@ -308,12 +308,12 @@ RTCORBA::ThreadpoolPolicy::ThreadpoolPolicy (void) RTCORBA::ThreadpoolPolicy::~ThreadpoolPolicy (void) {} -void +void RTCORBA::ThreadpoolPolicy::_tao_any_destructor (void *_tao_void_pointer) { ThreadpoolPolicy *_tao_tmp_pointer = static_cast<ThreadpoolPolicy *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } RTCORBA::ThreadpoolPolicy_ptr @@ -341,18 +341,18 @@ RTCORBA::ThreadpoolPolicy::_unchecked_narrow ( RTCORBA::ThreadpoolPolicy_ptr RTCORBA::ThreadpoolPolicy::_duplicate (ThreadpoolPolicy_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void RTCORBA::ThreadpoolPolicy::_tao_release (ThreadpoolPolicy_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -417,7 +417,7 @@ TAO::Objref_Traits<RTCORBA::ProtocolProperties>::release ( RTCORBA::ProtocolProperties_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } RTCORBA::ProtocolProperties_ptr @@ -441,12 +441,12 @@ RTCORBA::ProtocolProperties::ProtocolProperties (void) RTCORBA::ProtocolProperties::~ProtocolProperties (void) {} -void +void RTCORBA::ProtocolProperties::_tao_any_destructor (void *_tao_void_pointer) { ProtocolProperties *_tao_tmp_pointer = static_cast<ProtocolProperties *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } RTCORBA::ProtocolProperties_ptr @@ -474,18 +474,18 @@ RTCORBA::ProtocolProperties::_unchecked_narrow ( RTCORBA::ProtocolProperties_ptr RTCORBA::ProtocolProperties::_duplicate (ProtocolProperties_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void RTCORBA::ProtocolProperties::_tao_release (ProtocolProperties_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -528,10 +528,10 @@ RTCORBA::ProtocolProperties::marshal (TAO_OutputCDR &) return false; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/structure_cs.cpp:66 -void +void RTCORBA::Protocol::_tao_any_destructor ( void *_tao_void_pointer ) @@ -541,7 +541,7 @@ RTCORBA::Protocol::_tao_any_destructor ( delete _tao_tmp_pointer; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_RTCORBA_PROTOCOLLIST_CS_) @@ -553,7 +553,7 @@ RTCORBA::ProtocolList::ProtocolList (void) RTCORBA::ProtocolList::ProtocolList ( CORBA::ULong max ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< RTCORBA::Protocol > (max) @@ -565,7 +565,7 @@ RTCORBA::ProtocolList::ProtocolList ( RTCORBA::Protocol * buffer, CORBA::Boolean release ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< RTCORBA::Protocol > (max, length, buffer, release) @@ -574,7 +574,7 @@ RTCORBA::ProtocolList::ProtocolList ( RTCORBA::ProtocolList::ProtocolList ( const ProtocolList &seq ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< RTCORBA::Protocol > (seq) @@ -612,7 +612,7 @@ TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::release ( RTCORBA::ServerProtocolPolicy_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } RTCORBA::ServerProtocolPolicy_ptr @@ -636,12 +636,12 @@ RTCORBA::ServerProtocolPolicy::ServerProtocolPolicy (void) RTCORBA::ServerProtocolPolicy::~ServerProtocolPolicy (void) {} -void +void RTCORBA::ServerProtocolPolicy::_tao_any_destructor (void *_tao_void_pointer) { ServerProtocolPolicy *_tao_tmp_pointer = static_cast<ServerProtocolPolicy *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } RTCORBA::ServerProtocolPolicy_ptr @@ -669,18 +669,18 @@ RTCORBA::ServerProtocolPolicy::_unchecked_narrow ( RTCORBA::ServerProtocolPolicy_ptr RTCORBA::ServerProtocolPolicy::_duplicate (ServerProtocolPolicy_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void RTCORBA::ServerProtocolPolicy::_tao_release (ServerProtocolPolicy_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -745,7 +745,7 @@ TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::release ( RTCORBA::ClientProtocolPolicy_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } RTCORBA::ClientProtocolPolicy_ptr @@ -769,12 +769,12 @@ RTCORBA::ClientProtocolPolicy::ClientProtocolPolicy (void) RTCORBA::ClientProtocolPolicy::~ClientProtocolPolicy (void) {} -void +void RTCORBA::ClientProtocolPolicy::_tao_any_destructor (void *_tao_void_pointer) { ClientProtocolPolicy *_tao_tmp_pointer = static_cast<ClientProtocolPolicy *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } RTCORBA::ClientProtocolPolicy_ptr @@ -802,18 +802,18 @@ RTCORBA::ClientProtocolPolicy::_unchecked_narrow ( RTCORBA::ClientProtocolPolicy_ptr RTCORBA::ClientProtocolPolicy::_duplicate (ClientProtocolPolicy_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void RTCORBA::ClientProtocolPolicy::_tao_release (ClientProtocolPolicy_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -878,7 +878,7 @@ TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::release ( RTCORBA::PrivateConnectionPolicy_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } RTCORBA::PrivateConnectionPolicy_ptr @@ -902,12 +902,12 @@ RTCORBA::PrivateConnectionPolicy::PrivateConnectionPolicy (void) RTCORBA::PrivateConnectionPolicy::~PrivateConnectionPolicy (void) {} -void +void RTCORBA::PrivateConnectionPolicy::_tao_any_destructor (void *_tao_void_pointer) { PrivateConnectionPolicy *_tao_tmp_pointer = static_cast<PrivateConnectionPolicy *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } RTCORBA::PrivateConnectionPolicy_ptr @@ -935,18 +935,18 @@ RTCORBA::PrivateConnectionPolicy::_unchecked_narrow ( RTCORBA::PrivateConnectionPolicy_ptr RTCORBA::PrivateConnectionPolicy::_duplicate (PrivateConnectionPolicy_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void RTCORBA::PrivateConnectionPolicy::_tao_release (PrivateConnectionPolicy_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -1011,7 +1011,7 @@ TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::release ( RTCORBA::TCPProtocolProperties_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } RTCORBA::TCPProtocolProperties_ptr @@ -1035,12 +1035,12 @@ RTCORBA::TCPProtocolProperties::TCPProtocolProperties (void) RTCORBA::TCPProtocolProperties::~TCPProtocolProperties (void) {} -void +void RTCORBA::TCPProtocolProperties::_tao_any_destructor (void *_tao_void_pointer) { TCPProtocolProperties *_tao_tmp_pointer = static_cast<TCPProtocolProperties *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } RTCORBA::TCPProtocolProperties_ptr @@ -1068,18 +1068,18 @@ RTCORBA::TCPProtocolProperties::_unchecked_narrow ( RTCORBA::TCPProtocolProperties_ptr RTCORBA::TCPProtocolProperties::_duplicate (TCPProtocolProperties_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void RTCORBA::TCPProtocolProperties::_tao_release (TCPProtocolProperties_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -1144,7 +1144,7 @@ TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::release ( RTCORBA::GIOPProtocolProperties_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } RTCORBA::GIOPProtocolProperties_ptr @@ -1168,12 +1168,12 @@ RTCORBA::GIOPProtocolProperties::GIOPProtocolProperties (void) RTCORBA::GIOPProtocolProperties::~GIOPProtocolProperties (void) {} -void +void RTCORBA::GIOPProtocolProperties::_tao_any_destructor (void *_tao_void_pointer) { GIOPProtocolProperties *_tao_tmp_pointer = static_cast<GIOPProtocolProperties *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } RTCORBA::GIOPProtocolProperties_ptr @@ -1201,18 +1201,18 @@ RTCORBA::GIOPProtocolProperties::_unchecked_narrow ( RTCORBA::GIOPProtocolProperties_ptr RTCORBA::GIOPProtocolProperties::_duplicate (GIOPProtocolProperties_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void RTCORBA::GIOPProtocolProperties::_tao_release (GIOPProtocolProperties_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -1277,7 +1277,7 @@ TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::release ( RTCORBA::UnixDomainProtocolProperties_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } RTCORBA::UnixDomainProtocolProperties_ptr @@ -1301,12 +1301,12 @@ RTCORBA::UnixDomainProtocolProperties::UnixDomainProtocolProperties (void) RTCORBA::UnixDomainProtocolProperties::~UnixDomainProtocolProperties (void) {} -void +void RTCORBA::UnixDomainProtocolProperties::_tao_any_destructor (void *_tao_void_pointer) { UnixDomainProtocolProperties *_tao_tmp_pointer = static_cast<UnixDomainProtocolProperties *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } RTCORBA::UnixDomainProtocolProperties_ptr @@ -1334,18 +1334,18 @@ RTCORBA::UnixDomainProtocolProperties::_unchecked_narrow ( RTCORBA::UnixDomainProtocolProperties_ptr RTCORBA::UnixDomainProtocolProperties::_duplicate (UnixDomainProtocolProperties_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void RTCORBA::UnixDomainProtocolProperties::_tao_release (UnixDomainProtocolProperties_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -1410,7 +1410,7 @@ TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::release ( RTCORBA::SharedMemoryProtocolProperties_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } RTCORBA::SharedMemoryProtocolProperties_ptr @@ -1434,12 +1434,12 @@ RTCORBA::SharedMemoryProtocolProperties::SharedMemoryProtocolProperties (void) RTCORBA::SharedMemoryProtocolProperties::~SharedMemoryProtocolProperties (void) {} -void +void RTCORBA::SharedMemoryProtocolProperties::_tao_any_destructor (void *_tao_void_pointer) { SharedMemoryProtocolProperties *_tao_tmp_pointer = static_cast<SharedMemoryProtocolProperties *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } RTCORBA::SharedMemoryProtocolProperties_ptr @@ -1467,18 +1467,18 @@ RTCORBA::SharedMemoryProtocolProperties::_unchecked_narrow ( RTCORBA::SharedMemoryProtocolProperties_ptr RTCORBA::SharedMemoryProtocolProperties::_duplicate (SharedMemoryProtocolProperties_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void RTCORBA::SharedMemoryProtocolProperties::_tao_release (SharedMemoryProtocolProperties_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -1543,7 +1543,7 @@ TAO::Objref_Traits<RTCORBA::UserDatagramProtocolProperties>::release ( RTCORBA::UserDatagramProtocolProperties_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } RTCORBA::UserDatagramProtocolProperties_ptr @@ -1567,12 +1567,12 @@ RTCORBA::UserDatagramProtocolProperties::UserDatagramProtocolProperties (void) RTCORBA::UserDatagramProtocolProperties::~UserDatagramProtocolProperties (void) {} -void +void RTCORBA::UserDatagramProtocolProperties::_tao_any_destructor (void *_tao_void_pointer) { UserDatagramProtocolProperties *_tao_tmp_pointer = static_cast<UserDatagramProtocolProperties *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } RTCORBA::UserDatagramProtocolProperties_ptr @@ -1600,18 +1600,18 @@ RTCORBA::UserDatagramProtocolProperties::_unchecked_narrow ( RTCORBA::UserDatagramProtocolProperties_ptr RTCORBA::UserDatagramProtocolProperties::_duplicate (UserDatagramProtocolProperties_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void RTCORBA::UserDatagramProtocolProperties::_tao_release (UserDatagramProtocolProperties_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -1676,7 +1676,7 @@ TAO::Objref_Traits<RTCORBA::StreamControlProtocolProperties>::release ( RTCORBA::StreamControlProtocolProperties_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } RTCORBA::StreamControlProtocolProperties_ptr @@ -1700,12 +1700,12 @@ RTCORBA::StreamControlProtocolProperties::StreamControlProtocolProperties (void) RTCORBA::StreamControlProtocolProperties::~StreamControlProtocolProperties (void) {} -void +void RTCORBA::StreamControlProtocolProperties::_tao_any_destructor (void *_tao_void_pointer) { StreamControlProtocolProperties *_tao_tmp_pointer = static_cast<StreamControlProtocolProperties *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } RTCORBA::StreamControlProtocolProperties_ptr @@ -1733,18 +1733,18 @@ RTCORBA::StreamControlProtocolProperties::_unchecked_narrow ( RTCORBA::StreamControlProtocolProperties_ptr RTCORBA::StreamControlProtocolProperties::_duplicate (StreamControlProtocolProperties_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void RTCORBA::StreamControlProtocolProperties::_tao_release (StreamControlProtocolProperties_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -1791,10 +1791,10 @@ RTCORBA::StreamControlProtocolProperties::marshal (TAO_OutputCDR &) return false; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_structure/structure_cs.cpp:66 -void +void RTCORBA::PriorityBand::_tao_any_destructor ( void *_tao_void_pointer ) @@ -1804,7 +1804,7 @@ RTCORBA::PriorityBand::_tao_any_destructor ( delete _tao_tmp_pointer; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_RTCORBA_PRIORITYBANDS_CS_) @@ -1816,7 +1816,7 @@ RTCORBA::PriorityBands::PriorityBands (void) RTCORBA::PriorityBands::PriorityBands ( CORBA::ULong max ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< RTCORBA::PriorityBand > (max) @@ -1828,7 +1828,7 @@ RTCORBA::PriorityBands::PriorityBands ( RTCORBA::PriorityBand * buffer, CORBA::Boolean release ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< RTCORBA::PriorityBand > (max, length, buffer, release) @@ -1837,7 +1837,7 @@ RTCORBA::PriorityBands::PriorityBands ( RTCORBA::PriorityBands::PriorityBands ( const PriorityBands &seq ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< RTCORBA::PriorityBand > (seq) @@ -1875,7 +1875,7 @@ TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::release ( RTCORBA::PriorityBandedConnectionPolicy_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } RTCORBA::PriorityBandedConnectionPolicy_ptr @@ -1899,12 +1899,12 @@ RTCORBA::PriorityBandedConnectionPolicy::PriorityBandedConnectionPolicy (void) RTCORBA::PriorityBandedConnectionPolicy::~PriorityBandedConnectionPolicy (void) {} -void +void RTCORBA::PriorityBandedConnectionPolicy::_tao_any_destructor (void *_tao_void_pointer) { PriorityBandedConnectionPolicy *_tao_tmp_pointer = static_cast<PriorityBandedConnectionPolicy *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } RTCORBA::PriorityBandedConnectionPolicy_ptr @@ -1932,18 +1932,18 @@ RTCORBA::PriorityBandedConnectionPolicy::_unchecked_narrow ( RTCORBA::PriorityBandedConnectionPolicy_ptr RTCORBA::PriorityBandedConnectionPolicy::_duplicate (PriorityBandedConnectionPolicy_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void RTCORBA::PriorityBandedConnectionPolicy::_tao_release (PriorityBandedConnectionPolicy_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -2008,7 +2008,7 @@ TAO::Objref_Traits<RTCORBA::Current>::release ( RTCORBA::Current_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } RTCORBA::Current_ptr @@ -2032,12 +2032,12 @@ RTCORBA::Current::Current (void) RTCORBA::Current::~Current (void) {} -void +void RTCORBA::Current::_tao_any_destructor (void *_tao_void_pointer) { Current *_tao_tmp_pointer = static_cast<Current *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } RTCORBA::Current_ptr @@ -2065,18 +2065,18 @@ RTCORBA::Current::_unchecked_narrow ( RTCORBA::Current_ptr RTCORBA::Current::_duplicate (Current_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void RTCORBA::Current::_tao_release (Current_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -2141,7 +2141,7 @@ TAO::Objref_Traits<RTCORBA::Mutex>::release ( RTCORBA::Mutex_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } RTCORBA::Mutex_ptr @@ -2165,12 +2165,12 @@ RTCORBA::Mutex::Mutex (void) RTCORBA::Mutex::~Mutex (void) {} -void +void RTCORBA::Mutex::_tao_any_destructor (void *_tao_void_pointer) { Mutex *_tao_tmp_pointer = static_cast<Mutex *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } RTCORBA::Mutex_ptr @@ -2198,18 +2198,18 @@ RTCORBA::Mutex::_unchecked_narrow ( RTCORBA::Mutex_ptr RTCORBA::Mutex::_duplicate (Mutex_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void RTCORBA::Mutex::_tao_release (Mutex_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -2270,7 +2270,7 @@ TAO::Objref_Traits<RTCORBA::RTORB>::release ( RTCORBA::RTORB_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } RTCORBA::RTORB_ptr @@ -2288,7 +2288,7 @@ TAO::Objref_Traits<RTCORBA::RTORB>::marshal ( return CORBA::Object::marshal (p, cdr); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 RTCORBA::RTORB::MutexNotFound::MutexNotFound (void) @@ -2314,7 +2314,7 @@ RTCORBA::RTORB::MutexNotFound::MutexNotFound (const ::RTCORBA::RTORB::MutexNotFo RTCORBA::RTORB::MutexNotFound& RTCORBA::RTORB::MutexNotFound::operator= (const ::RTCORBA::RTORB::MutexNotFound &_tao_excp) { - this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp); + this->::CORBA::UserException::operator= (_tao_excp); return *this; } @@ -2383,7 +2383,7 @@ CORBA::TypeCode_ptr RTCORBA::RTORB::MutexNotFound::_tao_type (void) const return ::RTCORBA::RTORB::_tc_MutexNotFound; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 RTCORBA::RTORB::InvalidThreadpool::InvalidThreadpool (void) @@ -2409,7 +2409,7 @@ RTCORBA::RTORB::InvalidThreadpool::InvalidThreadpool (const ::RTCORBA::RTORB::In RTCORBA::RTORB::InvalidThreadpool& RTCORBA::RTORB::InvalidThreadpool::operator= (const ::RTCORBA::RTORB::InvalidThreadpool &_tao_excp) { - this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp); + this->::CORBA::UserException::operator= (_tao_excp); return *this; } @@ -2484,12 +2484,12 @@ RTCORBA::RTORB::RTORB (void) RTCORBA::RTORB::~RTORB (void) {} -void +void RTCORBA::RTORB::_tao_any_destructor (void *_tao_void_pointer) { RTORB *_tao_tmp_pointer = static_cast<RTORB *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } RTCORBA::RTORB_ptr @@ -2517,18 +2517,18 @@ RTCORBA::RTORB::_unchecked_narrow ( RTCORBA::RTORB_ptr RTCORBA::RTORB::_duplicate (RTORB_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void RTCORBA::RTORB::_tao_release (RTORB_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -2607,22 +2607,7 @@ CORBA::Boolean operator<< ( const RTCORBA::ThreadpoolLanes &_tao_sequence ) { - const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm << _tao_sequence[i]); - } - - return _tao_marshal_flag; - } - - return false; + return TAO::marshal_sequence(strm, _tao_sequence); } CORBA::Boolean operator>> ( @@ -2630,40 +2615,7 @@ CORBA::Boolean operator>> ( RTCORBA::ThreadpoolLanes &_tao_sequence ) { - CORBA::ULong _tao_seq_len; - - if (strm >> _tao_seq_len) - { - // Add a check to the length of the sequence - // to make sure it does not exceed the length - // of the stream. (See bug 58.) - if (_tao_seq_len > strm.length ()) - { - return false; - } - - // Set the length of the sequence. - _tao_sequence.length (_tao_seq_len); - - // If length is 0 we return true. - if (0 >= _tao_seq_len) - { - return true; - } - - // Retrieve all the elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm >> _tao_sequence[i]); - } - - return _tao_marshal_flag; - - } - - return false; + return TAO::demarshal_sequence(strm, _tao_sequence); } #endif /* _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_CPP_ */ @@ -2680,12 +2632,12 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, RTCORBA::PriorityModel & _tao_en { CORBA::ULong _tao_temp = 0; CORBA::Boolean const _tao_success = strm >> _tao_temp; - + if (_tao_success) { _tao_enumerator = static_cast<RTCORBA::PriorityModel> (_tao_temp); } - + return _tao_success; } @@ -2724,20 +2676,20 @@ CORBA::Boolean operator<< ( ) { const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - + if (strm << _tao_seq_len) { // Encode all elements. CORBA::Boolean _tao_marshal_flag = true; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = (strm << _tao_sequence[i]); } - + return _tao_marshal_flag; } - + return false; } @@ -2747,7 +2699,7 @@ CORBA::Boolean operator>> ( ) { CORBA::ULong _tao_seq_len; - + if (strm >> _tao_seq_len) { // Add a check to the length of the sequence @@ -2757,28 +2709,28 @@ CORBA::Boolean operator>> ( { return false; } - + // Set the length of the sequence. _tao_sequence.length (_tao_seq_len); - + // If length is 0 we return true. - if (0 >= _tao_seq_len) + if (0 >= _tao_seq_len) { return true; } - + // Retrieve all the elements. CORBA::Boolean _tao_marshal_flag = true; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = (strm >> _tao_sequence[i]); } - + return _tao_marshal_flag; - + } - + return false; } diff --git a/TAO/tao/RTCORBA/RTCORBAC.h b/TAO/tao/RTCORBA/RTCORBAC.h index 036bf70b06a..bcc506cc1f1 100644 --- a/TAO/tao/RTCORBA/RTCORBAC.h +++ b/TAO/tao/RTCORBA/RTCORBAC.h @@ -180,22 +180,19 @@ namespace RTCORBA typedef TAO_FixedSeq_Var_T< - ThreadpoolLanes, - ThreadpoolLane + ThreadpoolLanes > ThreadpoolLanes_var; typedef TAO_Seq_Out_T< - ThreadpoolLanes, - ThreadpoolLanes_var, - ThreadpoolLane + ThreadpoolLanes > ThreadpoolLanes_out; class TAO_RTCORBA_Export ThreadpoolLanes : public - TAO_Unbounded_Sequence< + TAO::unbounded_value_sequence< ThreadpoolLane > { @@ -206,7 +203,7 @@ namespace RTCORBA CORBA::ULong max, CORBA::ULong length, ThreadpoolLane* buffer, - CORBA::Boolean release = 0 + CORBA::Boolean release = false ); ThreadpoolLanes (const ThreadpoolLanes &); ~ThreadpoolLanes (void); @@ -635,22 +632,19 @@ namespace RTCORBA typedef TAO_VarSeq_Var_T< - ProtocolList, - Protocol + ProtocolList > ProtocolList_var; typedef TAO_Seq_Out_T< - ProtocolList, - ProtocolList_var, - Protocol + ProtocolList > ProtocolList_out; class TAO_RTCORBA_Export ProtocolList : public - TAO_Unbounded_Sequence< + TAO::unbounded_value_sequence< Protocol > { @@ -661,7 +655,7 @@ namespace RTCORBA CORBA::ULong max, CORBA::ULong length, Protocol* buffer, - CORBA::Boolean release = 0 + CORBA::Boolean release = false ); ProtocolList (const ProtocolList &); ~ProtocolList (void); @@ -2099,22 +2093,19 @@ namespace RTCORBA typedef TAO_FixedSeq_Var_T< - PriorityBands, - PriorityBand + PriorityBands > PriorityBands_var; typedef TAO_Seq_Out_T< - PriorityBands, - PriorityBands_var, - PriorityBand + PriorityBands > PriorityBands_out; class TAO_RTCORBA_Export PriorityBands : public - TAO_Unbounded_Sequence< + TAO::unbounded_value_sequence< PriorityBand > { @@ -2125,7 +2116,7 @@ namespace RTCORBA CORBA::ULong max, CORBA::ULong length, PriorityBand* buffer, - CORBA::Boolean release = 0 + CORBA::Boolean release = false ); PriorityBands (const PriorityBands &); ~PriorityBands (void); diff --git a/TAO/tao/RTCORBA/RT_Policy_i.cpp b/TAO/tao/RTCORBA/RT_Policy_i.cpp index a9f893c31e3..5cb4737b17a 100644 --- a/TAO/tao/RTCORBA/RT_Policy_i.cpp +++ b/TAO/tao/RTCORBA/RT_Policy_i.cpp @@ -23,9 +23,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_PriorityModelPolicy::TAO_PriorityModelPolicy ( RTCORBA::PriorityModel priority_model, RTCORBA::Priority server_priority) - : ACE_NESTED_CLASS (CORBA, Object) () - , ACE_NESTED_CLASS (CORBA, Policy) () - , ACE_NESTED_CLASS (CORBA, LocalObject) () + : ::CORBA::Object () + , ::CORBA::Policy () + , ::CORBA::LocalObject () , RTCORBA::PriorityModelPolicy () , TAO_Local_RefCounted_Object () , priority_model_ (priority_model) @@ -34,9 +34,9 @@ TAO_PriorityModelPolicy::TAO_PriorityModelPolicy ( } TAO_PriorityModelPolicy::TAO_PriorityModelPolicy (const TAO_PriorityModelPolicy &rhs) - : ACE_NESTED_CLASS (CORBA, Object) () - , ACE_NESTED_CLASS (CORBA, Policy) () - , ACE_NESTED_CLASS (CORBA, LocalObject) () + : ::CORBA::Object () + , ::CORBA::Policy () + , ::CORBA::LocalObject () , RTCORBA::PriorityModelPolicy () , TAO_Local_RefCounted_Object () , priority_model_ (rhs.priority_model_) @@ -98,7 +98,7 @@ CORBA::Policy_ptr TAO_PriorityModelPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_PriorityModelPolicy* tmp; + TAO_PriorityModelPolicy* tmp = 0; ACE_NEW_THROW_EX (tmp, TAO_PriorityModelPolicy (*this), CORBA::NO_MEMORY (TAO::VMCID, @@ -151,9 +151,9 @@ TAO_PriorityModelPolicy::_tao_scope (void) const // **************************************************************** TAO_ThreadpoolPolicy::TAO_ThreadpoolPolicy (RTCORBA::ThreadpoolId id) - : ACE_NESTED_CLASS (CORBA, Object) () - , ACE_NESTED_CLASS (CORBA, Policy) () - , ACE_NESTED_CLASS (CORBA, LocalObject) () + : ::CORBA::Object () + , ::CORBA::Policy () + , ::CORBA::LocalObject () , RTCORBA::ThreadpoolPolicy () , TAO_Local_RefCounted_Object () , id_ (id) @@ -161,9 +161,9 @@ TAO_ThreadpoolPolicy::TAO_ThreadpoolPolicy (RTCORBA::ThreadpoolId id) } TAO_ThreadpoolPolicy::TAO_ThreadpoolPolicy (const TAO_ThreadpoolPolicy &rhs) - : ACE_NESTED_CLASS (CORBA, Object) () - , ACE_NESTED_CLASS (CORBA, Policy) () - , ACE_NESTED_CLASS (CORBA, LocalObject) () + : ::CORBA::Object () + , ::CORBA::Policy () + , ::CORBA::LocalObject () , RTCORBA::ThreadpoolPolicy () , TAO_Local_RefCounted_Object () , id_ (rhs.id_) @@ -211,7 +211,7 @@ CORBA::Policy_ptr TAO_ThreadpoolPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_ThreadpoolPolicy* tmp; + TAO_ThreadpoolPolicy* tmp = 0; ACE_NEW_THROW_EX (tmp, TAO_ThreadpoolPolicy (*this), CORBA::NO_MEMORY (TAO::VMCID, @@ -243,18 +243,18 @@ TAO_ThreadpoolPolicy::_tao_scope (void) const // **************************************************************** TAO_PrivateConnectionPolicy::TAO_PrivateConnectionPolicy (void) - : ACE_NESTED_CLASS (CORBA, Object) () - , ACE_NESTED_CLASS (CORBA, Policy) () - , ACE_NESTED_CLASS (CORBA, LocalObject) () + : ::CORBA::Object () + , ::CORBA::Policy () + , ::CORBA::LocalObject () , RTCORBA::PrivateConnectionPolicy () , TAO_Local_RefCounted_Object () { } TAO_PrivateConnectionPolicy::TAO_PrivateConnectionPolicy (const TAO_PrivateConnectionPolicy &) - : ACE_NESTED_CLASS (CORBA, Object) () - , ACE_NESTED_CLASS (CORBA, Policy) () - , ACE_NESTED_CLASS (CORBA, LocalObject) () + : ::CORBA::Object () + , ::CORBA::Policy () + , ::CORBA::LocalObject () , RTCORBA::PrivateConnectionPolicy () , TAO_Local_RefCounted_Object () { @@ -289,7 +289,7 @@ CORBA::Policy_ptr TAO_PrivateConnectionPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_PrivateConnectionPolicy* tmp; + TAO_PrivateConnectionPolicy* tmp = 0; ACE_NEW_THROW_EX (tmp, TAO_PrivateConnectionPolicy (*this), CORBA::NO_MEMORY (TAO::VMCID, @@ -322,9 +322,9 @@ TAO_PrivateConnectionPolicy::_tao_scope (void) const // **************************************************************** TAO_PriorityBandedConnectionPolicy::TAO_PriorityBandedConnectionPolicy (const RTCORBA::PriorityBands &bands) - : ACE_NESTED_CLASS (CORBA, Object) () - , ACE_NESTED_CLASS (CORBA, Policy) () - , ACE_NESTED_CLASS (CORBA, LocalObject) () + : ::CORBA::Object () + , ::CORBA::Policy () + , ::CORBA::LocalObject () , RTCORBA::PriorityBandedConnectionPolicy () , TAO_Local_RefCounted_Object () , priority_bands_ (bands) @@ -332,9 +332,9 @@ TAO_PriorityBandedConnectionPolicy::TAO_PriorityBandedConnectionPolicy (const RT } TAO_PriorityBandedConnectionPolicy::TAO_PriorityBandedConnectionPolicy (const TAO_PriorityBandedConnectionPolicy &rhs) - : ACE_NESTED_CLASS (CORBA, Object) () - , ACE_NESTED_CLASS (CORBA, Policy) () - , ACE_NESTED_CLASS (CORBA, LocalObject) () + : ::CORBA::Object () + , ::CORBA::Policy () + , ::CORBA::LocalObject () , RTCORBA::PriorityBandedConnectionPolicy () , TAO_Local_RefCounted_Object () , priority_bands_ (rhs.priority_bands_) @@ -393,7 +393,7 @@ CORBA::Policy_ptr TAO_PriorityBandedConnectionPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_PriorityBandedConnectionPolicy *tmp; + TAO_PriorityBandedConnectionPolicy *tmp = 0; ACE_NEW_THROW_EX (tmp, TAO_PriorityBandedConnectionPolicy (*this), CORBA::NO_MEMORY (TAO::VMCID, @@ -443,9 +443,9 @@ TAO_PriorityBandedConnectionPolicy::priority_bands_rep (void) // **************************************************************** TAO_ServerProtocolPolicy::TAO_ServerProtocolPolicy (const RTCORBA::ProtocolList &protocols) - : ACE_NESTED_CLASS (CORBA, Object) () - , ACE_NESTED_CLASS (CORBA, Policy) () - , ACE_NESTED_CLASS (CORBA, LocalObject) () + : ::CORBA::Object () + , ::CORBA::Policy () + , ::CORBA::LocalObject () , RTCORBA::ServerProtocolPolicy () , TAO_Local_RefCounted_Object () , protocols_ (protocols) @@ -453,9 +453,9 @@ TAO_ServerProtocolPolicy::TAO_ServerProtocolPolicy (const RTCORBA::ProtocolList } TAO_ServerProtocolPolicy::TAO_ServerProtocolPolicy (const TAO_ServerProtocolPolicy &rhs) - : ACE_NESTED_CLASS (CORBA, Object) () - , ACE_NESTED_CLASS (CORBA, Policy) () - , ACE_NESTED_CLASS (CORBA, LocalObject) () + : ::CORBA::Object () + , ::CORBA::Policy () + , ::CORBA::LocalObject () , RTCORBA::ServerProtocolPolicy () , TAO_Local_RefCounted_Object () , protocols_ (rhs.protocols_) @@ -489,7 +489,7 @@ RTCORBA::ProtocolList * TAO_ServerProtocolPolicy::protocols (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - RTCORBA::ProtocolList *tmp; + RTCORBA::ProtocolList *tmp = 0; ACE_NEW_THROW_EX (tmp, RTCORBA::ProtocolList (this->protocols_), CORBA::NO_MEMORY (TAO::VMCID, @@ -510,7 +510,7 @@ CORBA::Policy_ptr TAO_ServerProtocolPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_ServerProtocolPolicy* tmp; + TAO_ServerProtocolPolicy* tmp = 0; ACE_NEW_THROW_EX (tmp, TAO_ServerProtocolPolicy (*this), CORBA::NO_MEMORY (TAO::VMCID, @@ -553,9 +553,9 @@ TAO_ClientProtocolPolicy::TAO_ClientProtocolPolicy (void) TAO_ClientProtocolPolicy::TAO_ClientProtocolPolicy (const RTCORBA::ProtocolList &protocols) - : ACE_NESTED_CLASS (CORBA, Object) () - , ACE_NESTED_CLASS (CORBA, Policy) () - , ACE_NESTED_CLASS (CORBA, LocalObject) () + : ::CORBA::Object () + , ::CORBA::Policy () + , ::CORBA::LocalObject () , RTCORBA::ClientProtocolPolicy () , TAO_Local_RefCounted_Object () , protocols_ (protocols) @@ -563,9 +563,9 @@ TAO_ClientProtocolPolicy::TAO_ClientProtocolPolicy (const RTCORBA::ProtocolList } TAO_ClientProtocolPolicy::TAO_ClientProtocolPolicy (const TAO_ClientProtocolPolicy &rhs) - : ACE_NESTED_CLASS (CORBA, Object) () - , ACE_NESTED_CLASS (CORBA, Policy) () - , ACE_NESTED_CLASS (CORBA, LocalObject) () + : ::CORBA::Object () + , ::CORBA::Policy () + , ::CORBA::LocalObject () , RTCORBA::ClientProtocolPolicy () , TAO_Local_RefCounted_Object () , protocols_ (rhs.protocols_) @@ -599,7 +599,7 @@ RTCORBA::ProtocolList * TAO_ClientProtocolPolicy::protocols (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - RTCORBA::ProtocolList *tmp; + RTCORBA::ProtocolList *tmp = 0; ACE_NEW_THROW_EX (tmp, RTCORBA::ProtocolList (this->protocols_), CORBA::NO_MEMORY (TAO::VMCID, @@ -620,7 +620,7 @@ CORBA::Policy_ptr TAO_ClientProtocolPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_ClientProtocolPolicy* tmp; + TAO_ClientProtocolPolicy* tmp = 0; ACE_NEW_THROW_EX (tmp, TAO_ClientProtocolPolicy (*this), CORBA::NO_MEMORY (TAO::VMCID, @@ -1303,9 +1303,9 @@ TAO_Protocol_Properties_Factory::create_transport_protocol_property (IOP::Profil int send_buffer_size = orb_core ? orb_core->orb_params ()->sock_sndbuf_size () : 0; int recv_buffer_size = orb_core ? orb_core->orb_params ()->sock_rcvbuf_size () : 0; int no_delay = orb_core ? orb_core->orb_params ()->nodelay () : 0; - CORBA::Boolean keep_alive = 1; - CORBA::Boolean dont_route = 0; - CORBA::Boolean enable_network_priority = 0; + CORBA::Boolean keep_alive = true; + CORBA::Boolean dont_route = false; + CORBA::Boolean enable_network_priority = false; ACE_NEW_RETURN (property, TAO_TCP_Protocol_Properties (send_buffer_size, @@ -1322,9 +1322,9 @@ TAO_Protocol_Properties_Factory::create_transport_protocol_property (IOP::Profil int send_buffer_size = orb_core ? orb_core->orb_params ()->sock_sndbuf_size () : 0; int recv_buffer_size = orb_core ? orb_core->orb_params ()->sock_rcvbuf_size () : 0; int no_delay = orb_core ? orb_core->orb_params ()->nodelay () : 0; - CORBA::Boolean keep_alive = 1; - CORBA::Boolean dont_route = 0; - CORBA::Long preallocate_buffer_size = 0; + CORBA::Boolean keep_alive = true; + CORBA::Boolean dont_route = false; + CORBA::Long preallocate_buffer_size = false; const char *mmap_filename = ""; const char *mmap_lockname = ""; @@ -1365,9 +1365,9 @@ TAO_Protocol_Properties_Factory::create_transport_protocol_property (IOP::Profil int send_buffer_size = orb_core ? orb_core->orb_params ()->sock_sndbuf_size () : 0; int recv_buffer_size = orb_core ? orb_core->orb_params ()->sock_rcvbuf_size () : 0; int no_delay = orb_core ? orb_core->orb_params ()->nodelay () : 0; - CORBA::Boolean keep_alive = 1; - CORBA::Boolean dont_route = 0; - CORBA::Boolean enable_network_priority = 0; + CORBA::Boolean keep_alive = true; + CORBA::Boolean dont_route = false; + CORBA::Boolean enable_network_priority = false; ACE_NEW_RETURN (property, TAO_StreamControl_Protocol_Properties (send_buffer_size, diff --git a/TAO/tao/RTCORBA/RT_Stub.cpp b/TAO/tao/RTCORBA/RT_Stub.cpp index fe828a2bb5f..a82714e4802 100644 --- a/TAO/tao/RTCORBA/RT_Stub.cpp +++ b/TAO/tao/RTCORBA/RT_Stub.cpp @@ -56,15 +56,15 @@ TAO_RT_Stub::parse_policies (ACE_ENV_SINGLE_ARG_DECL) { if (policy_list[i]->policy_type () == RTCORBA::PRIORITY_MODEL_POLICY_TYPE) - this->exposed_priority_model (policy_list[i].in ()); + this->exposed_priority_model (policy_list[i]); else if (policy_list[i]->policy_type () == RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE) - this->exposed_priority_banded_connection (policy_list[i].in ()); + this->exposed_priority_banded_connection (policy_list[i]); else if (policy_list[i]->policy_type () == RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE) - this->exposed_client_protocol (policy_list[i].in ()); + this->exposed_client_protocol (policy_list[i]); } this->are_policies_parsed_ = 1; diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.cpp b/TAO/tao/RTPortableServer/RTPortableServerC.cpp index 85e9834111f..faca5cb2fcd 100644 --- a/TAO/tao/RTPortableServer/RTPortableServerC.cpp +++ b/TAO/tao/RTPortableServer/RTPortableServerC.cpp @@ -67,7 +67,7 @@ TAO::Objref_Traits<RTPortableServer::POA>::release ( RTPortableServer::POA_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } RTPortableServer::POA_ptr @@ -91,12 +91,12 @@ RTPortableServer::POA::POA (void) RTPortableServer::POA::~POA (void) {} -void +void RTPortableServer::POA::_tao_any_destructor (void *_tao_void_pointer) { POA *_tao_tmp_pointer = static_cast<POA *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } RTPortableServer::POA_ptr @@ -109,10 +109,10 @@ RTPortableServer::POA::_narrow ( { return POA::_nil (); } - + POA_ptr proxy = dynamic_cast<POA_ptr> (_tao_objref); - + return POA::_duplicate (proxy); } @@ -126,28 +126,28 @@ RTPortableServer::POA::_unchecked_narrow ( { return POA::_nil (); } - + POA_ptr proxy = dynamic_cast<POA_ptr> (_tao_objref); - + return POA::_duplicate (proxy); } RTPortableServer::POA_ptr RTPortableServer::POA::_duplicate (POA_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void RTPortableServer::POA::_tao_release (POA_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp index 3ac075d66e0..08a4c9584f8 100644 --- a/TAO/tao/RTScheduling/Current.cpp +++ b/TAO/tao/RTScheduling/Current.cpp @@ -865,13 +865,13 @@ TAO_RTScheduler_Current_var::TAO_RTScheduler_Current_var (const ::TAO_RTSchedule TAO_RTScheduler_Current_var::~TAO_RTScheduler_Current_var (void) // destructor { - CORBA::release (this->ptr_); + ::CORBA::release (this->ptr_); } TAO_RTScheduler_Current_var & TAO_RTScheduler_Current_var::operator= (TAO_RTScheduler_Current_ptr p) { - CORBA::release (this->ptr_); + ::CORBA::release (this->ptr_); this->ptr_ = p; return *this; } @@ -881,7 +881,7 @@ TAO_RTScheduler_Current_var::operator= (const ::TAO_RTScheduler_Current_var &p) { if (this != &p) { - CORBA::release (this->ptr_); + ::CORBA::release (this->ptr_); this->ptr_ = ::TAO_RTScheduler_Current::_duplicate (p.ptr ()); } return *this; @@ -918,7 +918,7 @@ TAO_RTScheduler_Current_var::inout (void) TAO_RTScheduler_Current_ptr & TAO_RTScheduler_Current_var::out (void) { - CORBA::release (this->ptr_); + ::CORBA::release (this->ptr_); this->ptr_ = ::TAO_RTScheduler_Current::_nil (); return this->ptr_; } @@ -941,7 +941,7 @@ TAO_RTScheduler_Current_var::duplicate (TAO_RTScheduler_Current_ptr p) void TAO_RTScheduler_Current_var::release (TAO_RTScheduler_Current_ptr p) { - CORBA::release (p); + ::CORBA::release (p); } TAO_RTScheduler_Current_ptr diff --git a/TAO/tao/RTScheduling/Current.h b/TAO/tao/RTScheduling/Current.h index bae9d0e22c7..0189511e16f 100644 --- a/TAO/tao/RTScheduling/Current.h +++ b/TAO/tao/RTScheduling/Current.h @@ -41,7 +41,7 @@ class TAO_TSS_Resources; * Define the hash() method for Object Ids. */ -typedef TAO_Unbounded_Sequence<CORBA::Octet> IdType; +typedef TAO::unbounded_value_sequence<CORBA::Octet> IdType; class TAO_RTScheduler_Export TAO_DTId_Hash { diff --git a/TAO/tao/RTScheduling/RTSchedulerC.cpp b/TAO/tao/RTScheduling/RTSchedulerC.cpp index 4c493789da4..67c7ff533a2 100644 --- a/TAO/tao/RTScheduling/RTSchedulerC.cpp +++ b/TAO/tao/RTScheduling/RTSchedulerC.cpp @@ -88,7 +88,7 @@ TAO::Objref_Traits<RTScheduling::ThreadAction>::release ( RTScheduling::ThreadAction_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } RTScheduling::ThreadAction_ptr @@ -137,7 +137,7 @@ RTScheduling::ThreadAction::_unchecked_narrow ( RTScheduling::ThreadAction_ptr RTScheduling::ThreadAction::_duplicate (ThreadAction_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } @@ -148,7 +148,7 @@ RTScheduling::ThreadAction::_duplicate (ThreadAction_ptr obj) void RTScheduling::ThreadAction::_tao_release (ThreadAction_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -209,7 +209,7 @@ TAO::Objref_Traits<RTScheduling::DistributableThread>::release ( RTScheduling::DistributableThread_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } RTScheduling::DistributableThread_ptr @@ -258,18 +258,18 @@ RTScheduling::DistributableThread::_unchecked_narrow ( RTScheduling::DistributableThread_ptr RTScheduling::DistributableThread::_duplicate (DistributableThread_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void RTScheduling::DistributableThread::_tao_release (DistributableThread_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -330,7 +330,7 @@ TAO::Objref_Traits<RTScheduling::Current>::release ( RTScheduling::Current_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } RTScheduling::Current_ptr @@ -348,7 +348,7 @@ TAO::Objref_Traits<RTScheduling::Current>::marshal ( return CORBA::Object::marshal (p, cdr); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE::UNSUPPORTED_SCHEDULING_DISCIPLINE (void) @@ -374,7 +374,7 @@ RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE::UNSUPPORTED_SCHEDULING RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE& RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE::operator= (const ::RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE &_tao_excp) { - this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp); + this->::CORBA::UserException::operator= (_tao_excp); return *this; } @@ -436,7 +436,7 @@ CORBA::TypeCode_ptr RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE::_t return ::RTScheduling::Current::_tc_UNSUPPORTED_SCHEDULING_DISCIPLINE; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_RTSCHEDULING_CURRENT_IDTYPE_CS_) @@ -448,7 +448,7 @@ RTScheduling::Current::IdType::IdType (void) RTScheduling::Current::IdType::IdType ( CORBA::ULong max ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< CORBA::Octet > (max) @@ -460,7 +460,7 @@ RTScheduling::Current::IdType::IdType ( CORBA::Octet * buffer, CORBA::Boolean release ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< CORBA::Octet > (max, length, buffer, release) @@ -469,7 +469,7 @@ RTScheduling::Current::IdType::IdType ( RTScheduling::Current::IdType::IdType ( const IdType &seq ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< CORBA::Octet > (seq) @@ -480,7 +480,7 @@ RTScheduling::Current::IdType::~IdType (void) #endif /* end #if !defined */ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_RTSCHEDULING_CURRENT_NAMELIST_CS_) @@ -492,7 +492,7 @@ RTScheduling::Current::NameList::NameList (void) RTScheduling::Current::NameList::NameList ( CORBA::ULong max ) - : TAO_Unbounded_String_Sequence + : TAO::unbounded_string_sequence (max) {} @@ -502,14 +502,14 @@ RTScheduling::Current::NameList::NameList ( char * * buffer, CORBA::Boolean release ) - : TAO_Unbounded_String_Sequence + : TAO::unbounded_string_sequence (max, length, buffer, release) {} RTScheduling::Current::NameList::NameList ( const NameList &seq ) - : TAO_Unbounded_String_Sequence + : TAO::unbounded_string_sequence (seq) {} @@ -549,18 +549,18 @@ RTScheduling::Current::_unchecked_narrow ( RTScheduling::Current_ptr RTScheduling::Current::_duplicate (Current_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void RTScheduling::Current::_tao_release (Current_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -629,7 +629,7 @@ TAO::Objref_Traits<RTScheduling::ResourceManager>::release ( RTScheduling::ResourceManager_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } RTScheduling::ResourceManager_ptr @@ -678,18 +678,18 @@ RTScheduling::ResourceManager::_unchecked_narrow ( RTScheduling::ResourceManager_ptr RTScheduling::ResourceManager::_duplicate (ResourceManager_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void RTScheduling::ResourceManager::_tao_release (ResourceManager_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean @@ -754,7 +754,7 @@ TAO::Objref_Traits<RTScheduling::Scheduler>::release ( RTScheduling::Scheduler_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } RTScheduling::Scheduler_ptr @@ -772,7 +772,7 @@ TAO::Objref_Traits<RTScheduling::Scheduler>::marshal ( return CORBA::Object::marshal (p, cdr); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES::INCOMPATIBLE_SCHEDULING_DISCIPLINES (void) @@ -798,7 +798,7 @@ RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES::INCOMPATIBLE_SCHED RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES& RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES::operator= (const ::RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES &_tao_excp) { - this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp); + this->::CORBA::UserException::operator= (_tao_excp); return *this; } @@ -891,18 +891,18 @@ RTScheduling::Scheduler::_unchecked_narrow ( RTScheduling::Scheduler_ptr RTScheduling::Scheduler::_duplicate (Scheduler_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void RTScheduling::Scheduler::_tao_release (Scheduler_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean diff --git a/TAO/tao/RTScheduling/RTSchedulerC.h b/TAO/tao/RTScheduling/RTSchedulerC.h index 5d9d5944fc7..322b2f7da10 100644 --- a/TAO/tao/RTScheduling/RTSchedulerC.h +++ b/TAO/tao/RTScheduling/RTSchedulerC.h @@ -205,16 +205,16 @@ namespace RTScheduling #if !defined (_RTSCHEDULING_DISTRIBUTABLETHREAD__VAR_OUT_CH_) #define _RTSCHEDULING_DISTRIBUTABLETHREAD__VAR_OUT_CH_ - + class DistributableThread; typedef DistributableThread *DistributableThread_ptr; - + typedef TAO_Objref_Var_T< DistributableThread > DistributableThread_var; - + typedef TAO_Objref_Out_T< DistributableThread @@ -222,124 +222,124 @@ namespace RTScheduling DistributableThread_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_RTSCHEDULING_DISTRIBUTABLETHREAD_CH_) #define _RTSCHEDULING_DISTRIBUTABLETHREAD_CH_ - + class TAO_RTScheduler_Export DistributableThread : public virtual CORBA::Object { public: typedef DistributableThread_ptr _ptr_type; typedef DistributableThread_var _var_type; - + // The static operations. static DistributableThread_ptr _duplicate (DistributableThread_ptr obj); - + static void _tao_release (DistributableThread_ptr obj); - + static DistributableThread_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static DistributableThread_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static DistributableThread_ptr _nil (void) { return static_cast<DistributableThread_ptr> (0); } - - - + + + // TAO_IDL - Generated from // be\be_visitor_enum/enum_ch.cpp:57 - + enum DT_State { ACTIVE, CANCELLED }; - + typedef DT_State &DT_State_out; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + static ::CORBA::TypeCode_ptr const _tc_DT_State; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void cancel ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::RTScheduling::DistributableThread::DT_State state ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. DistributableThread (void); - + virtual ~DistributableThread (void); - + private: // Private and unimplemented for concrete interfaces. DistributableThread (const DistributableThread &); - + void operator= (const DistributableThread &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + extern TAO_RTScheduler_Export ::CORBA::TypeCode_ptr const _tc_DistributableThread; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_RTSCHEDULING_CURRENT__VAR_OUT_CH_) #define _RTSCHEDULING_CURRENT__VAR_OUT_CH_ - + class Current; typedef Current *Current_ptr; - + typedef TAO_Objref_Var_T< Current > Current_var; - + typedef TAO_Objref_Out_T< Current @@ -347,45 +347,45 @@ namespace RTScheduling Current_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_RTSCHEDULING_CURRENT_CH_) #define _RTSCHEDULING_CURRENT_CH_ - + class TAO_RTScheduler_Export Current : public virtual ::RTCORBA::Current { public: typedef Current_ptr _ptr_type; typedef Current_var _var_type; - + // The static operations. static Current_ptr _duplicate (Current_ptr obj); - + static void _tao_release (Current_ptr obj); - + static Current_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Current_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Current_ptr _nil (void) { return static_cast<Current_ptr> (0); } - - - + + + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::RTScheduling::DistributableThread_ptr spawn ( ::RTScheduling::ThreadAction_ptr start, ::CORBA::VoidData data, @@ -399,28 +399,28 @@ namespace RTScheduling ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:53 #if !defined (_RTSCHEDULING_CURRENT_UNSUPPORTED_SCHEDULING_DISCIPLINE_CH_) #define _RTSCHEDULING_CURRENT_UNSUPPORTED_SCHEDULING_DISCIPLINE_CH_ - + class TAO_RTScheduler_Export UNSUPPORTED_SCHEDULING_DISCIPLINE : public CORBA::UserException { public: - + UNSUPPORTED_SCHEDULING_DISCIPLINE (void); UNSUPPORTED_SCHEDULING_DISCIPLINE (const UNSUPPORTED_SCHEDULING_DISCIPLINE &); ~UNSUPPORTED_SCHEDULING_DISCIPLINE (void); UNSUPPORTED_SCHEDULING_DISCIPLINE &operator= (const UNSUPPORTED_SCHEDULING_DISCIPLINE &); - + static UNSUPPORTED_SCHEDULING_DISCIPLINE *_downcast (CORBA::Exception *); static const UNSUPPORTED_SCHEDULING_DISCIPLINE *_downcast (CORBA::Exception const *); - + static CORBA::Exception *_alloc (void); - + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void) const; @@ -429,28 +429,28 @@ namespace RTScheduling TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:129 - + virtual CORBA::TypeCode_ptr _tao_type (void) const; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + static ::CORBA::TypeCode_ptr const _tc_UNSUPPORTED_SCHEDULING_DISCIPLINE; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void begin_scheduling_segment ( const char * name, ::CORBA::Policy_ptr sched_param, @@ -461,10 +461,10 @@ namespace RTScheduling CORBA::SystemException, ::RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void update_scheduling_segment ( const char * name, ::CORBA::Policy_ptr sched_param, @@ -475,10 +475,10 @@ namespace RTScheduling CORBA::SystemException, ::RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void end_scheduling_segment ( const char * name ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -486,33 +486,30 @@ namespace RTScheduling ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_RTSCHEDULING_CURRENT_IDTYPE_CH_) #define _RTSCHEDULING_CURRENT_IDTYPE_CH_ - + class IdType; - + typedef TAO_FixedSeq_Var_T< - IdType, - CORBA::Octet + IdType > IdType_var; - + typedef TAO_Seq_Out_T< - IdType, - IdType_var, - CORBA::Octet + IdType > IdType_out; - + class TAO_RTScheduler_Export IdType : public - TAO_Unbounded_Sequence< + TAO::unbounded_value_sequence< CORBA::Octet > { @@ -522,12 +519,12 @@ namespace RTScheduling IdType ( CORBA::ULong max, CORBA::ULong length, - CORBA::Octet* buffer, - CORBA::Boolean release = 0 + CORBA::Octet* buffer, + CORBA::Boolean release = false ); IdType (const IdType &); ~IdType (void); - + typedef IdType_var _var_type; #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) @@ -535,30 +532,30 @@ namespace RTScheduling CORBA::ULong length, const ACE_Message_Block* mb ) - : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {} + : TAO::unbounded_value_sequence<CORBA::Octet> (length, mb) {} #endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */ }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + static ::CORBA::TypeCode_ptr const _tc_IdType; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::RTScheduling::Current::IdType * id ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::RTScheduling::DistributableThread_ptr lookup ( const ::RTScheduling::Current::IdType & id ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -566,53 +563,50 @@ namespace RTScheduling ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::Policy_ptr scheduling_parameter ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::Policy_ptr implicit_scheduling_parameter ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_RTSCHEDULING_CURRENT_NAMELIST_CH_) #define _RTSCHEDULING_CURRENT_NAMELIST_CH_ - + class NameList; - + typedef - TAO_MngSeq_Var_T< - NameList, - TAO_SeqElem_String_Manager + TAO_VarSeq_Var_T< + NameList > NameList_var; - + typedef - TAO_MngSeq_Out_T< - NameList, - NameList_var, - TAO_SeqElem_String_Manager + TAO_Seq_Out_T< + NameList > NameList_out; - + class TAO_RTScheduler_Export NameList : public - TAO_Unbounded_String_Sequence + TAO::unbounded_string_sequence { public: NameList (void); @@ -620,78 +614,78 @@ namespace RTScheduling NameList ( CORBA::ULong max, CORBA::ULong length, - char ** buffer, - CORBA::Boolean release = 0 + char ** buffer, + CORBA::Boolean release = false ); NameList (const NameList &); ~NameList (void); - + typedef NameList_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + static ::CORBA::TypeCode_ptr const _tc_NameList; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::RTScheduling::Current::NameList * current_scheduling_segment_names ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. Current (void); - + virtual ~Current (void); - + private: // Private and unimplemented for concrete interfaces. Current (const Current &); - + void operator= (const Current &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + extern TAO_RTScheduler_Export ::CORBA::TypeCode_ptr const _tc_Current; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_RTSCHEDULING_RESOURCEMANAGER__VAR_OUT_CH_) #define _RTSCHEDULING_RESOURCEMANAGER__VAR_OUT_CH_ - + class ResourceManager; typedef ResourceManager *ResourceManager_ptr; - + typedef TAO_Objref_Var_T< ResourceManager > ResourceManager_var; - + typedef TAO_Objref_Out_T< ResourceManager @@ -699,88 +693,88 @@ namespace RTScheduling ResourceManager_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_RTSCHEDULING_RESOURCEMANAGER_CH_) #define _RTSCHEDULING_RESOURCEMANAGER_CH_ - + class TAO_RTScheduler_Export ResourceManager : public virtual ::RTCORBA::Mutex { public: typedef ResourceManager_ptr _ptr_type; typedef ResourceManager_var _var_type; - + // The static operations. static ResourceManager_ptr _duplicate (ResourceManager_ptr obj); - + static void _tao_release (ResourceManager_ptr obj); - + static ResourceManager_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ResourceManager_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ResourceManager_ptr _nil (void) { return static_cast<ResourceManager_ptr> (0); } - - - + + + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. ResourceManager (void); - + virtual ~ResourceManager (void); - + private: // Private and unimplemented for concrete interfaces. ResourceManager (const ResourceManager &); - + void operator= (const ResourceManager &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + extern TAO_RTScheduler_Export ::CORBA::TypeCode_ptr const _tc_ResourceManager; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_RTSCHEDULING_SCHEDULER__VAR_OUT_CH_) #define _RTSCHEDULING_SCHEDULER__VAR_OUT_CH_ - + class Scheduler; typedef Scheduler *Scheduler_ptr; - + typedef TAO_Objref_Var_T< Scheduler > Scheduler_var; - + typedef TAO_Objref_Out_T< Scheduler @@ -788,63 +782,63 @@ namespace RTScheduling Scheduler_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_RTSCHEDULING_SCHEDULER_CH_) #define _RTSCHEDULING_SCHEDULER_CH_ - + class TAO_RTScheduler_Export Scheduler : public virtual CORBA::Object { public: typedef Scheduler_ptr _ptr_type; typedef Scheduler_var _var_type; - + // The static operations. static Scheduler_ptr _duplicate (Scheduler_ptr obj); - + static void _tao_release (Scheduler_ptr obj); - + static Scheduler_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Scheduler_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Scheduler_ptr _nil (void) { return static_cast<Scheduler_ptr> (0); } - - - + + + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:53 #if !defined (_RTSCHEDULING_SCHEDULER_INCOMPATIBLE_SCHEDULING_DISCIPLINES_CH_) #define _RTSCHEDULING_SCHEDULER_INCOMPATIBLE_SCHEDULING_DISCIPLINES_CH_ - + class TAO_RTScheduler_Export INCOMPATIBLE_SCHEDULING_DISCIPLINES : public CORBA::UserException { public: - + INCOMPATIBLE_SCHEDULING_DISCIPLINES (void); INCOMPATIBLE_SCHEDULING_DISCIPLINES (const INCOMPATIBLE_SCHEDULING_DISCIPLINES &); ~INCOMPATIBLE_SCHEDULING_DISCIPLINES (void); INCOMPATIBLE_SCHEDULING_DISCIPLINES &operator= (const INCOMPATIBLE_SCHEDULING_DISCIPLINES &); - + static INCOMPATIBLE_SCHEDULING_DISCIPLINES *_downcast (CORBA::Exception *); static const INCOMPATIBLE_SCHEDULING_DISCIPLINES *_downcast (CORBA::Exception const *); - + static CORBA::Exception *_alloc (void); - + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void) const; @@ -853,38 +847,38 @@ namespace RTScheduling TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:129 - + virtual CORBA::TypeCode_ptr _tao_type (void) const; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + static ::CORBA::TypeCode_ptr const _tc_INCOMPATIBLE_SCHEDULING_DISCIPLINES; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::PolicyList * scheduling_policies ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void scheduling_policies ( const ::CORBA::PolicyList & scheduling_policies ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -892,30 +886,30 @@ namespace RTScheduling ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::PolicyList * poa_policies ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual char * scheduling_discipline_name ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::RTScheduling::ResourceManager_ptr create_resource_manager ( const char * name, ::CORBA::Policy_ptr scheduling_parameter @@ -924,10 +918,10 @@ namespace RTScheduling ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void set_scheduling_parameter ( ::PortableServer::Servant & resource, const char * name, @@ -937,10 +931,10 @@ namespace RTScheduling ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void begin_new_scheduling_segment ( const ::RTScheduling::Current::IdType & guid, const char * name, @@ -952,10 +946,10 @@ namespace RTScheduling CORBA::SystemException, ::RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void begin_nested_scheduling_segment ( const ::RTScheduling::Current::IdType & guid, const char * name, @@ -967,10 +961,10 @@ namespace RTScheduling CORBA::SystemException, ::RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void update_scheduling_segment ( const ::RTScheduling::Current::IdType & guid, const char * name, @@ -982,10 +976,10 @@ namespace RTScheduling CORBA::SystemException, ::RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void end_scheduling_segment ( const ::RTScheduling::Current::IdType & guid, const char * name @@ -994,10 +988,10 @@ namespace RTScheduling ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void end_nested_scheduling_segment ( const ::RTScheduling::Current::IdType & guid, const char * name, @@ -1007,10 +1001,10 @@ namespace RTScheduling ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void send_request ( ::PortableInterceptor::ClientRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1019,10 +1013,10 @@ namespace RTScheduling CORBA::SystemException, ::PortableInterceptor::ForwardRequest )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void receive_request ( ::PortableInterceptor::ServerRequestInfo_ptr ri, ::RTScheduling::Current::IdType_out guid, @@ -1035,10 +1029,10 @@ namespace RTScheduling CORBA::SystemException, ::PortableInterceptor::ForwardRequest )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void send_reply ( ::PortableInterceptor::ServerRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1046,10 +1040,10 @@ namespace RTScheduling ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void send_exception ( ::PortableInterceptor::ServerRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1058,10 +1052,10 @@ namespace RTScheduling CORBA::SystemException, ::PortableInterceptor::ForwardRequest )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void send_other ( ::PortableInterceptor::ServerRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1070,10 +1064,10 @@ namespace RTScheduling CORBA::SystemException, ::PortableInterceptor::ForwardRequest )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void send_poll ( ::PortableInterceptor::ClientRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1082,10 +1076,10 @@ namespace RTScheduling CORBA::SystemException, ::PortableInterceptor::ForwardRequest )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void receive_reply ( ::PortableInterceptor::ClientRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1093,10 +1087,10 @@ namespace RTScheduling ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void receive_exception ( ::PortableInterceptor::ClientRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1105,10 +1099,10 @@ namespace RTScheduling CORBA::SystemException, ::PortableInterceptor::ForwardRequest )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void receive_other ( ::PortableInterceptor::ClientRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1117,10 +1111,10 @@ namespace RTScheduling CORBA::SystemException, ::PortableInterceptor::ForwardRequest )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void cancel ( const ::RTScheduling::Current::IdType & guid ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1128,36 +1122,36 @@ namespace RTScheduling ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. Scheduler (void); - + virtual ~Scheduler (void); - + private: // Private and unimplemented for concrete interfaces. Scheduler (const Scheduler &); - + void operator= (const Scheduler &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + extern TAO_RTScheduler_Export ::CORBA::TypeCode_ptr const _tc_Scheduler; // TAO_IDL - Generated from @@ -1174,7 +1168,7 @@ namespace TAO #if !defined (_RTSCHEDULING_THREADACTION__TRAITS_CH_) #define _RTSCHEDULING_THREADACTION__TRAITS_CH_ - + template<> struct TAO_RTScheduler_Export Objref_Traits< ::RTScheduling::ThreadAction> { @@ -1195,7 +1189,7 @@ namespace TAO #if !defined (_RTSCHEDULING_DISTRIBUTABLETHREAD__TRAITS_CH_) #define _RTSCHEDULING_DISTRIBUTABLETHREAD__TRAITS_CH_ - + template<> struct TAO_RTScheduler_Export Objref_Traits< ::RTScheduling::DistributableThread> { @@ -1216,7 +1210,7 @@ namespace TAO #if !defined (_RTSCHEDULING_CURRENT__TRAITS_CH_) #define _RTSCHEDULING_CURRENT__TRAITS_CH_ - + template<> struct TAO_RTScheduler_Export Objref_Traits< ::RTScheduling::Current> { @@ -1237,7 +1231,7 @@ namespace TAO #if !defined (_RTSCHEDULING_RESOURCEMANAGER__TRAITS_CH_) #define _RTSCHEDULING_RESOURCEMANAGER__TRAITS_CH_ - + template<> struct TAO_RTScheduler_Export Objref_Traits< ::RTScheduling::ResourceManager> { @@ -1258,7 +1252,7 @@ namespace TAO #if !defined (_RTSCHEDULING_SCHEDULER__TRAITS_CH_) #define _RTSCHEDULING_SCHEDULER__TRAITS_CH_ - + template<> struct TAO_RTScheduler_Export Objref_Traits< ::RTScheduling::Scheduler> { diff --git a/TAO/tao/RTScheduling/Request_Interceptor.cpp b/TAO/tao/RTScheduling/Request_Interceptor.cpp index d9cba461f36..d0a8fc4c313 100644 --- a/TAO/tao/RTScheduling/Request_Interceptor.cpp +++ b/TAO/tao/RTScheduling/Request_Interceptor.cpp @@ -319,7 +319,7 @@ Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr CORBA::Policy_ptr sched_param = 0; CORBA::Policy_ptr implicit_sched_param = 0; - TAO_RTScheduler_Current_i* new_current; + TAO_RTScheduler_Current_i* new_current = 0; ACE_NEW_THROW_EX (new_current, TAO_RTScheduler_Current_i (this->current_->orb (), this->current_->dt_hash ()), @@ -340,7 +340,7 @@ Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr sched_param, implicit_sched_param); - if (guid_var.in () == 0) + if (guid_var->length () == 0) { ACE_ERROR ((LM_ERROR, "The scheduler MUST retreive and return the " diff --git a/TAO/tao/Strategies/sciop_endpointsC.cpp b/TAO/tao/Strategies/sciop_endpointsC.cpp index 7b5dbd4fd68..657e1e910c9 100644 --- a/TAO/tao/Strategies/sciop_endpointsC.cpp +++ b/TAO/tao/Strategies/sciop_endpointsC.cpp @@ -96,7 +96,7 @@ TAO_SCIOPEndpointSequence::TAO_SCIOPEndpointSequence (void) TAO_SCIOPEndpointSequence::TAO_SCIOPEndpointSequence ( CORBA::ULong max ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< TAO_SCIOP_Endpoint_Info > (max) @@ -108,7 +108,7 @@ TAO_SCIOPEndpointSequence::TAO_SCIOPEndpointSequence ( TAO_SCIOP_Endpoint_Info * buffer, CORBA::Boolean release ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< TAO_SCIOP_Endpoint_Info > (max, length, buffer, release) @@ -117,7 +117,7 @@ TAO_SCIOPEndpointSequence::TAO_SCIOPEndpointSequence ( TAO_SCIOPEndpointSequence::TAO_SCIOPEndpointSequence ( const TAO_SCIOPEndpointSequence &seq ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< TAO_SCIOP_Endpoint_Info > (seq) @@ -206,22 +206,7 @@ CORBA::Boolean operator<< ( const TAO_SCIOPEndpointSequence &_tao_sequence ) { - const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm << _tao_sequence[i]); - } - - return _tao_marshal_flag; - } - - return false; + return TAO::marshal_sequence(strm, _tao_sequence); } CORBA::Boolean operator>> ( @@ -229,40 +214,7 @@ CORBA::Boolean operator>> ( TAO_SCIOPEndpointSequence &_tao_sequence ) { - CORBA::ULong _tao_seq_len; - - if (strm >> _tao_seq_len) - { - // Add a check to the length of the sequence - // to make sure it does not exceed the length - // of the stream. (See bug 58.) - if (_tao_seq_len > strm.length ()) - { - return false; - } - - // Set the length of the sequence. - _tao_sequence.length (_tao_seq_len); - - // If length is 0 we return true. - if (0 >= _tao_seq_len) - { - return true; - } - - // Retrieve all the elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm >> _tao_sequence[i]); - } - - return _tao_marshal_flag; - - } - - return false; + return TAO::demarshal_sequence(strm, _tao_sequence); } #endif /* _TAO_CDR_OP_TAO_SCIOPEndpointSequence_CPP_ */ diff --git a/TAO/tao/Strategies/sciop_endpointsC.h b/TAO/tao/Strategies/sciop_endpointsC.h index 4944c7276c0..634b4d3ff28 100644 --- a/TAO/tao/Strategies/sciop_endpointsC.h +++ b/TAO/tao/Strategies/sciop_endpointsC.h @@ -47,6 +47,7 @@ #include "tao/Seq_Var_T.h" #include "tao/Seq_Out_T.h" #include "tao/VarOut_T.h" +#include "tao/String_Manager_T.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -88,9 +89,9 @@ typedef struct TAO_Strategies_Export TAO_SCIOP_Endpoint_Info { typedef TAO_SCIOP_Endpoint_Info_var _var_type; - - - TAO_String_Manager host; + + + TAO::String_Manager host; CORBA::Short port; CORBA::Short priority; }; @@ -110,22 +111,19 @@ class TAO_SCIOPEndpointSequence; typedef TAO_VarSeq_Var_T< - TAO_SCIOPEndpointSequence, - TAO_SCIOP_Endpoint_Info + TAO_SCIOPEndpointSequence > TAO_SCIOPEndpointSequence_var; typedef TAO_Seq_Out_T< - TAO_SCIOPEndpointSequence, - TAO_SCIOPEndpointSequence_var, - TAO_SCIOP_Endpoint_Info + TAO_SCIOPEndpointSequence > TAO_SCIOPEndpointSequence_out; class TAO_Strategies_Export TAO_SCIOPEndpointSequence : public - TAO_Unbounded_Sequence< + TAO::unbounded_value_sequence< TAO_SCIOP_Endpoint_Info > { @@ -135,12 +133,12 @@ public: TAO_SCIOPEndpointSequence ( CORBA::ULong max, CORBA::ULong length, - TAO_SCIOP_Endpoint_Info* buffer, - CORBA::Boolean release = 0 + TAO_SCIOP_Endpoint_Info* buffer, + CORBA::Boolean release = false ); TAO_SCIOPEndpointSequence (const TAO_SCIOPEndpointSequence &); ~TAO_SCIOPEndpointSequence (void); - + typedef TAO_SCIOPEndpointSequence_var _var_type; }; diff --git a/TAO/tao/Strategies/uiop_endpointsC.cpp b/TAO/tao/Strategies/uiop_endpointsC.cpp index a9b2ed7f462..edb2ac0c6e8 100644 --- a/TAO/tao/Strategies/uiop_endpointsC.cpp +++ b/TAO/tao/Strategies/uiop_endpointsC.cpp @@ -95,7 +95,7 @@ TAO_UIOPEndpointSequence::TAO_UIOPEndpointSequence (void) TAO_UIOPEndpointSequence::TAO_UIOPEndpointSequence ( CORBA::ULong max ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< TAO_UIOP_Endpoint_Info > (max) @@ -107,7 +107,7 @@ TAO_UIOPEndpointSequence::TAO_UIOPEndpointSequence ( TAO_UIOP_Endpoint_Info * buffer, CORBA::Boolean release ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< TAO_UIOP_Endpoint_Info > (max, length, buffer, release) @@ -116,7 +116,7 @@ TAO_UIOPEndpointSequence::TAO_UIOPEndpointSequence ( TAO_UIOPEndpointSequence::TAO_UIOPEndpointSequence ( const TAO_UIOPEndpointSequence &seq ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< TAO_UIOP_Endpoint_Info > (seq) @@ -203,22 +203,7 @@ CORBA::Boolean operator<< ( const TAO_UIOPEndpointSequence &_tao_sequence ) { - const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm << _tao_sequence[i]); - } - - return _tao_marshal_flag; - } - - return false; + return TAO::marshal_sequence(strm, _tao_sequence); } CORBA::Boolean operator>> ( @@ -226,40 +211,7 @@ CORBA::Boolean operator>> ( TAO_UIOPEndpointSequence &_tao_sequence ) { - CORBA::ULong _tao_seq_len; - - if (strm >> _tao_seq_len) - { - // Add a check to the length of the sequence - // to make sure it does not exceed the length - // of the stream. (See bug 58.) - if (_tao_seq_len > strm.length ()) - { - return false; - } - - // Set the length of the sequence. - _tao_sequence.length (_tao_seq_len); - - // If length is 0 we return true. - if (0 >= _tao_seq_len) - { - return true; - } - - // Retrieve all the elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm >> _tao_sequence[i]); - } - - return _tao_marshal_flag; - - } - - return false; + return TAO::demarshal_sequence(strm, _tao_sequence); } #endif /* _TAO_CDR_OP_TAO_UIOPEndpointSequence_CPP_ */ diff --git a/TAO/tao/Strategies/uiop_endpointsC.h b/TAO/tao/Strategies/uiop_endpointsC.h index 1907a64939b..67b93a85845 100644 --- a/TAO/tao/Strategies/uiop_endpointsC.h +++ b/TAO/tao/Strategies/uiop_endpointsC.h @@ -47,6 +47,7 @@ #include "tao/Seq_Var_T.h" #include "tao/Seq_Out_T.h" #include "tao/VarOut_T.h" +#include "tao/String_Manager_T.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -88,9 +89,9 @@ typedef struct TAO_Strategies_Export TAO_UIOP_Endpoint_Info { typedef TAO_UIOP_Endpoint_Info_var _var_type; - - - TAO_String_Manager rendezvous_point; + + + TAO::String_Manager rendezvous_point; CORBA::Short priority; }; @@ -109,22 +110,19 @@ class TAO_UIOPEndpointSequence; typedef TAO_VarSeq_Var_T< - TAO_UIOPEndpointSequence, - TAO_UIOP_Endpoint_Info + TAO_UIOPEndpointSequence > TAO_UIOPEndpointSequence_var; typedef TAO_Seq_Out_T< - TAO_UIOPEndpointSequence, - TAO_UIOPEndpointSequence_var, - TAO_UIOP_Endpoint_Info + TAO_UIOPEndpointSequence > TAO_UIOPEndpointSequence_out; class TAO_Strategies_Export TAO_UIOPEndpointSequence : public - TAO_Unbounded_Sequence< + TAO::unbounded_value_sequence< TAO_UIOP_Endpoint_Info > { @@ -134,12 +132,12 @@ public: TAO_UIOPEndpointSequence ( CORBA::ULong max, CORBA::ULong length, - TAO_UIOP_Endpoint_Info* buffer, - CORBA::Boolean release = 0 + TAO_UIOP_Endpoint_Info* buffer, + CORBA::Boolean release = false ); TAO_UIOPEndpointSequence (const TAO_UIOPEndpointSequence &); ~TAO_UIOPEndpointSequence (void); - + typedef TAO_UIOPEndpointSequence_var _var_type; }; diff --git a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.inl b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.inl index 6fa35755fad..2a425197aa7 100644 --- a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.inl +++ b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.inl @@ -6,8 +6,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO::TypeCodeFactory::Recursive_TypeCode::Recursive_TypeCode (char const * id) - : CORBA::TypeCode (CORBA::TAO_TC_KIND_COUNT) - , ACE_NESTED_CLASS (TAO, True_RefCount_Policy) () + : ::CORBA::TypeCode (CORBA::TAO_TC_KIND_COUNT) + , ::TAO::True_RefCount_Policy () , id_ (id) , the_typecode_ () { diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp index aa97c491b4c..75c2d968c94 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp @@ -66,7 +66,7 @@ TAO::Objref_Traits<CORBA::TypeCodeFactory>::release ( CORBA::TypeCodeFactory_ptr p ) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::TypeCodeFactory_ptr @@ -90,12 +90,12 @@ CORBA::TypeCodeFactory::TypeCodeFactory (void) CORBA::TypeCodeFactory::~TypeCodeFactory (void) {} -void +void CORBA::TypeCodeFactory::_tao_any_destructor (void *_tao_void_pointer) { TypeCodeFactory *_tao_tmp_pointer = static_cast<TypeCodeFactory *> (_tao_void_pointer); - CORBA::release (_tao_tmp_pointer); + ::CORBA::release (_tao_tmp_pointer); } CORBA::TypeCodeFactory_ptr @@ -108,10 +108,10 @@ CORBA::TypeCodeFactory::_narrow ( { return TypeCodeFactory::_nil (); } - + TypeCodeFactory_ptr proxy = dynamic_cast<TypeCodeFactory_ptr> (_tao_objref); - + return TypeCodeFactory::_duplicate (proxy); } @@ -125,28 +125,28 @@ CORBA::TypeCodeFactory::_unchecked_narrow ( { return TypeCodeFactory::_nil (); } - + TypeCodeFactory_ptr proxy = dynamic_cast<TypeCodeFactory_ptr> (_tao_objref); - + return TypeCodeFactory::_duplicate (proxy); } CORBA::TypeCodeFactory_ptr CORBA::TypeCodeFactory::_duplicate (TypeCodeFactory_ptr obj) { - if (! CORBA::is_nil (obj)) + if (! ::CORBA::is_nil (obj)) { obj->_add_ref (); } - + return obj; } void CORBA::TypeCodeFactory::_tao_release (TypeCodeFactory_ptr obj) { - CORBA::release (obj); + ::CORBA::release (obj); } CORBA::Boolean diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp index 5fb6c575d65..d1e918736c7 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp @@ -688,16 +688,9 @@ TAO_TypeCodeFactory_i::create_enum_tc ( tc); } - enumerators[index] = members[index].in (); - -// cdr << members[index].in (); + enumerators[index] = members[index]; } -// return this->assemble_tc (cdr, -// CORBA::tk_enum, -// 0 -// ACE_ENV_ARG_PARAMETER); - typedef TAO::TypeCode::Enum< CORBA::String_var, ACE_Array_Base<CORBA::String_var>, diff --git a/TAO/tao/Utils/Server_Main.cpp b/TAO/tao/Utils/Server_Main.cpp index da47ec1e8df..a4dce4bb8eb 100644 --- a/TAO/tao/Utils/Server_Main.cpp +++ b/TAO/tao/Utils/Server_Main.cpp @@ -55,7 +55,7 @@ TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[]) CORBA::ORB_init (argc, asciiArgv, name_ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (! CORBA::is_nil(orb.in ())) + if (! ::CORBA::is_nil(orb.in ())) { // create an instance of the servant object and give it a // chance at the arguments. diff --git a/TAO/tao/diffs/Object_Key.diff b/TAO/tao/diffs/Object_Key.diff index 8d6a1c4ef59..bb632ec4c49 100644 --- a/TAO/tao/diffs/Object_Key.diff +++ b/TAO/tao/diffs/Object_Key.diff @@ -3,23 +3,23 @@ @@ -37,6 +37,10 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ - + +#include "ace/ACE.h" +#include "ace/OS_NS_string.h" +#include "ace/os_include/os_ctype.h" + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 - + @@ -88,6 +92,150 @@ TAO::ObjectKey::~ObjectKey (void) {} - + +// Hand crafted. + +void +TAO::ObjectKey::encode_sequence_to_string (char * &str, -+ const TAO_Unbounded_Sequence<CORBA::Octet> &seq) ++ const TAO::unbounded_value_sequence<CORBA::Octet> &seq) +{ + // We must allocate a buffer which is (gag) 3 times the length + // of the sequence, which is the length required in the worst-case @@ -71,7 +71,7 @@ +} + +void -+TAO::ObjectKey::decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> &seq, ++TAO::ObjectKey::decode_string_to_sequence (TAO::unbounded_value_sequence<CORBA::Octet> &seq, + const char *str) +{ + if (str == 0) @@ -142,10 +142,8 @@ + if (ACE_BIT_DISABLED (strm.start ()->flags (), + ACE_Message_Block::DONT_DELETE)) + { -+ TAO_Unbounded_Sequence<CORBA::Octet> *oseq = -+ static_cast<TAO_Unbounded_Sequence<CORBA::Octet>*> (&key); -+ oseq->replace (_tao_seq_len, strm.start ()); -+ oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len); ++ key.replace (_tao_seq_len, strm.start ()); ++ key.mb ()->wr_ptr (key.mb()->rd_ptr () + _tao_seq_len); + strm.skip_bytes (_tao_seq_len); + return 1; + } @@ -160,7 +158,7 @@ +} + #endif /* end #if !defined */ - + // TAO_IDL - Generated from --- orig/Object_KeyC.h 2005-04-08 10:17:40.978604800 +0200 +++ Object_KeyC.h 2005-04-08 10:17:41.879900800 +0200 @@ -173,10 +171,10 @@ + + static void encode_sequence_to_string ( + char * &str, -+ const TAO_Unbounded_Sequence<CORBA::Octet> &seq ++ const TAO::unbounded_value_sequence<CORBA::Octet> &seq + ); + static void decode_string_to_sequence ( -+ TAO_Unbounded_Sequence<CORBA::Octet> &seq, ++ TAO::unbounded_value_sequence<CORBA::Octet> &seq, + const char *str + ); + static int is_legal (u_char & c); @@ -188,5 +186,5 @@ + static CORBA::Boolean demarshal_key (ObjectKey &key, + TAO_InputCDR &cdr); }; - + #endif /* end #if !defined */ |