diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-03-30 08:55:10 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-03-30 08:55:10 +0000 |
| commit | 34d52a95d44ae9a824645f17e4b7041067f6a05e (patch) | |
| tree | f47b59d29f9f9c115b4e1424b397e2f68e9a6a1f | |
| parent | f15ace470d00634f0cb110135154e4c9d14daad3 (diff) | |
| download | ATCD-34d52a95d44ae9a824645f17e4b7041067f6a05e.tar.gz | |
ChangeLogTag: Sun Mar 30 02:50:01 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
73 files changed, 5834 insertions, 21427 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 28663e2b453..d72ee9be5ed 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,88 @@ +Sun Mar 30 02:50:01 2003 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/ast/ast_type.cpp: + * TAO_IDL/be/be_interface.cpp: + * TAO_IDL/be/be_sequence.cpp: + * TAO_IDL/be/be_visitor_sequence/buffer_type.cpp: + * TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp: + * TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp: + * TAO_IDL/be_include/be_sequence.h: + * TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h: + * TAO_IDL/be_include/be_visitor_sequence/sequence_cs.h: + * TAO_IDL/include/ast_type.h: + * tao/CONV_FRAMEC.cpp: + * tao/CONV_FRAMEC.h: + * tao/CONV_FRAMEC.i: + * tao/ClientRequestInfo.cpp: + * tao/CurrentC.h: + * tao/DomainC.cpp: + * tao/DomainC.h: + * tao/DomainC.i: + * tao/DynamicC.cpp: + * tao/DynamicC.h: + * tao/DynamicC.i: + * tao/IIOPC.cpp: + * tao/IIOPC.h: + * tao/IIOPC.i: + * tao/IOPC.cpp: + * tao/IOPC.h: + * tao/IOPC.i: + * tao/Messaging_PolicyValueC.cpp: + * tao/Messaging_PolicyValueC.h: + * tao/Messaging_PolicyValueC.i: + * tao/Messaging_SyncScopeC.cpp: + * tao/Messaging_SyncScopeC.h: + * tao/Messaging_SyncScopeC.i: + * tao/ORB.h: + * tao/ObjectIdListC.cpp: + * tao/ObjectIdListC.h: + * tao/ObjectIdListC.i: + * tao/ObjectReferenceTemplateC.cpp: + * tao/ObjectReferenceTemplateC.h: + * tao/ObjectReferenceTemplateC.i: + * tao/Object_KeyC.cpp: + * tao/Object_KeyC.h: + * tao/Object_KeyC.i: + * tao/OctetSeqC.cpp: + * tao/OctetSeqC.h: + * tao/OctetSeqC.i: + * tao/PolicyC.cpp: + * tao/PolicyC.h: + * tao/PolicyC.i: + * tao/Policy_ForwardC.cpp: + * tao/Policy_ForwardC.h: + * tao/Policy_ForwardC.i: + * tao/PollableC.cpp: + * tao/PollableC.h: + * tao/PollableC.i: + * tao/PortableInterceptorC.cpp: + * tao/PortableInterceptorC.h: + * tao/PortableInterceptorC.i: + * tao/Seq_VarOut_T.cpp: + * tao/Seq_VarOut_T.h: + * tao/Seq_VarOut_T.inl: + * tao/Sequence_T.cpp: + * tao/Sequence_T.h: + * tao/ServicesC.cpp: + * tao/ServicesC.h: + * tao/ServicesC.i: + * tao/StringSeqC.cpp: + * tao/StringSeqC.h: + * tao/StringSeqC.i: + * tao/TAOC.cpp: + * tao/TAOC.h: + * tao/TAOC.i: + * tao/TimeBaseC.cpp: + * tao/TimeBaseC.h: + * tao/TimeBaseC.i: + * tao/corbafwd.h: + + Changed sequence generation to create a class that inherits + from the template class instead of just a typedef. Also + regenerated hand-crafted files in the TAO library. + Fri Mar 28 19:12:40 2003 Jeff Parsons <j.parsons@vanderbilt.edu> * CONV_FRAMEC.cpp: diff --git a/TAO/TAO_IDL/ast/ast_type.cpp b/TAO/TAO_IDL/ast/ast_type.cpp index 0e76aa4d9c9..5ff335a1896 100644 --- a/TAO/TAO_IDL/ast/ast_type.cpp +++ b/TAO/TAO_IDL/ast/ast_type.cpp @@ -83,9 +83,7 @@ AST_Type::AST_Type (void) ifr_fwd_added_ (0), size_type_ (AST_Type::SIZE_UNKNOWN), has_constructor_ (0), - nested_type_name_ (0), - seq_cdr_hdr_gen_ (I_FALSE), - seq_cdr_body_gen_ (I_FALSE) + nested_type_name_ (0) { } @@ -97,9 +95,7 @@ AST_Type::AST_Type (AST_Decl::NodeType nt, ifr_fwd_added_ (0), size_type_ (AST_Type::SIZE_UNKNOWN), has_constructor_ (0), - nested_type_name_ (0), - seq_cdr_hdr_gen_ (I_FALSE), - seq_cdr_body_gen_ (I_FALSE) + nested_type_name_ (0) { } @@ -499,31 +495,6 @@ AST_Type::nested_name (const char* local_name, return this->nested_type_name_; } -idl_bool -AST_Type::seq_cdr_hdr_gen (void) const -{ - return this->seq_cdr_hdr_gen_; -} - -void -AST_Type::seq_cdr_hdr_gen (idl_bool val) -{ - this->seq_cdr_hdr_gen_ = val; -} - -idl_bool -AST_Type::seq_cdr_body_gen (void) const -{ - return this->seq_cdr_body_gen_; -} - -void -AST_Type::seq_cdr_body_gen (idl_bool val) -{ - this->seq_cdr_body_gen_ = val; -} - -int AST_Type::ast_accept (ast_visitor *visitor) { return visitor->visit_type (this); diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp index a3ef97c7a71..2de82017bef 100644 --- a/TAO/TAO_IDL/be/be_interface.cpp +++ b/TAO/TAO_IDL/be/be_interface.cpp @@ -560,14 +560,18 @@ be_interface:: gen_var_out_seq_decls (void) return; } + const char *lname = this->local_name (); TAO_OutStream *os = tao_cg->client_header (); *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; + << "// " << __FILE__ << ":" << __LINE__; - const char *lname = this->local_name (); + // Generate the ifdefined macro for this interface. + os->gen_ifdef_macro (this->flat_name (), + "odds_n_ends"); - *os << "class " << lname << ";" << be_nl + *os << be_nl << be_nl + << "class " << lname << ";" << be_nl << "typedef " << lname << " *" << lname << "_ptr;" << be_nl << "struct tao_" << lname << "_life;" << be_nl << "typedef TAO_Objref_Var_T<" << lname << ", tao_" @@ -601,6 +605,8 @@ be_interface:: gen_var_out_seq_decls (void) << "};"; } + os->gen_endif (); + this->var_out_seq_decls_gen_ = 1; } diff --git a/TAO/TAO_IDL/be/be_sequence.cpp b/TAO/TAO_IDL/be/be_sequence.cpp index fd51d8e2aae..19785a579f5 100644 --- a/TAO/TAO_IDL/be/be_sequence.cpp +++ b/TAO/TAO_IDL/be/be_sequence.cpp @@ -25,6 +25,7 @@ #include "be_interface_fwd.h" #include "be_predefined_type.h" #include "be_visitor.h" +#include "be_helper.h" #include "utl_identifier.h" #include "idl_defines.h" #include "ace/Log_Msg.h" @@ -463,6 +464,162 @@ be_sequence::instance_name () return namebuf; } +int +be_sequence::gen_base_class_name (TAO_OutStream *os) +{ + be_type *elem = be_type::narrow_from_decl (this->base_type ()); + + // Generate the appropriate base class type. + switch (this->managed_type ()) + { + case be_sequence::MNG_OBJREF: + if (this->unbounded ()) + { + *os << "TAO_Unbounded_Object_Sequence<" << be_idt << be_idt_nl + << elem->name () << "," << be_nl + << elem->name () << "_var," << be_nl + << elem->fwd_helper_name () << "_life," << be_nl + << elem->fwd_helper_name () << "_cast" << be_uidt_nl + << ">" << be_uidt; + } + else + { + *os << "TAO_Bounded_Object_Sequence<" << be_idt << be_idt_nl + << elem->name () << "," << be_nl + << elem->name () << "_var," << be_nl + << elem->fwd_helper_name () << "_life," << be_nl + << elem->fwd_helper_name () << "_cast," << be_nl + << this->max_size ()->ev ()->u.ulval << be_uidt_nl + << ">" << be_uidt; + } + + break; + case be_sequence::MNG_ABSTRACT: + if (this->unbounded ()) + { + *os << "TAO_Unbounded_Abstract_Sequence<" << be_idt << be_idt_nl + << elem->name () << "," << be_nl + << elem->name () << "_var," << be_nl + << elem->fwd_helper_name () << "_life" << be_uidt_nl + << ">" << be_uidt; + } + else + { + *os << "TAO_Bounded_Abstract_Sequence<" << be_idt << be_idt_nl + << elem->name () << "," << be_nl + << elem->name () << "_var," << be_nl + << elem->fwd_helper_name () << "_life," << be_nl + << this->max_size ()->ev ()->u.ulval << be_uidt_nl + << ">" << be_uidt; + } + + break; + case be_sequence::MNG_PSEUDO: + if (this->unbounded ()) + { + *os << "TAO_Unbounded_Pseudo_Sequence<" << be_idt << be_idt_nl + << elem->name () << "," << be_nl + << elem->name () << "_var" << be_uidt_nl + << ">" << be_uidt; + } + else + { + *os << "TAO_Bounded_Pseudo_Sequence<" << be_idt << be_idt_nl + << elem->name () << "," << be_nl + << elem->name () << "_var," << be_nl + << this->max_size ()->ev ()->u.ulval << be_uidt_nl + << ">" << be_uidt; + } + + break; + case be_sequence::MNG_VALUE: + if (this->unbounded ()) + { + *os << "TAO_Unbounded_Valuetype_Sequence<" << be_idt << be_idt_nl + << elem->name () << "," << be_nl + << elem->name () << "_var," << be_nl + << elem->fwd_helper_name () << "_life" << be_uidt_nl + << ">" << be_uidt; + } + else + { + *os << "TAO_Bounded_Valuetype_Sequence<" << be_idt << be_idt_nl + << elem->name () << "," << be_nl + << elem->name () << "_var," << be_nl + << elem->fwd_helper_name () << "_life," << be_nl + << this->max_size ()->ev ()->u.ulval << be_uidt_nl + << ">" << be_uidt; + } + + break; + case be_sequence::MNG_STRING: + if (this->unbounded ()) + { + *os << "TAO_Unbounded_String_Sequence"; + } + else + { + *os << "TAO_Bounded_String_Sequence<" + << this->max_size ()->ev ()->u.ulval << ">"; + } + + break; + case be_sequence::MNG_WSTRING: + if (this->unbounded ()) + { + *os << "TAO_Unbounded_WString_Sequence"; + } + else + { + *os << "TAO_Bounded_WString_Sequence<" + << this->max_size ()->ev ()->u.ulval << ">"; + } + + break; + default: // Not a managed type. + if (elem->base_node_type () == AST_Decl::NT_array) + { + if (this->unbounded ()) + { + *os << "TAO_Unbounded_Array_Sequence<" + << be_idt << be_idt_nl + << elem->name () << "," << be_nl + << elem->fwd_helper_name () << "_life" << be_uidt_nl + << ">" << be_uidt; + } + else + { + *os << "TAO_Bounded_Array_Sequence<" + << be_idt << be_idt_nl + << elem->name () << "," << be_nl + << elem->fwd_helper_name () << "_life," << be_nl + << this->max_size ()->ev ()->u.ulval << be_uidt_nl + << ">" << be_uidt; + } + } + else + { + if (this->unbounded ()) + { + *os << "TAO_Unbounded_Sequence<" << be_idt << be_idt_nl + << elem->name () << be_uidt_nl + << ">" << be_uidt; + } + else + { + *os << "TAO_Bounded_Sequence<" << be_idt << be_idt_nl + << elem->name () << "," << be_nl + << this->max_size ()->ev ()->u.ulval << be_uidt_nl + << ">" << be_uidt; + } + } + + break; + } + + return 0; +} + void be_sequence::destroy (void) { diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp index 03c5ebe2613..6db0c5878ef 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp @@ -127,13 +127,35 @@ be_visitor_sequence_buffer_type::visit_interface_fwd (be_interface_fwd *node) int be_visitor_sequence_buffer_type::visit_valuetype (be_valuetype *node) { - return this->visit_interface (node); + TAO_OutStream *os = this->ctx_->stream (); + + if (this->ctx_->state () == TAO_CodeGen::TAO_SEQUENCE_BUFFER_TYPE_CH) + { + *os << node->nested_type_name (this->ctx_->scope (), " *"); + } + else + { + *os << node->name () << " *"; + } + + return 0; } int be_visitor_sequence_buffer_type::visit_valuetype_fwd (be_valuetype_fwd *node) { - return this->visit_interface_fwd (node); + TAO_OutStream *os = this->ctx_->stream (); + + if (this->ctx_->state () == TAO_CodeGen::TAO_SEQUENCE_BUFFER_TYPE_CH) + { + *os << node->nested_type_name (this->ctx_->scope (), " *"); + } + else + { + *os << node->name () << " *"; + } + + return 0; } int diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp index 752ba35d833..0515a6fbc2d 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp @@ -48,13 +48,6 @@ be_visitor_sequence_cdr_op_ch::visit_sequence (be_sequence *node) return 0; } - AST_Type *elem = node->base_type (); - - if (elem->seq_cdr_hdr_gen () == I_TRUE) - { - return 0; - } - TAO_OutStream *os = this->ctx_->stream (); be_type *bt = be_type::narrow_from_decl (node); @@ -91,6 +84,5 @@ be_visitor_sequence_cdr_op_ch::visit_sequence (be_sequence *node) } node->cli_hdr_cdr_op_gen (1); - bt->seq_cdr_hdr_gen (I_TRUE); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp index af51027505c..31db271080e 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp @@ -63,11 +63,6 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node) -1); } - if (bt->seq_cdr_body_gen () == I_TRUE) - { - return 0; - } - // If our base type is anonymous sequence, // generate code for the base type sequence here. @@ -246,7 +241,6 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node) } node->cli_stub_cdr_op_gen (1); - bt->seq_cdr_body_gen (I_TRUE); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp index af1fe3fa826..1a7f723da1d 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp @@ -74,371 +74,306 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; - // Generate the appropriate sequence type. + if (this->ctx_->tdef () != 0) + { + *os << be_nl << be_nl + << "class " << node->local_name () << ";"; + } + + if (this->ctx_->tdef () != 0) + { + this->gen_varout_typedefs (node, + bt); + } + + *os << be_nl << be_nl + << "class " << be_global->stub_export_macro () << " " + << node->local_name () << be_idt_nl + << ": public" << be_idt << be_idt_nl; + + if (node->gen_base_class_name (os) == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + "(%N:%l) be_visitor_sequence_ch::" + "visit_sequence - " + "Base class name generation failed\n"), + -1); + } + + *os << be_uidt << be_uidt << be_uidt; + + *os << be_nl + << "{" << be_nl + << "public:" << be_idt; + + *os << be_nl + << node->local_name () << " (void);"; + + if (node->unbounded ()) + { + *os << be_nl + << node->local_name () << " (CORBA::ULong max);"; + } + + *os << be_nl + << node->local_name () << " (" << be_idt << be_idt; + + if (node->unbounded ()) + { + *os << be_nl + << "CORBA::ULong max,"; + } + + *os << be_nl + << "CORBA::ULong length," << be_nl; + + // Generate the base type for the buffer. + be_visitor_context ctx (*this->ctx_); + ctx.state (TAO_CodeGen::TAO_SEQUENCE_BUFFER_TYPE_CH); + be_visitor_sequence_buffer_type bt_visitor (&ctx); + + if (bt->accept (&bt_visitor) == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + "(%N:%l) be_visitor_sequence_ch::" + "visit_sequence - " + "base type visit failed\n"), + -1); + } + + *os << "* buffer, " << be_nl + << "CORBA::Boolean release = 0" << be_uidt_nl + << ");" << be_uidt_nl; + *os << node->local_name () << " (const " << node->local_name () + << " &);" << be_nl; + *os << "~" << node->local_name () << " (void);" << be_nl << be_nl; + + if (be_global->any_support ()) + { + *os << "static void _tao_any_destructor (void *);" << be_nl << be_nl; + } + + // Generate the _var_type typedef (only if we are not anonymous). + if (this->ctx_->tdef () != 0) + { + *os << "typedef " << node->local_name () << "_var _var_type;"; + } + + // TAO provides extensions for octet sequences, first find out if + // the base type is an octet (or an alias for octet). + be_predefined_type *predef = 0; + + if (bt->base_node_type () == AST_Type::NT_pre_defined) + { + be_typedef* alias = + be_typedef::narrow_from_decl (bt); + + if (alias == 0) + { + predef = be_predefined_type::narrow_from_decl (bt); + } + else + { + predef = + be_predefined_type::narrow_from_decl ( + alias->primitive_base_type () + ); + } + } + + // Now generate the extension... + if (predef != 0 && predef->pt () == AST_PredefinedType::PT_octet + && node->unbounded ()) + { + *os << "\n\n#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)" << be_nl + << node->local_name () << " (" << be_idt << be_idt_nl + << "CORBA::ULong length," << be_nl + << "const ACE_Message_Block* mb" << be_uidt_nl + << ")" << be_uidt_nl + << " : " << node->instance_name () + << " (length, mb) {}" << "\n" + << "#endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */"; + } + + *os << be_uidt_nl + << "};"; + + node->cli_hdr_gen (1); + return 0; +} + +void +be_visitor_sequence_ch::gen_varout_typedefs (be_sequence *node, + be_type *elem) +{ + TAO_OutStream *os = this->ctx_->stream (); + + *os << be_nl << be_nl; + switch (node->managed_type ()) { case be_sequence::MNG_OBJREF: - if (node->unbounded ()) - { - *os << be_nl << be_nl - << "typedef" << be_idt_nl - << "TAO_Unbounded_Object_Sequence<" << be_idt << be_idt_nl - << bt->name () << "," << be_nl - << bt->name () << "_var," << be_nl - << bt->fwd_helper_name () << "_life," << be_nl - << bt->fwd_helper_name () << "_cast" << be_uidt_nl - << "> " << node->local_name () << ";" << be_uidt << be_uidt; - } - else - { - *os << be_nl << be_nl - << "typedef" << be_idt_nl - << "TAO_Bounded_Object_Sequence<" << be_idt << be_idt_nl - << bt->name () << "," << be_nl - << bt->name () << "_var," << be_nl - << bt->fwd_helper_name () << "_life," << be_nl - << bt->fwd_helper_name () << "_cast," << be_nl - << node->max_size ()->ev ()->u.ulval << be_uidt_nl - << "> " << node->local_name () << ";" << be_uidt << be_uidt; - } - - // Generate the _var and _out types only if we are not anonymous. - if (this->ctx_->tdef () != 0) - { - *os << be_nl << be_nl - << "typedef" << be_idt_nl - << "TAO_VarSeq_Var_T<" << be_idt << be_idt_nl - << node->local_name () << "," << be_nl - << "TAO_Object_Manager<" << be_idt << be_idt_nl - << bt->name () << "," << be_nl - << bt->name () << "_var," << be_nl - << bt->fwd_helper_name () << "_life" << be_uidt_nl - << ">" << be_uidt << be_uidt_nl - << "> " << node->local_name () << "_var;" << be_uidt << be_uidt; - - *os << be_nl << be_nl - << "typedef" << be_idt_nl - << "TAO_Seq_Out_T<" << be_idt << be_idt_nl - << node->local_name () << "," << be_nl - << node->local_name () << "_var," << be_nl - << "TAO_Object_Manager<" << be_idt << be_idt_nl - << bt->name () << "," << be_nl - << bt->name () << "_var," << be_nl - << bt->fwd_helper_name () << "_life" << be_uidt_nl - << ">" << be_uidt << be_uidt_nl - << "> " << node->local_name () << "_out;" << be_uidt << be_uidt; - } + *os << "typedef" << be_idt_nl + << "TAO_MngSeq_Var_T<" << be_idt << be_idt_nl + << node->local_name () << "," << be_nl + << "TAO_Object_Manager<" << be_idt << be_idt_nl + << elem->name () << "," << be_nl + << elem->name () << "_var," << be_nl + << elem->fwd_helper_name () << "_life" << be_uidt_nl + << ">" << be_uidt << be_uidt_nl + << ">" << be_uidt_nl + << node->local_name () << "_var;" << be_uidt; + + *os << be_nl << be_nl + << "typedef" << be_idt_nl + << "TAO_Seq_Out_T<" << be_idt << be_idt_nl + << node->local_name () << "," << be_nl + << node->local_name () << "_var," << be_nl + << "TAO_Object_Manager<" << be_idt << be_idt_nl + << elem->name () << "," << be_nl + << elem->name () << "_var," << be_nl + << elem->fwd_helper_name () << "_life" << be_uidt_nl + << ">" << be_uidt << be_uidt_nl + << ">" << be_uidt_nl + << node->local_name () << "_out;" << be_uidt; break; case be_sequence::MNG_ABSTRACT: - if (node->unbounded ()) - { - *os << be_nl << be_nl - << "typedef" << be_idt_nl - << "TAO_Unbounded_Abstract_Sequence<" << be_idt << be_idt_nl - << bt->name () << "," << be_nl - << bt->name () << "_var," << be_nl - << bt->fwd_helper_name () << "_life" << be_uidt_nl - << "> " << node->local_name () << ";" << be_uidt << be_uidt; - } - else - { - *os << be_nl << be_nl - << "typedef" << be_idt_nl - << "TAO_Bounded_Object_Sequence<" << be_idt << be_idt_nl - << bt->name () << "," << be_nl - << bt->name () << "_var," << be_nl - << bt->fwd_helper_name () << "_life," << be_nl - << node->max_size ()->ev ()->u.ulval << be_uidt_nl - << "> " << node->local_name () << ";" << be_uidt << be_uidt; - } - - // Generate the _var and _out types only if we are not anonymous. - if (this->ctx_->tdef () != 0) - { - *os << be_nl << be_nl - << "typedef" << be_idt_nl - << "TAO_VarSeq_Var_T<" << be_idt << be_idt_nl - << node->local_name () << "," << be_nl - << "TAO_Abstract_Manager<" << be_idt << be_idt_nl - << bt->name () << "," << be_nl - << bt->name () << "_var," << be_nl - << bt->fwd_helper_name () << "_life" << be_uidt_nl - << ">" << be_uidt << be_uidt_nl - << "> " << node->local_name () << "_var;" << be_uidt << be_uidt; - - *os << be_nl << be_nl - << "typedef" << be_idt_nl - << "TAO_Seq_Out_T<" << be_idt << be_idt_nl - << node->local_name () << "," << be_nl - << node->local_name () << "_var," << be_nl - << "TAO_Abstract_Manager<" << be_idt << be_idt_nl - << bt->name () << "," << be_nl - << bt->name () << "_var," << be_nl - << bt->fwd_helper_name () << "_life" << be_uidt_nl - << ">" << be_uidt << be_uidt_nl - << "> " << node->local_name () << "_out;" << be_uidt << be_uidt; - } + *os << "typedef" << be_idt_nl + << "TAO_MngSeq_Var_T<" << be_idt << be_idt_nl + << node->local_name () << "," << be_nl + << "TAO_Abstract_Manager<" << be_idt << be_idt_nl + << elem->name () << "," << be_nl + << elem->name () << "_var," << be_nl + << elem->fwd_helper_name () << "_life" << be_uidt_nl + << ">" << be_uidt << be_uidt_nl + << ">" << be_uidt_nl + << node->local_name () << "_var;" << be_uidt; + + *os << be_nl << be_nl + << "typedef" << be_idt_nl + << "TAO_Seq_Out_T<" << be_idt << be_idt_nl + << node->local_name () << "," << be_nl + << node->local_name () << "_var," << be_nl + << "TAO_Abstract_Manager<" << be_idt << be_idt_nl + << elem->name () << "," << be_nl + << elem->name () << "_var," << be_nl + << elem->fwd_helper_name () << "_life" << be_uidt_nl + << ">" << be_uidt << be_uidt_nl + << ">" << be_uidt_nl + << node->local_name () << "_out;" << be_uidt; break; case be_sequence::MNG_PSEUDO: - if (node->unbounded ()) - { - *os << be_nl << be_nl - << "typedef" << be_idt_nl - << "TAO_Unbounded_Pseudo_Sequence<" << be_idt << be_idt_nl - << bt->name () << "," << be_nl - << bt->name () << "_var" << be_uidt_nl - << ">" << be_uidt_nl - << node->local_name () << ";" << be_uidt; - } - else - { - *os << be_nl << be_nl - << "typedef" << be_idt_nl - << "TAO_Bounded_Pseudo_Sequence<" << be_idt << be_idt_nl - << bt->name () << "," << be_nl - << bt->name () << "_var," << be_nl - << node->max_size ()->ev ()->u.ulval << be_uidt_nl - << ">" << be_uidt_nl - << node->local_name () << ";" << be_uidt; - } - - // Generate the _var and _out types only if we are not anonymous. - if (this->ctx_->tdef () != 0) - { - *os << be_nl << be_nl - << "typedef" << be_idt_nl - << "TAO_VarSeq_Var_T<" << be_idt << be_idt_nl - << node->local_name () << "," << be_nl - << "TAO_Pseudo_Object_Manager<" << be_idt << be_idt_nl - << bt->name () << "," << be_nl - << bt->name () << "_var" << be_uidt_nl - << ">" << be_uidt << be_uidt_nl - << "> " << node->local_name () << "_var;" << be_uidt << be_uidt; - - *os << be_nl << be_nl - << "typedef" << be_idt_nl - << "TAO_Seq_Out_T<" << be_idt << be_idt_nl - << node->local_name () << "," << be_nl - << node->local_name () << "_var," << be_nl - << "TAO_Pseudo_Object_Manager<" << be_idt << be_idt_nl - << bt->name () << "," << be_nl - << bt->name () << "_var" << be_uidt_nl - << ">" << be_uidt << be_uidt_nl - << "> " << node->local_name () << "_out;" << be_uidt << be_uidt; - } + *os << "typedef" << be_idt_nl + << "TAO_MngSeq_Var_T<" << be_idt << be_idt_nl + << node->local_name () << "," << be_nl + << "TAO_Pseudo_Object_Manager<" << be_idt << be_idt_nl + << elem->name () << "," << be_nl + << elem->name () << "_var" << be_uidt_nl + << ">" << be_uidt << be_uidt_nl + << ">" << be_uidt_nl + << node->local_name () << "_var;" << be_uidt; + + *os << be_nl << be_nl + << "typedef" << be_idt_nl + << "TAO_Seq_Out_T<" << be_idt << be_idt_nl + << node->local_name () << "," << be_nl + << node->local_name () << "_var," << be_nl + << "TAO_Pseudo_Object_Manager<" << be_idt << be_idt_nl + << elem->name () << "," << be_nl + << elem->name () << "_var" << be_uidt_nl + << ">" << be_uidt << be_uidt_nl + << ">" << be_uidt_nl + << node->local_name () << "_out;" << be_uidt; break; case be_sequence::MNG_VALUE: - if (node->unbounded ()) - { - *os << be_nl << be_nl - << "typedef" << be_idt_nl - << "TAO_Unbounded_Valuetype_Sequence<" << be_idt << be_idt_nl - << bt->name () << "," << be_nl - << bt->name () << "_var," << be_nl - << bt->fwd_helper_name () << "_life" << be_uidt_nl - << ">" << be_uidt_nl - << node->local_name () << ";" << be_uidt; - } - else - { - *os << be_nl << be_nl - << "typedef" << be_idt_nl - << "TAO_Bounded_Valuetype_Sequence<" << be_idt << be_idt_nl - << bt->name () << "," << be_nl - << bt->name () << "_var," << be_nl - << bt->fwd_helper_name () << "_life," << be_nl - << node->max_size ()->ev ()->u.ulval << be_uidt_nl - << ">" << be_uidt_nl - << node->local_name () << ";" << be_uidt; - } - - // Generate the _var and _out types only if we are not anonymous. - if (this->ctx_->tdef () != 0) - { - *os << be_nl << be_nl - << "typedef" << be_idt_nl - << "TAO_VarSeq_Var_T<" << be_idt << be_idt_nl - << node->local_name () << "," << be_nl - << "TAO_Valuetype_Manager<" << be_idt << be_idt_nl - << bt->name () << "," << be_nl - << bt->name () << "_var," << be_nl - << bt->fwd_helper_name () << "_life" << be_uidt_nl - << ">" << be_uidt << be_uidt_nl - << "> " << node->local_name () << "_var;" << be_uidt << be_uidt; - - *os << be_nl << be_nl - << "typedef" << be_idt_nl - << "TAO_Seq_Out_T<" << be_idt << be_idt_nl - << node->local_name () << "," << be_nl - << node->local_name () << "_var," << be_nl - << "TAO_Valuetype_Manager<" << be_idt << be_idt_nl - << bt->name () << "," << be_nl - << bt->name () << "_var," << be_nl - << bt->fwd_helper_name () << "_life" << be_uidt_nl - << ">" << be_uidt << be_uidt_nl - << "> " << node->local_name () << "_out;" << be_uidt << be_uidt; - } + *os << "typedef" << be_idt_nl + << "TAO_MngSeq_Var_T<" << be_idt << be_idt_nl + << node->local_name () << "," << be_nl + << "TAO_Valuetype_Manager<" << be_idt << be_idt_nl + << elem->name () << "," << be_nl + << elem->name () << "_var," << be_nl + << elem->fwd_helper_name () << "_life" << be_uidt_nl + << ">" << be_uidt << be_uidt_nl + << ">" << be_uidt_nl + << node->local_name () << "_var;" << be_uidt; + + *os << be_nl << be_nl + << "typedef" << be_idt_nl + << "TAO_Seq_Out_T<" << be_idt << be_idt_nl + << node->local_name () << "," << be_nl + << node->local_name () << "_var," << be_nl + << "TAO_Valuetype_Manager<" << be_idt << be_idt_nl + << elem->name () << "," << be_nl + << elem->name () << "_var," << be_nl + << elem->fwd_helper_name () << "_life" << be_uidt_nl + << ">" << be_uidt << be_uidt_nl + << ">" << be_uidt_nl + << node->local_name () << "_out;" << be_uidt; break; case be_sequence::MNG_STRING: - if (node->unbounded ()) - { - *os << be_nl << be_nl - << "typedef" << be_idt_nl - << "TAO_Unbounded_String_Sequence" << be_nl - << node->local_name () << ";" << be_uidt; - } - else - { - *os << be_nl << be_nl - << "typedef" << be_idt_nl - << "TAO_Bounded_String_Sequence<" - << node->max_size ()->ev ()->u.ulval << ">" << be_nl - << node->local_name () << ";" << be_uidt; - } - - if (this->ctx_->tdef () != 0) - { - *os << be_nl << be_nl - << "typedef" << be_idt_nl - << "TAO_VarSeq_Var_T<" << be_idt << be_idt_nl - << node->local_name () << "," << be_nl - << "TAO_SeqElem_String_Manager" << be_uidt_nl - << ">" << be_uidt_nl - << node->local_name () << "_var;" << be_uidt; - - *os << be_nl << be_nl - << "typedef" << be_idt_nl - << "TAO_Seq_Out_T<" << be_idt << be_idt_nl - << node->local_name () << "," << be_nl - << node->local_name () << "_var," << be_nl - << "TAO_SeqElem_String_Manager" << be_uidt_nl - << ">" << be_uidt_nl - << node->local_name () << "_out;" << be_uidt; - } + *os << "typedef" << be_idt_nl + << "TAO_MngSeq_Var_T<" << be_idt << be_idt_nl + << node->local_name () << "," << be_nl + << "TAO_SeqElem_String_Manager" << be_uidt_nl + << ">" << be_uidt_nl + << node->local_name () << "_var;" << be_uidt; + + *os << be_nl << be_nl + << "typedef" << be_idt_nl + << "TAO_Seq_Out_T<" << be_idt << be_idt_nl + << node->local_name () << "," << be_nl + << node->local_name () << "_var," << be_nl + << "TAO_SeqElem_String_Manager" << be_uidt_nl + << ">" << be_uidt_nl + << node->local_name () << "_out;" << be_uidt; break; case be_sequence::MNG_WSTRING: - if (node->unbounded ()) - { - *os << be_nl << be_nl - << "typedef" << be_idt_nl - << "TAO_Unbounded_WString_Sequence" << be_nl - << node->local_name () << ";" << be_uidt; - } - else - { - *os << be_nl << be_nl - << "typedef" << be_idt_nl - << "TAO_Bounded_WString_Sequence<" - << node->max_size ()->ev ()->u.ulval << ">" << be_nl - << node->local_name () << ";" << be_uidt; - } - - if (this->ctx_->tdef () != 0) - { - *os << be_nl << be_nl - << "typedef" << be_idt_nl - << "TAO_VarSeq_Var_T<" << be_idt << be_idt_nl - << node->local_name () << "," << be_nl - << "TAO_SeqElem_WString_Manager" << be_uidt_nl - << ">" << be_uidt_nl - << node->local_name () << "_var;" << be_uidt; - - *os << be_nl << be_nl - << "typedef" << be_idt_nl - << "TAO_Seq_Out_T<" << be_idt << be_idt_nl - << node->local_name () << "," << be_nl - << node->local_name () << "_var," << be_nl - << "TAO_SeqElem_WString_Manager" << be_uidt_nl - << ">" << be_uidt_nl - << node->local_name () << "_out;" << be_uidt; - } - + *os << "typedef" << be_idt_nl + << "TAO_MngSeq_Var_T<" << be_idt << be_idt_nl + << node->local_name () << "," << be_nl + << "TAO_SeqElem_WString_Manager" << be_uidt_nl + << ">" << be_uidt_nl + << node->local_name () << "_var;" << be_uidt; + + *os << be_nl << be_nl + << "typedef" << be_idt_nl + << "TAO_Seq_Out_T<" << be_idt << be_idt_nl + << node->local_name () << "," << be_nl + << node->local_name () << "_var," << be_nl + << "TAO_SeqElem_WString_Manager" << be_uidt_nl + << ">" << be_uidt_nl + << node->local_name () << "_out;" << be_uidt; break; default: // Not a managed type. - if (bt->base_node_type () == AST_Decl::NT_array) - { - if (node->unbounded ()) - { - *os << be_nl << be_nl - << "typedef" << be_idt_nl - << "TAO_Unbounded_Array_Sequence<" - << be_idt << be_idt_nl - << bt->name () << "," << be_nl - << bt->fwd_helper_name () << "_life" << be_uidt_nl - << ">" << be_uidt_nl - << node->local_name () << ";" << be_uidt; - } - else - { - *os << be_nl << be_nl - << "typedef" << be_idt_nl - << "TAO_Bounded_Array_Sequence<" - << be_idt << be_idt_nl - << bt->name () << "," << be_nl - << bt->fwd_helper_name () << "_life," << be_nl - << node->max_size ()->ev ()->u.ulval << be_uidt_nl - << ">" << be_uidt_nl - << node->local_name () << ";" << be_uidt; - } - } - else - { - if (node->unbounded ()) - { - *os << be_nl << be_nl - << "typedef" << be_idt_nl - << "TAO_Unbounded_Sequence<" << be_idt << be_idt_nl - << bt->name () << be_uidt_nl - << ">" << be_uidt_nl - << node->local_name () << ";" << be_uidt; - } - else - { - *os << be_nl << be_nl - << "typedef" << be_idt_nl - << "TAO_Bounded_Sequence<" << be_idt << be_idt_nl - << bt->name () << "," << be_nl - << node->max_size ()->ev ()->u.ulval << be_uidt_nl - << ">" << be_uidt_nl - << node->local_name () << ";" << be_uidt; - } - } - - // Generate the _var and _out types only if we are not anonymous. - if (this->ctx_->tdef () != 0) - { - AST_Type::SIZE_TYPE st = bt->size_type (); - - *os << be_nl << be_nl - << "typedef" << be_idt_nl - << (st == AST_Type::FIXED ? "TAO_FixedSeq_Var_T<" - : "TAO_VarSeq_Var_T<") - << be_idt << be_idt_nl - << node->local_name () << "," << be_nl - << bt->name () << be_uidt_nl - << ">" << be_uidt_nl - << node->local_name () << "_var;" << be_uidt; - - *os << be_nl << be_nl - << "typedef" << be_idt_nl - << "TAO_Seq_Out_T<" << be_idt << be_idt_nl - << node->local_name () << "," << be_nl - << node->local_name () << "_var," << be_nl - << bt->name () << be_uidt_nl - << ">" << be_uidt_nl - << node->local_name () << "_out;" << be_uidt; - } + { + AST_Type::SIZE_TYPE st = elem->size_type (); + + *os << "typedef" << be_idt_nl + << (st == AST_Type::FIXED ? "TAO_FixedSeq_Var_T<" + : "TAO_VarSeq_Var_T<") + << be_idt << be_idt_nl + << node->local_name () << "," << be_nl + << elem->name () << be_uidt_nl + << ">" << be_uidt_nl + << node->local_name () << "_var;" << be_uidt; + + *os << be_nl << be_nl + << "typedef" << be_idt_nl + << "TAO_Seq_Out_T<" << be_idt << be_idt_nl + << node->local_name () << "," << be_nl + << node->local_name () << "_var," << be_nl + << elem->name () << be_uidt_nl + << ">" << be_uidt_nl + << node->local_name () << "_out;" << be_uidt; + } break; } - - node->cli_hdr_gen (1); - return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp index b148609aaba..e044ddeb502 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp @@ -49,336 +49,297 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl << "// "__FILE__ << ":" << __LINE__; - os->gen_ifdef_AHETI (); + // default constructor + *os << be_nl << be_nl + << node->name () << "::" << node->local_name () << " (void)" << be_nl + << "{}"; - switch (node->managed_type ()) + // for unbounded sequences, we have a different set of constructors + if (node->unbounded ()) { - case be_sequence::MNG_OBJREF: - if (node->unbounded ()) - { - *os << be_nl << be_nl - << "template class" << be_idt_nl - << "TAO_Unbounded_Object_Sequence<" << be_idt << be_idt_nl - << bt->name () << "," << be_nl - << bt->name () << "_var," << be_nl - << bt->fwd_helper_name () << "_life," << be_nl - << bt->fwd_helper_name () << "_cast" << be_uidt_nl - << ">;" << be_uidt << be_uidt_nl; - } - else - { - *os << be_nl << be_nl - << "template class" << be_idt_nl - << "TAO_Bounded_Object_Sequence<" << be_idt << be_idt_nl - << bt->name () << "," << be_nl - << bt->name () << "_var," << be_nl - << bt->fwd_helper_name () << "_life," << be_nl - << bt->fwd_helper_name () << "_cast," << be_nl - << node->max_size ()->ev ()->u.ulval << be_uidt_nl - << ">;" << be_uidt << be_uidt; - } + *os << be_nl << be_nl + << node->name () << "::" << node->local_name () + << " (CORBA::ULong max)" << be_nl + << " : " << be_idt << be_idt; - // Instantiate the _var and _out types only if we are not anonymous. - if (this->ctx_->tdef () != 0) + // Pass it to the base constructor. + if (node->gen_base_class_name (os) == -1) { - *os << be_nl << be_nl - << "template class" << be_idt_nl - << "TAO_VarSeq_Var_T<" << be_idt << be_idt_nl - << node->name () << "," << be_nl - << "TAO_Object_Manager<" << be_idt << be_idt_nl - << bt->name () << "," << be_nl - << bt->name () << "_var," << be_nl - << bt->fwd_helper_name () << "_life" << be_uidt_nl - << ">" << be_uidt << be_uidt_nl - << ">;" << be_uidt << be_uidt; - - *os << be_nl << be_nl - << "template class" << be_idt_nl - << "TAO_Seq_Out_T<" << be_idt << be_idt_nl - << node->name () << "," << be_nl - << node->name () << "_var," << be_nl - << "TAO_Object_Manager<" << be_idt << be_idt_nl - << bt->name () << "," << be_nl - << bt->name () << "_var," << be_nl - << bt->fwd_helper_name () << "_life" << be_uidt_nl - << ">" << be_uidt << be_uidt_nl - << ">;" << be_uidt << be_uidt; + ACE_ERROR_RETURN ((LM_ERROR, + "(%N:%l) be_visitor_sequence_cs::" + "visit_sequence - " + "codegen for base sequence class\n"), + -1); } + + *os << be_nl << "(max)" << be_uidt << be_uidt_nl + << "{}"; + } + + // constructor with the buffer + *os << be_nl << be_nl + << node->name () << "::" << node->local_name () << " (" + << be_idt << be_idt_nl; + + if (node->unbounded ()) + { + // Unbounded seq takes this extra parameter. + *os << "CORBA::ULong max," << be_nl; + } + + *os << "CORBA::ULong length," << be_nl; + + // generate the base type for the buffer + be_visitor_context ctx (*this->ctx_); + be_visitor_sequence_buffer_type bt_visitor (&ctx); + + if (bt->accept (&bt_visitor) == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + "(%N:%l) be_visitor_sequence_cs::" + "visit_sequence - " + "base type visit failed\n"), + -1); + } + + *os << "* buffer," << be_nl + << "CORBA::Boolean release" << be_uidt_nl + << ")" << be_uidt_nl + << " : " << be_idt << be_idt; + + // Pass it to the base constructor. + if (node->gen_base_class_name (os) == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + "(%N:%l) be_visitor_sequence_cs::" + "visit_sequence - " + "codegen for base sequence class\n"), + -1); + } + + *os << be_nl << "("; + + if (node->unbounded ()) + { + *os << "max, "; + } + + *os << "length, buffer, release)" << be_uidt << be_uidt_nl + << "{}"; + + // Copy constructor. + *os << be_nl << be_nl + << node->name () << "::" << node->local_name () + << " (const " << node->local_name () + << " &seq)" << be_nl + << " : " << be_idt << be_idt; + + // Pass it to the base constructor. + if (node->gen_base_class_name (os) == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + "(%N:%l) be_visitor_sequence_cs::" + "visit_sequence - " + "codegen for base sequence class\n"), + -1); + } + + *os << be_nl << "(seq)" << be_uidt << be_uidt_nl + << "{}"; + + // Destructor. + *os << be_nl << be_nl + << node->name () << "::~" << node->local_name () + << " (void)" << be_nl + << "{}" << be_nl << be_nl; + + + if (be_global->any_support ()) + { + *os << "void " + << node->name () << "::_tao_any_destructor (void *_tao_void_pointer)" + << be_nl + << "{" << be_idt_nl + << node->local_name () << " *tmp = ACE_static_cast (" + << node->local_name () << "*, _tao_void_pointer);" << be_nl + << "delete tmp;" << be_uidt_nl + << "}"; + } + + if (this->ctx_->tdef () != 0) + { + this->gen_varout_tmplinst (node, + bt); + } + + node->cli_stub_gen (1); + return 0; +} + +int +be_visitor_sequence_cs::gen_varout_tmplinst (be_sequence *node, + be_type *bt) +{ + TAO_OutStream *os = this->ctx_->stream (); + + os->gen_ifdef_AHETI (); + + switch (node->managed_type ()) + { + case be_sequence::MNG_OBJREF: + *os << be_nl << be_nl + << "template class" << be_idt_nl + << "TAO_MngSeq_Var_T<" << be_idt << be_idt_nl + << node->name () << "," << be_nl + << "TAO_Object_Manager<" << be_idt << be_idt_nl + << bt->name () << "," << be_nl + << bt->name () << "_var," << be_nl + << bt->fwd_helper_name () << "_life" << be_uidt_nl + << ">" << be_uidt << be_uidt_nl + << ">;" << be_uidt << be_uidt; + + *os << be_nl << be_nl + << "template class" << be_idt_nl + << "TAO_Seq_Out_T<" << be_idt << be_idt_nl + << node->name () << "," << be_nl + << node->name () << "_var," << be_nl + << "TAO_Object_Manager<" << be_idt << be_idt_nl + << bt->name () << "," << be_nl + << bt->name () << "_var," << be_nl + << bt->fwd_helper_name () << "_life" << be_uidt_nl + << ">" << be_uidt << be_uidt_nl + << ">;" << be_uidt << be_uidt; + break; case be_sequence::MNG_ABSTRACT: - if (node->unbounded ()) - { - *os << be_nl << be_nl - << "template class" << be_idt_nl - << "TAO_Unbounded_Abstract_Sequence<" << be_idt << be_idt_nl - << bt->name () << "," << be_nl - << bt->name () << "_var," << be_nl - << bt->fwd_helper_name () << "_life" << be_uidt_nl - << ">;" << be_uidt << be_uidt; - } - else - { - *os << be_nl << be_nl - << "template class" << be_idt_nl - << "TAO_Bounded_Abstract_Sequence<" << be_idt << be_idt_nl - << bt->name () << "," << be_nl - << bt->name () << "_var," << be_nl - << bt->fwd_helper_name () << "_life," << be_nl - << node->max_size ()->ev ()->u.ulval << be_uidt_nl - << ">;" << be_uidt << be_uidt; - } - - // Instantiate the _var and _out types only if we are not anonymous. - if (this->ctx_->tdef () != 0) - { - *os << be_nl << be_nl - << "template class" << be_idt_nl - << "TAO_VarSeq_Var_T<" << be_idt << be_idt_nl - << node->name () << "," << be_nl - << "TAO_Abstract_Manager<" << be_idt << be_idt_nl - << bt->name () << "," << be_nl - << bt->name () << "_var," << be_nl - << bt->fwd_helper_name () << "_life" << be_uidt_nl - << ">" << be_uidt << be_uidt_nl - << ">;" << be_uidt << be_uidt; - - *os << be_nl << be_nl - << "template class" << be_idt_nl - << "TAO_Seq_Out_T<" << be_idt << be_idt_nl - << node->name () << "," << be_nl - << node->name () << "_var," << be_nl - << "TAO_Abstract_Manager<" << be_idt << be_idt_nl - << bt->name () << "," << be_nl - << bt->name () << "_var," << be_nl - << bt->fwd_helper_name () << "_life" << be_uidt_nl - << ">" << be_uidt << be_uidt_nl - << ">;" << be_uidt << be_uidt; - } + *os << be_nl << be_nl + << "template class" << be_idt_nl + << "TAO_MngSeq_Var_T<" << be_idt << be_idt_nl + << node->name () << "," << be_nl + << "TAO_Abstract_Manager<" << be_idt << be_idt_nl + << bt->name () << "," << be_nl + << bt->name () << "_var," << be_nl + << bt->fwd_helper_name () << "_life" << be_uidt_nl + << ">" << be_uidt << be_uidt_nl + << ">;" << be_uidt << be_uidt; + + *os << be_nl << be_nl + << "template class" << be_idt_nl + << "TAO_Seq_Out_T<" << be_idt << be_idt_nl + << node->name () << "," << be_nl + << node->name () << "_var," << be_nl + << "TAO_Abstract_Manager<" << be_idt << be_idt_nl + << bt->name () << "," << be_nl + << bt->name () << "_var," << be_nl + << bt->fwd_helper_name () << "_life" << be_uidt_nl + << ">" << be_uidt << be_uidt_nl + << ">;" << be_uidt << be_uidt; break; case be_sequence::MNG_PSEUDO: - if (node->unbounded ()) - { - *os << be_nl << be_nl - << "template class" << be_idt_nl - << "TAO_Unbounded_Pseudo_Sequence<" << be_idt << be_idt_nl - << bt->name () << "," << be_nl - << bt->name () << "_var" << be_uidt_nl - << ">;" << be_uidt << be_uidt; - } - else - { - *os << be_nl << be_nl - << "template class" << be_idt_nl - << "TAO_Bounded_Pseudo_Sequence<" << be_idt << be_idt_nl - << bt->name () << "," << be_nl - << bt->name () << "_var," << be_nl - << node->max_size ()->ev ()->u.ulval << be_uidt_nl - << ">;" << be_uidt << be_uidt; - } - - // Instantiate the _var and _out types only if we are not anonymous. - if (this->ctx_->tdef () != 0) - { - *os << be_nl << be_nl - << "template class" << be_idt_nl - << "TAO_VarSeq_Var_T<" << be_idt << be_idt_nl - << node->name () << "," << be_nl - << "TAO_Pseudo_Object_Manager<" << be_idt << be_idt_nl - << bt->name () << "," << be_nl - << bt->name () << "_var" << be_uidt_nl - << ">" << be_uidt << be_uidt_nl - << ">;" << be_uidt << be_uidt; - - *os << be_nl << be_nl - << "template class" << be_idt_nl - << "TAO_Seq_Out_T<" << be_idt << be_idt_nl - << node->name () << "," << be_nl - << node->name () << "_var," << be_nl - << "TAO_Pseudo_Object_Manager<" << be_idt << be_idt_nl - << bt->name () << "," << be_nl - << bt->name () << "_var" << be_uidt_nl - << ">" << be_uidt << be_uidt_nl - << ">;" << be_uidt << be_uidt; - } + *os << be_nl << be_nl + << "template class" << be_idt_nl + << "TAO_MngSeq_Var_T<" << be_idt << be_idt_nl + << node->name () << "," << be_nl + << "TAO_Pseudo_Object_Manager<" << be_idt << be_idt_nl + << bt->name () << "," << be_nl + << bt->name () << "_var" << be_uidt_nl + << ">" << be_uidt << be_uidt_nl + << ">;" << be_uidt << be_uidt; + + *os << be_nl << be_nl + << "template class" << be_idt_nl + << "TAO_Seq_Out_T<" << be_idt << be_idt_nl + << node->name () << "," << be_nl + << node->name () << "_var," << be_nl + << "TAO_Pseudo_Object_Manager<" << be_idt << be_idt_nl + << bt->name () << "," << be_nl + << bt->name () << "_var" << be_uidt_nl + << ">" << be_uidt << be_uidt_nl + << ">;" << be_uidt << be_uidt; break; case be_sequence::MNG_VALUE: - if (node->unbounded ()) - { - *os << be_nl << be_nl - << "template class" << be_idt_nl - << "TAO_Unbounded_Valuetype_Sequence<" << be_idt << be_idt_nl - << bt->name () << "," << be_nl - << bt->name () << "_var," << be_nl - << bt->fwd_helper_name () << "_life" << be_uidt_nl - << ">;" << be_uidt << be_uidt; - } - else - { - *os << be_nl << be_nl - << "template class" << be_idt_nl - << "TAO_Bounded_Valuetype_Sequence<" << be_idt << be_idt_nl - << bt->name () << "," << be_nl - << bt->name () << "_var," << be_nl - << bt->fwd_helper_name () << "_life," << be_nl - << node->max_size ()->ev ()->u.ulval << be_uidt_nl - << ">;" << be_uidt << be_uidt; - } - - // Instantiate the _var and _out types only if we are not anonymous. - if (this->ctx_->tdef () != 0) - { - *os << be_nl << be_nl - << "template class" << be_idt_nl - << "TAO_VarSeq_Var_T<" << be_idt << be_idt_nl - << node->name () << "," << be_nl - << "TAO_Valuetype_Manager<" << be_idt << be_idt_nl - << bt->name () << "," << be_nl - << bt->name () << "_var," << be_nl - << bt->fwd_helper_name () << "_life" << be_uidt_nl - << ">" << be_uidt << be_uidt_nl - << ">;" << be_uidt << be_uidt; - - *os << be_nl << be_nl - << "template class" << be_idt_nl - << "TAO_Seq_Out_T<" << be_idt << be_idt_nl - << node->name () << "," << be_nl - << node->name () << "_var," << be_nl - << "TAO_Valuetype_Manager<" << be_idt << be_idt_nl - << bt->name () << "," << be_nl - << bt->name () << "_var," << be_nl - << bt->fwd_helper_name () << "_life" << be_uidt_nl - << ">" << be_uidt << be_uidt_nl - << ">;" << be_uidt << be_uidt; - } + *os << be_nl << be_nl + << "template class" << be_idt_nl + << "TAO_MngSeq_Var_T<" << be_idt << be_idt_nl + << node->name () << "," << be_nl + << "TAO_Valuetype_Manager<" << be_idt << be_idt_nl + << bt->name () << "," << be_nl + << bt->name () << "_var," << be_nl + << bt->fwd_helper_name () << "_life" << be_uidt_nl + << ">" << be_uidt << be_uidt_nl + << ">;" << be_uidt << be_uidt; + + *os << be_nl << be_nl + << "template class" << be_idt_nl + << "TAO_Seq_Out_T<" << be_idt << be_idt_nl + << node->name () << "," << be_nl + << node->name () << "_var," << be_nl + << "TAO_Valuetype_Manager<" << be_idt << be_idt_nl + << bt->name () << "," << be_nl + << bt->name () << "_var," << be_nl + << bt->fwd_helper_name () << "_life" << be_uidt_nl + << ">" << be_uidt << be_uidt_nl + << ">;" << be_uidt << be_uidt; break; case be_sequence::MNG_STRING: - if (! node->unbounded ()) - { - *os << be_nl << be_nl - << "template class TAO_Bounded_String_Sequence<" << be_nl - << node->max_size ()->ev ()->u.ulval << ">;"; - } - - // Instantiate the _var and _out types only if we are not anonymous. - if (this->ctx_->tdef () != 0) - { - *os << be_nl << be_nl - << "template class" << be_idt_nl - << "TAO_VarSeq_Var_T<" << be_idt << be_idt_nl - << node->name () << "," << be_nl - <<"TAO_SeqElem_String_Manager" << be_uidt_nl - << ">;" << be_uidt << be_uidt; - - *os << be_nl << be_nl - << "template class" << be_idt_nl - << "TAO_Seq_Out_T<" << be_idt << be_idt_nl - << node->name () << "," << be_nl - << node->name () << "_var," << be_nl - << "TAO_SeqElem_String_Manager" << be_uidt_nl - << ">;" << be_uidt << be_uidt; - } + *os << be_nl << be_nl + << "template class" << be_idt_nl + << "TAO_MngSeq_Var_T<" << be_idt << be_idt_nl + << node->name () << "," << be_nl + <<"TAO_SeqElem_String_Manager" << be_uidt_nl + << ">;" << be_uidt << be_uidt; + + *os << be_nl << be_nl + << "template class" << be_idt_nl + << "TAO_Seq_Out_T<" << be_idt << be_idt_nl + << node->name () << "," << be_nl + << node->name () << "_var," << be_nl + << "TAO_SeqElem_String_Manager" << be_uidt_nl + << ">;" << be_uidt << be_uidt; break; case be_sequence::MNG_WSTRING: - if (! node->unbounded ()) - { - *os << be_nl << be_nl - << "template class TAO_Bounded_WString_Sequence<" - << node->max_size ()->ev ()->u.ulval << ">;"; - } - - // Instantiate the _var and _out types only if we are not anonymous. - if (this->ctx_->tdef () != 0) - { - *os << be_nl << be_nl - << "template class" << be_idt_nl - << "TAO_VarSeq_Var_T<" << be_idt << be_idt_nl - << node->name () << "," << be_nl - <<"TAO_SeqElem_WString_Manager" << be_uidt_nl - << ">;" << be_uidt << be_uidt; - - *os << be_nl << be_nl - << "template class" << be_idt_nl - << "TAO_Seq_Out_T<" << be_idt << be_idt_nl - << node->name () << "," << be_nl - << node->name () << "_var," << be_nl - << "TAO_SeqElem_WString_Manager" << be_uidt_nl - << ">;" << be_uidt << be_uidt; - } + *os << be_nl << be_nl + << "template class" << be_idt_nl + << "TAO_MngSeq_Var_T<" << be_idt << be_idt_nl + << node->name () << "," << be_nl + <<"TAO_SeqElem_WString_Manager" << be_uidt_nl + << ">;" << be_uidt << be_uidt; + + *os << be_nl << be_nl + << "template class" << be_idt_nl + << "TAO_Seq_Out_T<" << be_idt << be_idt_nl + << node->name () << "," << be_nl + << node->name () << "_var," << be_nl + << "TAO_SeqElem_WString_Manager" << be_uidt_nl + << ">;" << be_uidt << be_uidt; break; default: // not a managed type - if (bt->base_node_type () == AST_Decl::NT_array) - { - if (node->unbounded ()) - { - *os << be_nl << be_nl - << "template class" << be_idt_nl - << "TAO_Unbounded_Array_Sequence<" - << be_idt << be_idt_nl - << bt->name () << "," << be_nl - << bt->fwd_helper_name () << "_life" << be_uidt_nl - << ">;" << be_uidt << be_uidt; - } - else - { - *os << be_nl << be_nl - << "template class" << be_idt_nl - << "TAO_Bounded_Array_Sequence<" - << be_idt << be_idt_nl - << bt->name () << "," << be_nl - << bt->fwd_helper_name () << "_life," << be_nl - << node->max_size ()->ev ()->u.ulval << be_uidt_nl - << ">;" << be_uidt << be_uidt; - } - } - else - { - if (node->unbounded ()) - { - *os << be_nl << be_nl - << "template class" << be_idt_nl - << "TAO_Unbounded_Sequence<" - << be_idt << be_idt_nl - << bt->name () << be_uidt_nl - << ">;" << be_uidt << be_uidt; - } - else - { - *os << be_nl << be_nl - << "template class" << be_idt_nl - << "TAO_Bounded_Sequence<" - << be_idt << be_idt_nl - << bt->name () << "," << be_nl - << node->max_size ()->ev ()->u.ulval << be_uidt_nl - << ">;" << be_uidt << be_uidt; - } - } - - // Instantiate the _var and _out types only if we are not anonymous. - if (this->ctx_->tdef () != 0) - { - *os << be_nl << be_nl - << "template class" << be_idt_nl - << (st == AST_Type::FIXED ? "TAO_FixedSeq_Var_T<" - : "TAO_VarSeq_Var_T<") - << be_idt << be_idt_nl - << node->local_name () << "," << be_nl - << bt->name () << be_uidt_nl - << ">;" << be_uidt << be_uidt; - - *os << be_nl << be_nl - << "template class" << be_idt_nl - << "TAO_Seq_Out_T<" << be_idt << be_idt_nl - << node->local_name () << "," << be_nl - << node->local_name () << "_var," << be_nl - << bt->name () << be_uidt_nl - << ">;" << be_uidt << be_uidt; - } + { + AST_Type::SIZE_TYPE st = bt->size_type (); + + *os << be_nl << be_nl + << "template class" << be_idt_nl + << (st == AST_Type::FIXED ? "TAO_FixedSeq_Var_T<" + : "TAO_VarSeq_Var_T<") + << be_idt << be_idt_nl + << node->local_name () << "," << be_nl + << bt->name () << be_uidt_nl + << ">;" << be_uidt << be_uidt; + + *os << be_nl << be_nl + << "template class" << be_idt_nl + << "TAO_Seq_Out_T<" << be_idt << be_idt_nl + << node->local_name () << "," << be_nl + << node->local_name () << "_var," << be_nl + << bt->name () << be_uidt_nl + << ">;" << be_uidt << be_uidt; + } break; } @@ -388,340 +349,164 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node) switch (node->managed_type ()) { case be_sequence::MNG_OBJREF: - if (node->unbounded ()) - { - *os << be_nl << be_nl - << "# pragma instantiate \\" << be_idt << be_idt_nl - << "TAO_Unbounded_Object_Sequence< \\" << be_idt << be_idt_nl - << bt->name () << ", \\" << be_nl - << bt->name () << "_var, \\" << be_nl - << bt->fwd_helper_name () << "_life, \\" << be_nl - << bt->fwd_helper_name () << "_cast, \\" << be_uidt_nl - << ">" << be_uidt << be_uidt << be_uidt << be_uidt; - } - else - { - *os << be_nl << be_nl - << "# pragma instantiate \\" << be_idt << be_idt_nl - << "TAO_Bounded_Object_Sequence< \\" << be_idt << be_idt_nl - << bt->name () << ", \\" << be_nl - << bt->name () << "_var, \\" << be_nl - << bt->fwd_helper_name () << "_life, \\" << be_nl - << bt->fwd_helper_name () << "_cast \\" << be_nl - << node->max_size ()->ev ()->u.ulval << " \\" << be_uidt_nl - << ">" << be_uidt << be_uidt << be_uidt << be_uidt; - } - - // Instantiate the _var and _out types only if we are not anonymous. - if (this->ctx_->tdef () != 0) - { - *os << be_nl << be_nl - << "# pragma instantiate \\" << be_idt << be_idt_nl - << "TAO_VarSeq_Var_T< \\" << be_idt << be_idt_nl - << node->name () << ", \\" << be_nl - << "TAO_Object_Manager< \\" << be_idt << be_idt_nl - << bt->name () << ", \\" << be_nl - << bt->name () << "_var, \\" << be_nl - << bt->fwd_helper_name () << "_life \\" << be_uidt_nl - << "> \\" << be_uidt << be_uidt_nl - << ">" << be_uidt << be_uidt << be_uidt; - - *os << be_nl << be_nl - << "# pragma instantiate \\" << be_idt << be_idt_nl - << "TAO_Seq_Out_T< \\" << be_idt << be_idt_nl - << node->name () << ", \\" << be_nl - << node->name () << "_var, \\" << be_nl - << "TAO_Object_Manager< \\" << be_idt << be_idt_nl - << bt->name () << ", \\" << be_nl - << bt->name () << "_var, \\" << be_nl - << bt->fwd_helper_name () << "_life \\" << be_uidt_nl - << "> \\" << be_uidt << be_uidt_nl - << ">" << be_uidt << be_uidt; - } + *os << be_nl << be_nl + << "# pragma instantiate \\" << be_idt << be_idt_nl + << "TAO_MngSeq_Var_T< \\" << be_idt << be_idt_nl + << node->name () << ", \\" << be_nl + << "TAO_Object_Manager< \\" << be_idt << be_idt_nl + << bt->name () << ", \\" << be_nl + << bt->name () << "_var, \\" << be_nl + << bt->fwd_helper_name () << "_life \\" << be_uidt_nl + << "> \\" << be_uidt << be_uidt_nl + << ">" << be_uidt << be_uidt << be_uidt; + + *os << be_nl << be_nl + << "# pragma instantiate \\" << be_idt << be_idt_nl + << "TAO_Seq_Out_T< \\" << be_idt << be_idt_nl + << node->name () << ", \\" << be_nl + << node->name () << "_var, \\" << be_nl + << "TAO_Object_Manager< \\" << be_idt << be_idt_nl + << bt->name () << ", \\" << be_nl + << bt->name () << "_var, \\" << be_nl + << bt->fwd_helper_name () << "_life \\" << be_uidt_nl + << "> \\" << be_uidt << be_uidt_nl + << ">" << be_uidt << be_uidt; break; case be_sequence::MNG_ABSTRACT: - if (node->unbounded ()) - { - *os << be_nl << be_nl - << "# pragma instantiate \\" << be_idt_nl - << "TAO_Unbounded_Abstract_Sequence< \\" << be_idt << be_idt_nl - << bt->name () << ", \\" << be_nl - << bt->name () << "_var, \\" << be_nl - << bt->fwd_helper_name () << "_life \\" << be_uidt_nl - << ">" << be_uidt << be_uidt; - } - else - { - *os << be_nl << be_nl - << "# pragma instantiate \\" << be_idt_nl - << "TAO_Bounded_Abstract_Sequence< \\" << be_idt << be_idt_nl - << bt->name () << ", \\" << be_nl - << bt->name () << "_var, \\" << be_nl - << bt->fwd_helper_name () << "_life, \\" << be_nl - << node->max_size ()->ev ()->u.ulval << " \\" << be_uidt_nl - << ">" << be_uidt << be_uidt; - } - - // Instantiate the _var and _out types only if we are not anonymous. - if (this->ctx_->tdef () != 0) - { - *os << be_nl << be_nl - << "# pragma instantiate \\" << be_idt_nl - << "TAO_VarSeq_Var_T< \\" << be_idt << be_idt_nl - << node->name () << ", \\" << be_nl - << "TAO_Abstract_Manager< \\" << be_idt << be_idt_nl - << bt->name () << ", \\" << be_nl - << bt->name () << "_var, \\" << be_nl - << bt->fwd_helper_name () << "_life \\" << be_uidt_nl - << "> \\" << be_uidt << be_uidt_nl - << ">" << be_uidt << be_uidt; - - *os << be_nl << be_nl - << "# pragma instantiate \\" << be_idt_nl - << "TAO_Seq_Out_T< \\" << be_idt << be_idt_nl - << node->name () << ", \\" << be_nl - << node->name () << "_var, \\" << be_nl - << "TAO_Abstract_Manager< \\" << be_idt << be_idt_nl - << bt->name () << ", \\" << be_nl - << bt->name () << "_var, \\" << be_nl - << bt->fwd_helper_name () << "_life \\" << be_uidt_nl - << "> \\" << be_uidt << be_uidt_nl - << ">" << be_uidt << be_uidt; - } + *os << be_nl << be_nl + << "# pragma instantiate \\" << be_idt_nl + << "TAO_MngSeq_Var_T< \\" << be_idt << be_idt_nl + << node->name () << ", \\" << be_nl + << "TAO_Abstract_Manager< \\" << be_idt << be_idt_nl + << bt->name () << ", \\" << be_nl + << bt->name () << "_var, \\" << be_nl + << bt->fwd_helper_name () << "_life \\" << be_uidt_nl + << "> \\" << be_uidt << be_uidt_nl + << ">" << be_uidt << be_uidt; + + *os << be_nl << be_nl + << "# pragma instantiate \\" << be_idt_nl + << "TAO_Seq_Out_T< \\" << be_idt << be_idt_nl + << node->name () << ", \\" << be_nl + << node->name () << "_var, \\" << be_nl + << "TAO_Abstract_Manager< \\" << be_idt << be_idt_nl + << bt->name () << ", \\" << be_nl + << bt->name () << "_var, \\" << be_nl + << bt->fwd_helper_name () << "_life \\" << be_uidt_nl + << "> \\" << be_uidt << be_uidt_nl + << ">" << be_uidt << be_uidt; break; case be_sequence::MNG_PSEUDO: - if (node->unbounded ()) - { - *os << be_nl << be_nl - << "# pragma instantiate \\" << be_idt_nl - << "TAO_Unbounded_Pseudo_Sequence< \\" << be_idt << be_idt_nl - << bt->name () << ", \\" << be_nl - << bt->name () << "_var \\" << be_uidt_nl - << ">" << be_uidt << be_uidt; - } - else - { - *os << be_nl << be_nl - << "# pragma instantiate \\" << be_idt_nl - << "TAO_Bounded_Pseudo_Sequence< \\" << be_idt << be_idt_nl - << bt->name () << ", \\" << be_nl - << bt->name () << "_var, \\" << be_nl - << node->max_size ()->ev ()->u.ulval << " \\" << be_uidt_nl - << ">" << be_uidt << be_uidt; - } - - // Instantiate the _var and _out types only if we are not anonymous. - if (this->ctx_->tdef () != 0) - { - *os << be_nl << be_nl - << "# pragma instantiate \\" << be_idt_nl - << "TAO_VarSeq_Var_T< \\" << be_idt << be_idt_nl - << node->name () << ", \\" << be_nl - << "TAO_Pseudo_Object_Manager< \\" << be_idt << be_idt_nl - << bt->name () << ", \\" << be_nl - << bt->name () << "_var \\" << be_uidt_nl - << "> \\" << be_uidt << be_uidt_nl - << ">" << be_uidt << be_uidt; - - *os << be_nl << be_nl - << "# pragma instantiate \\" << be_idt_nl - << "TAO_Seq_Out_T< \\" << be_idt << be_idt_nl - << node->name () << ", \\" << be_nl - << node->name () << "_var, \\" << be_nl - << "TAO_Pseudo_Object_Manager< \\" << be_idt << be_idt_nl - << bt->name () << ", \\" << be_nl - << bt->name () << "_var \\" << be_uidt_nl - << "> \\" << be_uidt << be_uidt_nl - << ">" << be_uidt << be_uidt; - } + *os << be_nl << be_nl + << "# pragma instantiate \\" << be_idt_nl + << "TAO_MngSeq_Var_T< \\" << be_idt << be_idt_nl + << node->name () << ", \\" << be_nl + << "TAO_Pseudo_Object_Manager< \\" << be_idt << be_idt_nl + << bt->name () << ", \\" << be_nl + << bt->name () << "_var \\" << be_uidt_nl + << "> \\" << be_uidt << be_uidt_nl + << ">" << be_uidt << be_uidt; + + *os << be_nl << be_nl + << "# pragma instantiate \\" << be_idt_nl + << "TAO_Seq_Out_T< \\" << be_idt << be_idt_nl + << node->name () << ", \\" << be_nl + << node->name () << "_var, \\" << be_nl + << "TAO_Pseudo_Object_Manager< \\" << be_idt << be_idt_nl + << bt->name () << ", \\" << be_nl + << bt->name () << "_var \\" << be_uidt_nl + << "> \\" << be_uidt << be_uidt_nl + << ">" << be_uidt << be_uidt; break; case be_sequence::MNG_VALUE: - if (node->unbounded ()) - { - *os << be_nl << be_nl - << "# pragma instantiate \\" << be_idt_nl - << "TAO_Unbounded_Valuetype_Sequence< \\" << be_idt << be_idt_nl - << bt->name () << ", \\" << be_nl - << bt->name () << "_var, \\" << be_nl - << bt->fwd_helper_name () << "_life \\" << be_uidt_nl - << ">" << be_uidt << be_uidt; - } - else - { - *os << be_nl << be_nl - << "# pragma instantiate \\" << be_idt_nl - << "TAO_Bounded_Valuetype_Sequence< \\" << be_idt << be_idt_nl - << bt->name () << ", \\" << be_nl - << bt->name () << "_var, \\" << be_nl - << bt->fwd_helper_name () << "_life, \\" << be_nl - << node->max_size ()->ev ()->u.ulval << " \\" << be_uidt_nl - << ">" << be_uidt << be_uidt; - } - - // Instantiate the _var and _out types only if we are not anonymous. - if (this->ctx_->tdef () != 0) - { - *os << be_nl << be_nl - << "# pragma instantiate \\" << be_idt_nl - << "TAO_VarSeq_Var_T< \\" << be_idt << be_idt_nl - << node->name () << ", \\" << be_nl - << "TAO_Valuetype_Manager< \\" << be_idt << be_idt_nl - << bt->name () << ", \\" << be_nl - << bt->name () << "_var, \\" << be_nl - << bt->fwd_helper_name () << "_life \\" << be_uidt_nl - << "> \\" << be_uidt << be_uidt_nl - << ">" << be_uidt << be_uidt; - - *os << be_nl << be_nl - << "# pragma instantiate \\" << be_idt_nl - << "TAO_Seq_Out_T< \\" << be_idt << be_idt_nl - << node->name () << ", \\" << be_nl - << node->name () << "_var, \\" << be_nl - << "TAO_Valuetype_Manager< \\" << be_idt << be_idt_nl - << bt->name () << ", \\" << be_nl - << bt->name () << "_var, \\" << be_nl - << bt->fwd_helper_name () << "_life \\" << be_uidt_nl - << "> \\" << be_uidt << be_uidt_nl - << ">" << be_uidt << be_uidt; - } + *os << be_nl << be_nl + << "# pragma instantiate \\" << be_idt_nl + << "TAO_MngSeq_Var_T< \\" << be_idt << be_idt_nl + << node->name () << ", \\" << be_nl + << "TAO_Valuetype_Manager< \\" << be_idt << be_idt_nl + << bt->name () << ", \\" << be_nl + << bt->name () << "_var, \\" << be_nl + << bt->fwd_helper_name () << "_life \\" << be_uidt_nl + << "> \\" << be_uidt << be_uidt_nl + << ">" << be_uidt << be_uidt; + + *os << be_nl << be_nl + << "# pragma instantiate \\" << be_idt_nl + << "TAO_Seq_Out_T< \\" << be_idt << be_idt_nl + << node->name () << ", \\" << be_nl + << node->name () << "_var, \\" << be_nl + << "TAO_Valuetype_Manager< \\" << be_idt << be_idt_nl + << bt->name () << ", \\" << be_nl + << bt->name () << "_var, \\" << be_nl + << bt->fwd_helper_name () << "_life \\" << be_uidt_nl + << "> \\" << be_uidt << be_uidt_nl + << ">" << be_uidt << be_uidt; break; case be_sequence::MNG_STRING: - if (! node->unbounded ()) - { - *os << be_nl << be_nl - << "# pragma instantiate TAO_Bounded_String_Sequence< \\" << be_nl - << node->max_size ()->ev ()->u.ulval << ">"; - } - - // Instantiate the _var and _out types only if we are not anonymous. - if (this->ctx_->tdef () != 0) - { - *os << be_nl << be_nl - << "# pragma instantiate \\" << be_idt_nl - << "TAO_VarSeq_Var_T< \\" << be_idt << be_idt_nl - << node->name () << ", \\" << be_nl - <<"TAO_SeqElem_String_Manager \\" << be_uidt_nl - << ">" << be_uidt << be_uidt; - - *os << be_nl << be_nl - << "# pragma instantiate \\" << be_idt_nl - << "TAO_Seq_Out_T< \\" << be_idt << be_idt_nl - << node->name () << ", \\" << be_nl - << node->name () << "_var, \\" << be_nl - << "TAO_SeqElem_String_Manager \\" << be_uidt_nl - << ">" << be_uidt << be_uidt; - } + *os << be_nl << be_nl + << "# pragma instantiate \\" << be_idt_nl + << "TAO_MngSeq_Var_T< \\" << be_idt << be_idt_nl + << node->name () << ", \\" << be_nl + <<"TAO_SeqElem_String_Manager \\" << be_uidt_nl + << ">" << be_uidt << be_uidt; + + *os << be_nl << be_nl + << "# pragma instantiate \\" << be_idt_nl + << "TAO_Seq_Out_T< \\" << be_idt << be_idt_nl + << node->name () << ", \\" << be_nl + << node->name () << "_var, \\" << be_nl + << "TAO_SeqElem_String_Manager \\" << be_uidt_nl + << ">" << be_uidt << be_uidt; break; case be_sequence::MNG_WSTRING: - if (! node->unbounded ()) - { - *os << be_nl << be_nl - << "# pragma instantiate TAO_Bounded_WString_Sequence<" - << node->max_size ()->ev ()->u.ulval << ">"; - } - - // Instantiate the _var and _out types only if we are not anonymous. - if (this->ctx_->tdef () != 0) - { - *os << be_nl << be_nl - << "# pragma instantiate \\" << be_idt_nl - << "TAO_VarSeq_Var_T< \\" << be_idt << be_idt_nl - << node->name () << ", \\" << be_nl - <<"TAO_SeqElem_WString_Manager \\" << be_uidt_nl - << ">" << be_uidt << be_uidt; - - *os << be_nl << be_nl - << "# pragma instantiate \\" << be_idt_nl - << "TAO_Seq_Out_T< \\" << be_idt << be_idt_nl - << node->name () << ", \\" << be_nl - << node->name () << "_var, \\" << be_nl - << "TAO_SeqElem_WString_Manager \\" << be_uidt_nl - << ">" << be_uidt << be_uidt; - } + *os << be_nl << be_nl + << "# pragma instantiate \\" << be_idt_nl + << "TAO_MngSeq_Var_T< \\" << be_idt << be_idt_nl + << node->name () << ", \\" << be_nl + <<"TAO_SeqElem_WString_Manager \\" << be_uidt_nl + << ">" << be_uidt << be_uidt; + + *os << be_nl << be_nl + << "# pragma instantiate \\" << be_idt_nl + << "TAO_Seq_Out_T< \\" << be_idt << be_idt_nl + << node->name () << ", \\" << be_nl + << node->name () << "_var, \\" << be_nl + << "TAO_SeqElem_WString_Manager \\" << be_uidt_nl + << ">" << be_uidt << be_uidt; break; default: // not a managed type - if (bt->base_node_type () == AST_Decl::NT_array) - { - if (node->unbounded ()) - { - *os << be_nl << be_nl - << "# pragma instantiate \\" << be_idt_nl - << "TAO_Unbounded_Array_Sequence< \\" - << be_idt << be_idt_nl - << bt->name () << ", \\" << be_nl - << bt->fwd_helper_name () << "_life \\" << be_uidt_nl - << ">" << be_uidt << be_uidt; - } - else - { - *os << be_nl << be_nl - << "# pragma instantiate \\" << be_idt_nl - << "TAO_Bounded_Array_Sequence< \\" - << be_idt << be_idt_nl - << bt->name () << ", \\" << be_nl - << bt->fwd_helper_name () << "_life, \\" << be_nl - << node->max_size ()->ev ()->u.ulval - << " \\" << be_uidt_nl - << ">" << be_uidt << be_uidt; - } - } - else - { - if (node->unbounded ()) - { - *os << be_nl << be_nl - << "# pragma instantiate \\" << be_idt_nl - << "TAO_Unbounded_Sequence< \\" - << be_idt << be_idt_nl - << bt->name () << " \\" << be_uidt_nl - << ">" << be_uidt << be_uidt; - } - else - { - *os << be_nl << be_nl - << "# pragma instantiate \\" << be_idt_nl - << "TAO_Bounded_Sequence< \\" - << be_idt << be_idt_nl - << bt->name () << ", \\" << be_nl - << node->max_size ()->ev ()->u.ulval - << " \\" << be_uidt_nl - << ">" << be_uidt << be_uidt; - } - } - - // Generate the _var and _out types only if we are not anonymous. - if (this->ctx_->tdef () != 0) - { - *os << be_nl << be_nl - << "# pragma instantiate \\" << be_idt_nl - << (st == AST_Type::FIXED ? "TAO_FixedSeq_Var_T< \\" - : "TAO_VarSeq_Var_T< \\") - << be_idt << be_idt_nl - << node->local_name () << ", \\" << be_nl - << bt->name () << " \\" << be_uidt_nl - << ">" << be_uidt << be_uidt; - - *os << be_nl << be_nl - << "# pragma instantiate \\" << be_idt_nl - << "TAO_Seq_Out_T< \\" << be_idt << be_idt_nl - << node->local_name () << ", \\" << be_nl - << node->local_name () << "_var, \\" << be_nl - << bt->name () << " \\" << be_uidt_nl - << ">" << be_uidt << be_uidt; - } + { + AST_Type::SIZE_TYPE st = bt->size_type (); + + *os << be_nl << be_nl + << "# pragma instantiate \\" << be_idt_nl + << (st == AST_Type::FIXED ? "TAO_FixedSeq_Var_T< \\" + : "TAO_VarSeq_Var_T< \\") + << be_idt << be_idt_nl + << node->local_name () << ", \\" << be_nl + << bt->name () << " \\" << be_uidt_nl + << ">" << be_uidt << be_uidt; + + *os << be_nl << be_nl + << "# pragma instantiate \\" << be_idt_nl + << "TAO_Seq_Out_T< \\" << be_idt << be_idt_nl + << node->local_name () << ", \\" << be_nl + << node->local_name () << "_var, \\" << be_nl + << bt->name () << " \\" << be_uidt_nl + << ">" << be_uidt << be_uidt; + } break; } os->gen_endif_AHETI (); - node->cli_stub_gen (1); return 0; } diff --git a/TAO/TAO_IDL/be_include/be_sequence.h b/TAO/TAO_IDL/be_include/be_sequence.h index 6d7ec629437..6bfe518b2a7 100644 --- a/TAO/TAO_IDL/be_include/be_sequence.h +++ b/TAO/TAO_IDL/be_include/be_sequence.h @@ -89,6 +89,10 @@ public: const char *instance_name (void); // Report the instance name for instantiation. + int gen_base_class_name (TAO_OutStream *os); + // Common code for generating the name and parameters of our + // template sequence base class. + protected: virtual char *gen_name (void); // Helper to create_name. diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h index 0b33495d830..993e7c894ad 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h @@ -42,7 +42,11 @@ public: // destructor virtual int visit_sequence (be_sequence *node); - // visit sequence node + // visit sequence node. + + void gen_varout_typedefs (be_sequence *node, + be_type *elem); + // Generate the typedefs for our _var and _out template classes. }; #endif /* _BE_VISITOR_SEQUENCE_SEQUENCE_CH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_cs.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_cs.h index 9fe180ec7c0..6c4d6aabebc 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_cs.h @@ -43,6 +43,11 @@ public: virtual int visit_sequence (be_sequence *node); // visit sequence node + + int gen_varout_tmplinst (be_sequence *node, + be_type *bt); + // Generate explicit template instantiations for our _var + // and _out classes. }; #endif /* _BE_VISITOR_SEQUENCE_SEQUENCE_CS_H_ */ diff --git a/TAO/TAO_IDL/include/ast_type.h b/TAO/TAO_IDL/include/ast_type.h index 65f710f18e6..28c4b9c20d4 100644 --- a/TAO/TAO_IDL/include/ast_type.h +++ b/TAO/TAO_IDL/include/ast_type.h @@ -129,12 +129,6 @@ public: const char *prefix = 0); // Type name of a node used when generating declarations. - idl_bool seq_cdr_hdr_gen (void) const; - void seq_cdr_hdr_gen (idl_bool val); - idl_bool seq_cdr_body_gen (void) const; - void seq_cdr_body_gen (idl_bool val); - // Accessors for the members. - // Narrowing. DEF_NARROW_METHODS1(AST_Type, AST_Decl); DEF_NARROW_FROM_DECL(AST_Type); @@ -172,11 +166,6 @@ protected: char *nested_type_name_; // For the corresponding method. - - idl_bool seq_cdr_hdr_gen_; - idl_bool seq_cdr_body_gen_; - // Helps in avoiding duplicate generation of CDR stream operators - // for sequences. }; #endif // _AST_TYPE_AST_TYPE_HH diff --git a/TAO/tao/CONV_FRAMEC.cpp b/TAO/tao/CONV_FRAMEC.cpp index 6f2d05a514f..dd6c13bc7f7 100644 --- a/TAO/tao/CONV_FRAMEC.cpp +++ b/TAO/tao/CONV_FRAMEC.cpp @@ -172,21 +172,43 @@ void CONV_FRAME::CodeSetComponent::_tao_any_destructor (void *_tao_void_pointer) // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50 -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class - TAO_Unbounded_Sequence< - CONV_FRAME::CodeSetId - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO_Unbounded_Sequence< \ - CONV_FRAME::CodeSetId \ - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_seq_CodeSetId (void) +{} + +CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_seq_CodeSetId (CORBA::ULong max) + : TAO_Unbounded_Sequence< + CONV_FRAME::CodeSetId + > + (max) +{} + +CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_seq_CodeSetId ( + CORBA::ULong max, + CORBA::ULong length, + CORBA::ULong *buffer, + CORBA::Boolean release + ) + : TAO_Unbounded_Sequence< + CONV_FRAME::CodeSetId + > + (max, length, buffer, release) +{} + +CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_seq_CodeSetId (const _tao_seq_CodeSetId &seq) + : TAO_Unbounded_Sequence< + CONV_FRAME::CodeSetId + > + (seq) +{} + +CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::~_tao_seq_CodeSetId (void) +{} + +void CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_any_destructor (void *_tao_void_pointer) +{ + _tao_seq_CodeSetId *tmp = ACE_static_cast (_tao_seq_CodeSetId*, _tao_void_pointer); + delete tmp; +} // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274 @@ -677,7 +699,7 @@ CORBA::Boolean operator>>= ( #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:98 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93 #if !defined _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId_CPP_ #define _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId_CPP_ diff --git a/TAO/tao/CONV_FRAMEC.h b/TAO/tao/CONV_FRAMEC.h index fc285ae928d..c15536557f6 100644 --- a/TAO/tao/CONV_FRAMEC.h +++ b/TAO/tao/CONV_FRAMEC.h @@ -107,11 +107,28 @@ TAO_NAMESPACE CONV_FRAME // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75 - typedef - TAO_Unbounded_Sequence< - CONV_FRAME::CodeSetId - > - _tao_seq_CodeSetId; + class TAO_Export _tao_seq_CodeSetId + : public + TAO_Unbounded_Sequence< + CONV_FRAME::CodeSetId + > + { + public: + _tao_seq_CodeSetId (void); + _tao_seq_CodeSetId (CORBA::ULong max); + _tao_seq_CodeSetId ( + CORBA::ULong max, + CORBA::ULong length, + CORBA::ULong *buffer, + CORBA::Boolean release = 0 + ); + _tao_seq_CodeSetId (const _tao_seq_CodeSetId &); + ~_tao_seq_CodeSetId (void); + + static void _tao_any_destructor (void *); + + + }; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_field/field_ch.cpp:447 @@ -234,7 +251,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CONV_FRAME::CodeSet TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetComponent &); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:64 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57 #if !defined _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId_H_ #define _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId_H_ diff --git a/TAO/tao/ClientRequestInfo.cpp b/TAO/tao/ClientRequestInfo.cpp index 0ea591e59a7..a0390415b22 100644 --- a/TAO/tao/ClientRequestInfo.cpp +++ b/TAO/tao/ClientRequestInfo.cpp @@ -291,3 +291,4 @@ TAO_ClientRequestInfo_Guard::~TAO_ClientRequestInfo_Guard (void) #endif /* TAO_HAS_INTERCEPTORS == 1 */ + diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h index 288c1332001..1a272b982f4 100644 --- a/TAO/tao/CurrentC.h +++ b/TAO/tao/CurrentC.h @@ -32,10 +32,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/corbafwd.h" -#include "tao/varbase.h" - #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO #endif diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp index 7edff95f4ce..110a2bd612b 100644 --- a/TAO/tao/DomainC.cpp +++ b/TAO/tao/DomainC.cpp @@ -1545,19 +1545,57 @@ TAO_NAMESPACE_END // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50 -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) +CORBA::DomainManagerList::DomainManagerList (void) +{} -template class - TAO_Unbounded_Object_Sequence< - CORBA::DomainManager, - CORBA::DomainManager_var, - CORBA::tao_DomainManager_life, - CORBA::tao_DomainManager_cast - >; +CORBA::DomainManagerList::DomainManagerList (CORBA::ULong max) + : TAO_Unbounded_Object_Sequence< + CORBA::DomainManager, + CORBA::DomainManager_var, + CORBA::tao_DomainManager_life, + CORBA::tao_DomainManager_cast + > + (max) +{} + +CORBA::DomainManagerList::DomainManagerList ( + CORBA::ULong max, + CORBA::ULong length, + CORBA::DomainManager_ptr *buffer, + CORBA::Boolean release + ) + : TAO_Unbounded_Object_Sequence< + CORBA::DomainManager, + CORBA::DomainManager_var, + CORBA::tao_DomainManager_life, + CORBA::tao_DomainManager_cast + > + (max, length, buffer, release) +{} + +CORBA::DomainManagerList::DomainManagerList (const DomainManagerList &seq) + : TAO_Unbounded_Object_Sequence< + CORBA::DomainManager, + CORBA::DomainManager_var, + CORBA::tao_DomainManager_life, + CORBA::tao_DomainManager_cast + > + (seq) +{} +CORBA::DomainManagerList::~DomainManagerList (void) +{} + +void CORBA::DomainManagerList::_tao_any_destructor (void *_tao_void_pointer) +{ + DomainManagerList *tmp = ACE_static_cast (DomainManagerList*, _tao_void_pointer); + delete tmp; +} + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class - TAO_VarSeq_Var_T< + TAO_MngSeq_Var_T< CORBA::DomainManagerList, TAO_Object_Manager< CORBA::DomainManager, @@ -1580,15 +1618,7 @@ template class #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ - TAO_Unbounded_Object_Sequence< \ - CORBA::DomainManager, \ - CORBA::DomainManager_var, \ - CORBA::tao_DomainManager_life, \ - CORBA::tao_DomainManager_cast, \ - > - -# pragma instantiate \ - TAO_VarSeq_Var_T< \ + TAO_MngSeq_Var_T< \ CORBA::DomainManagerList, \ TAO_Object_Manager< \ CORBA::DomainManager, \ @@ -1956,7 +1986,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:98 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93 CORBA::Boolean operator<< ( TAO_OutputCDR &strm, diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h index 388710b1f75..9f705199d1a 100644 --- a/TAO/tao/DomainC.h +++ b/TAO/tao/DomainC.h @@ -33,9 +33,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/corbafwd.h" - #include "PolicyC.h" #if defined (TAO_EXPORT_MACRO) @@ -601,23 +598,18 @@ TAO_NAMESPACE CORBA // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75 - typedef - TAO_Unbounded_Object_Sequence< - CORBA::DomainManager, - CORBA::DomainManager_var, - CORBA::tao_DomainManager_life, - CORBA::tao_DomainManager_cast - > DomainManagerList; + class DomainManagerList; typedef - TAO_VarSeq_Var_T< + TAO_MngSeq_Var_T< DomainManagerList, TAO_Object_Manager< CORBA::DomainManager, CORBA::DomainManager_var, CORBA::tao_DomainManager_life > - > DomainManagerList_var; + > + DomainManagerList_var; typedef TAO_Seq_Out_T< @@ -628,7 +620,34 @@ TAO_NAMESPACE CORBA CORBA::DomainManager_var, CORBA::tao_DomainManager_life > - > DomainManagerList_out; + > + DomainManagerList_out; + + class TAO_Export DomainManagerList + : public + TAO_Unbounded_Object_Sequence< + CORBA::DomainManager, + CORBA::DomainManager_var, + CORBA::tao_DomainManager_life, + CORBA::tao_DomainManager_cast + > + { + public: + DomainManagerList (void); + DomainManagerList (CORBA::ULong max); + DomainManagerList ( + CORBA::ULong max, + CORBA::ULong length, + DomainManager_ptr *buffer, + CORBA::Boolean release = 0 + ); + DomainManagerList (const DomainManagerList &); + ~DomainManagerList (void); + + static void _tao_any_destructor (void *); + + typedef DomainManagerList_var _var_type; + }; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 @@ -698,7 +717,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Construction TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ConstructionPolicy_ptr &); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:64 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57 #if !defined _TAO_CDR_OP_CORBA_DomainManagerList_H_ #define _TAO_CDR_OP_CORBA_DomainManagerList_H_ diff --git a/TAO/tao/DynamicC.cpp b/TAO/tao/DynamicC.cpp index f8a3e7bd62d..29eea4ceebc 100644 --- a/TAO/tao/DynamicC.cpp +++ b/TAO/tao/DynamicC.cpp @@ -24,16 +24,6 @@ #include "DynamicC.h" -#include "tao/Stub.h" -#include "tao/Invocation.h" -#include "tao/PortableInterceptor.h" - -#if TAO_HAS_INTERCEPTORS == 1 -#include "tao/RequestInfo_Util.h" -#include "tao/ClientRequestInfo_i.h" -#include "tao/ClientInterceptorAdapter.h" -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig @@ -167,12 +157,45 @@ template class // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50 -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) +Dynamic::ParameterList::ParameterList (void) +{} + +Dynamic::ParameterList::ParameterList (CORBA::ULong max) + : TAO_Unbounded_Sequence< + Dynamic::Parameter + > + (max) +{} + +Dynamic::ParameterList::ParameterList ( + CORBA::ULong max, + CORBA::ULong length, + Dynamic::Parameter *buffer, + CORBA::Boolean release + ) + : TAO_Unbounded_Sequence< + Dynamic::Parameter + > + (max, length, buffer, release) +{} + +Dynamic::ParameterList::ParameterList (const ParameterList &seq) + : TAO_Unbounded_Sequence< + Dynamic::Parameter + > + (seq) +{} + +Dynamic::ParameterList::~ParameterList (void) +{} + +void Dynamic::ParameterList::_tao_any_destructor (void *_tao_void_pointer) +{ + ParameterList *tmp = ACE_static_cast (ParameterList*, _tao_void_pointer); + delete tmp; +} -template class - TAO_Unbounded_Sequence< - Dynamic::Parameter - >; +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class TAO_VarSeq_Var_T< @@ -190,11 +213,6 @@ template class #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ - TAO_Unbounded_Sequence< \ - Dynamic::Parameter \ - > - -# pragma instantiate \ TAO_VarSeq_Var_T< \ ParameterList, \ Dynamic::Parameter \ @@ -422,13 +440,48 @@ TAO_NAMESPACE_END // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50 -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) +Dynamic::ExceptionList::ExceptionList (void) +{} + +Dynamic::ExceptionList::ExceptionList (CORBA::ULong max) + : TAO_Unbounded_Pseudo_Sequence< + Dynamic::TypeCode, + Dynamic::TypeCode_var + > + (max) +{} + +Dynamic::ExceptionList::ExceptionList ( + CORBA::ULong max, + CORBA::ULong length, + CORBA::TypeCode_ptr *buffer, + CORBA::Boolean release + ) + : TAO_Unbounded_Pseudo_Sequence< + Dynamic::TypeCode, + Dynamic::TypeCode_var + > + (max, length, buffer, release) +{} + +Dynamic::ExceptionList::ExceptionList (const ExceptionList &seq) + : TAO_Unbounded_Pseudo_Sequence< + Dynamic::TypeCode, + Dynamic::TypeCode_var + > + (seq) +{} + +Dynamic::ExceptionList::~ExceptionList (void) +{} + +void Dynamic::ExceptionList::_tao_any_destructor (void *_tao_void_pointer) +{ + ExceptionList *tmp = ACE_static_cast (ExceptionList*, _tao_void_pointer); + delete tmp; +} -template class - TAO_Unbounded_Pseudo_Sequence< - Dynamic::TypeCode, - Dynamic::TypeCode_var - >; +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class TAO_VarSeq_Var_T< @@ -452,12 +505,6 @@ template class #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ - TAO_Unbounded_Pseudo_Sequence< \ - Dynamic::TypeCode, \ - Dynamic::TypeCode_var \ - > - -# pragma instantiate \ TAO_VarSeq_Var_T< \ Dynamic::ExceptionList, \ TAO_Pseudo_Object_Manager< \ @@ -805,7 +852,7 @@ CORBA::Boolean operator>>= ( #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:98 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93 CORBA::Boolean operator<< ( TAO_OutputCDR &strm, @@ -871,7 +918,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:98 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93 CORBA::Boolean operator<< ( TAO_OutputCDR &strm, diff --git a/TAO/tao/DynamicC.h b/TAO/tao/DynamicC.h index bce1640c6e8..0efa7d102de 100644 --- a/TAO/tao/DynamicC.h +++ b/TAO/tao/DynamicC.h @@ -105,11 +105,7 @@ TAO_NAMESPACE Dynamic // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75 - typedef - TAO_Unbounded_Sequence< - Dynamic::Parameter - > - ParameterList; + class ParameterList; typedef TAO_VarSeq_Var_T< @@ -126,6 +122,29 @@ TAO_NAMESPACE Dynamic > ParameterList_out; + class TAO_Export ParameterList + : public + TAO_Unbounded_Sequence< + Dynamic::Parameter + > + { + public: + ParameterList (void); + ParameterList (CORBA::ULong max); + ParameterList ( + CORBA::ULong max, + CORBA::ULong length, + Parameter *buffer, + CORBA::Boolean release = 0 + ); + ParameterList (const ParameterList &); + ~ParameterList (void); + + static void _tao_any_destructor (void *); + + typedef ParameterList_var _var_type; + }; + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 @@ -159,12 +178,7 @@ TAO_NAMESPACE Dynamic // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75 - typedef - TAO_Unbounded_Pseudo_Sequence< - Dynamic::TypeCode, - Dynamic::TypeCode_var - > - ExceptionList; + class ExceptionList; typedef TAO_VarSeq_Var_T< @@ -173,7 +187,8 @@ TAO_NAMESPACE Dynamic Dynamic::TypeCode, Dynamic::TypeCode_var > - > ExceptionList_var; + > + ExceptionList_var; typedef TAO_Seq_Out_T< @@ -183,7 +198,32 @@ TAO_NAMESPACE Dynamic Dynamic::TypeCode, Dynamic::TypeCode_var > - > ExceptionList_out; + > + ExceptionList_out; + + class TAO_Export ExceptionList + : public + TAO_Unbounded_Pseudo_Sequence< + Dynamic::TypeCode, + Dynamic::TypeCode_var + > + { + public: + ExceptionList (void); + ExceptionList (CORBA::ULong max); + ExceptionList ( + CORBA::ULong max, + CORBA::ULong length, + CORBA::TypeCode_ptr *buffer, + CORBA::Boolean release = 0 + ); + ExceptionList (const ExceptionList &); + ~ExceptionList (void); + + static void _tao_any_destructor (void *); + + typedef ExceptionList_var _var_type; + }; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 @@ -244,7 +284,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Dynamic::Parameter TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Dynamic::Parameter &); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:64 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57 #if !defined _TAO_CDR_OP_Dynamic_ParameterList_H_ #define _TAO_CDR_OP_Dynamic_ParameterList_H_ @@ -261,7 +301,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_Dynamic_ParameterList_H_ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:64 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57 #if !defined _TAO_CDR_OP_Dynamic_ExceptionList_H_ #define _TAO_CDR_OP_Dynamic_ExceptionList_H_ diff --git a/TAO/tao/IIOPC.cpp b/TAO/tao/IIOPC.cpp index f07daa9acf4..bd1c2906bb0 100644 --- a/TAO/tao/IIOPC.cpp +++ b/TAO/tao/IIOPC.cpp @@ -128,12 +128,45 @@ template class // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50 -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) +IIOP::ListenPointList::ListenPointList (void) +{} + +IIOP::ListenPointList::ListenPointList (CORBA::ULong max) + : TAO_Unbounded_Sequence< + IIOP::ListenPoint + > + (max) +{} + +IIOP::ListenPointList::ListenPointList ( + CORBA::ULong max, + CORBA::ULong length, + IIOP::ListenPoint *buffer, + CORBA::Boolean release + ) + : TAO_Unbounded_Sequence< + IIOP::ListenPoint + > + (max, length, buffer, release) +{} + +IIOP::ListenPointList::ListenPointList (const ListenPointList &seq) + : TAO_Unbounded_Sequence< + IIOP::ListenPoint + > + (seq) +{} + +IIOP::ListenPointList::~ListenPointList (void) +{} + +void IIOP::ListenPointList::_tao_any_destructor (void *_tao_void_pointer) +{ + ListenPointList *tmp = ACE_static_cast (ListenPointList*, _tao_void_pointer); + delete tmp; +} -template class - TAO_Unbounded_Sequence< - IIOP::ListenPoint - >; +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class TAO_VarSeq_Var_T< @@ -151,11 +184,6 @@ template class #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ - TAO_Unbounded_Sequence< \ - IIOP::ListenPoint \ - > - -# pragma instantiate \ TAO_VarSeq_Var_T< \ ListenPointList, \ IIOP::ListenPoint \ @@ -586,7 +614,7 @@ CORBA::Boolean operator>>= ( #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:98 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93 CORBA::Boolean operator<< ( TAO_OutputCDR &strm, diff --git a/TAO/tao/IIOPC.h b/TAO/tao/IIOPC.h index d0f850bca44..7f78114295b 100644 --- a/TAO/tao/IIOPC.h +++ b/TAO/tao/IIOPC.h @@ -26,17 +26,13 @@ #define _TAO_IDL_ORIG_IIOPC_H_ #include "ace/pre.h" -#include "tao/TAO_Export.h" - +#include "tao/Sequence_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/corbafwd.h" -#include "tao/Managed_Types.h" -#include "tao/Sequence_T.h" -#include "tao/CDR.h" +#include "CDR.h" #include "tao/VarOut_T.h" #include "tao/Seq_VarOut_T.h" @@ -107,11 +103,7 @@ TAO_NAMESPACE IIOP // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75 - typedef - TAO_Unbounded_Sequence< - IIOP::ListenPoint - > - ListenPointList; + class ListenPointList; typedef TAO_VarSeq_Var_T< @@ -128,6 +120,29 @@ TAO_NAMESPACE IIOP > ListenPointList_out; + class TAO_Export ListenPointList + : public + TAO_Unbounded_Sequence< + IIOP::ListenPoint + > + { + public: + ListenPointList (void); + ListenPointList (CORBA::ULong max); + ListenPointList ( + CORBA::ULong max, + CORBA::ULong length, + ListenPoint *buffer, + CORBA::Boolean release = 0 + ); + ListenPointList (const ListenPointList &); + ~ListenPointList (void); + + static void _tao_any_destructor (void *); + + typedef ListenPointList_var _var_type; + }; + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 @@ -209,7 +224,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IIOP::ListenPoint & TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IIOP::ListenPoint &); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:64 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57 #if !defined _TAO_CDR_OP_IIOP_ListenPointList_H_ #define _TAO_CDR_OP_IIOP_ListenPointList_H_ diff --git a/TAO/tao/IOPC.cpp b/TAO/tao/IOPC.cpp index 8a00f7d796c..7a8ec6b7eaf 100644 --- a/TAO/tao/IOPC.cpp +++ b/TAO/tao/IOPC.cpp @@ -24,17 +24,6 @@ #include "IOPC.h" -#include "tao/Stub.h" -#include "tao/Invocation.h" -#include "tao/PortableInterceptor.h" - -#if TAO_HAS_INTERCEPTORS == 1 -#include "tao/RequestInfo_Util.h" -#include "tao/ClientRequestInfo_i.h" -#include "tao/ClientInterceptorAdapter.h" -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - - #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig @@ -132,12 +121,29 @@ static const CORBA::Long _oc_IOP_TaggedProfile[] = ACE_NTOHL (0x696c655f), ACE_NTOHL (0x64617461), ACE_NTOHL (0x0), // name = profile_data - CORBA::tk_sequence, // typecode kind - 12, // encapsulation length + CORBA::tk_alias, // typecode kind for typedefs + 76, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order - CORBA::tk_octet, + 31, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f4f63), + ACE_NTOHL (0x74657453), + ACE_NTOHL (0x65713a31), + ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0 + 9, + ACE_NTOHL (0x4f637465), + ACE_NTOHL (0x74536571), + ACE_NTOHL (0x0), // name = OctetSeq + CORBA::tk_sequence, // typecode kind + 12, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + CORBA::tk_octet, + + 0U, - 0U, }; @@ -159,7 +165,7 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 void IOP::TaggedProfile::_tao_any_destructor (void *_tao_void_pointer) { @@ -167,70 +173,36 @@ void IOP::TaggedProfile::_tao_any_destructor (void *_tao_void_pointer) delete tmp; } -#if !defined (_IOP_TAGGEDPROFILE__TAO_SEQ_OCTET_CS_) -#define _IOP_TAGGEDPROFILE__TAO_SEQ_OCTET_CS_ - // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250 - -// ************************************************************* -// IOP::TaggedProfile::_tao_seq_Octet -// ************************************************************* - -IOP::TaggedProfile::_tao_seq_Octet::_tao_seq_Octet (void) -{} - -IOP::TaggedProfile::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -TAO_Unbounded_Sequence<CORBA::Octet> -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<CORBA::Octet> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max) -{} - -IOP::TaggedProfile::_tao_seq_Octet::_tao_seq_Octet ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::Octet *buffer, - CORBA::Boolean release - ) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -TAO_Unbounded_Sequence<CORBA::Octet> -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<CORBA::Octet> +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274 -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max, length, buffer, release) -{} +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -IOP::TaggedProfile::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) - : +template class + TAO_Var_Var_T< + TaggedProfile + >; -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -TAO_Unbounded_Sequence<CORBA::Octet> -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<CORBA::Octet> +template class + TAO_Out_T< + TaggedProfile, + TaggedProfile_var + >; -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (seq) -{} +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -IOP::TaggedProfile::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor -{} +# pragma instantiate \ + TAO_Var_Var_T< \ + TaggedProfile \ + > -void IOP::TaggedProfile::_tao_seq_Octet::_tao_any_destructor (void *_tao_void_pointer) -{ - _tao_seq_Octet *tmp = ACE_static_cast (_tao_seq_Octet*, _tao_void_pointer); - delete tmp; -} +# pragma instantiate \ + TAO_Out_T< \ + TaggedProfile, \ + TaggedProfile_var \ + > -#endif /* end #if !defined */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -258,10 +230,10 @@ static const CORBA::Long _oc_IOP_IOR[] = ACE_NTOHL (0x696c6573), ACE_NTOHL (0x0), // name = profiles CORBA::tk_sequence, // typecode kind - 200, // encapsulation length + 264, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order CORBA::tk_struct, // typecode kind - 184, // encapsulation length + 248, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 34, ACE_NTOHL (0x49444c3a), @@ -305,12 +277,29 @@ static const CORBA::Long _oc_IOP_IOR[] = ACE_NTOHL (0x696c655f), ACE_NTOHL (0x64617461), ACE_NTOHL (0x0), // name = profile_data - CORBA::tk_sequence, // typecode kind - 12, // encapsulation length + CORBA::tk_alias, // typecode kind for typedefs + 76, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order - CORBA::tk_octet, + 31, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f4f63), + ACE_NTOHL (0x74657453), + ACE_NTOHL (0x65713a31), + ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0 + 9, + ACE_NTOHL (0x4f637465), + ACE_NTOHL (0x74536571), + ACE_NTOHL (0x0), // name = OctetSeq + CORBA::tk_sequence, // typecode kind + 12, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + CORBA::tk_octet, + + 0U, - 0U, 0U, @@ -335,7 +324,7 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 void IOP::IOR::_tao_any_destructor (void *_tao_void_pointer) { @@ -344,84 +333,16 @@ void IOP::IOR::_tao_any_destructor (void *_tao_void_pointer) } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CS_) -#define __TAO_UNBOUNDED_SEQUENCE_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CS_ - -void -IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::_allocate_buffer (CORBA::ULong length) -{ - IOP::TaggedProfile* tmp = 0; - tmp = _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (length); - - if (this->buffer_ != 0) - { - IOP::TaggedProfile *old = - ACE_reinterpret_cast (IOP::TaggedProfile *, this->buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - tmp[i] = old[i]; - } - - if (this->release_) - { - _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::freebuf (old); - } - } - - this->buffer_ = tmp; -} - -void -IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::_deallocate_buffer (void) -{ - if (this->buffer_ == 0 || this->release_ == 0) - { - return; - } - - IOP::TaggedProfile *tmp = - ACE_reinterpret_cast (IOP::TaggedProfile *, this->buffer_); - _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::freebuf (tmp); - this->buffer_ = 0; -} - -IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::~_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (void) -{ - this->_deallocate_buffer (); -} - -#endif /* end #if !defined */ - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CS_) -#define _IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CS_ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250 - -// ************************************************************* -// IOP::IOR::_tao_seq_TaggedProfile -// ************************************************************* +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50 IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile (void) {} IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile (CORBA::ULong max) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<IOP::TaggedProfile> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max) + : TAO_Unbounded_Sequence< + IOP::TaggedProfile + > + (max) {} IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile ( @@ -430,30 +351,20 @@ IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile ( IOP::TaggedProfile *buffer, CORBA::Boolean release ) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<IOP::TaggedProfile> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max, length, buffer, release) + : TAO_Unbounded_Sequence< + IOP::TaggedProfile + > + (max, length, buffer, release) {} IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile (const _tao_seq_TaggedProfile &seq) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<IOP::TaggedProfile> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (seq) + : TAO_Unbounded_Sequence< + IOP::TaggedProfile + > + (seq) {} -IOP::IOR::_tao_seq_TaggedProfile::~_tao_seq_TaggedProfile (void) // dtor +IOP::IOR::_tao_seq_TaggedProfile::~_tao_seq_TaggedProfile (void) {} void IOP::IOR::_tao_seq_TaggedProfile::_tao_any_destructor (void *_tao_void_pointer) @@ -462,7 +373,36 @@ void IOP::IOR::_tao_seq_TaggedProfile::_tao_any_destructor (void *_tao_void_poin delete tmp; } -#endif /* end #if !defined */ +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274 + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + +template class + TAO_Var_Var_T< + IOR + >; + +template class + TAO_Out_T< + IOR, + IOR_var + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# pragma instantiate \ + TAO_Var_Var_T< \ + IOR \ + > + +# pragma instantiate \ + TAO_Out_T< \ + IOR, \ + IOR_var \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -552,12 +492,29 @@ static const CORBA::Long _oc_IOP_TaggedComponent[] = ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x745f6461), ACE_NTOHL (0x74610000), // name = component_data - CORBA::tk_sequence, // typecode kind - 12, // encapsulation length + CORBA::tk_alias, // typecode kind for typedefs + 76, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order - CORBA::tk_octet, + 31, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f4f63), + ACE_NTOHL (0x74657453), + ACE_NTOHL (0x65713a31), + ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0 + 9, + ACE_NTOHL (0x4f637465), + ACE_NTOHL (0x74536571), + ACE_NTOHL (0x0), // name = OctetSeq + CORBA::tk_sequence, // typecode kind + 12, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + CORBA::tk_octet, + + 0U, - 0U, }; @@ -579,7 +536,7 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 void IOP::TaggedComponent::_tao_any_destructor (void *_tao_void_pointer) { @@ -587,150 +544,48 @@ void IOP::TaggedComponent::_tao_any_destructor (void *_tao_void_pointer) delete tmp; } -#if !defined (_IOP_TAGGEDCOMPONENT__TAO_SEQ_OCTET_CS_) -#define _IOP_TAGGEDCOMPONENT__TAO_SEQ_OCTET_CS_ - // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250 - -// ************************************************************* -// IOP::TaggedComponent::_tao_seq_Octet -// ************************************************************* - -IOP::TaggedComponent::_tao_seq_Octet::_tao_seq_Octet (void) -{} - -IOP::TaggedComponent::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -TAO_Unbounded_Sequence<CORBA::Octet> -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<CORBA::Octet> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max) -{} - -IOP::TaggedComponent::_tao_seq_Octet::_tao_seq_Octet ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::Octet *buffer, - CORBA::Boolean release - ) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -TAO_Unbounded_Sequence<CORBA::Octet> -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<CORBA::Octet> +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274 -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max, length, buffer, release) -{} +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -IOP::TaggedComponent::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) - : +template class + TAO_Var_Var_T< + TaggedComponent + >; -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -TAO_Unbounded_Sequence<CORBA::Octet> -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<CORBA::Octet> +template class + TAO_Out_T< + TaggedComponent, + TaggedComponent_var + >; -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (seq) -{} +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -IOP::TaggedComponent::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor -{} +# pragma instantiate \ + TAO_Var_Var_T< \ + TaggedComponent \ + > -void IOP::TaggedComponent::_tao_seq_Octet::_tao_any_destructor (void *_tao_void_pointer) -{ - _tao_seq_Octet *tmp = ACE_static_cast (_tao_seq_Octet*, _tao_void_pointer); - delete tmp; -} +# pragma instantiate \ + TAO_Out_T< \ + TaggedComponent, \ + TaggedComponent_var \ + > -#endif /* end #if !defined */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_MULTIPLECOMPONENTPROFILE_CS_) -#define __TAO_UNBOUNDED_SEQUENCE_IOP_MULTIPLECOMPONENTPROFILE_CS_ - -void -IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::_allocate_buffer (CORBA::ULong length) -{ - IOP::TaggedComponent* tmp = 0; - tmp = _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (length); - - if (this->buffer_ != 0) - { - IOP::TaggedComponent *old = - ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - tmp[i] = old[i]; - } - - if (this->release_) - { - _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::freebuf (old); - } - } - - this->buffer_ = tmp; -} - -void -IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::_deallocate_buffer (void) -{ - if (this->buffer_ == 0 || this->release_ == 0) - { - return; - } - - IOP::TaggedComponent *tmp = - ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_); - _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::freebuf (tmp); - this->buffer_ = 0; -} - -IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::~_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (void) -{ - this->_deallocate_buffer (); -} - -#endif /* end #if !defined */ - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_IOP_MULTIPLECOMPONENTPROFILE_CS_) -#define _IOP_MULTIPLECOMPONENTPROFILE_CS_ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250 - -// ************************************************************* -// IOP::MultipleComponentProfile -// ************************************************************* +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50 IOP::MultipleComponentProfile::MultipleComponentProfile (void) {} IOP::MultipleComponentProfile::MultipleComponentProfile (CORBA::ULong max) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<IOP::TaggedComponent> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max) + : TAO_Unbounded_Sequence< + IOP::TaggedComponent + > + (max) {} IOP::MultipleComponentProfile::MultipleComponentProfile ( @@ -739,30 +594,20 @@ IOP::MultipleComponentProfile::MultipleComponentProfile ( IOP::TaggedComponent *buffer, CORBA::Boolean release ) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<IOP::TaggedComponent> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max, length, buffer, release) + : TAO_Unbounded_Sequence< + IOP::TaggedComponent + > + (max, length, buffer, release) {} IOP::MultipleComponentProfile::MultipleComponentProfile (const MultipleComponentProfile &seq) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<IOP::TaggedComponent> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (seq) + : TAO_Unbounded_Sequence< + IOP::TaggedComponent + > + (seq) {} -IOP::MultipleComponentProfile::~MultipleComponentProfile (void) // dtor +IOP::MultipleComponentProfile::~MultipleComponentProfile (void) {} void IOP::MultipleComponentProfile::_tao_any_destructor (void *_tao_void_pointer) @@ -771,7 +616,37 @@ void IOP::MultipleComponentProfile::_tao_any_destructor (void *_tao_void_pointer delete tmp; } -#endif /* end #if !defined */ +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + +template class + TAO_VarSeq_Var_T< + MultipleComponentProfile, + IOP::TaggedComponent + >; + +template class + TAO_Seq_Out_T< + MultipleComponentProfile, + MultipleComponentProfile_var, + IOP::TaggedComponent + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# pragma instantiate \ + TAO_VarSeq_Var_T< \ + MultipleComponentProfile, \ + IOP::TaggedComponent \ + > + +# pragma instantiate \ + TAO_Seq_Out_T< \ + MultipleComponentProfile, \ + MultipleComponentProfile_var, \ + IOP::TaggedComponent \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -801,10 +676,10 @@ static const CORBA::Long _oc_IOP_MultipleComponentProfile[] = ACE_NTOHL (0x66696c65), ACE_NTOHL (0x0), // name = MultipleComponentProfile CORBA::tk_sequence, // typecode kind - 200, // encapsulation length + 264, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order CORBA::tk_struct, // typecode kind - 184, // encapsulation length + 248, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 36, ACE_NTOHL (0x49444c3a), @@ -848,12 +723,29 @@ static const CORBA::Long _oc_IOP_MultipleComponentProfile[] = ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x745f6461), ACE_NTOHL (0x74610000), // name = component_data - CORBA::tk_sequence, // typecode kind - 12, // encapsulation length + CORBA::tk_alias, // typecode kind for typedefs + 76, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order - CORBA::tk_octet, + 31, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f4f63), + ACE_NTOHL (0x74657453), + ACE_NTOHL (0x65713a31), + ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0 + 9, + ACE_NTOHL (0x4f637465), + ACE_NTOHL (0x74536571), + ACE_NTOHL (0x0), // name = OctetSeq + CORBA::tk_sequence, // typecode kind + 12, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + CORBA::tk_octet, + + 0U, - 0U, 0U, @@ -878,84 +770,16 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTLIST_CS_) -#define __TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTLIST_CS_ - -void -IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::_allocate_buffer (CORBA::ULong length) -{ - IOP::TaggedComponent* tmp = 0; - tmp = _TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (length); - - if (this->buffer_ != 0) - { - IOP::TaggedComponent *old = - ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - tmp[i] = old[i]; - } - - if (this->release_) - { - _TAO_Unbounded_Sequence_IOP_TaggedComponentList::freebuf (old); - } - } - - this->buffer_ = tmp; -} - -void -IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::_deallocate_buffer (void) -{ - if (this->buffer_ == 0 || this->release_ == 0) - { - return; - } - - IOP::TaggedComponent *tmp = - ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_); - _TAO_Unbounded_Sequence_IOP_TaggedComponentList::freebuf (tmp); - this->buffer_ = 0; -} - -IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::~_TAO_Unbounded_Sequence_IOP_TaggedComponentList (void) -{ - this->_deallocate_buffer (); -} - -#endif /* end #if !defined */ - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_IOP_TAGGEDCOMPONENTLIST_CS_) -#define _IOP_TAGGEDCOMPONENTLIST_CS_ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250 - -// ************************************************************* -// IOP::TaggedComponentList -// ************************************************************* +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50 IOP::TaggedComponentList::TaggedComponentList (void) {} IOP::TaggedComponentList::TaggedComponentList (CORBA::ULong max) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -_TAO_Unbounded_Sequence_IOP_TaggedComponentList -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<IOP::TaggedComponent> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max) + : TAO_Unbounded_Sequence< + IOP::TaggedComponent + > + (max) {} IOP::TaggedComponentList::TaggedComponentList ( @@ -964,30 +788,20 @@ IOP::TaggedComponentList::TaggedComponentList ( IOP::TaggedComponent *buffer, CORBA::Boolean release ) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -_TAO_Unbounded_Sequence_IOP_TaggedComponentList -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<IOP::TaggedComponent> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max, length, buffer, release) + : TAO_Unbounded_Sequence< + IOP::TaggedComponent + > + (max, length, buffer, release) {} IOP::TaggedComponentList::TaggedComponentList (const TaggedComponentList &seq) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -_TAO_Unbounded_Sequence_IOP_TaggedComponentList -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<IOP::TaggedComponent> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (seq) + : TAO_Unbounded_Sequence< + IOP::TaggedComponent + > + (seq) {} -IOP::TaggedComponentList::~TaggedComponentList (void) // dtor +IOP::TaggedComponentList::~TaggedComponentList (void) {} void IOP::TaggedComponentList::_tao_any_destructor (void *_tao_void_pointer) @@ -996,7 +810,37 @@ void IOP::TaggedComponentList::_tao_any_destructor (void *_tao_void_pointer) delete tmp; } -#endif /* end #if !defined */ +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + +template class + TAO_VarSeq_Var_T< + TaggedComponentList, + IOP::TaggedComponent + >; + +template class + TAO_Seq_Out_T< + TaggedComponentList, + TaggedComponentList_var, + IOP::TaggedComponent + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# pragma instantiate \ + TAO_VarSeq_Var_T< \ + TaggedComponentList, \ + IOP::TaggedComponent \ + > + +# pragma instantiate \ + TAO_Seq_Out_T< \ + TaggedComponentList, \ + TaggedComponentList_var, \ + IOP::TaggedComponent \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -1022,10 +866,10 @@ static const CORBA::Long _oc_IOP_TaggedComponentList[] = ACE_NTOHL (0x656e744c), ACE_NTOHL (0x69737400), // name = TaggedComponentList CORBA::tk_sequence, // typecode kind - 200, // encapsulation length + 264, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order CORBA::tk_struct, // typecode kind - 184, // encapsulation length + 248, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 36, ACE_NTOHL (0x49444c3a), @@ -1069,12 +913,29 @@ static const CORBA::Long _oc_IOP_TaggedComponentList[] = ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x745f6461), ACE_NTOHL (0x74610000), // name = component_data - CORBA::tk_sequence, // typecode kind - 12, // encapsulation length + CORBA::tk_alias, // typecode kind for typedefs + 76, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order - CORBA::tk_octet, + 31, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f4f63), + ACE_NTOHL (0x74657453), + ACE_NTOHL (0x65713a31), + ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0 + 9, + ACE_NTOHL (0x4f637465), + ACE_NTOHL (0x74536571), + ACE_NTOHL (0x0), // name = OctetSeq + CORBA::tk_sequence, // typecode kind + 12, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + CORBA::tk_octet, + + 0U, - 0U, 0U, @@ -1099,84 +960,16 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTSEQ_CS_) -#define __TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTSEQ_CS_ - -void -IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::_allocate_buffer (CORBA::ULong length) -{ - IOP::TaggedComponent* tmp = 0; - tmp = _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (length); - - if (this->buffer_ != 0) - { - IOP::TaggedComponent *old = - ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - tmp[i] = old[i]; - } - - if (this->release_) - { - _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::freebuf (old); - } - } - - this->buffer_ = tmp; -} - -void -IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::_deallocate_buffer (void) -{ - if (this->buffer_ == 0 || this->release_ == 0) - { - return; - } - - IOP::TaggedComponent *tmp = - ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_); - _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::freebuf (tmp); - this->buffer_ = 0; -} - -IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::~_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (void) -{ - this->_deallocate_buffer (); -} - -#endif /* end #if !defined */ - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_IOP_TAGGEDCOMPONENTSEQ_CS_) -#define _IOP_TAGGEDCOMPONENTSEQ_CS_ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250 - -// ************************************************************* -// IOP::TaggedComponentSeq -// ************************************************************* +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50 IOP::TaggedComponentSeq::TaggedComponentSeq (void) {} IOP::TaggedComponentSeq::TaggedComponentSeq (CORBA::ULong max) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<IOP::TaggedComponent> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max) + : TAO_Unbounded_Sequence< + IOP::TaggedComponent + > + (max) {} IOP::TaggedComponentSeq::TaggedComponentSeq ( @@ -1185,30 +978,20 @@ IOP::TaggedComponentSeq::TaggedComponentSeq ( IOP::TaggedComponent *buffer, CORBA::Boolean release ) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<IOP::TaggedComponent> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max, length, buffer, release) + : TAO_Unbounded_Sequence< + IOP::TaggedComponent + > + (max, length, buffer, release) {} IOP::TaggedComponentSeq::TaggedComponentSeq (const TaggedComponentSeq &seq) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<IOP::TaggedComponent> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (seq) + : TAO_Unbounded_Sequence< + IOP::TaggedComponent + > + (seq) {} -IOP::TaggedComponentSeq::~TaggedComponentSeq (void) // dtor +IOP::TaggedComponentSeq::~TaggedComponentSeq (void) {} void IOP::TaggedComponentSeq::_tao_any_destructor (void *_tao_void_pointer) @@ -1217,7 +1000,37 @@ void IOP::TaggedComponentSeq::_tao_any_destructor (void *_tao_void_pointer) delete tmp; } -#endif /* end #if !defined */ +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + +template class + TAO_VarSeq_Var_T< + TaggedComponentSeq, + IOP::TaggedComponent + >; + +template class + TAO_Seq_Out_T< + TaggedComponentSeq, + TaggedComponentSeq_var, + IOP::TaggedComponent + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# pragma instantiate \ + TAO_VarSeq_Var_T< \ + TaggedComponentSeq, \ + IOP::TaggedComponent \ + > + +# pragma instantiate \ + TAO_Seq_Out_T< \ + TaggedComponentSeq, \ + TaggedComponentSeq_var, \ + IOP::TaggedComponent \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -1243,10 +1056,10 @@ static const CORBA::Long _oc_IOP_TaggedComponentSeq[] = ACE_NTOHL (0x656e7453), ACE_NTOHL (0x65710000), // name = TaggedComponentSeq CORBA::tk_sequence, // typecode kind - 200, // encapsulation length + 264, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order CORBA::tk_struct, // typecode kind - 184, // encapsulation length + 248, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 36, ACE_NTOHL (0x49444c3a), @@ -1290,12 +1103,29 @@ static const CORBA::Long _oc_IOP_TaggedComponentSeq[] = ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x745f6461), ACE_NTOHL (0x74610000), // name = component_data - CORBA::tk_sequence, // typecode kind - 12, // encapsulation length + CORBA::tk_alias, // typecode kind for typedefs + 76, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order - CORBA::tk_octet, + 31, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f4f63), + ACE_NTOHL (0x74657453), + ACE_NTOHL (0x65713a31), + ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0 + 9, + ACE_NTOHL (0x4f637465), + ACE_NTOHL (0x74536571), + ACE_NTOHL (0x0), // name = OctetSeq + CORBA::tk_sequence, // typecode kind + 12, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + CORBA::tk_octet, + + 0U, - 0U, 0U, @@ -1409,12 +1239,29 @@ static const CORBA::Long _oc_IOP_ServiceContext[] = ACE_NTOHL (0x6578745f), ACE_NTOHL (0x64617461), ACE_NTOHL (0x0), // name = context_data - CORBA::tk_sequence, // typecode kind - 12, // encapsulation length + CORBA::tk_alias, // typecode kind for typedefs + 76, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order - CORBA::tk_octet, + 31, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f4f63), + ACE_NTOHL (0x74657453), + ACE_NTOHL (0x65713a31), + ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0 + 9, + ACE_NTOHL (0x4f637465), + ACE_NTOHL (0x74536571), + ACE_NTOHL (0x0), // name = OctetSeq + CORBA::tk_sequence, // typecode kind + 12, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + CORBA::tk_octet, + + 0U, - 0U, }; @@ -1436,7 +1283,7 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 void IOP::ServiceContext::_tao_any_destructor (void *_tao_void_pointer) { @@ -1444,150 +1291,48 @@ void IOP::ServiceContext::_tao_any_destructor (void *_tao_void_pointer) delete tmp; } -#if !defined (_IOP_SERVICECONTEXT__TAO_SEQ_OCTET_CS_) -#define _IOP_SERVICECONTEXT__TAO_SEQ_OCTET_CS_ - // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250 - -// ************************************************************* -// IOP::ServiceContext::_tao_seq_Octet -// ************************************************************* - -IOP::ServiceContext::_tao_seq_Octet::_tao_seq_Octet (void) -{} - -IOP::ServiceContext::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -TAO_Unbounded_Sequence<CORBA::Octet> -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<CORBA::Octet> +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274 -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max) -{} - -IOP::ServiceContext::_tao_seq_Octet::_tao_seq_Octet ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::Octet *buffer, - CORBA::Boolean release - ) - : +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -TAO_Unbounded_Sequence<CORBA::Octet> -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<CORBA::Octet> +template class + TAO_Var_Var_T< + ServiceContext + >; -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max, length, buffer, release) -{} +template class + TAO_Out_T< + ServiceContext, + ServiceContext_var + >; -IOP::ServiceContext::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) - : +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -TAO_Unbounded_Sequence<CORBA::Octet> -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<CORBA::Octet> +# pragma instantiate \ + TAO_Var_Var_T< \ + ServiceContext \ + > -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (seq) -{} +# pragma instantiate \ + TAO_Out_T< \ + ServiceContext, \ + ServiceContext_var \ + > -IOP::ServiceContext::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor -{} - -void IOP::ServiceContext::_tao_seq_Octet::_tao_any_destructor (void *_tao_void_pointer) -{ - _tao_seq_Octet *tmp = ACE_static_cast (_tao_seq_Octet*, _tao_void_pointer); - delete tmp; -} - -#endif /* end #if !defined */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_SERVICECONTEXTLIST_CS_) -#define __TAO_UNBOUNDED_SEQUENCE_IOP_SERVICECONTEXTLIST_CS_ - -void -IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::_allocate_buffer (CORBA::ULong length) -{ - IOP::ServiceContext* tmp = 0; - tmp = _TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (length); - - if (this->buffer_ != 0) - { - IOP::ServiceContext *old = - ACE_reinterpret_cast (IOP::ServiceContext *, this->buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - tmp[i] = old[i]; - } - - if (this->release_) - { - _TAO_Unbounded_Sequence_IOP_ServiceContextList::freebuf (old); - } - } - - this->buffer_ = tmp; -} - -void -IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::_deallocate_buffer (void) -{ - if (this->buffer_ == 0 || this->release_ == 0) - { - return; - } - - IOP::ServiceContext *tmp = - ACE_reinterpret_cast (IOP::ServiceContext *, this->buffer_); - _TAO_Unbounded_Sequence_IOP_ServiceContextList::freebuf (tmp); - this->buffer_ = 0; -} - -IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::~_TAO_Unbounded_Sequence_IOP_ServiceContextList (void) -{ - this->_deallocate_buffer (); -} - -#endif /* end #if !defined */ - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_IOP_SERVICECONTEXTLIST_CS_) -#define _IOP_SERVICECONTEXTLIST_CS_ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250 - -// ************************************************************* -// IOP::ServiceContextList -// ************************************************************* +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50 IOP::ServiceContextList::ServiceContextList (void) {} IOP::ServiceContextList::ServiceContextList (CORBA::ULong max) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -_TAO_Unbounded_Sequence_IOP_ServiceContextList -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<IOP::ServiceContext> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max) + : TAO_Unbounded_Sequence< + IOP::ServiceContext + > + (max) {} IOP::ServiceContextList::ServiceContextList ( @@ -1596,30 +1341,20 @@ IOP::ServiceContextList::ServiceContextList ( IOP::ServiceContext *buffer, CORBA::Boolean release ) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -_TAO_Unbounded_Sequence_IOP_ServiceContextList -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<IOP::ServiceContext> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max, length, buffer, release) + : TAO_Unbounded_Sequence< + IOP::ServiceContext + > + (max, length, buffer, release) {} IOP::ServiceContextList::ServiceContextList (const ServiceContextList &seq) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -_TAO_Unbounded_Sequence_IOP_ServiceContextList -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<IOP::ServiceContext> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (seq) + : TAO_Unbounded_Sequence< + IOP::ServiceContext + > + (seq) {} -IOP::ServiceContextList::~ServiceContextList (void) // dtor +IOP::ServiceContextList::~ServiceContextList (void) {} void IOP::ServiceContextList::_tao_any_destructor (void *_tao_void_pointer) @@ -1628,7 +1363,37 @@ void IOP::ServiceContextList::_tao_any_destructor (void *_tao_void_pointer) delete tmp; } -#endif /* end #if !defined */ +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + +template class + TAO_VarSeq_Var_T< + ServiceContextList, + IOP::ServiceContext + >; + +template class + TAO_Seq_Out_T< + ServiceContextList, + ServiceContextList_var, + IOP::ServiceContext + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# pragma instantiate \ + TAO_VarSeq_Var_T< \ + ServiceContextList, \ + IOP::ServiceContext \ + > + +# pragma instantiate \ + TAO_Seq_Out_T< \ + ServiceContextList, \ + ServiceContextList_var, \ + IOP::ServiceContext \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -1654,10 +1419,10 @@ static const CORBA::Long _oc_IOP_ServiceContextList[] = ACE_NTOHL (0x78744c69), ACE_NTOHL (0x73740000), // name = ServiceContextList CORBA::tk_sequence, // typecode kind - 208, // encapsulation length + 272, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order CORBA::tk_struct, // typecode kind - 192, // encapsulation length + 256, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 35, ACE_NTOHL (0x49444c3a), @@ -1703,12 +1468,29 @@ static const CORBA::Long _oc_IOP_ServiceContextList[] = ACE_NTOHL (0x6578745f), ACE_NTOHL (0x64617461), ACE_NTOHL (0x0), // name = context_data - CORBA::tk_sequence, // typecode kind - 12, // encapsulation length + CORBA::tk_alias, // typecode kind for typedefs + 76, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order - CORBA::tk_octet, + 31, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f4f63), + ACE_NTOHL (0x74657453), + ACE_NTOHL (0x65713a31), + ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0 + 9, + ACE_NTOHL (0x4f637465), + ACE_NTOHL (0x74536571), + ACE_NTOHL (0x0), // name = OctetSeq + CORBA::tk_sequence, // typecode kind + 12, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + CORBA::tk_octet, + + 0U, - 0U, 0U, @@ -1738,7 +1520,7 @@ TAO_NAMESPACE_END int IOP::Codec::_tao_class_id = 0; IOP::Codec_ptr -tao_IOP_Codec_duplicate ( +IOP::tao_Codec_life::tao_duplicate ( IOP::Codec_ptr p ) { @@ -1746,7 +1528,7 @@ tao_IOP_Codec_duplicate ( } void -tao_IOP_Codec_release ( +IOP::tao_Codec_life::tao_release ( IOP::Codec_ptr p ) { @@ -1754,231 +1536,67 @@ tao_IOP_Codec_release ( } IOP::Codec_ptr -tao_IOP_Codec_nil ( +IOP::tao_Codec_life::tao_nil ( void ) { return IOP::Codec::_nil (); } -IOP::Codec_ptr -tao_IOP_Codec_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return IOP::Codec::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object * -tao_IOP_Codec_upcast ( - void *src - ) -{ - IOP::Codec **tmp = - ACE_static_cast (IOP::Codec **, src); - return *tmp; -} - CORBA::Boolean -tao_IOP_Codec_marshal ( +IOP::tao_Codec_life::tao_marshal ( IOP::Codec_ptr p, - TAO_OutputCDR &strm + TAO_OutputCDR &cdr ) { - return p->marshal (strm); + return p->marshal (cdr); } -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721 - -// ************************************************************* -// IOP::Codec_var -// ************************************************************* - -IOP::Codec_var::Codec_var (void) - : ptr_ (Codec::_nil ()) -{} - -::IOP::Codec_ptr -IOP::Codec_var::ptr (void) const -{ - return this->ptr_; -} - -IOP::Codec_var::Codec_var (const ::IOP::Codec_var &p) - : TAO_Base_var (), - ptr_ (Codec::_duplicate (p.ptr ())) -{} - -IOP::Codec_var::~Codec_var (void) -{ - CORBA::release (this->ptr_); -} - -IOP::Codec_var & -IOP::Codec_var::operator= (Codec_ptr p) -{ - CORBA::release (this->ptr_); - this->ptr_ = p; - return *this; -} - -IOP::Codec_var & -IOP::Codec_var::operator= (const ::IOP::Codec_var &p) -{ - if (this != &p) - { - CORBA::release (this->ptr_); - this->ptr_ = ::IOP::Codec::_duplicate (p.ptr ()); - } - return *this; -} - -IOP::Codec_var::operator const ::IOP::Codec_ptr &() const // cast -{ - return this->ptr_; -} - -IOP::Codec_var::operator ::IOP::Codec_ptr &() // cast -{ - return this->ptr_; -} - -::IOP::Codec_ptr -IOP::Codec_var::operator-> (void) const -{ - return this->ptr_; -} - -::IOP::Codec_ptr -IOP::Codec_var::in (void) const -{ - return this->ptr_; -} - -::IOP::Codec_ptr & -IOP::Codec_var::inout (void) -{ - return this->ptr_; -} - -::IOP::Codec_ptr & -IOP::Codec_var::out (void) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::IOP::Codec::_nil (); - return this->ptr_; -} - -::IOP::Codec_ptr -IOP::Codec_var::_retn (void) -{ - // yield ownership of managed obj reference - ::IOP::Codec_ptr val = this->ptr_; - this->ptr_ = ::IOP::Codec::_nil (); - return val; -} - -::IOP::Codec_ptr -IOP::Codec_var::tao_duplicate (Codec_ptr p) -{ - return ::IOP::Codec::_duplicate (p); -} - -void -IOP::Codec_var::tao_release (Codec_ptr p) -{ - CORBA::release (p); -} - -::IOP::Codec_ptr -IOP::Codec_var::tao_nil (void) -{ - return ::IOP::Codec::_nil (); -} - -::IOP::Codec_ptr -IOP::Codec_var::tao_narrow ( +IOP::Codec_ptr +IOP::tao_Codec_cast::tao_narrow ( CORBA::Object *p ACE_ENV_ARG_DECL ) { - return ::IOP::Codec::_narrow (p ACE_ENV_ARG_PARAMETER); + return IOP::Codec::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * -IOP::Codec_var::tao_upcast (void *src) +IOP::tao_Codec_cast::tao_upcast ( + void *src + ) { - Codec **tmp = - ACE_static_cast (Codec **, src); + IOP::Codec **tmp = + ACE_static_cast (IOP::Codec **, src); return *tmp; } -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030 - -// ************************************************************* -// IOP::Codec_out -// ************************************************************* - -IOP::Codec_out::Codec_out (Codec_ptr &p) - : ptr_ (p) -{ - this->ptr_ = ::IOP::Codec::_nil (); -} - -IOP::Codec_out::Codec_out (Codec_var &p) - : ptr_ (p.out ()) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::IOP::Codec::_nil (); -} - -IOP::Codec_out::Codec_out (const ::IOP::Codec_out &p) - : ptr_ (ACE_const_cast (Codec_out &, p).ptr_) -{} - -::IOP::Codec_out & -IOP::Codec_out::operator= (const ::IOP::Codec_out &p) -{ - this->ptr_ = ACE_const_cast (Codec_out&, p).ptr_; - return *this; -} - -IOP::Codec_out & -IOP::Codec_out::operator= (const ::IOP::Codec_var &p) -{ - this->ptr_ = ::IOP::Codec::_duplicate (p.ptr ()); - return *this; -} - -IOP::Codec_out & -IOP::Codec_out::operator= (Codec_ptr p) -{ - this->ptr_ = p; - return *this; -} - -IOP::Codec_out::operator ::IOP::Codec_ptr &() // cast -{ - return this->ptr_; -} - -::IOP::Codec_ptr & -IOP::Codec_out::ptr (void) -{ - return this->ptr_; -} - -::IOP::Codec_ptr -IOP::Codec_out::operator-> (void) -{ - return this->ptr_; -} +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + template class + TAO_Objref_Var_T< + IOP::Codec, + IOP::tao_Codec_life + >; + template class + TAO_Objref_Out_T< + IOP::Codec, + IOP::tao_Codec_life + >; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +# pragma instantiate \ + TAO_Objref_Var_T< \ + IOP::Codec, \ + IOP::tao_Codec_life \ + > +# pragma instantiate \ + TAO_Objref_Out_T< \ + IOP::Codec, \ + IOP::tao_Codec_life \ + > +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 IOP::Codec::Codec (void) {} @@ -2072,6 +1690,12 @@ const char* IOP::Codec::_interface_repository_id (void) const return "IDL:omg.org/IOP/Codec:1.0"; } +CORBA::Boolean +IOP::Codec::marshal (TAO_OutputCDR &) +{ + return 0; +} + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63 @@ -2088,8 +1712,10 @@ IOP::Codec::InvalidTypeForEncoding::~InvalidTypeForEncoding (void) } IOP::Codec::InvalidTypeForEncoding::InvalidTypeForEncoding (const ::IOP::Codec::InvalidTypeForEncoding &_tao_excp) - : CORBA::UserException (_tao_excp._rep_id (), - _tao_excp._name ()) + : CORBA::UserException ( + _tao_excp._rep_id (), + _tao_excp._name () + ) { } @@ -2625,7 +2251,7 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 void IOP::Encoding::_tao_any_destructor (void *_tao_void_pointer) { @@ -2634,12 +2260,31 @@ void IOP::Encoding::_tao_any_destructor (void *_tao_void_pointer) } // TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274 + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + +template class + TAO_Fixed_Var_T< + Encoding + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# pragma instantiate \ + TAO_Fixed_Var_T< \ + Encoding \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61 int IOP::CodecFactory::_tao_class_id = 0; IOP::CodecFactory_ptr -tao_IOP_CodecFactory_duplicate ( +IOP::tao_CodecFactory_life::tao_duplicate ( IOP::CodecFactory_ptr p ) { @@ -2647,7 +2292,7 @@ tao_IOP_CodecFactory_duplicate ( } void -tao_IOP_CodecFactory_release ( +IOP::tao_CodecFactory_life::tao_release ( IOP::CodecFactory_ptr p ) { @@ -2655,231 +2300,67 @@ tao_IOP_CodecFactory_release ( } IOP::CodecFactory_ptr -tao_IOP_CodecFactory_nil ( +IOP::tao_CodecFactory_life::tao_nil ( void ) { return IOP::CodecFactory::_nil (); } -IOP::CodecFactory_ptr -tao_IOP_CodecFactory_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return IOP::CodecFactory::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object * -tao_IOP_CodecFactory_upcast ( - void *src - ) -{ - IOP::CodecFactory **tmp = - ACE_static_cast (IOP::CodecFactory **, src); - return *tmp; -} - CORBA::Boolean -tao_IOP_CodecFactory_marshal ( +IOP::tao_CodecFactory_life::tao_marshal ( IOP::CodecFactory_ptr p, - TAO_OutputCDR &strm + TAO_OutputCDR &cdr ) { - return p->marshal (strm); -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721 - -// ************************************************************* -// IOP::CodecFactory_var -// ************************************************************* - -IOP::CodecFactory_var::CodecFactory_var (void) - : ptr_ (CodecFactory::_nil ()) -{} - -::IOP::CodecFactory_ptr -IOP::CodecFactory_var::ptr (void) const -{ - return this->ptr_; -} - -IOP::CodecFactory_var::CodecFactory_var (const ::IOP::CodecFactory_var &p) - : TAO_Base_var (), - ptr_ (CodecFactory::_duplicate (p.ptr ())) -{} - -IOP::CodecFactory_var::~CodecFactory_var (void) -{ - CORBA::release (this->ptr_); -} - -IOP::CodecFactory_var & -IOP::CodecFactory_var::operator= (CodecFactory_ptr p) -{ - CORBA::release (this->ptr_); - this->ptr_ = p; - return *this; -} - -IOP::CodecFactory_var & -IOP::CodecFactory_var::operator= (const ::IOP::CodecFactory_var &p) -{ - if (this != &p) - { - CORBA::release (this->ptr_); - this->ptr_ = ::IOP::CodecFactory::_duplicate (p.ptr ()); - } - return *this; -} - -IOP::CodecFactory_var::operator const ::IOP::CodecFactory_ptr &() const // cast -{ - return this->ptr_; -} - -IOP::CodecFactory_var::operator ::IOP::CodecFactory_ptr &() // cast -{ - return this->ptr_; -} - -::IOP::CodecFactory_ptr -IOP::CodecFactory_var::operator-> (void) const -{ - return this->ptr_; -} - -::IOP::CodecFactory_ptr -IOP::CodecFactory_var::in (void) const -{ - return this->ptr_; -} - -::IOP::CodecFactory_ptr & -IOP::CodecFactory_var::inout (void) -{ - return this->ptr_; -} - -::IOP::CodecFactory_ptr & -IOP::CodecFactory_var::out (void) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::IOP::CodecFactory::_nil (); - return this->ptr_; -} - -::IOP::CodecFactory_ptr -IOP::CodecFactory_var::_retn (void) -{ - // yield ownership of managed obj reference - ::IOP::CodecFactory_ptr val = this->ptr_; - this->ptr_ = ::IOP::CodecFactory::_nil (); - return val; + return p->marshal (cdr); } -::IOP::CodecFactory_ptr -IOP::CodecFactory_var::tao_duplicate (CodecFactory_ptr p) -{ - return ::IOP::CodecFactory::_duplicate (p); -} - -void -IOP::CodecFactory_var::tao_release (CodecFactory_ptr p) -{ - CORBA::release (p); -} - -::IOP::CodecFactory_ptr -IOP::CodecFactory_var::tao_nil (void) -{ - return ::IOP::CodecFactory::_nil (); -} - -::IOP::CodecFactory_ptr -IOP::CodecFactory_var::tao_narrow ( +IOP::CodecFactory_ptr +IOP::tao_CodecFactory_cast::tao_narrow ( CORBA::Object *p ACE_ENV_ARG_DECL ) { - return ::IOP::CodecFactory::_narrow (p ACE_ENV_ARG_PARAMETER); + return IOP::CodecFactory::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * -IOP::CodecFactory_var::tao_upcast (void *src) +IOP::tao_CodecFactory_cast::tao_upcast ( + void *src + ) { - CodecFactory **tmp = - ACE_static_cast (CodecFactory **, src); + IOP::CodecFactory **tmp = + ACE_static_cast (IOP::CodecFactory **, src); return *tmp; } -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030 - -// ************************************************************* -// IOP::CodecFactory_out -// ************************************************************* - -IOP::CodecFactory_out::CodecFactory_out (CodecFactory_ptr &p) - : ptr_ (p) -{ - this->ptr_ = ::IOP::CodecFactory::_nil (); -} - -IOP::CodecFactory_out::CodecFactory_out (CodecFactory_var &p) - : ptr_ (p.out ()) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::IOP::CodecFactory::_nil (); -} - -IOP::CodecFactory_out::CodecFactory_out (const ::IOP::CodecFactory_out &p) - : ptr_ (ACE_const_cast (CodecFactory_out &, p).ptr_) -{} - -::IOP::CodecFactory_out & -IOP::CodecFactory_out::operator= (const ::IOP::CodecFactory_out &p) -{ - this->ptr_ = ACE_const_cast (CodecFactory_out&, p).ptr_; - return *this; -} - -IOP::CodecFactory_out & -IOP::CodecFactory_out::operator= (const ::IOP::CodecFactory_var &p) -{ - this->ptr_ = ::IOP::CodecFactory::_duplicate (p.ptr ()); - return *this; -} - -IOP::CodecFactory_out & -IOP::CodecFactory_out::operator= (CodecFactory_ptr p) -{ - this->ptr_ = p; - return *this; -} - -IOP::CodecFactory_out::operator ::IOP::CodecFactory_ptr &() // cast -{ - return this->ptr_; -} - -::IOP::CodecFactory_ptr & -IOP::CodecFactory_out::ptr (void) -{ - return this->ptr_; -} - -::IOP::CodecFactory_ptr -IOP::CodecFactory_out::operator-> (void) -{ - return this->ptr_; -} +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + template class + TAO_Objref_Var_T< + IOP::CodecFactory, + IOP::tao_CodecFactory_life + >; + template class + TAO_Objref_Out_T< + IOP::CodecFactory, + IOP::tao_CodecFactory_life + >; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +# pragma instantiate \ + TAO_Objref_Var_T< \ + IOP::CodecFactory, \ + IOP::tao_CodecFactory_life \ + > +# pragma instantiate \ + TAO_Objref_Out_T< \ + IOP::CodecFactory, \ + IOP::tao_CodecFactory_life \ + > +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 IOP::CodecFactory::CodecFactory (void) {} @@ -2973,6 +2454,12 @@ const char* IOP::CodecFactory::_interface_repository_id (void) const return "IDL:omg.org/IOP/CodecFactory:1.0"; } +CORBA::Boolean +IOP::CodecFactory::marshal (TAO_OutputCDR &) +{ + return 0; +} + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63 @@ -3400,6 +2887,13 @@ CORBA::Boolean operator>>= ( ); } +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ + defined (ACE_HAS_GNU_REPO) + template class TAO::Any_Dual_Impl_T<IOP::MultipleComponentProfile>; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +# pragma instantiate TAO::Any_Dual_Impl_T<IOP::MultipleComponentProfile> +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54 @@ -3458,6 +2952,13 @@ CORBA::Boolean operator>>= ( ); } +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ + defined (ACE_HAS_GNU_REPO) + template class TAO::Any_Dual_Impl_T<IOP::TaggedComponentList>; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +# pragma instantiate TAO::Any_Dual_Impl_T<IOP::TaggedComponentList> +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54 @@ -3516,6 +3017,13 @@ CORBA::Boolean operator>>= ( ); } +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ + defined (ACE_HAS_GNU_REPO) + template class TAO::Any_Dual_Impl_T<IOP::TaggedComponentSeq>; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +# pragma instantiate TAO::Any_Dual_Impl_T<IOP::TaggedComponentSeq> +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54 @@ -3639,6 +3147,13 @@ CORBA::Boolean operator>>= ( ); } +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ + defined (ACE_HAS_GNU_REPO) + template class TAO::Any_Dual_Impl_T<IOP::ServiceContextList>; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +# pragma instantiate TAO::Any_Dual_Impl_T<IOP::ServiceContextList> +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52 @@ -3861,100 +3376,7 @@ TAO::Any_Impl_T<IOP::CodecFactory>::demarshal_value (TAO_InputCDR &) #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125 - -#if !defined _TAO_CDR_OP_IOP_TaggedProfile__tao_seq_Octet_CPP_ -#define _TAO_CDR_OP_IOP_TaggedProfile__tao_seq_Octet_CPP_ - -CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, - const IOP::TaggedProfile::_tao_seq_Octet &_tao_sequence - ) -{ - CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - -#if (TAO_NO_COPY_OCTET_SEQUENCES == 1) - { - TAO_Unbounded_Sequence<CORBA::Octet> *oseq = - ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (IOP::TaggedProfile::_tao_seq_Octet *)&_tao_sequence); - if (oseq->mb ()) - return strm.write_octet_array_mb (oseq->mb ()); - else - return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - } - -#else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ - return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - -#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ - } - - return 0; -} - -CORBA::Boolean operator>> ( - TAO_InputCDR &strm, - IOP::TaggedProfile::_tao_seq_Octet &_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 0; - } - - // 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 1; - } - - // Retrieve all the elements. - -#if (TAO_NO_COPY_OCTET_SEQUENCES == 1) - if (ACE_BIT_DISABLED (strm.start ()->flags (), - ACE_Message_Block::DONT_DELETE)) - { - TAO_ORB_Core* orb_core = strm.orb_core (); - if (orb_core != 0 && - strm.orb_core ()->resource_factory ()-> - input_cdr_allocator_type_locked () == 1) - { - TAO_Unbounded_Sequence<CORBA::Octet> *oseq = - ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence); - oseq->replace (_tao_seq_len, strm.start ()); - oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len); - strm.skip_bytes (_tao_seq_len); - return 1; - } - } - return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len); -#else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ - return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - -#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ - } - - return 0; -} - -#endif /* _TAO_CDR_OP_IOP_TaggedProfile__tao_seq_Octet_CPP_ */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93 #if !defined _TAO_CDR_OP_IOP_IOR__tao_seq_TaggedProfile_CPP_ #define _TAO_CDR_OP_IOP_IOR__tao_seq_TaggedProfile_CPP_ @@ -4025,100 +3447,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_IOP_IOR__tao_seq_TaggedProfile_CPP_ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125 - -#if !defined _TAO_CDR_OP_IOP_TaggedComponent__tao_seq_Octet_CPP_ -#define _TAO_CDR_OP_IOP_TaggedComponent__tao_seq_Octet_CPP_ - -CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, - const IOP::TaggedComponent::_tao_seq_Octet &_tao_sequence - ) -{ - CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - -#if (TAO_NO_COPY_OCTET_SEQUENCES == 1) - { - TAO_Unbounded_Sequence<CORBA::Octet> *oseq = - ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (IOP::TaggedComponent::_tao_seq_Octet *)&_tao_sequence); - if (oseq->mb ()) - return strm.write_octet_array_mb (oseq->mb ()); - else - return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - } - -#else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ - return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - -#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ - } - - return 0; -} - -CORBA::Boolean operator>> ( - TAO_InputCDR &strm, - IOP::TaggedComponent::_tao_seq_Octet &_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 0; - } - - // 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 1; - } - - // Retrieve all the elements. - -#if (TAO_NO_COPY_OCTET_SEQUENCES == 1) - if (ACE_BIT_DISABLED (strm.start ()->flags (), - ACE_Message_Block::DONT_DELETE)) - { - TAO_ORB_Core* orb_core = strm.orb_core (); - if (orb_core != 0 && - strm.orb_core ()->resource_factory ()-> - input_cdr_allocator_type_locked () == 1) - { - TAO_Unbounded_Sequence<CORBA::Octet> *oseq = - ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence); - oseq->replace (_tao_seq_len, strm.start ()); - oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len); - strm.skip_bytes (_tao_seq_len); - return 1; - } - } - return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len); -#else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ - return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - -#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ - } - - return 0; -} - -#endif /* _TAO_CDR_OP_IOP_TaggedComponent__tao_seq_Octet_CPP_ */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93 CORBA::Boolean operator<< ( TAO_OutputCDR &strm, @@ -4184,7 +3513,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93 CORBA::Boolean operator<< ( TAO_OutputCDR &strm, @@ -4250,7 +3579,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93 CORBA::Boolean operator<< ( TAO_OutputCDR &strm, @@ -4316,100 +3645,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125 - -#if !defined _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_CPP_ -#define _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_CPP_ - -CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, - const IOP::ServiceContext::_tao_seq_Octet &_tao_sequence - ) -{ - CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - -#if (TAO_NO_COPY_OCTET_SEQUENCES == 1) - { - TAO_Unbounded_Sequence<CORBA::Octet> *oseq = - ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (IOP::ServiceContext::_tao_seq_Octet *)&_tao_sequence); - if (oseq->mb ()) - return strm.write_octet_array_mb (oseq->mb ()); - else - return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - } - -#else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ - return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - -#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ - } - - return 0; -} - -CORBA::Boolean operator>> ( - TAO_InputCDR &strm, - IOP::ServiceContext::_tao_seq_Octet &_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 0; - } - - // 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 1; - } - - // Retrieve all the elements. - -#if (TAO_NO_COPY_OCTET_SEQUENCES == 1) - if (ACE_BIT_DISABLED (strm.start ()->flags (), - ACE_Message_Block::DONT_DELETE)) - { - TAO_ORB_Core* orb_core = strm.orb_core (); - if (orb_core != 0 && - strm.orb_core ()->resource_factory ()-> - input_cdr_allocator_type_locked () == 1) - { - TAO_Unbounded_Sequence<CORBA::Octet> *oseq = - ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence); - oseq->replace (_tao_seq_len, strm.start ()); - oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len); - strm.skip_bytes (_tao_seq_len); - return 1; - } - } - return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len); -#else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ - return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - -#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ - } - - return 0; -} - -#endif /* _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_CPP_ */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93 CORBA::Boolean operator<< ( TAO_OutputCDR &strm, diff --git a/TAO/tao/IOPC.h b/TAO/tao/IOPC.h index 21815aa277f..24d939dcf2d 100644 --- a/TAO/tao/IOPC.h +++ b/TAO/tao/IOPC.h @@ -26,16 +26,14 @@ #define _TAO_IDL_ORIG_IOPC_H_ #include "ace/pre.h" -#include "tao/corbafwd.h" +#include "OctetSeqC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/TAO_Export.h" -#include "Exception.h" -#include "Object.h" #include "Any_T.h" +#include "VarOut_T.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -67,7 +65,7 @@ TAO_NAMESPACE IOP { // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333 typedef CORBA::ULong ProfileId; typedef CORBA::ULong_out ProfileId_out; @@ -80,17 +78,33 @@ TAO_NAMESPACE IOP // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::ULong TAG_INTERNET_IOP = 0U; + const IOP::ProfileId TAG_INTERNET_IOP = 0U; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::ULong TAG_MULTIPLE_COMPONENTS = 1U; + const IOP::ProfileId TAG_MULTIPLE_COMPONENTS = 1U; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231 - class TaggedProfile_var; + struct TaggedProfile; + + typedef + TAO_Var_Var_T< + TaggedProfile + > + TaggedProfile_var; + + typedef + TAO_Out_T< + TaggedProfile, + TaggedProfile_var + > + TaggedProfile_out; + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52 struct TAO_Export TaggedProfile { @@ -98,129 +112,34 @@ TAO_NAMESPACE IOP static void _tao_any_destructor (void *); IOP::ProfileId tag; - - -#if !defined (_IOP_TAGGEDPROFILE__TAO_SEQ_OCTET_CH_) -#define _IOP_TAGGEDPROFILE__TAO_SEQ_OCTET_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371 - - class _tao_seq_Octet; - - // ************************************************************* - // IOP::TaggedProfile::_tao_seq_Octet - // ************************************************************* - - class TAO_Export _tao_seq_Octet : public - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - TAO_Unbounded_Sequence<CORBA::Octet> -#else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<CORBA::Octet> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - { - public: - _tao_seq_Octet (void); - _tao_seq_Octet (CORBA::ULong max); - _tao_seq_Octet ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::Octet *buffer, - CORBA::Boolean release = 0 - ); - _tao_seq_Octet (const _tao_seq_Octet &); - ~_tao_seq_Octet (void); - - static void _tao_any_destructor (void*); - - -#if (TAO_NO_COPY_OCTET_SEQUENCES == 1) - _tao_seq_Octet ( - CORBA::ULong length, - const ACE_Message_Block* mb - ) - : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {} -#endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */ - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_field/field_ch.cpp:447 - - typedef _tao_seq_Octet _profile_data_seq; - _tao_seq_Octet profile_data; + CORBA::OctetSeq profile_data; }; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71 - - class TAO_Export TaggedProfile_var - { - public: - TaggedProfile_var (void); - TaggedProfile_var (TaggedProfile *); - TaggedProfile_var (const TaggedProfile_var &); - ~TaggedProfile_var (void); - - TaggedProfile_var &operator= (TaggedProfile *); - TaggedProfile_var &operator= (const TaggedProfile_var &); - TaggedProfile *operator-> (void); - const TaggedProfile *operator-> (void) const; - - operator const TaggedProfile &() const; - operator TaggedProfile &(); - operator TaggedProfile &() const; - - // Variable-size types only. - operator TaggedProfile *&(); - - // in, inout, out, _retn - const TaggedProfile &in (void) const; - TaggedProfile &inout (void); - TaggedProfile *&out (void); - TaggedProfile *_retn (void); - TaggedProfile *ptr (void) const; + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - private: - TaggedProfile *ptr_; - }; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TaggedProfile; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231 - class TAO_Export TaggedProfile_out - { - public: - TaggedProfile_out (TaggedProfile *&); - TaggedProfile_out (TaggedProfile_var &); - TaggedProfile_out (const TaggedProfile_out &); - TaggedProfile_out &operator= (const TaggedProfile_out &); - TaggedProfile_out &operator= (TaggedProfile *); - operator TaggedProfile *&(); - TaggedProfile *&ptr (void); - TaggedProfile *operator-> (void); - - private: - TaggedProfile *&ptr_; - // Assignment from T_var not allowed. - void operator= (const TaggedProfile_var &); - }; + struct IOR; - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 + typedef + TAO_Var_Var_T< + IOR + > + IOR_var; - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TaggedProfile; + typedef + TAO_Out_T< + IOR, + IOR_var + > + IOR_out; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49 - - class IOR_var; + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52 struct TAO_Export IOR { @@ -230,101 +149,31 @@ TAO_NAMESPACE IOP TAO_String_Manager type_id; - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CH_) -#define __TAO_UNBOUNDED_SEQUENCE_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CH_ - - class TAO_Export _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile - : public TAO_Unbounded_Base_Sequence - { - public: - _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (void); - _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (CORBA::ULong maximum); - _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile ( - CORBA::ULong maximum, - CORBA::ULong length, - ACE_NESTED_CLASS (IOP, TaggedProfile) *data, - CORBA::Boolean release = 0 - ); - _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile ( - const _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile &rhs - ); - _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile &operator= ( - const _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile &rhs - ); - virtual ~_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (void); - - // = Accessors. - ACE_NESTED_CLASS (IOP, TaggedProfile) &operator[] (CORBA::ULong i); - const ACE_NESTED_CLASS (IOP, TaggedProfile) &operator[] (CORBA::ULong i) const; - - // = Static operations. - static ACE_NESTED_CLASS (IOP, TaggedProfile) *allocbuf (CORBA::ULong size); - static void freebuf (ACE_NESTED_CLASS (IOP, TaggedProfile) *buffer); - - // Implement the TAO_Base_Sequence methods (see Sequence.h) - virtual void _allocate_buffer (CORBA::ULong length); - virtual void _deallocate_buffer (void); - ACE_NESTED_CLASS (IOP, TaggedProfile) *get_buffer (CORBA::Boolean orphan = 0); - const ACE_NESTED_CLASS (IOP, TaggedProfile) *get_buffer (void) const; - void replace ( - CORBA::ULong max, - CORBA::ULong length, - ACE_NESTED_CLASS (IOP, TaggedProfile) *data, - CORBA::Boolean release - ); - }; - -#endif /* end #if !defined */ - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CH_) -#define _IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CH_ - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371 - - class _tao_seq_TaggedProfile; - - // ************************************************************* - // IOP::IOR::_tao_seq_TaggedProfile - // ************************************************************* + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75 - class TAO_Export _tao_seq_TaggedProfile : public - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile -#else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<ACE_NESTED_CLASS (IOP, TaggedProfile)> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + class TAO_Export _tao_seq_TaggedProfile + : public + TAO_Unbounded_Sequence< + IOP::TaggedProfile + > { public: _tao_seq_TaggedProfile (void); _tao_seq_TaggedProfile (CORBA::ULong max); _tao_seq_TaggedProfile ( - CORBA::ULong max, - CORBA::ULong length, + CORBA::ULong max, + CORBA::ULong length, ACE_NESTED_CLASS (IOP, TaggedProfile) *buffer, CORBA::Boolean release = 0 ); _tao_seq_TaggedProfile (const _tao_seq_TaggedProfile &); ~_tao_seq_TaggedProfile (void); - static void _tao_any_destructor (void*); + static void _tao_any_destructor (void *); }; - -#endif /* end #if !defined */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_field/field_ch.cpp:447 @@ -334,67 +183,12 @@ TAO_NAMESPACE IOP }; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71 - - class TAO_Export IOR_var - { - public: - IOR_var (void); - IOR_var (IOR *); - IOR_var (const IOR_var &); - ~IOR_var (void); - - IOR_var &operator= (IOR *); - IOR_var &operator= (const IOR_var &); - IOR *operator-> (void); - const IOR *operator-> (void) const; - - operator const IOR &() const; - operator IOR &(); - operator IOR &() const; - - // Variable-size types only. - operator IOR *&(); - - // in, inout, out, _retn - const IOR &in (void) const; - IOR &inout (void); - IOR *&out (void); - IOR *_retn (void); - IOR *ptr (void) const; - - private: - IOR *ptr_; - }; - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445 - - class TAO_Export IOR_out - { - public: - IOR_out (IOR *&); - IOR_out (IOR_var &); - IOR_out (const IOR_out &); - IOR_out &operator= (const IOR_out &); - IOR_out &operator= (IOR *); - operator IOR *&(); - IOR *&ptr (void); - IOR *operator-> (void); - - private: - IOR *&ptr_; - // Assignment from T_var not allowed. - void operator= (const IOR_var &); - }; - - // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IOR; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333 typedef CORBA::ULong ComponentId; typedef CORBA::ULong_out ComponentId_out; @@ -405,128 +199,33 @@ TAO_NAMESPACE IOP TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ComponentId; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49 - - class TaggedComponent_var; + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231 - struct TAO_Export TaggedComponent - { - typedef TaggedComponent_var _var_type; - - static void _tao_any_destructor (void *); - IOP::ComponentId tag; - - -#if !defined (_IOP_TAGGEDCOMPONENT__TAO_SEQ_OCTET_CH_) -#define _IOP_TAGGEDCOMPONENT__TAO_SEQ_OCTET_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371 - - class _tao_seq_Octet; - - // ************************************************************* - // IOP::TaggedComponent::_tao_seq_Octet - // ************************************************************* - - class TAO_Export _tao_seq_Octet : public - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - TAO_Unbounded_Sequence<CORBA::Octet> -#else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<CORBA::Octet> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - { - public: - _tao_seq_Octet (void); - _tao_seq_Octet (CORBA::ULong max); - _tao_seq_Octet ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::Octet *buffer, - CORBA::Boolean release = 0 - ); - _tao_seq_Octet (const _tao_seq_Octet &); - ~_tao_seq_Octet (void); - - static void _tao_any_destructor (void*); - - -#if (TAO_NO_COPY_OCTET_SEQUENCES == 1) - _tao_seq_Octet ( - CORBA::ULong length, - const ACE_Message_Block* mb - ) - : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {} -#endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */ - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_field/field_ch.cpp:447 - - typedef _tao_seq_Octet _component_data_seq; - _tao_seq_Octet component_data; - }; - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71 + struct TaggedComponent; - class TAO_Export TaggedComponent_var - { - public: - TaggedComponent_var (void); - TaggedComponent_var (TaggedComponent *); - TaggedComponent_var (const TaggedComponent_var &); - ~TaggedComponent_var (void); - - TaggedComponent_var &operator= (TaggedComponent *); - TaggedComponent_var &operator= (const TaggedComponent_var &); - TaggedComponent *operator-> (void); - const TaggedComponent *operator-> (void) const; - - operator const TaggedComponent &() const; - operator TaggedComponent &(); - operator TaggedComponent &() const; - - // Variable-size types only. - operator TaggedComponent *&(); - - // in, inout, out, _retn - const TaggedComponent &in (void) const; - TaggedComponent &inout (void); - TaggedComponent *&out (void); - TaggedComponent *_retn (void); - TaggedComponent *ptr (void) const; + typedef + TAO_Var_Var_T< + TaggedComponent + > + TaggedComponent_var; - private: - TaggedComponent *ptr_; - }; + typedef + TAO_Out_T< + TaggedComponent, + TaggedComponent_var + > + TaggedComponent_out; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52 - class TAO_Export TaggedComponent_out + struct TAO_Export TaggedComponent { - public: - TaggedComponent_out (TaggedComponent *&); - TaggedComponent_out (TaggedComponent_var &); - TaggedComponent_out (const TaggedComponent_out &); - TaggedComponent_out &operator= (const TaggedComponent_out &); - TaggedComponent_out &operator= (TaggedComponent *); - operator TaggedComponent *&(); - TaggedComponent *&ptr (void); - TaggedComponent *operator-> (void); + typedef TaggedComponent_var _var_type; - private: - TaggedComponent *&ptr_; - // Assignment from T_var not allowed. - void operator= (const TaggedComponent_var &); + static void _tao_any_destructor (void *); + IOP::ComponentId tag; + CORBA::OctetSeq component_data; }; // TAO_IDL - Generated from @@ -534,525 +233,144 @@ TAO_NAMESPACE IOP TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TaggedComponent; - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_MULTIPLECOMPONENTPROFILE_CH_) -#define __TAO_UNBOUNDED_SEQUENCE_IOP_MULTIPLECOMPONENTPROFILE_CH_ - - class TAO_Export _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile - : public TAO_Unbounded_Base_Sequence - { - public: - _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (void); - _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (CORBA::ULong maximum); - _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile ( - CORBA::ULong maximum, - CORBA::ULong length, - TaggedComponent *data, - CORBA::Boolean release = 0 - ); - _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile ( - const _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile &rhs - ); - _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile &operator= ( - const _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile &rhs - ); - virtual ~_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (void); - - // = Accessors. - TaggedComponent &operator[] (CORBA::ULong i); - const TaggedComponent &operator[] (CORBA::ULong i) const; - - // = Static operations. - static TaggedComponent *allocbuf (CORBA::ULong size); - static void freebuf (TaggedComponent *buffer); - - // Implement the TAO_Base_Sequence methods (see Sequence.h) - virtual void _allocate_buffer (CORBA::ULong length); - virtual void _deallocate_buffer (void); - TaggedComponent *get_buffer (CORBA::Boolean orphan = 0); - const TaggedComponent *get_buffer (void) const; - void replace ( - CORBA::ULong max, - CORBA::ULong length, - TaggedComponent *data, - CORBA::Boolean release - ); - }; - -#endif /* end #if !defined */ - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_IOP_MULTIPLECOMPONENTPROFILE_CH_) -#define _IOP_MULTIPLECOMPONENTPROFILE_CH_ - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75 class MultipleComponentProfile; - class MultipleComponentProfile_var; - - // ************************************************************* - // IOP::MultipleComponentProfile - // ************************************************************* - class TAO_Export MultipleComponentProfile : public - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile -#else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<TaggedComponent> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + typedef + TAO_VarSeq_Var_T< + MultipleComponentProfile, + IOP::TaggedComponent + > + MultipleComponentProfile_var; + + typedef + TAO_Seq_Out_T< + MultipleComponentProfile, + MultipleComponentProfile_var, + IOP::TaggedComponent + > + MultipleComponentProfile_out; + + class TAO_Export MultipleComponentProfile + : public + TAO_Unbounded_Sequence< + IOP::TaggedComponent + > { public: MultipleComponentProfile (void); MultipleComponentProfile (CORBA::ULong max); MultipleComponentProfile ( - CORBA::ULong max, - CORBA::ULong length, + CORBA::ULong max, + CORBA::ULong length, TaggedComponent *buffer, CORBA::Boolean release = 0 ); MultipleComponentProfile (const MultipleComponentProfile &); ~MultipleComponentProfile (void); - static void _tao_any_destructor (void*); + static void _tao_any_destructor (void *); typedef MultipleComponentProfile_var _var_type; }; - -#endif /* end #if !defined */ - -#if !defined (_IOP_MULTIPLECOMPONENTPROFILE___VAR_CH_) -#define _IOP_MULTIPLECOMPONENTPROFILE___VAR_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549 - - // ************************************************************* - // class IOP::MultipleComponentProfile_var - // ************************************************************* - - class TAO_Export MultipleComponentProfile_var - { - public: - MultipleComponentProfile_var (void); - MultipleComponentProfile_var (MultipleComponentProfile *); - MultipleComponentProfile_var (const MultipleComponentProfile_var &); - ~MultipleComponentProfile_var (void); - - MultipleComponentProfile_var &operator= (MultipleComponentProfile *); - MultipleComponentProfile_var &operator= (const MultipleComponentProfile_var &); - MultipleComponentProfile *operator-> (void); - const MultipleComponentProfile *operator-> (void) const; - - operator const MultipleComponentProfile &() const; - operator MultipleComponentProfile &(); - operator MultipleComponentProfile &() const; - - // Variable-size base types only. - operator MultipleComponentProfile *&(); - - TaggedComponent & operator[] (CORBA::ULong index); - const TaggedComponent & operator[] (CORBA::ULong index) const; - - // in, inout, out, _retn - const MultipleComponentProfile &in (void) const; - MultipleComponentProfile &inout (void); - MultipleComponentProfile *&out (void); - MultipleComponentProfile *_retn (void); - MultipleComponentProfile *ptr (void) const; - - private: - MultipleComponentProfile *ptr_; - }; - -#endif /* end #if !defined */ - -#if !defined (_IOP_MULTIPLECOMPONENTPROFILE___OUT_CH_) -#define _IOP_MULTIPLECOMPONENTPROFILE___OUT_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753 - - class TAO_Export MultipleComponentProfile_out - { - public: - MultipleComponentProfile_out (MultipleComponentProfile *&); - MultipleComponentProfile_out (MultipleComponentProfile_var &); - MultipleComponentProfile_out (const MultipleComponentProfile_out &); - MultipleComponentProfile_out &operator= (const MultipleComponentProfile_out &); - MultipleComponentProfile_out &operator= (MultipleComponentProfile *); - operator MultipleComponentProfile *&(); - MultipleComponentProfile *&ptr (void); - MultipleComponentProfile *operator-> (void); - TaggedComponent & operator[] (CORBA::ULong index); - - private: - MultipleComponentProfile *&ptr_; - // Assignment from T_var not allowed. - void operator= (const MultipleComponentProfile_var &); - }; - -#endif /* end #if !defined */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultipleComponentProfile; - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTLIST_CH_) -#define __TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTLIST_CH_ - - class TAO_Export _TAO_Unbounded_Sequence_IOP_TaggedComponentList - : public TAO_Unbounded_Base_Sequence - { - public: - _TAO_Unbounded_Sequence_IOP_TaggedComponentList (void); - _TAO_Unbounded_Sequence_IOP_TaggedComponentList (CORBA::ULong maximum); - _TAO_Unbounded_Sequence_IOP_TaggedComponentList ( - CORBA::ULong maximum, - CORBA::ULong length, - TaggedComponent *data, - CORBA::Boolean release = 0 - ); - _TAO_Unbounded_Sequence_IOP_TaggedComponentList ( - const _TAO_Unbounded_Sequence_IOP_TaggedComponentList &rhs - ); - _TAO_Unbounded_Sequence_IOP_TaggedComponentList &operator= ( - const _TAO_Unbounded_Sequence_IOP_TaggedComponentList &rhs - ); - virtual ~_TAO_Unbounded_Sequence_IOP_TaggedComponentList (void); - - // = Accessors. - TaggedComponent &operator[] (CORBA::ULong i); - const TaggedComponent &operator[] (CORBA::ULong i) const; - - // = Static operations. - static TaggedComponent *allocbuf (CORBA::ULong size); - static void freebuf (TaggedComponent *buffer); - - // Implement the TAO_Base_Sequence methods (see Sequence.h) - virtual void _allocate_buffer (CORBA::ULong length); - virtual void _deallocate_buffer (void); - TaggedComponent *get_buffer (CORBA::Boolean orphan = 0); - const TaggedComponent *get_buffer (void) const; - void replace ( - CORBA::ULong max, - CORBA::ULong length, - TaggedComponent *data, - CORBA::Boolean release - ); - }; - -#endif /* end #if !defined */ - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_IOP_TAGGEDCOMPONENTLIST_CH_) -#define _IOP_TAGGEDCOMPONENTLIST_CH_ - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75 class TaggedComponentList; - class TaggedComponentList_var; - - // ************************************************************* - // IOP::TaggedComponentList - // ************************************************************* - class TAO_Export TaggedComponentList : public - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_IOP_TaggedComponentList -#else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<TaggedComponent> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + typedef + TAO_VarSeq_Var_T< + TaggedComponentList, + IOP::TaggedComponent + > + TaggedComponentList_var; + + typedef + TAO_Seq_Out_T< + TaggedComponentList, + TaggedComponentList_var, + IOP::TaggedComponent + > + TaggedComponentList_out; + + class TAO_Export TaggedComponentList + : public + TAO_Unbounded_Sequence< + IOP::TaggedComponent + > { public: TaggedComponentList (void); TaggedComponentList (CORBA::ULong max); TaggedComponentList ( - CORBA::ULong max, - CORBA::ULong length, + CORBA::ULong max, + CORBA::ULong length, TaggedComponent *buffer, CORBA::Boolean release = 0 ); TaggedComponentList (const TaggedComponentList &); ~TaggedComponentList (void); - static void _tao_any_destructor (void*); + static void _tao_any_destructor (void *); typedef TaggedComponentList_var _var_type; }; - -#endif /* end #if !defined */ - -#if !defined (_IOP_TAGGEDCOMPONENTLIST___VAR_CH_) -#define _IOP_TAGGEDCOMPONENTLIST___VAR_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549 - - // ************************************************************* - // class IOP::TaggedComponentList_var - // ************************************************************* - - class TAO_Export TaggedComponentList_var - { - public: - TaggedComponentList_var (void); - TaggedComponentList_var (TaggedComponentList *); - TaggedComponentList_var (const TaggedComponentList_var &); - ~TaggedComponentList_var (void); - - TaggedComponentList_var &operator= (TaggedComponentList *); - TaggedComponentList_var &operator= (const TaggedComponentList_var &); - TaggedComponentList *operator-> (void); - const TaggedComponentList *operator-> (void) const; - - operator const TaggedComponentList &() const; - operator TaggedComponentList &(); - operator TaggedComponentList &() const; - - // Variable-size base types only. - operator TaggedComponentList *&(); - - TaggedComponent & operator[] (CORBA::ULong index); - const TaggedComponent & operator[] (CORBA::ULong index) const; - - // in, inout, out, _retn - const TaggedComponentList &in (void) const; - TaggedComponentList &inout (void); - TaggedComponentList *&out (void); - TaggedComponentList *_retn (void); - TaggedComponentList *ptr (void) const; - - private: - TaggedComponentList *ptr_; - }; - -#endif /* end #if !defined */ - -#if !defined (_IOP_TAGGEDCOMPONENTLIST___OUT_CH_) -#define _IOP_TAGGEDCOMPONENTLIST___OUT_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753 - - class TAO_Export TaggedComponentList_out - { - public: - TaggedComponentList_out (TaggedComponentList *&); - TaggedComponentList_out (TaggedComponentList_var &); - TaggedComponentList_out (const TaggedComponentList_out &); - TaggedComponentList_out &operator= (const TaggedComponentList_out &); - TaggedComponentList_out &operator= (TaggedComponentList *); - operator TaggedComponentList *&(); - TaggedComponentList *&ptr (void); - TaggedComponentList *operator-> (void); - TaggedComponent & operator[] (CORBA::ULong index); - - private: - TaggedComponentList *&ptr_; - // Assignment from T_var not allowed. - void operator= (const TaggedComponentList_var &); - }; - -#endif /* end #if !defined */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TaggedComponentList; - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTSEQ_CH_) -#define __TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTSEQ_CH_ - - class TAO_Export _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq - : public TAO_Unbounded_Base_Sequence - { - public: - _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (void); - _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (CORBA::ULong maximum); - _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq ( - CORBA::ULong maximum, - CORBA::ULong length, - TaggedComponent *data, - CORBA::Boolean release = 0 - ); - _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq ( - const _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq &rhs - ); - _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq &operator= ( - const _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq &rhs - ); - virtual ~_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (void); - - // = Accessors. - TaggedComponent &operator[] (CORBA::ULong i); - const TaggedComponent &operator[] (CORBA::ULong i) const; - - // = Static operations. - static TaggedComponent *allocbuf (CORBA::ULong size); - static void freebuf (TaggedComponent *buffer); - - // Implement the TAO_Base_Sequence methods (see Sequence.h) - virtual void _allocate_buffer (CORBA::ULong length); - virtual void _deallocate_buffer (void); - TaggedComponent *get_buffer (CORBA::Boolean orphan = 0); - const TaggedComponent *get_buffer (void) const; - void replace ( - CORBA::ULong max, - CORBA::ULong length, - TaggedComponent *data, - CORBA::Boolean release - ); - }; - -#endif /* end #if !defined */ - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_IOP_TAGGEDCOMPONENTSEQ_CH_) -#define _IOP_TAGGEDCOMPONENTSEQ_CH_ - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75 class TaggedComponentSeq; - class TaggedComponentSeq_var; - - // ************************************************************* - // IOP::TaggedComponentSeq - // ************************************************************* - - class TAO_Export TaggedComponentSeq : public - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq -#else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<TaggedComponent> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + typedef + TAO_VarSeq_Var_T< + TaggedComponentSeq, + IOP::TaggedComponent + > + TaggedComponentSeq_var; + + typedef + TAO_Seq_Out_T< + TaggedComponentSeq, + TaggedComponentSeq_var, + IOP::TaggedComponent + > + TaggedComponentSeq_out; + + class TAO_Export TaggedComponentSeq + : public + TAO_Unbounded_Sequence< + IOP::TaggedComponent + > { public: TaggedComponentSeq (void); TaggedComponentSeq (CORBA::ULong max); TaggedComponentSeq ( - CORBA::ULong max, - CORBA::ULong length, + CORBA::ULong max, + CORBA::ULong length, TaggedComponent *buffer, CORBA::Boolean release = 0 ); TaggedComponentSeq (const TaggedComponentSeq &); ~TaggedComponentSeq (void); - static void _tao_any_destructor (void*); + static void _tao_any_destructor (void *); typedef TaggedComponentSeq_var _var_type; }; - -#endif /* end #if !defined */ - -#if !defined (_IOP_TAGGEDCOMPONENTSEQ___VAR_CH_) -#define _IOP_TAGGEDCOMPONENTSEQ___VAR_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549 - - // ************************************************************* - // class IOP::TaggedComponentSeq_var - // ************************************************************* - - class TAO_Export TaggedComponentSeq_var - { - public: - TaggedComponentSeq_var (void); - TaggedComponentSeq_var (TaggedComponentSeq *); - TaggedComponentSeq_var (const TaggedComponentSeq_var &); - ~TaggedComponentSeq_var (void); - - TaggedComponentSeq_var &operator= (TaggedComponentSeq *); - TaggedComponentSeq_var &operator= (const TaggedComponentSeq_var &); - TaggedComponentSeq *operator-> (void); - const TaggedComponentSeq *operator-> (void) const; - - operator const TaggedComponentSeq &() const; - operator TaggedComponentSeq &(); - operator TaggedComponentSeq &() const; - - // Variable-size base types only. - operator TaggedComponentSeq *&(); - - TaggedComponent & operator[] (CORBA::ULong index); - const TaggedComponent & operator[] (CORBA::ULong index) const; - - // in, inout, out, _retn - const TaggedComponentSeq &in (void) const; - TaggedComponentSeq &inout (void); - TaggedComponentSeq *&out (void); - TaggedComponentSeq *_retn (void); - TaggedComponentSeq *ptr (void) const; - - private: - TaggedComponentSeq *ptr_; - }; - -#endif /* end #if !defined */ - -#if !defined (_IOP_TAGGEDCOMPONENTSEQ___OUT_CH_) -#define _IOP_TAGGEDCOMPONENTSEQ___OUT_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753 - - class TAO_Export TaggedComponentSeq_out - { - public: - TaggedComponentSeq_out (TaggedComponentSeq *&); - TaggedComponentSeq_out (TaggedComponentSeq_var &); - TaggedComponentSeq_out (const TaggedComponentSeq_out &); - TaggedComponentSeq_out &operator= (const TaggedComponentSeq_out &); - TaggedComponentSeq_out &operator= (TaggedComponentSeq *); - operator TaggedComponentSeq *&(); - TaggedComponentSeq *&ptr (void); - TaggedComponentSeq *operator-> (void); - TaggedComponent & operator[] (CORBA::ULong index); - - private: - TaggedComponentSeq *&ptr_; - // Assignment from T_var not allowed. - void operator= (const TaggedComponentSeq_var &); - }; - -#endif /* end #if !defined */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 @@ -1062,55 +380,55 @@ TAO_NAMESPACE IOP // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::ULong TAG_ORB_TYPE = 0U; + const IOP::ComponentId TAG_ORB_TYPE = 0U; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::ULong TAG_CODE_SETS = 1U; + const IOP::ComponentId TAG_CODE_SETS = 1U; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::ULong TAG_POLICIES = 2U; + const IOP::ComponentId TAG_POLICIES = 2U; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::ULong TAG_ALTERNATE_IIOP_ADDRESS = 3U; + const IOP::ComponentId TAG_ALTERNATE_IIOP_ADDRESS = 3U; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::ULong TAG_COMPLETE_OBJECT_KEY = 5U; + const IOP::ComponentId TAG_COMPLETE_OBJECT_KEY = 5U; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::ULong TAG_ENDPOINT_ID_POSITION = 6U; + const IOP::ComponentId TAG_ENDPOINT_ID_POSITION = 6U; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::ULong TAG_LOCATION_POLICY = 12U; + const IOP::ComponentId TAG_LOCATION_POLICY = 12U; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::ULong TAG_DCE_STRING_BINDING = 100U; + const IOP::ComponentId TAG_DCE_STRING_BINDING = 100U; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::ULong TAG_DCE_BINDING_NAME = 101U; + const IOP::ComponentId TAG_DCE_BINDING_NAME = 101U; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::ULong TAG_DCE_NO_PIPES = 102U; + const IOP::ComponentId TAG_DCE_NO_PIPES = 102U; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333 typedef CORBA::ULong ServiceId; typedef CORBA::ULong_out ServiceId_out; @@ -1121,128 +439,33 @@ TAO_NAMESPACE IOP TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceId; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49 - - class ServiceContext_var; - - struct TAO_Export ServiceContext - { - typedef ServiceContext_var _var_type; - - static void _tao_any_destructor (void *); - IOP::ServiceId context_id; - - -#if !defined (_IOP_SERVICECONTEXT__TAO_SEQ_OCTET_CH_) -#define _IOP_SERVICECONTEXT__TAO_SEQ_OCTET_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371 - - class _tao_seq_Octet; - - // ************************************************************* - // IOP::ServiceContext::_tao_seq_Octet - // ************************************************************* - - class TAO_Export _tao_seq_Octet : public - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - TAO_Unbounded_Sequence<CORBA::Octet> -#else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<CORBA::Octet> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - { - public: - _tao_seq_Octet (void); - _tao_seq_Octet (CORBA::ULong max); - _tao_seq_Octet ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::Octet *buffer, - CORBA::Boolean release = 0 - ); - _tao_seq_Octet (const _tao_seq_Octet &); - ~_tao_seq_Octet (void); - - static void _tao_any_destructor (void*); - - -#if (TAO_NO_COPY_OCTET_SEQUENCES == 1) - _tao_seq_Octet ( - CORBA::ULong length, - const ACE_Message_Block* mb - ) - : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {} -#endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */ - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_field/field_ch.cpp:447 - - typedef _tao_seq_Octet _context_data_seq; - _tao_seq_Octet context_data; - }; + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231 - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71 + struct ServiceContext; - class TAO_Export ServiceContext_var - { - public: - ServiceContext_var (void); - ServiceContext_var (ServiceContext *); - ServiceContext_var (const ServiceContext_var &); - ~ServiceContext_var (void); - - ServiceContext_var &operator= (ServiceContext *); - ServiceContext_var &operator= (const ServiceContext_var &); - ServiceContext *operator-> (void); - const ServiceContext *operator-> (void) const; - - operator const ServiceContext &() const; - operator ServiceContext &(); - operator ServiceContext &() const; - - // Variable-size types only. - operator ServiceContext *&(); - - // in, inout, out, _retn - const ServiceContext &in (void) const; - ServiceContext &inout (void); - ServiceContext *&out (void); - ServiceContext *_retn (void); - ServiceContext *ptr (void) const; + typedef + TAO_Var_Var_T< + ServiceContext + > + ServiceContext_var; - private: - ServiceContext *ptr_; - }; + typedef + TAO_Out_T< + ServiceContext, + ServiceContext_var + > + ServiceContext_out; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52 - class TAO_Export ServiceContext_out + struct TAO_Export ServiceContext { - public: - ServiceContext_out (ServiceContext *&); - ServiceContext_out (ServiceContext_var &); - ServiceContext_out (const ServiceContext_out &); - ServiceContext_out &operator= (const ServiceContext_out &); - ServiceContext_out &operator= (ServiceContext *); - operator ServiceContext *&(); - ServiceContext *&ptr (void); - ServiceContext *operator-> (void); + typedef ServiceContext_var _var_type; - private: - ServiceContext *&ptr_; - // Assignment from T_var not allowed. - void operator= (const ServiceContext_var &); + static void _tao_any_destructor (void *); + IOP::ServiceId context_id; + CORBA::OctetSeq context_data; }; // TAO_IDL - Generated from @@ -1250,175 +473,48 @@ TAO_NAMESPACE IOP TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceContext; - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_SERVICECONTEXTLIST_CH_) -#define __TAO_UNBOUNDED_SEQUENCE_IOP_SERVICECONTEXTLIST_CH_ - - class TAO_Export _TAO_Unbounded_Sequence_IOP_ServiceContextList - : public TAO_Unbounded_Base_Sequence - { - public: - _TAO_Unbounded_Sequence_IOP_ServiceContextList (void); - _TAO_Unbounded_Sequence_IOP_ServiceContextList (CORBA::ULong maximum); - _TAO_Unbounded_Sequence_IOP_ServiceContextList ( - CORBA::ULong maximum, - CORBA::ULong length, - ServiceContext *data, - CORBA::Boolean release = 0 - ); - _TAO_Unbounded_Sequence_IOP_ServiceContextList ( - const _TAO_Unbounded_Sequence_IOP_ServiceContextList &rhs - ); - _TAO_Unbounded_Sequence_IOP_ServiceContextList &operator= ( - const _TAO_Unbounded_Sequence_IOP_ServiceContextList &rhs - ); - virtual ~_TAO_Unbounded_Sequence_IOP_ServiceContextList (void); - - // = Accessors. - ServiceContext &operator[] (CORBA::ULong i); - const ServiceContext &operator[] (CORBA::ULong i) const; - - // = Static operations. - static ServiceContext *allocbuf (CORBA::ULong size); - static void freebuf (ServiceContext *buffer); - - // Implement the TAO_Base_Sequence methods (see Sequence.h) - virtual void _allocate_buffer (CORBA::ULong length); - virtual void _deallocate_buffer (void); - ServiceContext *get_buffer (CORBA::Boolean orphan = 0); - const ServiceContext *get_buffer (void) const; - void replace ( - CORBA::ULong max, - CORBA::ULong length, - ServiceContext *data, - CORBA::Boolean release - ); - }; - -#endif /* end #if !defined */ - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_IOP_SERVICECONTEXTLIST_CH_) -#define _IOP_SERVICECONTEXTLIST_CH_ - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75 class ServiceContextList; - class ServiceContextList_var; - - // ************************************************************* - // IOP::ServiceContextList - // ************************************************************* - - class TAO_Export ServiceContextList : public - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_IOP_ServiceContextList -#else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<ServiceContext> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + typedef + TAO_VarSeq_Var_T< + ServiceContextList, + IOP::ServiceContext + > + ServiceContextList_var; + + typedef + TAO_Seq_Out_T< + ServiceContextList, + ServiceContextList_var, + IOP::ServiceContext + > + ServiceContextList_out; + + class TAO_Export ServiceContextList + : public + TAO_Unbounded_Sequence< + IOP::ServiceContext + > { public: ServiceContextList (void); ServiceContextList (CORBA::ULong max); ServiceContextList ( - CORBA::ULong max, - CORBA::ULong length, + CORBA::ULong max, + CORBA::ULong length, ServiceContext *buffer, CORBA::Boolean release = 0 ); ServiceContextList (const ServiceContextList &); ~ServiceContextList (void); - static void _tao_any_destructor (void*); + static void _tao_any_destructor (void *); typedef ServiceContextList_var _var_type; }; - -#endif /* end #if !defined */ - -#if !defined (_IOP_SERVICECONTEXTLIST___VAR_CH_) -#define _IOP_SERVICECONTEXTLIST___VAR_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549 - - // ************************************************************* - // class IOP::ServiceContextList_var - // ************************************************************* - - class TAO_Export ServiceContextList_var - { - public: - ServiceContextList_var (void); - ServiceContextList_var (ServiceContextList *); - ServiceContextList_var (const ServiceContextList_var &); - ~ServiceContextList_var (void); - - ServiceContextList_var &operator= (ServiceContextList *); - ServiceContextList_var &operator= (const ServiceContextList_var &); - ServiceContextList *operator-> (void); - const ServiceContextList *operator-> (void) const; - - operator const ServiceContextList &() const; - operator ServiceContextList &(); - operator ServiceContextList &() const; - - // Variable-size base types only. - operator ServiceContextList *&(); - - ServiceContext & operator[] (CORBA::ULong index); - const ServiceContext & operator[] (CORBA::ULong index) const; - - // in, inout, out, _retn - const ServiceContextList &in (void) const; - ServiceContextList &inout (void); - ServiceContextList *&out (void); - ServiceContextList *_retn (void); - ServiceContextList *ptr (void) const; - - private: - ServiceContextList *ptr_; - }; - -#endif /* end #if !defined */ - -#if !defined (_IOP_SERVICECONTEXTLIST___OUT_CH_) -#define _IOP_SERVICECONTEXTLIST___OUT_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753 - - class TAO_Export ServiceContextList_out - { - public: - ServiceContextList_out (ServiceContextList *&); - ServiceContextList_out (ServiceContextList_var &); - ServiceContextList_out (const ServiceContextList_out &); - ServiceContextList_out &operator= (const ServiceContextList_out &); - ServiceContextList_out &operator= (ServiceContextList *); - operator ServiceContextList *&(); - ServiceContextList *&ptr (void); - ServiceContextList *operator-> (void); - ServiceContext & operator[] (CORBA::ULong index); - - private: - ServiceContextList *&ptr_; - // Assignment from T_var not allowed. - void operator= (const ServiceContextList_var &); - }; - -#endif /* end #if !defined */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 @@ -1428,183 +524,129 @@ TAO_NAMESPACE IOP // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::ULong TransactionService = 0U; + const IOP::ServiceId TransactionService = 0U; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::ULong CodeSets = 1U; + const IOP::ServiceId CodeSets = 1U; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::ULong ChainBypassCheck = 2U; + const IOP::ServiceId ChainBypassCheck = 2U; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::ULong ChainBypassInfo = 3U; + const IOP::ServiceId ChainBypassInfo = 3U; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::ULong LogicalThreadId = 4U; + const IOP::ServiceId LogicalThreadId = 4U; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::ULong BI_DIR_IIOP = 5U; + const IOP::ServiceId BI_DIR_IIOP = 5U; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::ULong SendingContextRunTime = 6U; + const IOP::ServiceId SendingContextRunTime = 6U; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::ULong INVOCATION_POLICIES = 7U; + const IOP::ServiceId INVOCATION_POLICIES = 7U; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::ULong UnknownExceptionInfo = 9U; + const IOP::ServiceId UnknownExceptionInfo = 9U; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::ULong RTCorbaPriority = 10U; + const IOP::ServiceId RTCorbaPriority = 10U; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::ULong RTCorbaPriorityRange = 11U; + const IOP::ServiceId RTCorbaPriorityRange = 11U; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::ULong TAG_FT_GROUP = 27U; + const IOP::ComponentId TAG_FT_GROUP = 27U; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::ULong TAG_FT_PRIMARY = 28U; + const IOP::ComponentId TAG_FT_PRIMARY = 28U; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::ULong TAG_FT_HEARTBEAT_ENABLED = 29U; + const IOP::ComponentId TAG_FT_HEARTBEAT_ENABLED = 29U; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::ULong FT_GROUP_VERSION = 12U; + const IOP::ServiceId FT_GROUP_VERSION = 12U; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::ULong FT_REQUEST = 13U; + const IOP::ServiceId FT_REQUEST = 13U; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::ULong TAG_UIPMC = 1413566220U; + const IOP::ProfileId TAG_UIPMC = 1413566220U; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::ULong TAG_GROUP = 1413566211U; + const IOP::ComponentId TAG_GROUP = 1413566211U; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::ULong TAG_GROUP_IIOP = 1413566212U; + const IOP::ComponentId TAG_GROUP_IIOP = 1413566212U; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52 - -#if !defined (_IOP_CODEC___PTR_CH_) -#define _IOP_CODEC___PTR_CH_ + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:566 class Codec; typedef Codec *Codec_ptr; - -#endif /* end #if !defined */ - -#if !defined (_IOP_CODEC___VAR_CH_) -#define _IOP_CODEC___VAR_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571 + struct tao_Codec_life; + typedef TAO_Objref_Var_T<Codec, tao_Codec_life> Codec_var; + typedef TAO_Objref_Out_T<Codec, tao_Codec_life> Codec_out; - class TAO_Export Codec_var : public TAO_Base_var + struct tao_Codec_life { - public: - Codec_var (void); // default constructor - Codec_var (Codec_ptr p) : ptr_ (p) {} - Codec_var (const Codec_var &); // copy constructor - ~Codec_var (void); // destructor - - Codec_var &operator= (Codec_ptr); - Codec_var &operator= (const Codec_var &); - Codec_ptr operator-> (void) const; - - operator const Codec_ptr &() const; - operator Codec_ptr &(); - // in, inout, out, _retn - Codec_ptr in (void) const; - Codec_ptr &inout (void); - Codec_ptr &out (void); - Codec_ptr _retn (void); - Codec_ptr ptr (void) const; - - // Hooks used by template sequence and object manager classes - // for non-defined forward declared interfaces. static Codec_ptr tao_duplicate (Codec_ptr); static void tao_release (Codec_ptr); static Codec_ptr tao_nil (void); - static Codec_ptr tao_narrow ( - CORBA::Object * - ACE_ENV_ARG_DECL_NOT_USED + static CORBA::Boolean tao_marshal ( + Codec_ptr, + TAO_OutputCDR & ); - static CORBA::Object * tao_upcast (void *); - - private: - Codec_ptr ptr_; - // Unimplemented - prevents widening assignment. - Codec_var (const TAO_Base_var &rhs); - Codec_var &operator= (const TAO_Base_var &rhs); }; - -#endif /* end #if !defined */ - -#if !defined (_IOP_CODEC___OUT_CH_) -#define _IOP_CODEC___OUT_CH_ - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946 - - class TAO_Export Codec_out + struct tao_Codec_cast { - public: - Codec_out (Codec_ptr &); - Codec_out (Codec_var &); - Codec_out (const Codec_out &); - Codec_out &operator= (const Codec_out &); - Codec_out &operator= (const Codec_var &); - Codec_out &operator= (Codec_ptr); - operator Codec_ptr &(); - Codec_ptr &ptr (void); - Codec_ptr operator-> (void); - - private: - Codec_ptr &ptr_; + static Codec_ptr tao_narrow ( + CORBA::Object_ptr + ACE_ENV_ARG_DECL + ); + static CORBA::Object_ptr tao_upcast (void *); }; - -#endif /* end #if !defined */ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_IOP_CODEC_CH_) #define _IOP_CODEC_CH_ @@ -1832,7 +874,7 @@ TAO_NAMESPACE IOP )) = 0; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -1842,7 +884,7 @@ TAO_NAMESPACE IOP protected: Codec (void); virtual ~Codec (void); - + private: Codec (const Codec &); void operator= (const Codec &); @@ -1856,7 +898,7 @@ TAO_NAMESPACE IOP TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Codec; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333 typedef CORBA::Short EncodingFormat; typedef CORBA::Short_out EncodingFormat_out; @@ -1869,12 +911,25 @@ TAO_NAMESPACE IOP // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::Short ENCODING_CDR_ENCAPS = 0; + const IOP::EncodingFormat ENCODING_CDR_ENCAPS = 0; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231 + + struct Encoding; + + typedef + TAO_Fixed_Var_T< + Encoding + > + Encoding_var; - class Encoding_var; + typedef + Encoding & + Encoding_out; + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52 struct TAO_Export Encoding { @@ -1887,137 +942,41 @@ TAO_NAMESPACE IOP }; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71 - - class TAO_Export Encoding_var - { - public: - Encoding_var (void); - Encoding_var (Encoding *); - Encoding_var (const Encoding_var &); - // Fixed-size types only. - Encoding_var (const Encoding &); - ~Encoding_var (void); - - Encoding_var &operator= (Encoding *); - Encoding_var &operator= (const Encoding_var &); - - // Fixed-size types only. - Encoding_var &operator= (const Encoding &); - - Encoding *operator-> (void); - const Encoding *operator-> (void) const; - - operator const Encoding &() const; - operator Encoding &(); - operator Encoding &() const; - - // in, inout, out, _retn - const Encoding &in (void) const; - Encoding &inout (void); - Encoding &out (void); - Encoding _retn (void); - Encoding *ptr (void) const; - - private: - Encoding *ptr_; - }; - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:105 - - typedef Encoding &Encoding_out; - - // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Encoding; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52 - -#if !defined (_IOP_CODECFACTORY___PTR_CH_) -#define _IOP_CODECFACTORY___PTR_CH_ + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:566 class CodecFactory; typedef CodecFactory *CodecFactory_ptr; - -#endif /* end #if !defined */ - -#if !defined (_IOP_CODECFACTORY___VAR_CH_) -#define _IOP_CODECFACTORY___VAR_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571 + struct tao_CodecFactory_life; + typedef TAO_Objref_Var_T<CodecFactory, tao_CodecFactory_life> CodecFactory_var; + typedef TAO_Objref_Out_T<CodecFactory, tao_CodecFactory_life> CodecFactory_out; - class TAO_Export CodecFactory_var : public TAO_Base_var + struct tao_CodecFactory_life { - public: - CodecFactory_var (void); // default constructor - CodecFactory_var (CodecFactory_ptr p) : ptr_ (p) {} - CodecFactory_var (const CodecFactory_var &); // copy constructor - ~CodecFactory_var (void); // destructor - - CodecFactory_var &operator= (CodecFactory_ptr); - CodecFactory_var &operator= (const CodecFactory_var &); - CodecFactory_ptr operator-> (void) const; - - operator const CodecFactory_ptr &() const; - operator CodecFactory_ptr &(); - // in, inout, out, _retn - CodecFactory_ptr in (void) const; - CodecFactory_ptr &inout (void); - CodecFactory_ptr &out (void); - CodecFactory_ptr _retn (void); - CodecFactory_ptr ptr (void) const; - - // Hooks used by template sequence and object manager classes - // for non-defined forward declared interfaces. static CodecFactory_ptr tao_duplicate (CodecFactory_ptr); static void tao_release (CodecFactory_ptr); static CodecFactory_ptr tao_nil (void); - static CodecFactory_ptr tao_narrow ( - CORBA::Object * - ACE_ENV_ARG_DECL_NOT_USED + static CORBA::Boolean tao_marshal ( + CodecFactory_ptr, + TAO_OutputCDR & ); - static CORBA::Object * tao_upcast (void *); - - private: - CodecFactory_ptr ptr_; - // Unimplemented - prevents widening assignment. - CodecFactory_var (const TAO_Base_var &rhs); - CodecFactory_var &operator= (const TAO_Base_var &rhs); }; - -#endif /* end #if !defined */ - -#if !defined (_IOP_CODECFACTORY___OUT_CH_) -#define _IOP_CODECFACTORY___OUT_CH_ - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946 - - class TAO_Export CodecFactory_out + struct tao_CodecFactory_cast { - public: - CodecFactory_out (CodecFactory_ptr &); - CodecFactory_out (CodecFactory_var &); - CodecFactory_out (const CodecFactory_out &); - CodecFactory_out &operator= (const CodecFactory_out &); - CodecFactory_out &operator= (const CodecFactory_var &); - CodecFactory_out &operator= (CodecFactory_ptr); - operator CodecFactory_ptr &(); - CodecFactory_ptr &ptr (void); - CodecFactory_ptr operator-> (void); - - private: - CodecFactory_ptr &ptr_; + static CodecFactory_ptr tao_narrow ( + CORBA::Object_ptr + ACE_ENV_ARG_DECL + ); + static CORBA::Object_ptr tao_upcast (void *); }; - -#endif /* end #if !defined */ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_IOP_CODECFACTORY_CH_) #define _IOP_CODECFACTORY_CH_ @@ -2111,7 +1070,7 @@ TAO_NAMESPACE IOP )) = 0; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -2121,10 +1080,6 @@ TAO_NAMESPACE IOP protected: CodecFactory (void); virtual ~CodecFactory (void); - - friend class _TAO_CodecFactory_Remote_Proxy_Impl; - friend class _TAO_CodecFactory_ThruPOA_Proxy_Impl; - friend class _TAO_CodecFactory_Direct_Proxy_Impl; private: CodecFactory (const CodecFactory &); @@ -2274,23 +1229,6 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::TaggedProfile TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::TaggedProfile &); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57 - -#if !defined _TAO_CDR_OP_IOP_TaggedProfile__tao_seq_Octet_H_ -#define _TAO_CDR_OP_IOP_TaggedProfile__tao_seq_Octet_H_ - -TAO_Export CORBA::Boolean operator<< ( - TAO_OutputCDR &, - const IOP::TaggedProfile::_tao_seq_Octet & - ); -TAO_Export CORBA::Boolean operator>> ( - TAO_InputCDR &, - IOP::TaggedProfile::_tao_seq_Octet & - ); - -#endif /* _TAO_CDR_OP_IOP_TaggedProfile__tao_seq_Octet_H_ */ - -// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::IOR &); @@ -2322,23 +1260,6 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::TaggedComponent &); // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57 -#if !defined _TAO_CDR_OP_IOP_TaggedComponent__tao_seq_Octet_H_ -#define _TAO_CDR_OP_IOP_TaggedComponent__tao_seq_Octet_H_ - -TAO_Export CORBA::Boolean operator<< ( - TAO_OutputCDR &, - const IOP::TaggedComponent::_tao_seq_Octet & - ); -TAO_Export CORBA::Boolean operator>> ( - TAO_InputCDR &, - IOP::TaggedComponent::_tao_seq_Octet & - ); - -#endif /* _TAO_CDR_OP_IOP_TaggedComponent__tao_seq_Octet_H_ */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57 - #if !defined _TAO_CDR_OP_IOP_MultipleComponentProfile_H_ #define _TAO_CDR_OP_IOP_MultipleComponentProfile_H_ @@ -2396,23 +1317,6 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::ServiceContext &); // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57 -#if !defined _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_H_ -#define _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_H_ - -TAO_Export CORBA::Boolean operator<< ( - TAO_OutputCDR &, - const IOP::ServiceContext::_tao_seq_Octet & - ); -TAO_Export CORBA::Boolean operator>> ( - TAO_InputCDR &, - IOP::ServiceContext::_tao_seq_Octet & - ); - -#endif /* _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_H_ */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57 - #if !defined _TAO_CDR_OP_IOP_ServiceContextList_H_ #define _TAO_CDR_OP_IOP_ServiceContextList_H_ @@ -2439,7 +1343,7 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::Encoding &); #endif /* __ACE_INLINE__ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018 #if defined (__ACE_INLINE__) #include "IOPC.i" diff --git a/TAO/tao/IOPC.i b/TAO/tao/IOPC.i index 1e49f78c2f5..a93c2847d55 100644 --- a/TAO/tao/IOPC.i +++ b/TAO/tao/IOPC.i @@ -21,3107 +21,23 @@ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194 - -// ************************************************************* -// Inline operations for class IOP::TaggedProfile_var -// ************************************************************* - -ACE_INLINE -IOP::TaggedProfile_var::TaggedProfile_var (void) - : ptr_ (0) -{} - -ACE_INLINE -IOP::TaggedProfile_var::TaggedProfile_var (TaggedProfile *p) - : ptr_ (p) -{} - -ACE_INLINE -IOP::TaggedProfile_var::TaggedProfile_var (const ::IOP::TaggedProfile_var &p) -{ - if (p.ptr_) - { - ACE_NEW (this->ptr_, ::IOP::TaggedProfile (*p.ptr_)); - } - else - { - this->ptr_ = 0; - } -} - -ACE_INLINE -IOP::TaggedProfile_var::~TaggedProfile_var (void) -{ - delete this->ptr_; -} - -ACE_INLINE -IOP::TaggedProfile_var & -IOP::TaggedProfile_var::operator= (TaggedProfile *_tao_struct_var) -{ - delete this->ptr_; - this->ptr_ = _tao_struct_var; - return *this; -} - -ACE_INLINE -::IOP::TaggedProfile_var & -IOP::TaggedProfile_var::operator= (const ::IOP::TaggedProfile_var &_tao_struct_var) -{ - if (this != &_tao_struct_var) - { - if (_tao_struct_var.ptr_ == 0) - { - delete this->ptr_; - this->ptr_ = 0; - } - else - { - TaggedProfile *deep_copy = 0; - ACE_NEW_RETURN ( - deep_copy, - TaggedProfile (*_tao_struct_var.ptr_), - *this - ); - - if (deep_copy != 0) - { - TaggedProfile *tmp = deep_copy; - deep_copy = this->ptr_; - this->ptr_ = tmp; - delete deep_copy; - } - } - } - - return *this; -} - -ACE_INLINE const ::IOP::TaggedProfile * -IOP::TaggedProfile_var::operator-> (void) const -{ - return this->ptr_; -} - -ACE_INLINE ::IOP::TaggedProfile * -IOP::TaggedProfile_var::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -IOP::TaggedProfile_var::operator const ::IOP::TaggedProfile &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE -IOP::TaggedProfile_var::operator ::IOP::TaggedProfile &() // cast -{ - return *this->ptr_; -} - -ACE_INLINE -IOP::TaggedProfile_var::operator ::IOP::TaggedProfile &() const // cast -{ - return *this->ptr_; -} - -// Variable-size types only. -ACE_INLINE -IOP::TaggedProfile_var::operator ::IOP::TaggedProfile *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE const ::IOP::TaggedProfile & -IOP::TaggedProfile_var::in (void) const -{ - return *this->ptr_; -} - -ACE_INLINE ::IOP::TaggedProfile & -IOP::TaggedProfile_var::inout (void) -{ - return *this->ptr_; -} - -// Mapping for variable size. -ACE_INLINE ::IOP::TaggedProfile *& -IOP::TaggedProfile_var::out (void) -{ - delete this->ptr_; - this->ptr_ = 0; - return this->ptr_; -} - -ACE_INLINE ::IOP::TaggedProfile * -IOP::TaggedProfile_var::_retn (void) -{ - ::IOP::TaggedProfile *tmp = this->ptr_; - this->ptr_ = 0; - return tmp; -} - -ACE_INLINE ::IOP::TaggedProfile * -IOP::TaggedProfile_var::ptr (void) const -{ - return this->ptr_; -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523 - -// ************************************************************* -// Inline operations for class IOP::TaggedProfile_out -// ************************************************************* - -ACE_INLINE -IOP::TaggedProfile_out::TaggedProfile_out (::IOP::TaggedProfile *&p) - : ptr_ (p) -{ - this->ptr_ = 0; -} - -ACE_INLINE -IOP::TaggedProfile_out::TaggedProfile_out (TaggedProfile_var &p) - : ptr_ (p.out ()) -{ - delete this->ptr_; - this->ptr_ = 0; -} - -ACE_INLINE -IOP::TaggedProfile_out::TaggedProfile_out (const ::IOP::TaggedProfile_out &p) - : ptr_ (ACE_const_cast (TaggedProfile_out&, p).ptr_) -{} - -ACE_INLINE -IOP::TaggedProfile_out & -IOP::TaggedProfile_out::operator= (const ::IOP::TaggedProfile_out &p) -{ - this->ptr_ = ACE_const_cast (TaggedProfile_out&, p).ptr_; - return *this; -} - -ACE_INLINE -IOP::TaggedProfile_out & -IOP::TaggedProfile_out::operator= (TaggedProfile *_tao_struct_out) -{ - this->ptr_ = _tao_struct_out; - return *this; -} - -ACE_INLINE -IOP::TaggedProfile_out::operator ::IOP::TaggedProfile *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE ::IOP::TaggedProfile *& -IOP::TaggedProfile_out::ptr (void) // ptr -{ - return this->ptr_; -} - -ACE_INLINE ::IOP::TaggedProfile * -IOP::TaggedProfile_out::operator-> (void) -{ - return this->ptr_; -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194 - -// ************************************************************* -// Inline operations for class IOP::IOR_var -// ************************************************************* - -ACE_INLINE -IOP::IOR_var::IOR_var (void) - : ptr_ (0) -{} - -ACE_INLINE -IOP::IOR_var::IOR_var (IOR *p) - : ptr_ (p) -{} - -ACE_INLINE -IOP::IOR_var::IOR_var (const ::IOP::IOR_var &p) -{ - if (p.ptr_) - { - ACE_NEW (this->ptr_, ::IOP::IOR (*p.ptr_)); - } - else - { - this->ptr_ = 0; - } -} - -ACE_INLINE -IOP::IOR_var::~IOR_var (void) -{ - delete this->ptr_; -} - -ACE_INLINE -IOP::IOR_var & -IOP::IOR_var::operator= (IOR *_tao_struct_var) -{ - delete this->ptr_; - this->ptr_ = _tao_struct_var; - return *this; -} - -ACE_INLINE -::IOP::IOR_var & -IOP::IOR_var::operator= (const ::IOP::IOR_var &_tao_struct_var) -{ - if (this != &_tao_struct_var) - { - if (_tao_struct_var.ptr_ == 0) - { - delete this->ptr_; - this->ptr_ = 0; - } - else - { - IOR *deep_copy = 0; - ACE_NEW_RETURN ( - deep_copy, - IOR (*_tao_struct_var.ptr_), - *this - ); - - if (deep_copy != 0) - { - IOR *tmp = deep_copy; - deep_copy = this->ptr_; - this->ptr_ = tmp; - delete deep_copy; - } - } - } - - return *this; -} - -ACE_INLINE const ::IOP::IOR * -IOP::IOR_var::operator-> (void) const -{ - return this->ptr_; -} - -ACE_INLINE ::IOP::IOR * -IOP::IOR_var::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -IOP::IOR_var::operator const ::IOP::IOR &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE -IOP::IOR_var::operator ::IOP::IOR &() // cast -{ - return *this->ptr_; -} - -ACE_INLINE -IOP::IOR_var::operator ::IOP::IOR &() const // cast -{ - return *this->ptr_; -} - -// Variable-size types only. -ACE_INLINE -IOP::IOR_var::operator ::IOP::IOR *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE const ::IOP::IOR & -IOP::IOR_var::in (void) const -{ - return *this->ptr_; -} - -ACE_INLINE ::IOP::IOR & -IOP::IOR_var::inout (void) -{ - return *this->ptr_; -} - -// Mapping for variable size. -ACE_INLINE ::IOP::IOR *& -IOP::IOR_var::out (void) -{ - delete this->ptr_; - this->ptr_ = 0; - return this->ptr_; -} - -ACE_INLINE ::IOP::IOR * -IOP::IOR_var::_retn (void) -{ - ::IOP::IOR *tmp = this->ptr_; - this->ptr_ = 0; - return tmp; -} - -ACE_INLINE ::IOP::IOR * -IOP::IOR_var::ptr (void) const -{ - return this->ptr_; -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523 - -// ************************************************************* -// Inline operations for class IOP::IOR_out -// ************************************************************* - -ACE_INLINE -IOP::IOR_out::IOR_out (::IOP::IOR *&p) - : ptr_ (p) -{ - this->ptr_ = 0; -} - -ACE_INLINE -IOP::IOR_out::IOR_out (IOR_var &p) - : ptr_ (p.out ()) -{ - delete this->ptr_; - this->ptr_ = 0; -} - -ACE_INLINE -IOP::IOR_out::IOR_out (const ::IOP::IOR_out &p) - : ptr_ (ACE_const_cast (IOR_out&, p).ptr_) -{} - -ACE_INLINE -IOP::IOR_out & -IOP::IOR_out::operator= (const ::IOP::IOR_out &p) -{ - this->ptr_ = ACE_const_cast (IOR_out&, p).ptr_; - return *this; -} - -ACE_INLINE -IOP::IOR_out & -IOP::IOR_out::operator= (IOR *_tao_struct_out) -{ - this->ptr_ = _tao_struct_out; - return *this; -} - -ACE_INLINE -IOP::IOR_out::operator ::IOP::IOR *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE ::IOP::IOR *& -IOP::IOR_out::ptr (void) // ptr -{ - return this->ptr_; -} - -ACE_INLINE ::IOP::IOR * -IOP::IOR_out::operator-> (void) -{ - return this->ptr_; -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CI_) -#define __TAO_UNBOUNDED_SEQUENCE_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CI_ - -ACE_INLINE -IOP::TaggedProfile * -IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (CORBA::ULong size) -{ - IOP::TaggedProfile *retval = 0; - ACE_NEW_RETURN (retval, IOP::TaggedProfile[size], 0); - return retval; -} - -ACE_INLINE -void IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::freebuf (IOP::TaggedProfile *buffer) -{ - delete [] buffer; -} - -ACE_INLINE -IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (void) -{ -} - -ACE_INLINE -IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (CORBA::ULong maximum) - : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (maximum)) -{ -} - -ACE_INLINE -IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile ( - CORBA::ULong maximum, - CORBA::ULong length, - IOP::TaggedProfile *data, - CORBA::Boolean release - ) - : TAO_Unbounded_Base_Sequence (maximum, length, data, release) -{ -} - -ACE_INLINE -IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile ( - const _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile &rhs - ) - : TAO_Unbounded_Base_Sequence (rhs) -{ - if (rhs.buffer_ != 0) - { - IOP::TaggedProfile *tmp1 = - _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (this->maximum_); - IOP::TaggedProfile * const tmp2 = - ACE_reinterpret_cast (IOP::TaggedProfile * ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - tmp1[i] = tmp2[i]; - } - - this->buffer_ = tmp1; - } - else - { - this->buffer_ = 0; - } -} - -ACE_INLINE -IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile & -IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::operator= ( - const _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile &rhs - ) -{ - if (this == &rhs) - { - return *this; - } - - if (this->release_) - { - if (this->maximum_ < rhs.maximum_) - { - // Free the old buffer. - IOP::TaggedProfile *tmp = - ACE_reinterpret_cast (IOP::TaggedProfile *, this->buffer_); - - _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::freebuf (tmp); - - this->buffer_ = - _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (rhs.maximum_); - } - } - else - { - this->buffer_ = - _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (rhs.maximum_); - } - - TAO_Unbounded_Base_Sequence::operator= (rhs); - - IOP::TaggedProfile *tmp1 = - ACE_reinterpret_cast (IOP::TaggedProfile *, this->buffer_); - IOP::TaggedProfile * const tmp2 = - ACE_reinterpret_cast (IOP::TaggedProfile * ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - tmp1[i] = tmp2[i]; - } - - return *this; -} - -// = Accessors. -ACE_INLINE -IOP::TaggedProfile & -IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::operator[] (CORBA::ULong i) -{ - ACE_ASSERT (i < this->maximum_); - IOP::TaggedProfile* tmp = - ACE_reinterpret_cast (IOP::TaggedProfile*, this->buffer_); - return tmp[i]; -} - -ACE_INLINE -const IOP::TaggedProfile & -IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::operator[] (CORBA::ULong i) const -{ - ACE_ASSERT (i < this->maximum_); - IOP::TaggedProfile * const tmp = - ACE_reinterpret_cast (IOP::TaggedProfile* ACE_CAST_CONST, this->buffer_); - return tmp[i]; -} - -// Implement the TAO_Base_Sequence methods (see Sequence.h) - -ACE_INLINE -IOP::TaggedProfile * -IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::get_buffer (CORBA::Boolean orphan) -{ - IOP::TaggedProfile *result = 0; - - if (orphan == 0) - { - // We retain ownership. - if (this->buffer_ == 0) - { - result = - _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (this->length_); - this->buffer_ = result; - this->release_ = 1; - } - else - { - result = - ACE_reinterpret_cast (IOP::TaggedProfile*, this->buffer_); - } - } - else // if (orphan == 1) - { - if (this->release_ != 0) - { - // We set the state back to default and relinquish ownership. - result = - ACE_reinterpret_cast(IOP::TaggedProfile*,this->buffer_); - this->maximum_ = 0; - this->length_ = 0; - this->buffer_ = 0; - this->release_ = 0; - } - } - - return result; -} - -ACE_INLINE -const IOP::TaggedProfile * -IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::get_buffer (void) const -{ - return ACE_reinterpret_cast (const IOP::TaggedProfile * ACE_CAST_CONST, this->buffer_); -} - -ACE_INLINE -void -IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::replace ( - CORBA::ULong max, - CORBA::ULong length, - IOP::TaggedProfile *data, - CORBA::Boolean release - ) -{ - this->maximum_ = max; - this->length_ = length; - - if (this->buffer_ && this->release_ == 1) - { - IOP::TaggedProfile *tmp = - ACE_reinterpret_cast (IOP::TaggedProfile*, this->buffer_); - _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::freebuf (tmp); - } - - this->buffer_ = data; - this->release_ = release; -} - -#endif /* end #if !defined */ - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194 - -// ************************************************************* -// Inline operations for class IOP::TaggedComponent_var -// ************************************************************* - -ACE_INLINE -IOP::TaggedComponent_var::TaggedComponent_var (void) - : ptr_ (0) -{} - -ACE_INLINE -IOP::TaggedComponent_var::TaggedComponent_var (TaggedComponent *p) - : ptr_ (p) -{} - -ACE_INLINE -IOP::TaggedComponent_var::TaggedComponent_var (const ::IOP::TaggedComponent_var &p) -{ - if (p.ptr_) - { - ACE_NEW (this->ptr_, ::IOP::TaggedComponent (*p.ptr_)); - } - else - { - this->ptr_ = 0; - } -} - -ACE_INLINE -IOP::TaggedComponent_var::~TaggedComponent_var (void) -{ - delete this->ptr_; -} - -ACE_INLINE -IOP::TaggedComponent_var & -IOP::TaggedComponent_var::operator= (TaggedComponent *_tao_struct_var) -{ - delete this->ptr_; - this->ptr_ = _tao_struct_var; - return *this; -} - -ACE_INLINE -::IOP::TaggedComponent_var & -IOP::TaggedComponent_var::operator= (const ::IOP::TaggedComponent_var &_tao_struct_var) -{ - if (this != &_tao_struct_var) - { - if (_tao_struct_var.ptr_ == 0) - { - delete this->ptr_; - this->ptr_ = 0; - } - else - { - TaggedComponent *deep_copy = 0; - ACE_NEW_RETURN ( - deep_copy, - TaggedComponent (*_tao_struct_var.ptr_), - *this - ); - - if (deep_copy != 0) - { - TaggedComponent *tmp = deep_copy; - deep_copy = this->ptr_; - this->ptr_ = tmp; - delete deep_copy; - } - } - } - - return *this; -} - -ACE_INLINE const ::IOP::TaggedComponent * -IOP::TaggedComponent_var::operator-> (void) const -{ - return this->ptr_; -} - -ACE_INLINE ::IOP::TaggedComponent * -IOP::TaggedComponent_var::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -IOP::TaggedComponent_var::operator const ::IOP::TaggedComponent &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE -IOP::TaggedComponent_var::operator ::IOP::TaggedComponent &() // cast -{ - return *this->ptr_; -} - -ACE_INLINE -IOP::TaggedComponent_var::operator ::IOP::TaggedComponent &() const // cast -{ - return *this->ptr_; -} - -// Variable-size types only. -ACE_INLINE -IOP::TaggedComponent_var::operator ::IOP::TaggedComponent *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE const ::IOP::TaggedComponent & -IOP::TaggedComponent_var::in (void) const -{ - return *this->ptr_; -} - -ACE_INLINE ::IOP::TaggedComponent & -IOP::TaggedComponent_var::inout (void) -{ - return *this->ptr_; -} - -// Mapping for variable size. -ACE_INLINE ::IOP::TaggedComponent *& -IOP::TaggedComponent_var::out (void) -{ - delete this->ptr_; - this->ptr_ = 0; - return this->ptr_; -} - -ACE_INLINE ::IOP::TaggedComponent * -IOP::TaggedComponent_var::_retn (void) -{ - ::IOP::TaggedComponent *tmp = this->ptr_; - this->ptr_ = 0; - return tmp; -} - -ACE_INLINE ::IOP::TaggedComponent * -IOP::TaggedComponent_var::ptr (void) const -{ - return this->ptr_; -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523 - -// ************************************************************* -// Inline operations for class IOP::TaggedComponent_out -// ************************************************************* - -ACE_INLINE -IOP::TaggedComponent_out::TaggedComponent_out (::IOP::TaggedComponent *&p) - : ptr_ (p) -{ - this->ptr_ = 0; -} - -ACE_INLINE -IOP::TaggedComponent_out::TaggedComponent_out (TaggedComponent_var &p) - : ptr_ (p.out ()) -{ - delete this->ptr_; - this->ptr_ = 0; -} - -ACE_INLINE -IOP::TaggedComponent_out::TaggedComponent_out (const ::IOP::TaggedComponent_out &p) - : ptr_ (ACE_const_cast (TaggedComponent_out&, p).ptr_) -{} - -ACE_INLINE -IOP::TaggedComponent_out & -IOP::TaggedComponent_out::operator= (const ::IOP::TaggedComponent_out &p) -{ - this->ptr_ = ACE_const_cast (TaggedComponent_out&, p).ptr_; - return *this; -} - -ACE_INLINE -IOP::TaggedComponent_out & -IOP::TaggedComponent_out::operator= (TaggedComponent *_tao_struct_out) -{ - this->ptr_ = _tao_struct_out; - return *this; -} - -ACE_INLINE -IOP::TaggedComponent_out::operator ::IOP::TaggedComponent *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE ::IOP::TaggedComponent *& -IOP::TaggedComponent_out::ptr (void) // ptr -{ - return this->ptr_; -} - -ACE_INLINE ::IOP::TaggedComponent * -IOP::TaggedComponent_out::operator-> (void) -{ - return this->ptr_; -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_MULTIPLECOMPONENTPROFILE_CI_) -#define __TAO_UNBOUNDED_SEQUENCE_IOP_MULTIPLECOMPONENTPROFILE_CI_ - -ACE_INLINE -IOP::TaggedComponent * -IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (CORBA::ULong size) -{ - IOP::TaggedComponent *retval = 0; - ACE_NEW_RETURN (retval, IOP::TaggedComponent[size], 0); - return retval; -} - -ACE_INLINE -void IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::freebuf (IOP::TaggedComponent *buffer) -{ - delete [] buffer; -} - -ACE_INLINE -IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (void) -{ -} - -ACE_INLINE -IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (CORBA::ULong maximum) - : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (maximum)) -{ -} - -ACE_INLINE -IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile ( - CORBA::ULong maximum, - CORBA::ULong length, - IOP::TaggedComponent *data, - CORBA::Boolean release - ) - : TAO_Unbounded_Base_Sequence (maximum, length, data, release) -{ -} - -ACE_INLINE -IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile ( - const _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile &rhs - ) - : TAO_Unbounded_Base_Sequence (rhs) -{ - if (rhs.buffer_ != 0) - { - IOP::TaggedComponent *tmp1 = - _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (this->maximum_); - IOP::TaggedComponent * const tmp2 = - ACE_reinterpret_cast (IOP::TaggedComponent * ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - tmp1[i] = tmp2[i]; - } - - this->buffer_ = tmp1; - } - else - { - this->buffer_ = 0; - } -} - -ACE_INLINE -IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile & -IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::operator= ( - const _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile &rhs - ) -{ - if (this == &rhs) - { - return *this; - } - - if (this->release_) - { - if (this->maximum_ < rhs.maximum_) - { - // Free the old buffer. - IOP::TaggedComponent *tmp = - ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_); - - _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::freebuf (tmp); - - this->buffer_ = - _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (rhs.maximum_); - } - } - else - { - this->buffer_ = - _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (rhs.maximum_); - } - - TAO_Unbounded_Base_Sequence::operator= (rhs); - - IOP::TaggedComponent *tmp1 = - ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_); - IOP::TaggedComponent * const tmp2 = - ACE_reinterpret_cast (IOP::TaggedComponent * ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - tmp1[i] = tmp2[i]; - } - - return *this; -} - -// = Accessors. -ACE_INLINE -IOP::TaggedComponent & -IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::operator[] (CORBA::ULong i) -{ - ACE_ASSERT (i < this->maximum_); - IOP::TaggedComponent* tmp = - ACE_reinterpret_cast (IOP::TaggedComponent*, this->buffer_); - return tmp[i]; -} - -ACE_INLINE -const IOP::TaggedComponent & -IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::operator[] (CORBA::ULong i) const -{ - ACE_ASSERT (i < this->maximum_); - IOP::TaggedComponent * const tmp = - ACE_reinterpret_cast (IOP::TaggedComponent* ACE_CAST_CONST, this->buffer_); - return tmp[i]; -} - -// Implement the TAO_Base_Sequence methods (see Sequence.h) - -ACE_INLINE -IOP::TaggedComponent * -IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::get_buffer (CORBA::Boolean orphan) -{ - IOP::TaggedComponent *result = 0; - - if (orphan == 0) - { - // We retain ownership. - if (this->buffer_ == 0) - { - result = - _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (this->length_); - this->buffer_ = result; - this->release_ = 1; - } - else - { - result = - ACE_reinterpret_cast (IOP::TaggedComponent*, this->buffer_); - } - } - else // if (orphan == 1) - { - if (this->release_ != 0) - { - // We set the state back to default and relinquish ownership. - result = - ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_); - this->maximum_ = 0; - this->length_ = 0; - this->buffer_ = 0; - this->release_ = 0; - } - } - - return result; -} - -ACE_INLINE -const IOP::TaggedComponent * -IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::get_buffer (void) const -{ - return ACE_reinterpret_cast (const IOP::TaggedComponent * ACE_CAST_CONST, this->buffer_); -} - -ACE_INLINE -void -IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::replace ( - CORBA::ULong max, - CORBA::ULong length, - IOP::TaggedComponent *data, - CORBA::Boolean release - ) -{ - this->maximum_ = max; - this->length_ = length; - - if (this->buffer_ && this->release_ == 1) - { - IOP::TaggedComponent *tmp = - ACE_reinterpret_cast (IOP::TaggedComponent*, this->buffer_); - _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::freebuf (tmp); - } - - this->buffer_ = data; - this->release_ = release; -} - -#endif /* end #if !defined */ - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_IOP_MULTIPLECOMPONENTPROFILE_CI_) -#define _IOP_MULTIPLECOMPONENTPROFILE_CI_ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226 - -// ************************************************************* -// Inline operations for class IOP::MultipleComponentProfile_var -// ************************************************************* - -ACE_INLINE -IOP::MultipleComponentProfile_var::MultipleComponentProfile_var (void) - : ptr_ (0) -{} - -ACE_INLINE -IOP::MultipleComponentProfile_var::MultipleComponentProfile_var (MultipleComponentProfile *p) - : ptr_ (p) -{} - -ACE_INLINE -IOP::MultipleComponentProfile_var::MultipleComponentProfile_var (const ::IOP::MultipleComponentProfile_var &p) -{ - if (p.ptr_) - { - ACE_NEW (this->ptr_, ::IOP::MultipleComponentProfile (*p.ptr_)); - } - else - { - this->ptr_ = 0; - } -} - -ACE_INLINE -IOP::MultipleComponentProfile_var::~MultipleComponentProfile_var (void) -{ - delete this->ptr_; -} - -ACE_INLINE -IOP::MultipleComponentProfile_var & -IOP::MultipleComponentProfile_var::operator= (MultipleComponentProfile *p) -{ - delete this->ptr_; - this->ptr_ = p; - return *this; -} - -ACE_INLINE -::IOP::MultipleComponentProfile_var & -IOP::MultipleComponentProfile_var::operator= (const ::IOP::MultipleComponentProfile_var &p) -{ - if (this != &p) - { - if (p.ptr_ == 0) - { - delete this->ptr_; - this->ptr_ = 0; - } - else - { - MultipleComponentProfile *deep_copy = 0; - ACE_NEW_RETURN ( - deep_copy, - MultipleComponentProfile (*p.ptr_), - *this - ); - - if (deep_copy != 0) - { - MultipleComponentProfile *tmp = deep_copy; - deep_copy = this->ptr_; - this->ptr_ = tmp; - delete deep_copy; - } - } - } - - return *this; -} - -ACE_INLINE -const ::IOP::MultipleComponentProfile * -IOP::MultipleComponentProfile_var::operator-> (void) const -{ - return this->ptr_; -} - -ACE_INLINE -::IOP::MultipleComponentProfile * -IOP::MultipleComponentProfile_var::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -IOP::MultipleComponentProfile_var::operator const ::IOP::MultipleComponentProfile &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE -IOP::MultipleComponentProfile_var::operator ::IOP::MultipleComponentProfile &() // cast -{ - return *this->ptr_; -} - -ACE_INLINE -IOP::MultipleComponentProfile_var::operator ::IOP::MultipleComponentProfile &() const // cast -{ - return *this->ptr_; -} - -// Variable-size types only. -ACE_INLINE -IOP::MultipleComponentProfile_var::operator ::IOP::MultipleComponentProfile *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE -IOP::TaggedComponent & -IOP::MultipleComponentProfile_var::operator[] (CORBA::ULong index) -{ - return this->ptr_->operator[] (index); -} - -ACE_INLINE -const IOP::TaggedComponent & -IOP::MultipleComponentProfile_var::operator[] (CORBA::ULong index) const -{ - return ACE_const_cast (const IOP::TaggedComponent &, this->ptr_->operator[] (index)); -} - -ACE_INLINE -const ::IOP::MultipleComponentProfile & -IOP::MultipleComponentProfile_var::in (void) const -{ - return *this->ptr_; -} - -ACE_INLINE -::IOP::MultipleComponentProfile & -IOP::MultipleComponentProfile_var::inout (void) -{ - return *this->ptr_; -} - -ACE_INLINE -::IOP::MultipleComponentProfile *& -IOP::MultipleComponentProfile_var::out (void) -{ - delete this->ptr_; - this->ptr_ = 0; - return this->ptr_; -} - -ACE_INLINE -::IOP::MultipleComponentProfile * -IOP::MultipleComponentProfile_var::_retn (void) -{ - ::IOP::MultipleComponentProfile *tmp = this->ptr_; - this->ptr_ = 0; - return tmp; -} - -ACE_INLINE -::IOP::MultipleComponentProfile * -IOP::MultipleComponentProfile_var::ptr (void) const -{ - return this->ptr_; -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567 - -// ************************************************************* -// Inline operations for class IOP::MultipleComponentProfile_out -// ************************************************************* - -ACE_INLINE -IOP::MultipleComponentProfile_out::MultipleComponentProfile_out (MultipleComponentProfile *&p) - : ptr_ (p) -{ - this->ptr_ = 0; -} - -ACE_INLINE -IOP::MultipleComponentProfile_out::MultipleComponentProfile_out (MultipleComponentProfile_var &p) - : ptr_ (p.out ()) -{ - delete this->ptr_; - this->ptr_ = 0; -} - -ACE_INLINE -IOP::MultipleComponentProfile_out::MultipleComponentProfile_out (const ::IOP::MultipleComponentProfile_out &p) - : ptr_ (ACE_const_cast (MultipleComponentProfile_out&, p).ptr_) -{} - -ACE_INLINE -::IOP::MultipleComponentProfile_out & -IOP::MultipleComponentProfile_out::operator= (const ::IOP::MultipleComponentProfile_out &p) -{ - this->ptr_ = ACE_const_cast (MultipleComponentProfile_out&, p).ptr_; - return *this; -} - -ACE_INLINE -::IOP::MultipleComponentProfile_out & -IOP::MultipleComponentProfile_out::operator= (MultipleComponentProfile *p) -{ - this->ptr_ = p; - return *this; -} - -ACE_INLINE -IOP::MultipleComponentProfile_out::operator ::IOP::MultipleComponentProfile *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE -::IOP::MultipleComponentProfile *& -IOP::MultipleComponentProfile_out::ptr (void) // ptr -{ - return this->ptr_; -} - -ACE_INLINE -::IOP::MultipleComponentProfile * -IOP::MultipleComponentProfile_out::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -IOP::TaggedComponent & -IOP::MultipleComponentProfile_out::operator[] (CORBA::ULong index) -{ - return this->ptr_->operator[] (index); -} - -#endif /* end #if !defined */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTLIST_CI_) -#define __TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTLIST_CI_ - -ACE_INLINE -IOP::TaggedComponent * -IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (CORBA::ULong size) -{ - IOP::TaggedComponent *retval = 0; - ACE_NEW_RETURN (retval, IOP::TaggedComponent[size], 0); - return retval; -} - -ACE_INLINE -void IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::freebuf (IOP::TaggedComponent *buffer) -{ - delete [] buffer; -} - -ACE_INLINE -IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::_TAO_Unbounded_Sequence_IOP_TaggedComponentList (void) -{ -} - -ACE_INLINE -IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::_TAO_Unbounded_Sequence_IOP_TaggedComponentList (CORBA::ULong maximum) - : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (maximum)) -{ -} - -ACE_INLINE -IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::_TAO_Unbounded_Sequence_IOP_TaggedComponentList ( - CORBA::ULong maximum, - CORBA::ULong length, - IOP::TaggedComponent *data, - CORBA::Boolean release - ) - : TAO_Unbounded_Base_Sequence (maximum, length, data, release) -{ -} - -ACE_INLINE -IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::_TAO_Unbounded_Sequence_IOP_TaggedComponentList ( - const _TAO_Unbounded_Sequence_IOP_TaggedComponentList &rhs - ) - : TAO_Unbounded_Base_Sequence (rhs) -{ - if (rhs.buffer_ != 0) - { - IOP::TaggedComponent *tmp1 = - _TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (this->maximum_); - IOP::TaggedComponent * const tmp2 = - ACE_reinterpret_cast (IOP::TaggedComponent * ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - tmp1[i] = tmp2[i]; - } - - this->buffer_ = tmp1; - } - else - { - this->buffer_ = 0; - } -} - -ACE_INLINE -IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList & -IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::operator= ( - const _TAO_Unbounded_Sequence_IOP_TaggedComponentList &rhs - ) -{ - if (this == &rhs) - { - return *this; - } - - if (this->release_) - { - if (this->maximum_ < rhs.maximum_) - { - // Free the old buffer. - IOP::TaggedComponent *tmp = - ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_); - - _TAO_Unbounded_Sequence_IOP_TaggedComponentList::freebuf (tmp); - - this->buffer_ = - _TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (rhs.maximum_); - } - } - else - { - this->buffer_ = - _TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (rhs.maximum_); - } - - TAO_Unbounded_Base_Sequence::operator= (rhs); - - IOP::TaggedComponent *tmp1 = - ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_); - IOP::TaggedComponent * const tmp2 = - ACE_reinterpret_cast (IOP::TaggedComponent * ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - tmp1[i] = tmp2[i]; - } - - return *this; -} - -// = Accessors. -ACE_INLINE -IOP::TaggedComponent & -IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::operator[] (CORBA::ULong i) -{ - ACE_ASSERT (i < this->maximum_); - IOP::TaggedComponent* tmp = - ACE_reinterpret_cast (IOP::TaggedComponent*, this->buffer_); - return tmp[i]; -} - -ACE_INLINE -const IOP::TaggedComponent & -IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::operator[] (CORBA::ULong i) const -{ - ACE_ASSERT (i < this->maximum_); - IOP::TaggedComponent * const tmp = - ACE_reinterpret_cast (IOP::TaggedComponent* ACE_CAST_CONST, this->buffer_); - return tmp[i]; -} - -// Implement the TAO_Base_Sequence methods (see Sequence.h) - -ACE_INLINE -IOP::TaggedComponent * -IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::get_buffer (CORBA::Boolean orphan) -{ - IOP::TaggedComponent *result = 0; - - if (orphan == 0) - { - // We retain ownership. - if (this->buffer_ == 0) - { - result = - _TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (this->length_); - this->buffer_ = result; - this->release_ = 1; - } - else - { - result = - ACE_reinterpret_cast (IOP::TaggedComponent*, this->buffer_); - } - } - else // if (orphan == 1) - { - if (this->release_ != 0) - { - // We set the state back to default and relinquish ownership. - result = - ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_); - this->maximum_ = 0; - this->length_ = 0; - this->buffer_ = 0; - this->release_ = 0; - } - } - - return result; -} - -ACE_INLINE -const IOP::TaggedComponent * -IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::get_buffer (void) const -{ - return ACE_reinterpret_cast (const IOP::TaggedComponent * ACE_CAST_CONST, this->buffer_); -} - -ACE_INLINE -void -IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::replace ( - CORBA::ULong max, - CORBA::ULong length, - IOP::TaggedComponent *data, - CORBA::Boolean release - ) -{ - this->maximum_ = max; - this->length_ = length; - - if (this->buffer_ && this->release_ == 1) - { - IOP::TaggedComponent *tmp = - ACE_reinterpret_cast (IOP::TaggedComponent*, this->buffer_); - _TAO_Unbounded_Sequence_IOP_TaggedComponentList::freebuf (tmp); - } - - this->buffer_ = data; - this->release_ = release; -} - -#endif /* end #if !defined */ - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_IOP_TAGGEDCOMPONENTLIST_CI_) -#define _IOP_TAGGEDCOMPONENTLIST_CI_ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226 - -// ************************************************************* -// Inline operations for class IOP::TaggedComponentList_var -// ************************************************************* - -ACE_INLINE -IOP::TaggedComponentList_var::TaggedComponentList_var (void) - : ptr_ (0) -{} - -ACE_INLINE -IOP::TaggedComponentList_var::TaggedComponentList_var (TaggedComponentList *p) - : ptr_ (p) -{} - -ACE_INLINE -IOP::TaggedComponentList_var::TaggedComponentList_var (const ::IOP::TaggedComponentList_var &p) -{ - if (p.ptr_) - { - ACE_NEW (this->ptr_, ::IOP::TaggedComponentList (*p.ptr_)); - } - else - { - this->ptr_ = 0; - } -} - -ACE_INLINE -IOP::TaggedComponentList_var::~TaggedComponentList_var (void) -{ - delete this->ptr_; -} - -ACE_INLINE -IOP::TaggedComponentList_var & -IOP::TaggedComponentList_var::operator= (TaggedComponentList *p) -{ - delete this->ptr_; - this->ptr_ = p; - return *this; -} - -ACE_INLINE -::IOP::TaggedComponentList_var & -IOP::TaggedComponentList_var::operator= (const ::IOP::TaggedComponentList_var &p) -{ - if (this != &p) - { - if (p.ptr_ == 0) - { - delete this->ptr_; - this->ptr_ = 0; - } - else - { - TaggedComponentList *deep_copy = 0; - ACE_NEW_RETURN ( - deep_copy, - TaggedComponentList (*p.ptr_), - *this - ); - - if (deep_copy != 0) - { - TaggedComponentList *tmp = deep_copy; - deep_copy = this->ptr_; - this->ptr_ = tmp; - delete deep_copy; - } - } - } - - return *this; -} - -ACE_INLINE -const ::IOP::TaggedComponentList * -IOP::TaggedComponentList_var::operator-> (void) const -{ - return this->ptr_; -} - -ACE_INLINE -::IOP::TaggedComponentList * -IOP::TaggedComponentList_var::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -IOP::TaggedComponentList_var::operator const ::IOP::TaggedComponentList &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE -IOP::TaggedComponentList_var::operator ::IOP::TaggedComponentList &() // cast -{ - return *this->ptr_; -} - -ACE_INLINE -IOP::TaggedComponentList_var::operator ::IOP::TaggedComponentList &() const // cast -{ - return *this->ptr_; -} - -// Variable-size types only. -ACE_INLINE -IOP::TaggedComponentList_var::operator ::IOP::TaggedComponentList *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE -IOP::TaggedComponent & -IOP::TaggedComponentList_var::operator[] (CORBA::ULong index) -{ - return this->ptr_->operator[] (index); -} - -ACE_INLINE -const IOP::TaggedComponent & -IOP::TaggedComponentList_var::operator[] (CORBA::ULong index) const -{ - return ACE_const_cast (const IOP::TaggedComponent &, this->ptr_->operator[] (index)); -} - -ACE_INLINE -const ::IOP::TaggedComponentList & -IOP::TaggedComponentList_var::in (void) const -{ - return *this->ptr_; -} - -ACE_INLINE -::IOP::TaggedComponentList & -IOP::TaggedComponentList_var::inout (void) -{ - return *this->ptr_; -} - -ACE_INLINE -::IOP::TaggedComponentList *& -IOP::TaggedComponentList_var::out (void) -{ - delete this->ptr_; - this->ptr_ = 0; - return this->ptr_; -} - -ACE_INLINE -::IOP::TaggedComponentList * -IOP::TaggedComponentList_var::_retn (void) -{ - ::IOP::TaggedComponentList *tmp = this->ptr_; - this->ptr_ = 0; - return tmp; -} - -ACE_INLINE -::IOP::TaggedComponentList * -IOP::TaggedComponentList_var::ptr (void) const -{ - return this->ptr_; -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567 - -// ************************************************************* -// Inline operations for class IOP::TaggedComponentList_out -// ************************************************************* - -ACE_INLINE -IOP::TaggedComponentList_out::TaggedComponentList_out (TaggedComponentList *&p) - : ptr_ (p) -{ - this->ptr_ = 0; -} - -ACE_INLINE -IOP::TaggedComponentList_out::TaggedComponentList_out (TaggedComponentList_var &p) - : ptr_ (p.out ()) -{ - delete this->ptr_; - this->ptr_ = 0; -} - -ACE_INLINE -IOP::TaggedComponentList_out::TaggedComponentList_out (const ::IOP::TaggedComponentList_out &p) - : ptr_ (ACE_const_cast (TaggedComponentList_out&, p).ptr_) -{} - -ACE_INLINE -::IOP::TaggedComponentList_out & -IOP::TaggedComponentList_out::operator= (const ::IOP::TaggedComponentList_out &p) -{ - this->ptr_ = ACE_const_cast (TaggedComponentList_out&, p).ptr_; - return *this; -} - -ACE_INLINE -::IOP::TaggedComponentList_out & -IOP::TaggedComponentList_out::operator= (TaggedComponentList *p) -{ - this->ptr_ = p; - return *this; -} - -ACE_INLINE -IOP::TaggedComponentList_out::operator ::IOP::TaggedComponentList *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE -::IOP::TaggedComponentList *& -IOP::TaggedComponentList_out::ptr (void) // ptr -{ - return this->ptr_; -} - -ACE_INLINE -::IOP::TaggedComponentList * -IOP::TaggedComponentList_out::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -IOP::TaggedComponent & -IOP::TaggedComponentList_out::operator[] (CORBA::ULong index) -{ - return this->ptr_->operator[] (index); -} - -#endif /* end #if !defined */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTSEQ_CI_) -#define __TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTSEQ_CI_ - -ACE_INLINE -IOP::TaggedComponent * -IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (CORBA::ULong size) -{ - IOP::TaggedComponent *retval = 0; - ACE_NEW_RETURN (retval, IOP::TaggedComponent[size], 0); - return retval; -} - -ACE_INLINE -void IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::freebuf (IOP::TaggedComponent *buffer) -{ - delete [] buffer; -} - -ACE_INLINE -IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (void) -{ -} - -ACE_INLINE -IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (CORBA::ULong maximum) - : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (maximum)) -{ -} - -ACE_INLINE -IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq ( - CORBA::ULong maximum, - CORBA::ULong length, - IOP::TaggedComponent *data, - CORBA::Boolean release - ) - : TAO_Unbounded_Base_Sequence (maximum, length, data, release) -{ -} - -ACE_INLINE -IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq ( - const _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq &rhs - ) - : TAO_Unbounded_Base_Sequence (rhs) -{ - if (rhs.buffer_ != 0) - { - IOP::TaggedComponent *tmp1 = - _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (this->maximum_); - IOP::TaggedComponent * const tmp2 = - ACE_reinterpret_cast (IOP::TaggedComponent * ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - tmp1[i] = tmp2[i]; - } - - this->buffer_ = tmp1; - } - else - { - this->buffer_ = 0; - } -} - -ACE_INLINE -IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq & -IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::operator= ( - const _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq &rhs - ) -{ - if (this == &rhs) - { - return *this; - } - - if (this->release_) - { - if (this->maximum_ < rhs.maximum_) - { - // Free the old buffer. - IOP::TaggedComponent *tmp = - ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_); - - _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::freebuf (tmp); - - this->buffer_ = - _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (rhs.maximum_); - } - } - else - { - this->buffer_ = - _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (rhs.maximum_); - } - - TAO_Unbounded_Base_Sequence::operator= (rhs); - - IOP::TaggedComponent *tmp1 = - ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_); - IOP::TaggedComponent * const tmp2 = - ACE_reinterpret_cast (IOP::TaggedComponent * ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - tmp1[i] = tmp2[i]; - } - - return *this; -} - -// = Accessors. -ACE_INLINE -IOP::TaggedComponent & -IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::operator[] (CORBA::ULong i) -{ - ACE_ASSERT (i < this->maximum_); - IOP::TaggedComponent* tmp = - ACE_reinterpret_cast (IOP::TaggedComponent*, this->buffer_); - return tmp[i]; -} - -ACE_INLINE -const IOP::TaggedComponent & -IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::operator[] (CORBA::ULong i) const -{ - ACE_ASSERT (i < this->maximum_); - IOP::TaggedComponent * const tmp = - ACE_reinterpret_cast (IOP::TaggedComponent* ACE_CAST_CONST, this->buffer_); - return tmp[i]; -} - -// Implement the TAO_Base_Sequence methods (see Sequence.h) - -ACE_INLINE -IOP::TaggedComponent * -IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::get_buffer (CORBA::Boolean orphan) -{ - IOP::TaggedComponent *result = 0; - - if (orphan == 0) - { - // We retain ownership. - if (this->buffer_ == 0) - { - result = - _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (this->length_); - this->buffer_ = result; - this->release_ = 1; - } - else - { - result = - ACE_reinterpret_cast (IOP::TaggedComponent*, this->buffer_); - } - } - else // if (orphan == 1) - { - if (this->release_ != 0) - { - // We set the state back to default and relinquish ownership. - result = - ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_); - this->maximum_ = 0; - this->length_ = 0; - this->buffer_ = 0; - this->release_ = 0; - } - } - - return result; -} - -ACE_INLINE -const IOP::TaggedComponent * -IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::get_buffer (void) const -{ - return ACE_reinterpret_cast (const IOP::TaggedComponent * ACE_CAST_CONST, this->buffer_); -} - -ACE_INLINE -void -IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::replace ( - CORBA::ULong max, - CORBA::ULong length, - IOP::TaggedComponent *data, - CORBA::Boolean release - ) -{ - this->maximum_ = max; - this->length_ = length; - - if (this->buffer_ && this->release_ == 1) - { - IOP::TaggedComponent *tmp = - ACE_reinterpret_cast (IOP::TaggedComponent*, this->buffer_); - _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::freebuf (tmp); - } - - this->buffer_ = data; - this->release_ = release; -} - -#endif /* end #if !defined */ - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_IOP_TAGGEDCOMPONENTSEQ_CI_) -#define _IOP_TAGGEDCOMPONENTSEQ_CI_ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226 - -// ************************************************************* -// Inline operations for class IOP::TaggedComponentSeq_var -// ************************************************************* - -ACE_INLINE -IOP::TaggedComponentSeq_var::TaggedComponentSeq_var (void) - : ptr_ (0) -{} - -ACE_INLINE -IOP::TaggedComponentSeq_var::TaggedComponentSeq_var (TaggedComponentSeq *p) - : ptr_ (p) -{} - -ACE_INLINE -IOP::TaggedComponentSeq_var::TaggedComponentSeq_var (const ::IOP::TaggedComponentSeq_var &p) -{ - if (p.ptr_) - { - ACE_NEW (this->ptr_, ::IOP::TaggedComponentSeq (*p.ptr_)); - } - else - { - this->ptr_ = 0; - } -} - -ACE_INLINE -IOP::TaggedComponentSeq_var::~TaggedComponentSeq_var (void) -{ - delete this->ptr_; -} - -ACE_INLINE -IOP::TaggedComponentSeq_var & -IOP::TaggedComponentSeq_var::operator= (TaggedComponentSeq *p) -{ - delete this->ptr_; - this->ptr_ = p; - return *this; -} - -ACE_INLINE -::IOP::TaggedComponentSeq_var & -IOP::TaggedComponentSeq_var::operator= (const ::IOP::TaggedComponentSeq_var &p) -{ - if (this != &p) - { - if (p.ptr_ == 0) - { - delete this->ptr_; - this->ptr_ = 0; - } - else - { - TaggedComponentSeq *deep_copy = 0; - ACE_NEW_RETURN ( - deep_copy, - TaggedComponentSeq (*p.ptr_), - *this - ); - - if (deep_copy != 0) - { - TaggedComponentSeq *tmp = deep_copy; - deep_copy = this->ptr_; - this->ptr_ = tmp; - delete deep_copy; - } - } - } - - return *this; -} - -ACE_INLINE -const ::IOP::TaggedComponentSeq * -IOP::TaggedComponentSeq_var::operator-> (void) const -{ - return this->ptr_; -} - -ACE_INLINE -::IOP::TaggedComponentSeq * -IOP::TaggedComponentSeq_var::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -IOP::TaggedComponentSeq_var::operator const ::IOP::TaggedComponentSeq &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE -IOP::TaggedComponentSeq_var::operator ::IOP::TaggedComponentSeq &() // cast -{ - return *this->ptr_; -} - -ACE_INLINE -IOP::TaggedComponentSeq_var::operator ::IOP::TaggedComponentSeq &() const // cast -{ - return *this->ptr_; -} - -// Variable-size types only. -ACE_INLINE -IOP::TaggedComponentSeq_var::operator ::IOP::TaggedComponentSeq *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE -IOP::TaggedComponent & -IOP::TaggedComponentSeq_var::operator[] (CORBA::ULong index) -{ - return this->ptr_->operator[] (index); -} - -ACE_INLINE -const IOP::TaggedComponent & -IOP::TaggedComponentSeq_var::operator[] (CORBA::ULong index) const -{ - return ACE_const_cast (const IOP::TaggedComponent &, this->ptr_->operator[] (index)); -} - -ACE_INLINE -const ::IOP::TaggedComponentSeq & -IOP::TaggedComponentSeq_var::in (void) const -{ - return *this->ptr_; -} - -ACE_INLINE -::IOP::TaggedComponentSeq & -IOP::TaggedComponentSeq_var::inout (void) -{ - return *this->ptr_; -} - -ACE_INLINE -::IOP::TaggedComponentSeq *& -IOP::TaggedComponentSeq_var::out (void) -{ - delete this->ptr_; - this->ptr_ = 0; - return this->ptr_; -} - -ACE_INLINE -::IOP::TaggedComponentSeq * -IOP::TaggedComponentSeq_var::_retn (void) -{ - ::IOP::TaggedComponentSeq *tmp = this->ptr_; - this->ptr_ = 0; - return tmp; -} - -ACE_INLINE -::IOP::TaggedComponentSeq * -IOP::TaggedComponentSeq_var::ptr (void) const -{ - return this->ptr_; -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567 - -// ************************************************************* -// Inline operations for class IOP::TaggedComponentSeq_out -// ************************************************************* - -ACE_INLINE -IOP::TaggedComponentSeq_out::TaggedComponentSeq_out (TaggedComponentSeq *&p) - : ptr_ (p) -{ - this->ptr_ = 0; -} - -ACE_INLINE -IOP::TaggedComponentSeq_out::TaggedComponentSeq_out (TaggedComponentSeq_var &p) - : ptr_ (p.out ()) -{ - delete this->ptr_; - this->ptr_ = 0; -} - -ACE_INLINE -IOP::TaggedComponentSeq_out::TaggedComponentSeq_out (const ::IOP::TaggedComponentSeq_out &p) - : ptr_ (ACE_const_cast (TaggedComponentSeq_out&, p).ptr_) -{} - -ACE_INLINE -::IOP::TaggedComponentSeq_out & -IOP::TaggedComponentSeq_out::operator= (const ::IOP::TaggedComponentSeq_out &p) -{ - this->ptr_ = ACE_const_cast (TaggedComponentSeq_out&, p).ptr_; - return *this; -} - -ACE_INLINE -::IOP::TaggedComponentSeq_out & -IOP::TaggedComponentSeq_out::operator= (TaggedComponentSeq *p) -{ - this->ptr_ = p; - return *this; -} - -ACE_INLINE -IOP::TaggedComponentSeq_out::operator ::IOP::TaggedComponentSeq *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE -::IOP::TaggedComponentSeq *& -IOP::TaggedComponentSeq_out::ptr (void) // ptr -{ - return this->ptr_; -} - -ACE_INLINE -::IOP::TaggedComponentSeq * -IOP::TaggedComponentSeq_out::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -IOP::TaggedComponent & -IOP::TaggedComponentSeq_out::operator[] (CORBA::ULong index) -{ - return this->ptr_->operator[] (index); -} - -#endif /* end #if !defined */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194 - -// ************************************************************* -// Inline operations for class IOP::ServiceContext_var -// ************************************************************* - -ACE_INLINE -IOP::ServiceContext_var::ServiceContext_var (void) - : ptr_ (0) -{} - -ACE_INLINE -IOP::ServiceContext_var::ServiceContext_var (ServiceContext *p) - : ptr_ (p) -{} - -ACE_INLINE -IOP::ServiceContext_var::ServiceContext_var (const ::IOP::ServiceContext_var &p) -{ - if (p.ptr_) - { - ACE_NEW (this->ptr_, ::IOP::ServiceContext (*p.ptr_)); - } - else - { - this->ptr_ = 0; - } -} - -ACE_INLINE -IOP::ServiceContext_var::~ServiceContext_var (void) -{ - delete this->ptr_; -} - -ACE_INLINE -IOP::ServiceContext_var & -IOP::ServiceContext_var::operator= (ServiceContext *_tao_struct_var) -{ - delete this->ptr_; - this->ptr_ = _tao_struct_var; - return *this; -} - -ACE_INLINE -::IOP::ServiceContext_var & -IOP::ServiceContext_var::operator= (const ::IOP::ServiceContext_var &_tao_struct_var) -{ - if (this != &_tao_struct_var) - { - if (_tao_struct_var.ptr_ == 0) - { - delete this->ptr_; - this->ptr_ = 0; - } - else - { - ServiceContext *deep_copy = 0; - ACE_NEW_RETURN ( - deep_copy, - ServiceContext (*_tao_struct_var.ptr_), - *this - ); - - if (deep_copy != 0) - { - ServiceContext *tmp = deep_copy; - deep_copy = this->ptr_; - this->ptr_ = tmp; - delete deep_copy; - } - } - } - - return *this; -} - -ACE_INLINE const ::IOP::ServiceContext * -IOP::ServiceContext_var::operator-> (void) const -{ - return this->ptr_; -} - -ACE_INLINE ::IOP::ServiceContext * -IOP::ServiceContext_var::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -IOP::ServiceContext_var::operator const ::IOP::ServiceContext &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE -IOP::ServiceContext_var::operator ::IOP::ServiceContext &() // cast -{ - return *this->ptr_; -} - -ACE_INLINE -IOP::ServiceContext_var::operator ::IOP::ServiceContext &() const // cast -{ - return *this->ptr_; -} - -// Variable-size types only. -ACE_INLINE -IOP::ServiceContext_var::operator ::IOP::ServiceContext *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE const ::IOP::ServiceContext & -IOP::ServiceContext_var::in (void) const -{ - return *this->ptr_; -} - -ACE_INLINE ::IOP::ServiceContext & -IOP::ServiceContext_var::inout (void) -{ - return *this->ptr_; -} - -// Mapping for variable size. -ACE_INLINE ::IOP::ServiceContext *& -IOP::ServiceContext_var::out (void) -{ - delete this->ptr_; - this->ptr_ = 0; - return this->ptr_; -} - -ACE_INLINE ::IOP::ServiceContext * -IOP::ServiceContext_var::_retn (void) -{ - ::IOP::ServiceContext *tmp = this->ptr_; - this->ptr_ = 0; - return tmp; -} - -ACE_INLINE ::IOP::ServiceContext * -IOP::ServiceContext_var::ptr (void) const -{ - return this->ptr_; -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523 - -// ************************************************************* -// Inline operations for class IOP::ServiceContext_out -// ************************************************************* - -ACE_INLINE -IOP::ServiceContext_out::ServiceContext_out (::IOP::ServiceContext *&p) - : ptr_ (p) -{ - this->ptr_ = 0; -} - -ACE_INLINE -IOP::ServiceContext_out::ServiceContext_out (ServiceContext_var &p) - : ptr_ (p.out ()) -{ - delete this->ptr_; - this->ptr_ = 0; -} - -ACE_INLINE -IOP::ServiceContext_out::ServiceContext_out (const ::IOP::ServiceContext_out &p) - : ptr_ (ACE_const_cast (ServiceContext_out&, p).ptr_) -{} - -ACE_INLINE -IOP::ServiceContext_out & -IOP::ServiceContext_out::operator= (const ::IOP::ServiceContext_out &p) -{ - this->ptr_ = ACE_const_cast (ServiceContext_out&, p).ptr_; - return *this; -} - -ACE_INLINE -IOP::ServiceContext_out & -IOP::ServiceContext_out::operator= (ServiceContext *_tao_struct_out) -{ - this->ptr_ = _tao_struct_out; - return *this; -} - -ACE_INLINE -IOP::ServiceContext_out::operator ::IOP::ServiceContext *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE ::IOP::ServiceContext *& -IOP::ServiceContext_out::ptr (void) // ptr -{ - return this->ptr_; -} - -ACE_INLINE ::IOP::ServiceContext * -IOP::ServiceContext_out::operator-> (void) -{ - return this->ptr_; -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_SERVICECONTEXTLIST_CI_) -#define __TAO_UNBOUNDED_SEQUENCE_IOP_SERVICECONTEXTLIST_CI_ - -ACE_INLINE -IOP::ServiceContext * -IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (CORBA::ULong size) -{ - IOP::ServiceContext *retval = 0; - ACE_NEW_RETURN (retval, IOP::ServiceContext[size], 0); - return retval; -} - -ACE_INLINE -void IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::freebuf (IOP::ServiceContext *buffer) -{ - delete [] buffer; -} - -ACE_INLINE -IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::_TAO_Unbounded_Sequence_IOP_ServiceContextList (void) -{ -} - -ACE_INLINE -IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::_TAO_Unbounded_Sequence_IOP_ServiceContextList (CORBA::ULong maximum) - : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (maximum)) -{ -} - -ACE_INLINE -IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::_TAO_Unbounded_Sequence_IOP_ServiceContextList ( - CORBA::ULong maximum, - CORBA::ULong length, - IOP::ServiceContext *data, - CORBA::Boolean release - ) - : TAO_Unbounded_Base_Sequence (maximum, length, data, release) -{ -} - -ACE_INLINE -IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::_TAO_Unbounded_Sequence_IOP_ServiceContextList ( - const _TAO_Unbounded_Sequence_IOP_ServiceContextList &rhs - ) - : TAO_Unbounded_Base_Sequence (rhs) -{ - if (rhs.buffer_ != 0) - { - IOP::ServiceContext *tmp1 = - _TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (this->maximum_); - IOP::ServiceContext * const tmp2 = - ACE_reinterpret_cast (IOP::ServiceContext * ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - tmp1[i] = tmp2[i]; - } - - this->buffer_ = tmp1; - } - else - { - this->buffer_ = 0; - } -} - -ACE_INLINE -IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList & -IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::operator= ( - const _TAO_Unbounded_Sequence_IOP_ServiceContextList &rhs - ) -{ - if (this == &rhs) - { - return *this; - } - - if (this->release_) - { - if (this->maximum_ < rhs.maximum_) - { - // Free the old buffer. - IOP::ServiceContext *tmp = - ACE_reinterpret_cast (IOP::ServiceContext *, this->buffer_); - - _TAO_Unbounded_Sequence_IOP_ServiceContextList::freebuf (tmp); - - this->buffer_ = - _TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (rhs.maximum_); - } - } - else - { - this->buffer_ = - _TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (rhs.maximum_); - } - - TAO_Unbounded_Base_Sequence::operator= (rhs); - - IOP::ServiceContext *tmp1 = - ACE_reinterpret_cast (IOP::ServiceContext *, this->buffer_); - IOP::ServiceContext * const tmp2 = - ACE_reinterpret_cast (IOP::ServiceContext * ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - tmp1[i] = tmp2[i]; - } - - return *this; -} - -// = Accessors. -ACE_INLINE -IOP::ServiceContext & -IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::operator[] (CORBA::ULong i) -{ - ACE_ASSERT (i < this->maximum_); - IOP::ServiceContext* tmp = - ACE_reinterpret_cast (IOP::ServiceContext*, this->buffer_); - return tmp[i]; -} - -ACE_INLINE -const IOP::ServiceContext & -IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::operator[] (CORBA::ULong i) const -{ - ACE_ASSERT (i < this->maximum_); - IOP::ServiceContext * const tmp = - ACE_reinterpret_cast (IOP::ServiceContext* ACE_CAST_CONST, this->buffer_); - return tmp[i]; -} - -// Implement the TAO_Base_Sequence methods (see Sequence.h) - -ACE_INLINE -IOP::ServiceContext * -IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::get_buffer (CORBA::Boolean orphan) -{ - IOP::ServiceContext *result = 0; - - if (orphan == 0) - { - // We retain ownership. - if (this->buffer_ == 0) - { - result = - _TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (this->length_); - this->buffer_ = result; - this->release_ = 1; - } - else - { - result = - ACE_reinterpret_cast (IOP::ServiceContext*, this->buffer_); - } - } - else // if (orphan == 1) - { - if (this->release_ != 0) - { - // We set the state back to default and relinquish ownership. - result = - ACE_reinterpret_cast(IOP::ServiceContext*,this->buffer_); - this->maximum_ = 0; - this->length_ = 0; - this->buffer_ = 0; - this->release_ = 0; - } - } - - return result; -} - -ACE_INLINE -const IOP::ServiceContext * -IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::get_buffer (void) const -{ - return ACE_reinterpret_cast (const IOP::ServiceContext * ACE_CAST_CONST, this->buffer_); -} - -ACE_INLINE -void -IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::replace ( - CORBA::ULong max, - CORBA::ULong length, - IOP::ServiceContext *data, - CORBA::Boolean release - ) -{ - this->maximum_ = max; - this->length_ = length; - - if (this->buffer_ && this->release_ == 1) - { - IOP::ServiceContext *tmp = - ACE_reinterpret_cast (IOP::ServiceContext*, this->buffer_); - _TAO_Unbounded_Sequence_IOP_ServiceContextList::freebuf (tmp); - } - - this->buffer_ = data; - this->release_ = release; -} - -#endif /* end #if !defined */ - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_IOP_SERVICECONTEXTLIST_CI_) -#define _IOP_SERVICECONTEXTLIST_CI_ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226 - -// ************************************************************* -// Inline operations for class IOP::ServiceContextList_var -// ************************************************************* - -ACE_INLINE -IOP::ServiceContextList_var::ServiceContextList_var (void) - : ptr_ (0) -{} - -ACE_INLINE -IOP::ServiceContextList_var::ServiceContextList_var (ServiceContextList *p) - : ptr_ (p) -{} - -ACE_INLINE -IOP::ServiceContextList_var::ServiceContextList_var (const ::IOP::ServiceContextList_var &p) -{ - if (p.ptr_) - { - ACE_NEW (this->ptr_, ::IOP::ServiceContextList (*p.ptr_)); - } - else - { - this->ptr_ = 0; - } -} - -ACE_INLINE -IOP::ServiceContextList_var::~ServiceContextList_var (void) -{ - delete this->ptr_; -} - -ACE_INLINE -IOP::ServiceContextList_var & -IOP::ServiceContextList_var::operator= (ServiceContextList *p) -{ - delete this->ptr_; - this->ptr_ = p; - return *this; -} - -ACE_INLINE -::IOP::ServiceContextList_var & -IOP::ServiceContextList_var::operator= (const ::IOP::ServiceContextList_var &p) -{ - if (this != &p) - { - if (p.ptr_ == 0) - { - delete this->ptr_; - this->ptr_ = 0; - } - else - { - ServiceContextList *deep_copy = 0; - ACE_NEW_RETURN ( - deep_copy, - ServiceContextList (*p.ptr_), - *this - ); - - if (deep_copy != 0) - { - ServiceContextList *tmp = deep_copy; - deep_copy = this->ptr_; - this->ptr_ = tmp; - delete deep_copy; - } - } - } - - return *this; -} - -ACE_INLINE -const ::IOP::ServiceContextList * -IOP::ServiceContextList_var::operator-> (void) const -{ - return this->ptr_; -} - -ACE_INLINE -::IOP::ServiceContextList * -IOP::ServiceContextList_var::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -IOP::ServiceContextList_var::operator const ::IOP::ServiceContextList &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE -IOP::ServiceContextList_var::operator ::IOP::ServiceContextList &() // cast -{ - return *this->ptr_; -} - -ACE_INLINE -IOP::ServiceContextList_var::operator ::IOP::ServiceContextList &() const // cast -{ - return *this->ptr_; -} - -// Variable-size types only. -ACE_INLINE -IOP::ServiceContextList_var::operator ::IOP::ServiceContextList *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE -IOP::ServiceContext & -IOP::ServiceContextList_var::operator[] (CORBA::ULong index) -{ - return this->ptr_->operator[] (index); -} - -ACE_INLINE -const IOP::ServiceContext & -IOP::ServiceContextList_var::operator[] (CORBA::ULong index) const -{ - return ACE_const_cast (const IOP::ServiceContext &, this->ptr_->operator[] (index)); -} - -ACE_INLINE -const ::IOP::ServiceContextList & -IOP::ServiceContextList_var::in (void) const -{ - return *this->ptr_; -} - -ACE_INLINE -::IOP::ServiceContextList & -IOP::ServiceContextList_var::inout (void) -{ - return *this->ptr_; -} - -ACE_INLINE -::IOP::ServiceContextList *& -IOP::ServiceContextList_var::out (void) -{ - delete this->ptr_; - this->ptr_ = 0; - return this->ptr_; -} - -ACE_INLINE -::IOP::ServiceContextList * -IOP::ServiceContextList_var::_retn (void) -{ - ::IOP::ServiceContextList *tmp = this->ptr_; - this->ptr_ = 0; - return tmp; -} - -ACE_INLINE -::IOP::ServiceContextList * -IOP::ServiceContextList_var::ptr (void) const -{ - return this->ptr_; -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567 - -// ************************************************************* -// Inline operations for class IOP::ServiceContextList_out -// ************************************************************* - -ACE_INLINE -IOP::ServiceContextList_out::ServiceContextList_out (ServiceContextList *&p) - : ptr_ (p) -{ - this->ptr_ = 0; -} - -ACE_INLINE -IOP::ServiceContextList_out::ServiceContextList_out (ServiceContextList_var &p) - : ptr_ (p.out ()) -{ - delete this->ptr_; - this->ptr_ = 0; -} - -ACE_INLINE -IOP::ServiceContextList_out::ServiceContextList_out (const ::IOP::ServiceContextList_out &p) - : ptr_ (ACE_const_cast (ServiceContextList_out&, p).ptr_) -{} - -ACE_INLINE -::IOP::ServiceContextList_out & -IOP::ServiceContextList_out::operator= (const ::IOP::ServiceContextList_out &p) -{ - this->ptr_ = ACE_const_cast (ServiceContextList_out&, p).ptr_; - return *this; -} - -ACE_INLINE -::IOP::ServiceContextList_out & -IOP::ServiceContextList_out::operator= (ServiceContextList *p) -{ - this->ptr_ = p; - return *this; -} - -ACE_INLINE -IOP::ServiceContextList_out::operator ::IOP::ServiceContextList *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE -::IOP::ServiceContextList *& -IOP::ServiceContextList_out::ptr (void) // ptr -{ - return this->ptr_; -} - -ACE_INLINE -::IOP::ServiceContextList * -IOP::ServiceContextList_out::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -IOP::ServiceContext & -IOP::ServiceContextList_out::operator[] (CORBA::ULong index) -{ - return this->ptr_->operator[] (index); -} - -#endif /* end #if !defined */ - -// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68 #if !defined (_IOP_CODEC___CI_) #define _IOP_CODEC___CI_ -ACE_INLINE -CORBA::Boolean -IOP::Codec::marshal (TAO_OutputCDR &) -{ - return 0; -} - #endif /* end #if !defined */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194 - -// ************************************************************* -// Inline operations for class IOP::Encoding_var -// ************************************************************* - -ACE_INLINE -IOP::Encoding_var::Encoding_var (void) - : ptr_ (0) -{} - -ACE_INLINE -IOP::Encoding_var::Encoding_var (Encoding *p) - : ptr_ (p) -{} - -ACE_INLINE -IOP::Encoding_var::Encoding_var (const ::IOP::Encoding_var &p) -{ - if (p.ptr_) - { - ACE_NEW (this->ptr_, ::IOP::Encoding (*p.ptr_)); - } - else - { - this->ptr_ = 0; - } -} - -// Fixed-size types only. -ACE_INLINE -IOP::Encoding_var::Encoding_var (const ::IOP::Encoding &p) -{ - ACE_NEW (this->ptr_, ::IOP::Encoding (p)); -} - -ACE_INLINE -IOP::Encoding_var::~Encoding_var (void) -{ - delete this->ptr_; -} - -ACE_INLINE -IOP::Encoding_var & -IOP::Encoding_var::operator= (Encoding *_tao_struct_var) -{ - delete this->ptr_; - this->ptr_ = _tao_struct_var; - return *this; -} - -ACE_INLINE -::IOP::Encoding_var & -IOP::Encoding_var::operator= (const ::IOP::Encoding_var &_tao_struct_var) -{ - if (this != &_tao_struct_var) - { - if (_tao_struct_var.ptr_ == 0) - { - delete this->ptr_; - this->ptr_ = 0; - } - else - { - Encoding *deep_copy = 0; - ACE_NEW_RETURN ( - deep_copy, - Encoding (*_tao_struct_var.ptr_), - *this - ); - - if (deep_copy != 0) - { - Encoding *tmp = deep_copy; - deep_copy = this->ptr_; - this->ptr_ = tmp; - delete deep_copy; - } - } - } - - return *this; -} - -// fixed-size types only -ACE_INLINE IOP::Encoding_var & -IOP::Encoding_var::operator= (const ::IOP::Encoding &p) -{ - if (this->ptr_ != &p) - { - delete this->ptr_; - ACE_NEW_RETURN ( - this->ptr_, - ::IOP::Encoding (p), - *this - ); - } - - return *this; -} - -ACE_INLINE const ::IOP::Encoding * -IOP::Encoding_var::operator-> (void) const -{ - return this->ptr_; -} - -ACE_INLINE ::IOP::Encoding * -IOP::Encoding_var::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -IOP::Encoding_var::operator const ::IOP::Encoding &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE -IOP::Encoding_var::operator ::IOP::Encoding &() // cast -{ - return *this->ptr_; -} - -ACE_INLINE -IOP::Encoding_var::operator ::IOP::Encoding &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE const ::IOP::Encoding & -IOP::Encoding_var::in (void) const -{ - return *this->ptr_; -} - -ACE_INLINE ::IOP::Encoding & -IOP::Encoding_var::inout (void) -{ - return *this->ptr_; -} - -// mapping for fixed size -ACE_INLINE ::IOP::Encoding & -IOP::Encoding_var::out (void) -{ - return *this->ptr_; -} - -ACE_INLINE ::IOP::Encoding -IOP::Encoding_var::_retn (void) -{ - return *this->ptr_; -} - -ACE_INLINE ::IOP::Encoding * -IOP::Encoding_var::ptr (void) const -{ - return this->ptr_; -} - -// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68 #if !defined (_IOP_CODECFACTORY___CI_) #define _IOP_CODECFACTORY___CI_ -ACE_INLINE -CORBA::Boolean -IOP::CodecFactory::marshal (TAO_OutputCDR &) -{ - return 0; -} - #endif /* end #if !defined */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84 - -#if !defined _TAO_CDR_OP_IOP_TaggedProfile__tao_seq_Octet_I_ -#define _TAO_CDR_OP_IOP_TaggedProfile__tao_seq_Octet_I_ - -CORBA::Boolean TAO_Export operator<< ( - TAO_OutputCDR &, - const IOP::TaggedProfile::_tao_seq_Octet & - ); - -CORBA::Boolean TAO_Export operator>> ( - TAO_InputCDR &, - IOP::TaggedProfile::_tao_seq_Octet & - ); - -#endif /* _TAO_CDR_OP_IOP_TaggedProfile__tao_seq_Octet_I_ */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71 ACE_INLINE CORBA::Boolean operator<< ( @@ -3180,7 +96,7 @@ CORBA::Boolean TAO_Export operator>> ( #endif /* _TAO_CDR_OP_IOP_IOR__tao_seq_TaggedProfile_I_ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71 ACE_INLINE CORBA::Boolean operator<< ( @@ -3221,25 +137,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84 - -#if !defined _TAO_CDR_OP_IOP_TaggedComponent__tao_seq_Octet_I_ -#define _TAO_CDR_OP_IOP_TaggedComponent__tao_seq_Octet_I_ - -CORBA::Boolean TAO_Export operator<< ( - TAO_OutputCDR &, - const IOP::TaggedComponent::_tao_seq_Octet & - ); - -CORBA::Boolean TAO_Export operator>> ( - TAO_InputCDR &, - IOP::TaggedComponent::_tao_seq_Octet & - ); - -#endif /* _TAO_CDR_OP_IOP_TaggedComponent__tao_seq_Octet_I_ */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71 ACE_INLINE CORBA::Boolean operator<< ( @@ -3334,25 +232,7 @@ CORBA::Boolean TAO_Export operator>> ( #endif /* _TAO_CDR_OP_IOP_TaggedComponentSeq_I_ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84 - -#if !defined _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_I_ -#define _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_I_ - -CORBA::Boolean TAO_Export operator<< ( - TAO_OutputCDR &, - const IOP::ServiceContext::_tao_seq_Octet & - ); - -CORBA::Boolean TAO_Export operator>> ( - TAO_InputCDR &, - IOP::ServiceContext::_tao_seq_Octet & - ); - -#endif /* _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_I_ */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71 ACE_INLINE CORBA::Boolean operator<< ( @@ -3411,7 +291,7 @@ CORBA::Boolean TAO_Export operator>> ( #endif /* _TAO_CDR_OP_IOP_ServiceContextList_I_ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71 ACE_INLINE CORBA::Boolean operator<< ( diff --git a/TAO/tao/Messaging_PolicyValueC.cpp b/TAO/tao/Messaging_PolicyValueC.cpp index 08ae2f16e94..d0bbdde14be 100644 --- a/TAO/tao/Messaging_PolicyValueC.cpp +++ b/TAO/tao/Messaging_PolicyValueC.cpp @@ -25,16 +25,6 @@ #include "Messaging_PolicyValueC.h" #include "tao/Stub.h" -#include "tao/Invocation.h" -#include "tao/PortableInterceptor.h" - -#if TAO_HAS_INTERCEPTORS == 1 -#include "tao/RequestInfo_Util.h" -#include "tao/ClientRequestInfo_i.h" -#include "tao/ClientInterceptorAdapter.h" -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - - #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig @@ -119,7 +109,7 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 void Messaging::PolicyValue::_tao_any_destructor (void *_tao_void_pointer) { @@ -127,29 +117,17 @@ void Messaging::PolicyValue::_tao_any_destructor (void *_tao_void_pointer) delete tmp; } -#if !defined (_MESSAGING_POLICYVALUE__TAO_SEQ_OCTET_CS_) -#define _MESSAGING_POLICYVALUE__TAO_SEQ_OCTET_CS_ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250 - -// ************************************************************* -// Messaging::PolicyValue::_tao_seq_Octet -// ************************************************************* +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50 Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (void) {} Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -TAO_Unbounded_Sequence<CORBA::Octet> -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<CORBA::Octet> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max) + : TAO_Unbounded_Sequence< + CORBA::Octet + > + (max) {} Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet ( @@ -158,30 +136,20 @@ Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet ( CORBA::Octet *buffer, CORBA::Boolean release ) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -TAO_Unbounded_Sequence<CORBA::Octet> -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<CORBA::Octet> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max, length, buffer, release) + : TAO_Unbounded_Sequence< + CORBA::Octet + > + (max, length, buffer, release) {} Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -TAO_Unbounded_Sequence<CORBA::Octet> -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<CORBA::Octet> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (seq) + : TAO_Unbounded_Sequence< + CORBA::Octet + > + (seq) {} -Messaging::PolicyValue::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor +Messaging::PolicyValue::_tao_seq_Octet::~_tao_seq_Octet (void) {} void Messaging::PolicyValue::_tao_seq_Octet::_tao_any_destructor (void *_tao_void_pointer) @@ -190,87 +158,48 @@ void Messaging::PolicyValue::_tao_seq_Octet::_tao_any_destructor (void *_tao_voi delete tmp; } -#endif /* end #if !defined */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101 +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274 -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -#if !defined (__TAO_UNBOUNDED_SEQUENCE_MESSAGING_POLICYVALUESEQ_CS_) -#define __TAO_UNBOUNDED_SEQUENCE_MESSAGING_POLICYVALUESEQ_CS_ +template class + TAO_Var_Var_T< + PolicyValue + >; -void -Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_allocate_buffer (CORBA::ULong length) -{ - Messaging::PolicyValue* tmp = 0; - tmp = _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (length); - - if (this->buffer_ != 0) - { - Messaging::PolicyValue *old = - ACE_reinterpret_cast (Messaging::PolicyValue *, this->buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - tmp[i] = old[i]; - } - - if (this->release_) - { - _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::freebuf (old); - } - } - - this->buffer_ = tmp; -} +template class + TAO_Out_T< + PolicyValue, + PolicyValue_var + >; -void -Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_deallocate_buffer (void) -{ - if (this->buffer_ == 0 || this->release_ == 0) - { - return; - } - - Messaging::PolicyValue *tmp = - ACE_reinterpret_cast (Messaging::PolicyValue *, this->buffer_); - _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::freebuf (tmp); - this->buffer_ = 0; -} - -Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::~_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (void) -{ - this->_deallocate_buffer (); -} - -#endif /* end #if !defined */ +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +# pragma instantiate \ + TAO_Var_Var_T< \ + PolicyValue \ + > -#if !defined (_MESSAGING_POLICYVALUESEQ_CS_) -#define _MESSAGING_POLICYVALUESEQ_CS_ +# pragma instantiate \ + TAO_Out_T< \ + PolicyValue, \ + PolicyValue_var \ + > -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250 +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -// ************************************************************* -// Messaging::PolicyValueSeq -// ************************************************************* +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50 Messaging::PolicyValueSeq::PolicyValueSeq (void) {} Messaging::PolicyValueSeq::PolicyValueSeq (CORBA::ULong max) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<Messaging::PolicyValue> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max) + : TAO_Unbounded_Sequence< + Messaging::PolicyValue + > + (max) {} Messaging::PolicyValueSeq::PolicyValueSeq ( @@ -279,30 +208,20 @@ Messaging::PolicyValueSeq::PolicyValueSeq ( Messaging::PolicyValue *buffer, CORBA::Boolean release ) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<Messaging::PolicyValue> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max, length, buffer, release) + : TAO_Unbounded_Sequence< + Messaging::PolicyValue + > + (max, length, buffer, release) {} Messaging::PolicyValueSeq::PolicyValueSeq (const PolicyValueSeq &seq) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<Messaging::PolicyValue> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (seq) + : TAO_Unbounded_Sequence< + Messaging::PolicyValue + > + (seq) {} -Messaging::PolicyValueSeq::~PolicyValueSeq (void) // dtor +Messaging::PolicyValueSeq::~PolicyValueSeq (void) {} void Messaging::PolicyValueSeq::_tao_any_destructor (void *_tao_void_pointer) @@ -311,7 +230,37 @@ void Messaging::PolicyValueSeq::_tao_any_destructor (void *_tao_void_pointer) delete tmp; } -#endif /* end #if !defined */ +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + +template class + TAO_VarSeq_Var_T< + PolicyValueSeq, + Messaging::PolicyValue + >; + +template class + TAO_Seq_Out_T< + PolicyValueSeq, + PolicyValueSeq_var, + Messaging::PolicyValue + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# pragma instantiate \ + TAO_VarSeq_Var_T< \ + PolicyValueSeq, \ + Messaging::PolicyValue \ + > + +# pragma instantiate \ + TAO_Seq_Out_T< \ + PolicyValueSeq, \ + PolicyValueSeq_var, \ + Messaging::PolicyValue \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -536,8 +485,15 @@ CORBA::Boolean operator>>= ( ); } +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ + defined (ACE_HAS_GNU_REPO) + template class TAO::Any_Dual_Impl_T<Messaging::PolicyValueSeq>; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +# pragma instantiate TAO::Any_Dual_Impl_T<Messaging::PolicyValueSeq> +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93 #if !defined _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_CPP_ #define _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_CPP_ @@ -630,7 +586,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_CPP_ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93 CORBA::Boolean operator<< ( TAO_OutputCDR &strm, diff --git a/TAO/tao/Messaging_PolicyValueC.h b/TAO/tao/Messaging_PolicyValueC.h index 24af31cc50a..13b919eebc3 100644 --- a/TAO/tao/Messaging_PolicyValueC.h +++ b/TAO/tao/Messaging_PolicyValueC.h @@ -26,16 +26,12 @@ #define _TAO_IDL_ORIG_MESSAGING_POLICYVALUEC_H_ #include "ace/pre.h" -#include "tao/corbafwd.h" +#include "IOPC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/TAO_Export.h" -#include "IOPC.h" -#include "Sequence.h" - #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO #endif @@ -66,9 +62,25 @@ TAO_NAMESPACE Messaging { // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231 - class PolicyValue_var; + struct PolicyValue; + + typedef + TAO_Var_Var_T< + PolicyValue + > + PolicyValue_var; + + typedef + TAO_Out_T< + PolicyValue, + PolicyValue_var + > + PolicyValue_out; + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52 struct TAO_Export PolicyValue { @@ -77,46 +89,32 @@ TAO_NAMESPACE Messaging static void _tao_any_destructor (void *); CORBA::PolicyType ptype; - -#if !defined (_MESSAGING_POLICYVALUE__TAO_SEQ_OCTET_CH_) -#define _MESSAGING_POLICYVALUE__TAO_SEQ_OCTET_CH_ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371 - - class _tao_seq_Octet; - - // ************************************************************* - // Messaging::PolicyValue::_tao_seq_Octet - // ************************************************************* - - class TAO_Export _tao_seq_Octet : public + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75 - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - TAO_Unbounded_Sequence<CORBA::Octet> -#else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<CORBA::Octet> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + class TAO_Export _tao_seq_Octet + : public + TAO_Unbounded_Sequence< + CORBA::Octet + > { public: _tao_seq_Octet (void); _tao_seq_Octet (CORBA::ULong max); _tao_seq_Octet ( - CORBA::ULong max, - CORBA::ULong length, + CORBA::ULong max, + CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release = 0 ); _tao_seq_Octet (const _tao_seq_Octet &); ~_tao_seq_Octet (void); - static void _tao_any_destructor (void*); + static void _tao_any_destructor (void *); + #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) _tao_seq_Octet ( CORBA::ULong length, @@ -125,8 +123,6 @@ TAO_NAMESPACE Messaging : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {} #endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */ }; - -#endif /* end #if !defined */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_field/field_ch.cpp:447 @@ -136,234 +132,52 @@ TAO_NAMESPACE Messaging }; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71 - - class TAO_Export PolicyValue_var - { - public: - PolicyValue_var (void); - PolicyValue_var (PolicyValue *); - PolicyValue_var (const PolicyValue_var &); - ~PolicyValue_var (void); - - PolicyValue_var &operator= (PolicyValue *); - PolicyValue_var &operator= (const PolicyValue_var &); - PolicyValue *operator-> (void); - const PolicyValue *operator-> (void) const; - - operator const PolicyValue &() const; - operator PolicyValue &(); - operator PolicyValue &() const; - - // Variable-size types only. - operator PolicyValue *&(); - - // in, inout, out, _retn - const PolicyValue &in (void) const; - PolicyValue &inout (void); - PolicyValue *&out (void); - PolicyValue *_retn (void); - PolicyValue *ptr (void) const; - - private: - PolicyValue *ptr_; - }; - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445 - - class TAO_Export PolicyValue_out - { - public: - PolicyValue_out (PolicyValue *&); - PolicyValue_out (PolicyValue_var &); - PolicyValue_out (const PolicyValue_out &); - PolicyValue_out &operator= (const PolicyValue_out &); - PolicyValue_out &operator= (PolicyValue *); - operator PolicyValue *&(); - PolicyValue *&ptr (void); - PolicyValue *operator-> (void); - - private: - PolicyValue *&ptr_; - // Assignment from T_var not allowed. - void operator= (const PolicyValue_var &); - }; - - // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyValue; - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_SEQUENCE_MESSAGING_POLICYVALUESEQ_CH_) -#define __TAO_UNBOUNDED_SEQUENCE_MESSAGING_POLICYVALUESEQ_CH_ - - class TAO_Export _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq - : public TAO_Unbounded_Base_Sequence - { - public: - _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (void); - _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (CORBA::ULong maximum); - _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq ( - CORBA::ULong maximum, - CORBA::ULong length, - PolicyValue *data, - CORBA::Boolean release = 0 - ); - _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq ( - const _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq &rhs - ); - _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq &operator= ( - const _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq &rhs - ); - virtual ~_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (void); - - // = Accessors. - PolicyValue &operator[] (CORBA::ULong i); - const PolicyValue &operator[] (CORBA::ULong i) const; - - // = Static operations. - static PolicyValue *allocbuf (CORBA::ULong size); - static void freebuf (PolicyValue *buffer); - - // Implement the TAO_Base_Sequence methods (see Sequence.h) - virtual void _allocate_buffer (CORBA::ULong length); - virtual void _deallocate_buffer (void); - PolicyValue *get_buffer (CORBA::Boolean orphan = 0); - const PolicyValue *get_buffer (void) const; - void replace ( - CORBA::ULong max, - CORBA::ULong length, - PolicyValue *data, - CORBA::Boolean release - ); - }; - -#endif /* end #if !defined */ - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_MESSAGING_POLICYVALUESEQ_CH_) -#define _MESSAGING_POLICYVALUESEQ_CH_ - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75 class PolicyValueSeq; - class PolicyValueSeq_var; - // ************************************************************* - // Messaging::PolicyValueSeq - // ************************************************************* + typedef + TAO_VarSeq_Var_T< + PolicyValueSeq, + Messaging::PolicyValue + > + PolicyValueSeq_var; - class TAO_Export PolicyValueSeq : public + typedef + TAO_Seq_Out_T< + PolicyValueSeq, + PolicyValueSeq_var, + Messaging::PolicyValue + > + PolicyValueSeq_out; - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq -#else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<PolicyValue> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + class TAO_Export PolicyValueSeq + : public + TAO_Unbounded_Sequence< + Messaging::PolicyValue + > { public: PolicyValueSeq (void); PolicyValueSeq (CORBA::ULong max); PolicyValueSeq ( - CORBA::ULong max, - CORBA::ULong length, + CORBA::ULong max, + CORBA::ULong length, PolicyValue *buffer, CORBA::Boolean release = 0 ); PolicyValueSeq (const PolicyValueSeq &); ~PolicyValueSeq (void); - static void _tao_any_destructor (void*); + static void _tao_any_destructor (void *); typedef PolicyValueSeq_var _var_type; }; - -#endif /* end #if !defined */ - -#if !defined (_MESSAGING_POLICYVALUESEQ___VAR_CH_) -#define _MESSAGING_POLICYVALUESEQ___VAR_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549 - - // ************************************************************* - // class Messaging::PolicyValueSeq_var - // ************************************************************* - - class TAO_Export PolicyValueSeq_var - { - public: - PolicyValueSeq_var (void); - PolicyValueSeq_var (PolicyValueSeq *); - PolicyValueSeq_var (const PolicyValueSeq_var &); - ~PolicyValueSeq_var (void); - - PolicyValueSeq_var &operator= (PolicyValueSeq *); - PolicyValueSeq_var &operator= (const PolicyValueSeq_var &); - PolicyValueSeq *operator-> (void); - const PolicyValueSeq *operator-> (void) const; - - operator const PolicyValueSeq &() const; - operator PolicyValueSeq &(); - operator PolicyValueSeq &() const; - - // Variable-size base types only. - operator PolicyValueSeq *&(); - - PolicyValue & operator[] (CORBA::ULong index); - const PolicyValue & operator[] (CORBA::ULong index) const; - - // in, inout, out, _retn - const PolicyValueSeq &in (void) const; - PolicyValueSeq &inout (void); - PolicyValueSeq *&out (void); - PolicyValueSeq *_retn (void); - PolicyValueSeq *ptr (void) const; - - private: - PolicyValueSeq *ptr_; - }; - -#endif /* end #if !defined */ - -#if !defined (_MESSAGING_POLICYVALUESEQ___OUT_CH_) -#define _MESSAGING_POLICYVALUESEQ___OUT_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753 - - class TAO_Export PolicyValueSeq_out - { - public: - PolicyValueSeq_out (PolicyValueSeq *&); - PolicyValueSeq_out (PolicyValueSeq_var &); - PolicyValueSeq_out (const PolicyValueSeq_out &); - PolicyValueSeq_out &operator= (const PolicyValueSeq_out &); - PolicyValueSeq_out &operator= (PolicyValueSeq *); - operator PolicyValueSeq *&(); - PolicyValueSeq *&ptr (void); - PolicyValueSeq *operator-> (void); - PolicyValue & operator[] (CORBA::ULong index); - - private: - PolicyValueSeq *&ptr_; - // Assignment from T_var not allowed. - void operator= (const PolicyValueSeq_var &); - }; - -#endif /* end #if !defined */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 @@ -373,12 +187,12 @@ TAO_NAMESPACE Messaging // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::ULong TAG_POLICIES = 2U; + const IOP::ComponentId TAG_POLICIES = 2U; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::ULong INVOCATION_POLICIES = 2U; + const IOP::ServiceId INVOCATION_POLICIES = 2U; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67 @@ -453,7 +267,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* __ACE_INLINE__ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018 #if defined (__ACE_INLINE__) #include "Messaging_PolicyValueC.i" diff --git a/TAO/tao/Messaging_PolicyValueC.i b/TAO/tao/Messaging_PolicyValueC.i index 331ec91b760..3710f2372eb 100644 --- a/TAO/tao/Messaging_PolicyValueC.i +++ b/TAO/tao/Messaging_PolicyValueC.i @@ -21,675 +21,6 @@ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194 - -// ************************************************************* -// Inline operations for class Messaging::PolicyValue_var -// ************************************************************* - -ACE_INLINE -Messaging::PolicyValue_var::PolicyValue_var (void) - : ptr_ (0) -{} - -ACE_INLINE -Messaging::PolicyValue_var::PolicyValue_var (PolicyValue *p) - : ptr_ (p) -{} - -ACE_INLINE -Messaging::PolicyValue_var::PolicyValue_var (const ::Messaging::PolicyValue_var &p) -{ - if (p.ptr_) - { - ACE_NEW (this->ptr_, ::Messaging::PolicyValue (*p.ptr_)); - } - else - { - this->ptr_ = 0; - } -} - -ACE_INLINE -Messaging::PolicyValue_var::~PolicyValue_var (void) -{ - delete this->ptr_; -} - -ACE_INLINE -Messaging::PolicyValue_var & -Messaging::PolicyValue_var::operator= (PolicyValue *_tao_struct_var) -{ - delete this->ptr_; - this->ptr_ = _tao_struct_var; - return *this; -} - -ACE_INLINE -::Messaging::PolicyValue_var & -Messaging::PolicyValue_var::operator= (const ::Messaging::PolicyValue_var &_tao_struct_var) -{ - if (this != &_tao_struct_var) - { - if (_tao_struct_var.ptr_ == 0) - { - delete this->ptr_; - this->ptr_ = 0; - } - else - { - PolicyValue *deep_copy = 0; - ACE_NEW_RETURN ( - deep_copy, - PolicyValue (*_tao_struct_var.ptr_), - *this - ); - - if (deep_copy != 0) - { - PolicyValue *tmp = deep_copy; - deep_copy = this->ptr_; - this->ptr_ = tmp; - delete deep_copy; - } - } - } - - return *this; -} - -ACE_INLINE const ::Messaging::PolicyValue * -Messaging::PolicyValue_var::operator-> (void) const -{ - return this->ptr_; -} - -ACE_INLINE ::Messaging::PolicyValue * -Messaging::PolicyValue_var::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -Messaging::PolicyValue_var::operator const ::Messaging::PolicyValue &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE -Messaging::PolicyValue_var::operator ::Messaging::PolicyValue &() // cast -{ - return *this->ptr_; -} - -ACE_INLINE -Messaging::PolicyValue_var::operator ::Messaging::PolicyValue &() const // cast -{ - return *this->ptr_; -} - -// Variable-size types only. -ACE_INLINE -Messaging::PolicyValue_var::operator ::Messaging::PolicyValue *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE const ::Messaging::PolicyValue & -Messaging::PolicyValue_var::in (void) const -{ - return *this->ptr_; -} - -ACE_INLINE ::Messaging::PolicyValue & -Messaging::PolicyValue_var::inout (void) -{ - return *this->ptr_; -} - -// Mapping for variable size. -ACE_INLINE ::Messaging::PolicyValue *& -Messaging::PolicyValue_var::out (void) -{ - delete this->ptr_; - this->ptr_ = 0; - return this->ptr_; -} - -ACE_INLINE ::Messaging::PolicyValue * -Messaging::PolicyValue_var::_retn (void) -{ - ::Messaging::PolicyValue *tmp = this->ptr_; - this->ptr_ = 0; - return tmp; -} - -ACE_INLINE ::Messaging::PolicyValue * -Messaging::PolicyValue_var::ptr (void) const -{ - return this->ptr_; -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523 - -// ************************************************************* -// Inline operations for class Messaging::PolicyValue_out -// ************************************************************* - -ACE_INLINE -Messaging::PolicyValue_out::PolicyValue_out (::Messaging::PolicyValue *&p) - : ptr_ (p) -{ - this->ptr_ = 0; -} - -ACE_INLINE -Messaging::PolicyValue_out::PolicyValue_out (PolicyValue_var &p) - : ptr_ (p.out ()) -{ - delete this->ptr_; - this->ptr_ = 0; -} - -ACE_INLINE -Messaging::PolicyValue_out::PolicyValue_out (const ::Messaging::PolicyValue_out &p) - : ptr_ (ACE_const_cast (PolicyValue_out&, p).ptr_) -{} - -ACE_INLINE -Messaging::PolicyValue_out & -Messaging::PolicyValue_out::operator= (const ::Messaging::PolicyValue_out &p) -{ - this->ptr_ = ACE_const_cast (PolicyValue_out&, p).ptr_; - return *this; -} - -ACE_INLINE -Messaging::PolicyValue_out & -Messaging::PolicyValue_out::operator= (PolicyValue *_tao_struct_out) -{ - this->ptr_ = _tao_struct_out; - return *this; -} - -ACE_INLINE -Messaging::PolicyValue_out::operator ::Messaging::PolicyValue *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE ::Messaging::PolicyValue *& -Messaging::PolicyValue_out::ptr (void) // ptr -{ - return this->ptr_; -} - -ACE_INLINE ::Messaging::PolicyValue * -Messaging::PolicyValue_out::operator-> (void) -{ - return this->ptr_; -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_SEQUENCE_MESSAGING_POLICYVALUESEQ_CI_) -#define __TAO_UNBOUNDED_SEQUENCE_MESSAGING_POLICYVALUESEQ_CI_ - -ACE_INLINE -Messaging::PolicyValue * -Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (CORBA::ULong size) -{ - Messaging::PolicyValue *retval = 0; - ACE_NEW_RETURN (retval, Messaging::PolicyValue[size], 0); - return retval; -} - -ACE_INLINE -void Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::freebuf (Messaging::PolicyValue *buffer) -{ - delete [] buffer; -} - -ACE_INLINE -Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (void) -{ -} - -ACE_INLINE -Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq (CORBA::ULong maximum) - : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (maximum)) -{ -} - -ACE_INLINE -Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq ( - CORBA::ULong maximum, - CORBA::ULong length, - Messaging::PolicyValue *data, - CORBA::Boolean release - ) - : TAO_Unbounded_Base_Sequence (maximum, length, data, release) -{ -} - -ACE_INLINE -Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq ( - const _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq &rhs - ) - : TAO_Unbounded_Base_Sequence (rhs) -{ - if (rhs.buffer_ != 0) - { - Messaging::PolicyValue *tmp1 = - _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (this->maximum_); - Messaging::PolicyValue * const tmp2 = - ACE_reinterpret_cast (Messaging::PolicyValue * ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - tmp1[i] = tmp2[i]; - } - - this->buffer_ = tmp1; - } - else - { - this->buffer_ = 0; - } -} - -ACE_INLINE -Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq & -Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::operator= ( - const _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq &rhs - ) -{ - if (this == &rhs) - { - return *this; - } - - if (this->release_) - { - if (this->maximum_ < rhs.maximum_) - { - // Free the old buffer. - Messaging::PolicyValue *tmp = - ACE_reinterpret_cast (Messaging::PolicyValue *, this->buffer_); - - _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::freebuf (tmp); - - this->buffer_ = - _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (rhs.maximum_); - } - } - else - { - this->buffer_ = - _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (rhs.maximum_); - } - - TAO_Unbounded_Base_Sequence::operator= (rhs); - - Messaging::PolicyValue *tmp1 = - ACE_reinterpret_cast (Messaging::PolicyValue *, this->buffer_); - Messaging::PolicyValue * const tmp2 = - ACE_reinterpret_cast (Messaging::PolicyValue * ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - tmp1[i] = tmp2[i]; - } - - return *this; -} - -// = Accessors. -ACE_INLINE -Messaging::PolicyValue & -Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::operator[] (CORBA::ULong i) -{ - ACE_ASSERT (i < this->maximum_); - Messaging::PolicyValue* tmp = - ACE_reinterpret_cast (Messaging::PolicyValue*, this->buffer_); - return tmp[i]; -} - -ACE_INLINE -const Messaging::PolicyValue & -Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::operator[] (CORBA::ULong i) const -{ - ACE_ASSERT (i < this->maximum_); - Messaging::PolicyValue * const tmp = - ACE_reinterpret_cast (Messaging::PolicyValue* ACE_CAST_CONST, this->buffer_); - return tmp[i]; -} - -// Implement the TAO_Base_Sequence methods (see Sequence.h) - -ACE_INLINE -Messaging::PolicyValue * -Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::get_buffer (CORBA::Boolean orphan) -{ - Messaging::PolicyValue *result = 0; - - if (orphan == 0) - { - // We retain ownership. - if (this->buffer_ == 0) - { - result = - _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::allocbuf (this->length_); - this->buffer_ = result; - this->release_ = 1; - } - else - { - result = - ACE_reinterpret_cast (Messaging::PolicyValue*, this->buffer_); - } - } - else // if (orphan == 1) - { - if (this->release_ != 0) - { - // We set the state back to default and relinquish ownership. - result = - ACE_reinterpret_cast(Messaging::PolicyValue*,this->buffer_); - this->maximum_ = 0; - this->length_ = 0; - this->buffer_ = 0; - this->release_ = 0; - } - } - - return result; -} - -ACE_INLINE -const Messaging::PolicyValue * -Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::get_buffer (void) const -{ - return ACE_reinterpret_cast (const Messaging::PolicyValue * ACE_CAST_CONST, this->buffer_); -} - -ACE_INLINE -void -Messaging::_TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::replace ( - CORBA::ULong max, - CORBA::ULong length, - Messaging::PolicyValue *data, - CORBA::Boolean release - ) -{ - this->maximum_ = max; - this->length_ = length; - - if (this->buffer_ && this->release_ == 1) - { - Messaging::PolicyValue *tmp = - ACE_reinterpret_cast (Messaging::PolicyValue*, this->buffer_); - _TAO_Unbounded_Sequence_Messaging_PolicyValueSeq::freebuf (tmp); - } - - this->buffer_ = data; - this->release_ = release; -} - -#endif /* end #if !defined */ - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_MESSAGING_POLICYVALUESEQ_CI_) -#define _MESSAGING_POLICYVALUESEQ_CI_ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226 - -// ************************************************************* -// Inline operations for class Messaging::PolicyValueSeq_var -// ************************************************************* - -ACE_INLINE -Messaging::PolicyValueSeq_var::PolicyValueSeq_var (void) - : ptr_ (0) -{} - -ACE_INLINE -Messaging::PolicyValueSeq_var::PolicyValueSeq_var (PolicyValueSeq *p) - : ptr_ (p) -{} - -ACE_INLINE -Messaging::PolicyValueSeq_var::PolicyValueSeq_var (const ::Messaging::PolicyValueSeq_var &p) -{ - if (p.ptr_) - { - ACE_NEW (this->ptr_, ::Messaging::PolicyValueSeq (*p.ptr_)); - } - else - { - this->ptr_ = 0; - } -} - -ACE_INLINE -Messaging::PolicyValueSeq_var::~PolicyValueSeq_var (void) -{ - delete this->ptr_; -} - -ACE_INLINE -Messaging::PolicyValueSeq_var & -Messaging::PolicyValueSeq_var::operator= (PolicyValueSeq *p) -{ - delete this->ptr_; - this->ptr_ = p; - return *this; -} - -ACE_INLINE -::Messaging::PolicyValueSeq_var & -Messaging::PolicyValueSeq_var::operator= (const ::Messaging::PolicyValueSeq_var &p) -{ - if (this != &p) - { - if (p.ptr_ == 0) - { - delete this->ptr_; - this->ptr_ = 0; - } - else - { - PolicyValueSeq *deep_copy = 0; - ACE_NEW_RETURN ( - deep_copy, - PolicyValueSeq (*p.ptr_), - *this - ); - - if (deep_copy != 0) - { - PolicyValueSeq *tmp = deep_copy; - deep_copy = this->ptr_; - this->ptr_ = tmp; - delete deep_copy; - } - } - } - - return *this; -} - -ACE_INLINE -const ::Messaging::PolicyValueSeq * -Messaging::PolicyValueSeq_var::operator-> (void) const -{ - return this->ptr_; -} - -ACE_INLINE -::Messaging::PolicyValueSeq * -Messaging::PolicyValueSeq_var::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -Messaging::PolicyValueSeq_var::operator const ::Messaging::PolicyValueSeq &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE -Messaging::PolicyValueSeq_var::operator ::Messaging::PolicyValueSeq &() // cast -{ - return *this->ptr_; -} - -ACE_INLINE -Messaging::PolicyValueSeq_var::operator ::Messaging::PolicyValueSeq &() const // cast -{ - return *this->ptr_; -} - -// Variable-size types only. -ACE_INLINE -Messaging::PolicyValueSeq_var::operator ::Messaging::PolicyValueSeq *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE -Messaging::PolicyValue & -Messaging::PolicyValueSeq_var::operator[] (CORBA::ULong index) -{ - return this->ptr_->operator[] (index); -} - -ACE_INLINE -const Messaging::PolicyValue & -Messaging::PolicyValueSeq_var::operator[] (CORBA::ULong index) const -{ - return ACE_const_cast (const Messaging::PolicyValue &, this->ptr_->operator[] (index)); -} - -ACE_INLINE -const ::Messaging::PolicyValueSeq & -Messaging::PolicyValueSeq_var::in (void) const -{ - return *this->ptr_; -} - -ACE_INLINE -::Messaging::PolicyValueSeq & -Messaging::PolicyValueSeq_var::inout (void) -{ - return *this->ptr_; -} - -ACE_INLINE -::Messaging::PolicyValueSeq *& -Messaging::PolicyValueSeq_var::out (void) -{ - delete this->ptr_; - this->ptr_ = 0; - return this->ptr_; -} - -ACE_INLINE -::Messaging::PolicyValueSeq * -Messaging::PolicyValueSeq_var::_retn (void) -{ - ::Messaging::PolicyValueSeq *tmp = this->ptr_; - this->ptr_ = 0; - return tmp; -} - -ACE_INLINE -::Messaging::PolicyValueSeq * -Messaging::PolicyValueSeq_var::ptr (void) const -{ - return this->ptr_; -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567 - -// ************************************************************* -// Inline operations for class Messaging::PolicyValueSeq_out -// ************************************************************* - -ACE_INLINE -Messaging::PolicyValueSeq_out::PolicyValueSeq_out (PolicyValueSeq *&p) - : ptr_ (p) -{ - this->ptr_ = 0; -} - -ACE_INLINE -Messaging::PolicyValueSeq_out::PolicyValueSeq_out (PolicyValueSeq_var &p) - : ptr_ (p.out ()) -{ - delete this->ptr_; - this->ptr_ = 0; -} - -ACE_INLINE -Messaging::PolicyValueSeq_out::PolicyValueSeq_out (const ::Messaging::PolicyValueSeq_out &p) - : ptr_ (ACE_const_cast (PolicyValueSeq_out&, p).ptr_) -{} - -ACE_INLINE -::Messaging::PolicyValueSeq_out & -Messaging::PolicyValueSeq_out::operator= (const ::Messaging::PolicyValueSeq_out &p) -{ - this->ptr_ = ACE_const_cast (PolicyValueSeq_out&, p).ptr_; - return *this; -} - -ACE_INLINE -::Messaging::PolicyValueSeq_out & -Messaging::PolicyValueSeq_out::operator= (PolicyValueSeq *p) -{ - this->ptr_ = p; - return *this; -} - -ACE_INLINE -Messaging::PolicyValueSeq_out::operator ::Messaging::PolicyValueSeq *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE -::Messaging::PolicyValueSeq *& -Messaging::PolicyValueSeq_out::ptr (void) // ptr -{ - return this->ptr_; -} - -ACE_INLINE -::Messaging::PolicyValueSeq * -Messaging::PolicyValueSeq_out::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -Messaging::PolicyValue & -Messaging::PolicyValueSeq_out::operator[] (CORBA::ULong index) -{ - return this->ptr_->operator[] (index); -} - -#endif /* end #if !defined */ - -// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84 #if !defined _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_I_ @@ -708,7 +39,7 @@ CORBA::Boolean TAO_Export operator>> ( #endif /* _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_I_ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71 ACE_INLINE CORBA::Boolean operator<< ( diff --git a/TAO/tao/Messaging_SyncScopeC.h b/TAO/tao/Messaging_SyncScopeC.h index 2b4ed88e016..e6096db4589 100644 --- a/TAO/tao/Messaging_SyncScopeC.h +++ b/TAO/tao/Messaging_SyncScopeC.h @@ -63,7 +63,7 @@ TAO_NAMESPACE Messaging { // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333 typedef CORBA::Short SyncScope; typedef CORBA::Short_out SyncScope_out; @@ -76,22 +76,22 @@ TAO_NAMESPACE Messaging // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::Short SYNC_NONE = 0; + const Messaging::SyncScope SYNC_NONE = 0; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::Short SYNC_WITH_TRANSPORT = 1; + const Messaging::SyncScope SYNC_WITH_TRANSPORT = 1; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::Short SYNC_WITH_SERVER = 2; + const Messaging::SyncScope SYNC_WITH_SERVER = 2; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::Short SYNC_WITH_TARGET = 3; + const Messaging::SyncScope SYNC_WITH_TARGET = 3; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67 @@ -110,7 +110,7 @@ TAO_NAMESPACE_CLOSE // module Messaging #endif /* __ACE_INLINE__ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018 #if defined (__ACE_INLINE__) #include "Messaging_SyncScopeC.i" diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h index 93285683985..8cd8a781d7a 100644 --- a/TAO/tao/ORB.h +++ b/TAO/tao/ORB.h @@ -67,8 +67,6 @@ namespace CORBA class ValueMemberSeq; class ORB_ObjectIdList; - class ORB_ObjectIdList_var; - class ORB_ObjectIdList_out; class ORB; typedef TAO_Pseudo_Var_T<ORB> ORB_var; diff --git a/TAO/tao/ObjectIdListC.cpp b/TAO/tao/ObjectIdListC.cpp index cac871e2420..3d16bda541f 100644 --- a/TAO/tao/ObjectIdListC.cpp +++ b/TAO/tao/ObjectIdListC.cpp @@ -25,15 +25,6 @@ #include "ObjectIdListC.h" #include "tao/Stub.h" -#include "tao/Invocation.h" -#include "tao/PortableInterceptor.h" - -#if TAO_HAS_INTERCEPTORS == 1 -#include "tao/RequestInfo_Util.h" -#include "tao/ClientRequestInfo_i.h" -#include "tao/ClientInterceptorAdapter.h" -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig @@ -55,14 +46,15 @@ static const CORBA::Long _oc_CORBA_ORB_ObjectId[] = ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4f52), - ACE_NTOHL (0x422f4f62), + ACE_NTOHL (0x425f4f62), ACE_NTOHL (0x6a656374), ACE_NTOHL (0x49643a31), - ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/ORB/ObjectId:1.0 - 9, + ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/ORB_ObjectId:1.0 + 13, + ACE_NTOHL (0x4f52425f), ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63744964), - ACE_NTOHL (0x0), // name = ObjectId + ACE_NTOHL (0x0), // name = ORB_ObjectId CORBA::tk_string, 0U, // string length }; @@ -84,29 +76,15 @@ TAO_NAMESPACE_DEFINE ( ) TAO_NAMESPACE_END -#if !defined (_CORBA_ORB_OBJECTIDLIST_CS_) -#define _CORBA_ORB_OBJECTIDLIST_CS_ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:249 - -// ************************************************************* -// CORBA::ORB_ObjectIdList -// ************************************************************* +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50 CORBA::ORB_ObjectIdList::ORB_ObjectIdList (void) {} CORBA::ORB_ObjectIdList::ORB_ObjectIdList (CORBA::ULong max) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -TAO_Unbounded_String_Sequence -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_String_Sequence - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max) + : TAO_Unbounded_String_Sequence + (max) {} CORBA::ORB_ObjectIdList::ORB_ObjectIdList ( @@ -115,35 +93,51 @@ CORBA::ORB_ObjectIdList::ORB_ObjectIdList ( char * *buffer, CORBA::Boolean release ) - : + : TAO_Unbounded_String_Sequence + (max, length, buffer, release) +{} -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -TAO_Unbounded_String_Sequence -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_String_Sequence +CORBA::ORB_ObjectIdList::ORB_ObjectIdList (const ORB_ObjectIdList &seq) + : TAO_Unbounded_String_Sequence + (seq) +{} -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max, length, buffer, release) +CORBA::ORB_ObjectIdList::~ORB_ObjectIdList (void) {} -CORBA::ORB_ObjectIdList::ORB_ObjectIdList (const ORB_ObjectIdList &seq) - : -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -TAO_Unbounded_String_Sequence -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_String_Sequence -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (seq) -{} +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -CORBA::ORB_ObjectIdList::~ORB_ObjectIdList (void) // dtor -{} +template class + TAO_MngSeq_Var_T< + CORBA::ORB_ObjectIdList, + TAO_SeqElem_String_Manager + >; + +template class + TAO_Seq_Out_T< + CORBA::ORB_ObjectIdList, + CORBA::ORB_ObjectIdList_var, + TAO_SeqElem_String_Manager + >; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +# pragma instantiate \ + TAO_MngSeq_Var_T< \ + CORBA::ORB_ObjectIdList, \ + TAO_SeqElem_String_Manager \ + > -#endif /* end #if !defined */ +# pragma instantiate \ + TAO_Seq_Out_T< \ + CORBA::ORB_ObjectIdList, \ + CORBA::ORB_ObjectIdList_var, \ + TAO_SeqElem_String_Manager \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -157,21 +151,22 @@ static const CORBA::Long _oc_CORBA_ORB_ObjectIdList[] = ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4f52), - ACE_NTOHL (0x422f4f62), + ACE_NTOHL (0x425f4f62), ACE_NTOHL (0x6a656374), ACE_NTOHL (0x49644c69), ACE_NTOHL (0x73743a31), - ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/ORB/ObjectIdList:1.0 - 13, + ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/ORB_ObjectIdList:1.0 + 17, + ACE_NTOHL (0x4f52425f), ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63744964), ACE_NTOHL (0x4c697374), - ACE_NTOHL (0x0), // name = ObjectIdList + ACE_NTOHL (0x0), // name = ORB_ObjectIdList CORBA::tk_sequence, // typecode kind - 84, // encapsulation length + 88, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order CORBA::tk_alias, // typecode kind for typedefs - 68, // encapsulation length + 72, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 35, ACE_NTOHL (0x49444c3a), @@ -179,14 +174,15 @@ static const CORBA::Long _oc_CORBA_ORB_ObjectIdList[] = ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4f52), - ACE_NTOHL (0x422f4f62), + ACE_NTOHL (0x425f4f62), ACE_NTOHL (0x6a656374), ACE_NTOHL (0x49643a31), - ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/ORB/ObjectId:1.0 - 9, + ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/ORB_ObjectId:1.0 + 13, + ACE_NTOHL (0x4f52425f), ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63744964), - ACE_NTOHL (0x0), // name = ObjectId + ACE_NTOHL (0x0), // name = ORB_ObjectId CORBA::tk_string, 0U, // string length @@ -212,7 +208,7 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93 CORBA::Boolean operator<< ( TAO_OutputCDR &strm, diff --git a/TAO/tao/ObjectIdListC.h b/TAO/tao/ObjectIdListC.h index 1cee475691d..c9e78ccdea6 100644 --- a/TAO/tao/ObjectIdListC.h +++ b/TAO/tao/ObjectIdListC.h @@ -26,13 +26,13 @@ #define _TAO_IDL_ORIG_OBJECTIDLISTC_H_ #include "ace/pre.h" -#include "tao/corbafwd.h" +#include "tao/Sequence.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Sequence.h" +#include "tao/Seq_VarOut_T.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -74,38 +74,37 @@ TAO_NAMESPACE CORBA // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ORB_ObjectId; - -#if !defined (_CORBA_ORB_OBJECTIDLIST_CH_) -#define _CORBA_ORB_OBJECTIDLIST_CH_ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75 class ORB_ObjectIdList; - class ORB_ObjectIdList_var; - - // ************************************************************* - // CORBA::ORB_ObjectIdList - // ************************************************************* - class TAO_Export ORB_ObjectIdList : public - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - TAO_Unbounded_String_Sequence -#else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_String_Sequence - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + typedef + TAO_MngSeq_Var_T< + ORB_ObjectIdList, + TAO_SeqElem_String_Manager + > + ORB_ObjectIdList_var; + + typedef + TAO_Seq_Out_T< + ORB_ObjectIdList, + ORB_ObjectIdList_var, + TAO_SeqElem_String_Manager + > + ORB_ObjectIdList_out; + + class TAO_Export ORB_ObjectIdList + : public + TAO_Unbounded_String_Sequence { public: ORB_ObjectIdList (void); ORB_ObjectIdList (CORBA::ULong max); ORB_ObjectIdList ( - CORBA::ULong max, - CORBA::ULong length, + CORBA::ULong max, + CORBA::ULong length, char * *buffer, CORBA::Boolean release = 0 ); @@ -114,80 +113,6 @@ TAO_NAMESPACE CORBA typedef ORB_ObjectIdList_var _var_type; }; - -#endif /* end #if !defined */ - -#if !defined (_CORBA_ORB_OBJECTIDLIST___VAR_CH_) -#define _CORBA_ORB_OBJECTIDLIST___VAR_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549 - - // ************************************************************* - // class CORBA::ORB_ObjectIdList_var - // ************************************************************* - - class TAO_Export ORB_ObjectIdList_var - { - public: - ORB_ObjectIdList_var (void); - ORB_ObjectIdList_var (ORB_ObjectIdList *); - ORB_ObjectIdList_var (const ORB_ObjectIdList_var &); - ~ORB_ObjectIdList_var (void); - - ORB_ObjectIdList_var &operator= (ORB_ObjectIdList *); - ORB_ObjectIdList_var &operator= (const ORB_ObjectIdList_var &); - ORB_ObjectIdList *operator-> (void); - const ORB_ObjectIdList *operator-> (void) const; - - operator const ORB_ObjectIdList &() const; - operator ORB_ObjectIdList &(); - operator ORB_ObjectIdList &() const; - - // Variable-size base types only. - operator ORB_ObjectIdList *&(); - - TAO_SeqElem_String_Manager operator[] (CORBA::ULong index); - - // in, inout, out, _retn - const ORB_ObjectIdList &in (void) const; - ORB_ObjectIdList &inout (void); - ORB_ObjectIdList *&out (void); - ORB_ObjectIdList *_retn (void); - ORB_ObjectIdList *ptr (void) const; - - private: - ORB_ObjectIdList *ptr_; - }; - -#endif /* end #if !defined */ - -#if !defined (_CORBA_ORB_OBJECTIDLIST___OUT_CH_) -#define _CORBA_ORB_OBJECTIDLIST___OUT_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753 - - class TAO_Export ORB_ObjectIdList_out - { - public: - ORB_ObjectIdList_out (ORB_ObjectIdList *&); - ORB_ObjectIdList_out (ORB_ObjectIdList_var &); - ORB_ObjectIdList_out (const ORB_ObjectIdList_out &); - ORB_ObjectIdList_out &operator= (const ORB_ObjectIdList_out &); - ORB_ObjectIdList_out &operator= (ORB_ObjectIdList *); - operator ORB_ObjectIdList *&(); - ORB_ObjectIdList *&ptr (void); - ORB_ObjectIdList *operator-> (void); - TAO_SeqElem_String_Manager operator[] (CORBA::ULong index); - - private: - ORB_ObjectIdList *&ptr_; - // Assignment from T_var not allowed. - void operator= (const ORB_ObjectIdList_var &); - }; - -#endif /* end #if !defined */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 diff --git a/TAO/tao/ObjectIdListC.i b/TAO/tao/ObjectIdListC.i index 79872ac40be..21c96338279 100644 --- a/TAO/tao/ObjectIdListC.i +++ b/TAO/tao/ObjectIdListC.i @@ -20,244 +20,6 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html -#if !defined (_CORBA_ORB_OBJECTIDLIST_CI_) -#define _CORBA_ORB_OBJECTIDLIST_CI_ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226 - -// ************************************************************* -// Inline operations for class CORBA::ORB_ObjectIdList_var -// ************************************************************* - -ACE_INLINE -CORBA::ORB_ObjectIdList_var::ORB_ObjectIdList_var (void) - : ptr_ (0) -{} - -ACE_INLINE -CORBA::ORB_ObjectIdList_var::ORB_ObjectIdList_var (ORB_ObjectIdList *p) - : ptr_ (p) -{} - -ACE_INLINE -CORBA::ORB_ObjectIdList_var::ORB_ObjectIdList_var (const ::CORBA::ORB_ObjectIdList_var &p) -{ - if (p.ptr_) - { - ACE_NEW (this->ptr_, ::CORBA::ORB_ObjectIdList (*p.ptr_)); - } - else - { - this->ptr_ = 0; - } -} - -ACE_INLINE -CORBA::ORB_ObjectIdList_var::~ORB_ObjectIdList_var (void) -{ - delete this->ptr_; -} - -ACE_INLINE -CORBA::ORB_ObjectIdList_var & -CORBA::ORB_ObjectIdList_var::operator= (ORB_ObjectIdList *p) -{ - delete this->ptr_; - this->ptr_ = p; - return *this; -} - -ACE_INLINE -::CORBA::ORB_ObjectIdList_var & -CORBA::ORB_ObjectIdList_var::operator= (const ::CORBA::ORB_ObjectIdList_var &p) -{ - if (this != &p) - { - if (p.ptr_ == 0) - { - delete this->ptr_; - this->ptr_ = 0; - } - else - { - ORB_ObjectIdList *deep_copy = 0; - ACE_NEW_RETURN ( - deep_copy, - ORB_ObjectIdList (*p.ptr_), - *this - ); - - if (deep_copy != 0) - { - ORB_ObjectIdList *tmp = deep_copy; - deep_copy = this->ptr_; - this->ptr_ = tmp; - delete deep_copy; - } - } - } - - return *this; -} - -ACE_INLINE -const ::CORBA::ORB_ObjectIdList * -CORBA::ORB_ObjectIdList_var::operator-> (void) const -{ - return this->ptr_; -} - -ACE_INLINE -::CORBA::ORB_ObjectIdList * -CORBA::ORB_ObjectIdList_var::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -CORBA::ORB_ObjectIdList_var::operator const ::CORBA::ORB_ObjectIdList &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE -CORBA::ORB_ObjectIdList_var::operator ::CORBA::ORB_ObjectIdList &() // cast -{ - return *this->ptr_; -} - -ACE_INLINE -CORBA::ORB_ObjectIdList_var::operator ::CORBA::ORB_ObjectIdList &() const // cast -{ - return *this->ptr_; -} - -// Variable-size types only. -ACE_INLINE -CORBA::ORB_ObjectIdList_var::operator ::CORBA::ORB_ObjectIdList *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE -TAO_SeqElem_String_Manager -CORBA::ORB_ObjectIdList_var::operator[] (CORBA::ULong index) -{ - return this->ptr_->operator[] (index); -} - -ACE_INLINE -const ::CORBA::ORB_ObjectIdList & -CORBA::ORB_ObjectIdList_var::in (void) const -{ - return *this->ptr_; -} - -ACE_INLINE -::CORBA::ORB_ObjectIdList & -CORBA::ORB_ObjectIdList_var::inout (void) -{ - return *this->ptr_; -} - -ACE_INLINE -::CORBA::ORB_ObjectIdList *& -CORBA::ORB_ObjectIdList_var::out (void) -{ - delete this->ptr_; - this->ptr_ = 0; - return this->ptr_; -} - -ACE_INLINE -::CORBA::ORB_ObjectIdList * -CORBA::ORB_ObjectIdList_var::_retn (void) -{ - ::CORBA::ORB_ObjectIdList *tmp = this->ptr_; - this->ptr_ = 0; - return tmp; -} - -ACE_INLINE -::CORBA::ORB_ObjectIdList * -CORBA::ORB_ObjectIdList_var::ptr (void) const -{ - return this->ptr_; -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:566 - -// ************************************************************* -// Inline operations for class CORBA::ORB_ObjectIdList_out -// ************************************************************* - -ACE_INLINE -CORBA::ORB_ObjectIdList_out::ORB_ObjectIdList_out (ORB_ObjectIdList *&p) - : ptr_ (p) -{ - this->ptr_ = 0; -} - -ACE_INLINE -CORBA::ORB_ObjectIdList_out::ORB_ObjectIdList_out (ORB_ObjectIdList_var &p) - : ptr_ (p.out ()) -{ - delete this->ptr_; - this->ptr_ = 0; -} - -ACE_INLINE -CORBA::ORB_ObjectIdList_out::ORB_ObjectIdList_out (const ::CORBA::ORB_ObjectIdList_out &p) - : ptr_ (ACE_const_cast (ORB_ObjectIdList_out&, p).ptr_) -{} - -ACE_INLINE -::CORBA::ORB_ObjectIdList_out & -CORBA::ORB_ObjectIdList_out::operator= (const ::CORBA::ORB_ObjectIdList_out &p) -{ - this->ptr_ = ACE_const_cast (ORB_ObjectIdList_out&, p).ptr_; - return *this; -} - -ACE_INLINE -::CORBA::ORB_ObjectIdList_out & -CORBA::ORB_ObjectIdList_out::operator= (ORB_ObjectIdList *p) -{ - this->ptr_ = p; - return *this; -} - -ACE_INLINE -CORBA::ORB_ObjectIdList_out::operator ::CORBA::ORB_ObjectIdList *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE -::CORBA::ORB_ObjectIdList *& -CORBA::ORB_ObjectIdList_out::ptr (void) // ptr -{ - return this->ptr_; -} - -ACE_INLINE -::CORBA::ORB_ObjectIdList * -CORBA::ORB_ObjectIdList_out::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -TAO_SeqElem_String_Manager -CORBA::ORB_ObjectIdList_out::operator[] (CORBA::ULong index) -{ - return this->ptr_->operator[] (index); -} - -#endif /* end #if !defined */ - // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84 diff --git a/TAO/tao/ObjectReferenceTemplateC.cpp b/TAO/tao/ObjectReferenceTemplateC.cpp index 17aa848aaeb..ed13279a059 100644 --- a/TAO/tao/ObjectReferenceTemplateC.cpp +++ b/TAO/tao/ObjectReferenceTemplateC.cpp @@ -25,16 +25,8 @@ #include "ObjectReferenceTemplateC.h" #include "tao/Stub.h" -#include "tao/Invocation.h" -#include "tao/PortableInterceptor.h" #include "tao/ValueFactory.h" -#if TAO_HAS_INTERCEPTORS == 1 -#include "tao/RequestInfo_Util.h" -#include "tao/ClientRequestInfo_i.h" -#include "tao/ClientInterceptorAdapter.h" -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ @@ -314,211 +306,47 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:95 - -void -tao_PortableInterceptor_ObjectReferenceFactory_add_ref ( - PortableInterceptor::ObjectReferenceFactory *p - ) -{ - CORBA::add_ref (p); -} - -void -tao_PortableInterceptor_ObjectReferenceFactory_remove_ref ( - PortableInterceptor::ObjectReferenceFactory *p - ) -{ - CORBA::remove_ref (p); -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:298 - -// ************************************************************* -// Operations for class PortableInterceptor::ObjectReferenceFactory_var -// ************************************************************* - -PortableInterceptor::ObjectReferenceFactory_var::ObjectReferenceFactory_var (void) - : ptr_ (0) -{} - -PortableInterceptor::ObjectReferenceFactory_var::ObjectReferenceFactory_var (ObjectReferenceFactory* p) - : ptr_ (p) -{} - -PortableInterceptor::ObjectReferenceFactory_var::ObjectReferenceFactory_var (const ObjectReferenceFactory* p) - : ptr_ (ACE_const_cast (ObjectReferenceFactory *, p)) -{} - -PortableInterceptor::ObjectReferenceFactory * -PortableInterceptor::ObjectReferenceFactory_var::ptr (void) const -{ - return this->ptr_; -} - -PortableInterceptor::ObjectReferenceFactory_var::ObjectReferenceFactory_var (const ObjectReferenceFactory_var &p) -{ - CORBA::add_ref (p.ptr ()); - this->ptr_ = p.ptr (); -} - -PortableInterceptor::ObjectReferenceFactory_var::~ObjectReferenceFactory_var (void) // destructor -{ - CORBA::remove_ref (this->ptr_); -} - -PortableInterceptor::ObjectReferenceFactory_var & -PortableInterceptor::ObjectReferenceFactory_var::operator= (ObjectReferenceFactory *p) -{ - CORBA::remove_ref (this->ptr_); - this->ptr_ = p; - return *this; -} - -PortableInterceptor::ObjectReferenceFactory_var & -PortableInterceptor::ObjectReferenceFactory_var::operator= (const ObjectReferenceFactory_var &p) -{ - if (this != &p) - { - CORBA::remove_ref (this->ptr_); - ObjectReferenceFactory *tmp = p.ptr (); - CORBA::add_ref (tmp); - this->ptr_ = tmp; - } - - return *this; -} - -PortableInterceptor::ObjectReferenceFactory_var::operator const PortableInterceptor::ObjectReferenceFactory* () const // cast -{ - return this->ptr_; -} - -PortableInterceptor::ObjectReferenceFactory_var::operator PortableInterceptor::ObjectReferenceFactory*& () // cast -{ - return this->ptr_; -} - -PortableInterceptor::ObjectReferenceFactory * -PortableInterceptor::ObjectReferenceFactory_var::operator-> (void) const -{ - return this->ptr_; -} - -PortableInterceptor::ObjectReferenceFactory * -PortableInterceptor::ObjectReferenceFactory_var::in (void) const -{ - return this->ptr_; -} - -PortableInterceptor::ObjectReferenceFactory *& -PortableInterceptor::ObjectReferenceFactory_var::inout (void) -{ - return this->ptr_; -} - -PortableInterceptor::ObjectReferenceFactory *& -PortableInterceptor::ObjectReferenceFactory_var::out (void) -{ - CORBA::remove_ref (this->ptr_); - this->ptr_ = 0; - return this->ptr_; -} - -PortableInterceptor::ObjectReferenceFactory * -PortableInterceptor::ObjectReferenceFactory_var::_retn (void) -{ - // yield ownership of managed obj reference - ObjectReferenceFactory* tmp = this->ptr_; - this->ptr_ = 0; - return tmp; -} +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:94 void -PortableInterceptor::ObjectReferenceFactory_var::tao_add_ref ( - ObjectReferenceFactory *p +PortableInterceptor::tao_ObjectReferenceFactory_life::tao_add_ref ( + PortableInterceptor::ObjectReferenceFactory * p ) { CORBA::add_ref (p); } void -PortableInterceptor::ObjectReferenceFactory_var::tao_remove_ref ( - ObjectReferenceFactory *p +PortableInterceptor::tao_ObjectReferenceFactory_life::tao_remove_ref ( + PortableInterceptor::ObjectReferenceFactory * p ) { CORBA::remove_ref (p); } -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:568 - -// ************************************************************* -// Operations for class PortableInterceptor::ObjectReferenceFactory_out -// ************************************************************* - -PortableInterceptor::ObjectReferenceFactory_out::ObjectReferenceFactory_out (ObjectReferenceFactory *&p) - : ptr_ (p) -{ - this->ptr_ = 0; -} - -PortableInterceptor::ObjectReferenceFactory_out::ObjectReferenceFactory_out (ObjectReferenceFactory_var &p) - : ptr_ (p.out ()) -{ - CORBA::remove_ref (this->ptr_); - this->ptr_ = 0; -} - -PortableInterceptor::ObjectReferenceFactory_out::ObjectReferenceFactory_out (const ObjectReferenceFactory_out &p) - : ptr_ (ACE_const_cast (ObjectReferenceFactory_out&, p).ptr_) -{} - -PortableInterceptor::ObjectReferenceFactory_out & -PortableInterceptor::ObjectReferenceFactory_out::operator= (const ObjectReferenceFactory_out &p) -{ - this->ptr_ = ACE_const_cast (ObjectReferenceFactory_out&, p).ptr_; - return *this; -} - -PortableInterceptor::ObjectReferenceFactory_out & -PortableInterceptor::ObjectReferenceFactory_out::operator= (const ObjectReferenceFactory_var &p) -{ - ObjectReferenceFactory *tmp = p.ptr (); - CORBA::add_ref (tmp); - this->ptr_ = tmp; - return *this; -} - -PortableInterceptor::ObjectReferenceFactory_out & -PortableInterceptor::ObjectReferenceFactory_out::operator= (ObjectReferenceFactory *p) -{ - this->ptr_ = p; - return *this; -} - -PortableInterceptor::ObjectReferenceFactory_out::operator PortableInterceptor::ObjectReferenceFactory*& () // cast -{ - return this->ptr_; -} - -PortableInterceptor::ObjectReferenceFactory *& -PortableInterceptor::ObjectReferenceFactory_out::ptr (void) // ptr -{ - return this->ptr_; -} - -PortableInterceptor::ObjectReferenceFactory * -PortableInterceptor::ObjectReferenceFactory_out::operator-> (void) -{ - return this->ptr_; -} - -// ************************************************************* - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:138 +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + template class + TAO_Value_Var_T< + PortableInterceptor::ObjectReferenceFactory, + PortableInterceptor::tao_ObjectReferenceFactory_life + >; + template class + TAO_Value_Out_T< + PortableInterceptor::ObjectReferenceFactory, + PortableInterceptor::tao_ObjectReferenceFactory_life + >; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +# pragma instantiate \ + TAO_Value_Var_T< \ + PortableInterceptor::ObjectReferenceFactory, \ + PortableInterceptor::tao_ObjectReferenceFactory_life \ + > +# pragma instantiate \ + TAO_Value_Out_T< \ + PortableInterceptor::ObjectReferenceFactory, \ + PortableInterceptor::tao_ObjectReferenceFactory_life \ + > +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ PortableInterceptor::ObjectReferenceFactory * PortableInterceptor::ObjectReferenceFactory::_downcast (CORBA::ValueBase *v) @@ -669,211 +497,47 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:95 - -void -PortableInterceptor::ObjectReferenceTemplate_life::tao_add_ref ( - PortableInterceptor::ObjectReferenceTemplate *p - ) -{ - CORBA::add_ref (p); -} - -void -PortableInterceptor::ObjectReferenceTemplate_life::tao_remove_ref ( - PortableInterceptor::ObjectReferenceTemplate *p - ) -{ - CORBA::remove_ref (p); -} -#if 0 -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:298 - -// ************************************************************* -// Operations for class PortableInterceptor::ObjectReferenceTemplate_var -// ************************************************************* - -PortableInterceptor::ObjectReferenceTemplate_var::ObjectReferenceTemplate_var (void) - : ptr_ (0) -{} - -PortableInterceptor::ObjectReferenceTemplate_var::ObjectReferenceTemplate_var (ObjectReferenceTemplate* p) - : ptr_ (p) -{} - -PortableInterceptor::ObjectReferenceTemplate_var::ObjectReferenceTemplate_var (const ObjectReferenceTemplate* p) - : ptr_ (ACE_const_cast (ObjectReferenceTemplate *, p)) -{} - -PortableInterceptor::ObjectReferenceTemplate * -PortableInterceptor::ObjectReferenceTemplate_var::ptr (void) const -{ - return this->ptr_; -} - -PortableInterceptor::ObjectReferenceTemplate_var::ObjectReferenceTemplate_var (const ObjectReferenceTemplate_var &p) -{ - CORBA::add_ref (p.ptr ()); - this->ptr_ = p.ptr (); -} - -PortableInterceptor::ObjectReferenceTemplate_var::~ObjectReferenceTemplate_var (void) // destructor -{ - CORBA::remove_ref (this->ptr_); -} - -PortableInterceptor::ObjectReferenceTemplate_var & -PortableInterceptor::ObjectReferenceTemplate_var::operator= (ObjectReferenceTemplate *p) -{ - CORBA::remove_ref (this->ptr_); - this->ptr_ = p; - return *this; -} - -PortableInterceptor::ObjectReferenceTemplate_var & -PortableInterceptor::ObjectReferenceTemplate_var::operator= (const ObjectReferenceTemplate_var &p) -{ - if (this != &p) - { - CORBA::remove_ref (this->ptr_); - ObjectReferenceTemplate *tmp = p.ptr (); - CORBA::add_ref (tmp); - this->ptr_ = tmp; - } - - return *this; -} - -PortableInterceptor::ObjectReferenceTemplate_var::operator const PortableInterceptor::ObjectReferenceTemplate* () const // cast -{ - return this->ptr_; -} - -PortableInterceptor::ObjectReferenceTemplate_var::operator PortableInterceptor::ObjectReferenceTemplate*& () // cast -{ - return this->ptr_; -} - -PortableInterceptor::ObjectReferenceTemplate * -PortableInterceptor::ObjectReferenceTemplate_var::operator-> (void) const -{ - return this->ptr_; -} - -PortableInterceptor::ObjectReferenceTemplate * -PortableInterceptor::ObjectReferenceTemplate_var::in (void) const -{ - return this->ptr_; -} - -PortableInterceptor::ObjectReferenceTemplate *& -PortableInterceptor::ObjectReferenceTemplate_var::inout (void) -{ - return this->ptr_; -} - -PortableInterceptor::ObjectReferenceTemplate *& -PortableInterceptor::ObjectReferenceTemplate_var::out (void) -{ - CORBA::remove_ref (this->ptr_); - this->ptr_ = 0; - return this->ptr_; -} - -PortableInterceptor::ObjectReferenceTemplate * -PortableInterceptor::ObjectReferenceTemplate_var::_retn (void) -{ - // yield ownership of managed obj reference - ObjectReferenceTemplate* tmp = this->ptr_; - this->ptr_ = 0; - return tmp; -} +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:94 void -PortableInterceptor::ObjectReferenceTemplate_var::tao_add_ref ( - ObjectReferenceTemplate *p +PortableInterceptor::tao_ObjectReferenceTemplate_life::tao_add_ref ( + PortableInterceptor::ObjectReferenceTemplate * p ) { CORBA::add_ref (p); } void -PortableInterceptor::ObjectReferenceTemplate_var::tao_remove_ref ( - ObjectReferenceTemplate *p +PortableInterceptor::tao_ObjectReferenceTemplate_life::tao_remove_ref ( + PortableInterceptor::ObjectReferenceTemplate * p ) { CORBA::remove_ref (p); } -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:568 - -// ************************************************************* -// Operations for class PortableInterceptor::ObjectReferenceTemplate_out -// ************************************************************* - -PortableInterceptor::ObjectReferenceTemplate_out::ObjectReferenceTemplate_out (ObjectReferenceTemplate *&p) - : ptr_ (p) -{ - this->ptr_ = 0; -} - -PortableInterceptor::ObjectReferenceTemplate_out::ObjectReferenceTemplate_out (ObjectReferenceTemplate_var &p) - : ptr_ (p.out ()) -{ - CORBA::remove_ref (this->ptr_); - this->ptr_ = 0; -} - -PortableInterceptor::ObjectReferenceTemplate_out::ObjectReferenceTemplate_out (const ObjectReferenceTemplate_out &p) - : ptr_ (ACE_const_cast (ObjectReferenceTemplate_out&, p).ptr_) -{} - -PortableInterceptor::ObjectReferenceTemplate_out & -PortableInterceptor::ObjectReferenceTemplate_out::operator= (const ObjectReferenceTemplate_out &p) -{ - this->ptr_ = ACE_const_cast (ObjectReferenceTemplate_out&, p).ptr_; - return *this; -} - -PortableInterceptor::ObjectReferenceTemplate_out & -PortableInterceptor::ObjectReferenceTemplate_out::operator= (const ObjectReferenceTemplate_var &p) -{ - ObjectReferenceTemplate *tmp = p.ptr (); - CORBA::add_ref (tmp); - this->ptr_ = tmp; - return *this; -} - -PortableInterceptor::ObjectReferenceTemplate_out & -PortableInterceptor::ObjectReferenceTemplate_out::operator= (ObjectReferenceTemplate *p) -{ - this->ptr_ = p; - return *this; -} - -PortableInterceptor::ObjectReferenceTemplate_out::operator PortableInterceptor::ObjectReferenceTemplate*& () // cast -{ - return this->ptr_; -} - -PortableInterceptor::ObjectReferenceTemplate *& -PortableInterceptor::ObjectReferenceTemplate_out::ptr (void) // ptr -{ - return this->ptr_; -} - -PortableInterceptor::ObjectReferenceTemplate * -PortableInterceptor::ObjectReferenceTemplate_out::operator-> (void) -{ - return this->ptr_; -} - -// ************************************************************* -#endif /* 0 */ -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:138 +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + template class + TAO_Value_Var_T< + PortableInterceptor::ObjectReferenceTemplate, + PortableInterceptor::tao_ObjectReferenceTemplate_life + >; + template class + TAO_Value_Out_T< + PortableInterceptor::ObjectReferenceTemplate, + PortableInterceptor::tao_ObjectReferenceTemplate_life + >; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +# pragma instantiate \ + TAO_Value_Var_T< \ + PortableInterceptor::ObjectReferenceTemplate, \ + PortableInterceptor::tao_ObjectReferenceTemplate_life \ + > +# pragma instantiate \ + TAO_Value_Out_T< \ + PortableInterceptor::ObjectReferenceTemplate, \ + PortableInterceptor::tao_ObjectReferenceTemplate_life \ + > +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ PortableInterceptor::ObjectReferenceTemplate * PortableInterceptor::ObjectReferenceTemplate::_downcast (CORBA::ValueBase *v) @@ -979,146 +643,46 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceTemplate::_tao_unmarshal ( new_object = ObjectReferenceTemplate::_downcast (base); return retval; } -#if 0 -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:103 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_VALUETYPE_SEQUENCE_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CS_) -#define __TAO_UNBOUNDED_VALUETYPE_SEQUENCE_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CS_ - -// The Base_Sequence functions, please see tao/Sequence.h -void -PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::_allocate_buffer (CORBA::ULong length) -{ - PortableInterceptor::ObjectReferenceTemplate **tmp = 0; - tmp = _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::allocbuf (length); - - if (this->buffer_ != 0) - { - PortableInterceptor::ObjectReferenceTemplate **old = ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate**, this->buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - if (!this->release_) - { - CORBA::add_ref (old[i]); - tmp[i] = old[i]; - } - else - { - tmp[i] = old[i]; - } - } - - if (this->release_) - { - delete [] old; - } - } - - this->buffer_ = tmp; -} - -void -PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::_deallocate_buffer (void) -{ - if (this->buffer_ == 0 || this->release_ == 0) - { - return; - } - - PortableInterceptor::ObjectReferenceTemplate **tmp = ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate**, this->buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - CORBA::remove_ref (tmp[i]); - tmp[i] = 0; - } - - _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::freebuf (tmp); - this->buffer_ = 0; -} -PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::~_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (void) -{ - this->_deallocate_buffer (); -} - -void -PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol) -{ - PortableInterceptor::ObjectReferenceTemplate **tmp = ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate**, this->buffer_); - - for (CORBA::ULong i = nl; i < ol; ++i) - { - CORBA::remove_ref (tmp[i]); - tmp[i] = 0; - } -} - - - -#endif /* end #if !defined */ - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CS_) -#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CS_ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250 - -// ************************************************************* -// PortableInterceptor::ObjectReferenceTemplateSeq -// ************************************************************* +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50 PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (void) {} PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (CORBA::ULong max) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Valuetype_Sequence<PortableInterceptor::ObjectReferenceTemplate,PortableInterceptor::ObjectReferenceTemplate_var> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max) + : TAO_Unbounded_Valuetype_Sequence< + PortableInterceptor::ObjectReferenceTemplate, + PortableInterceptor::ObjectReferenceTemplate_var, + PortableInterceptor::tao_ObjectReferenceTemplate_life + > + (max) {} PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq ( CORBA::ULong max, CORBA::ULong length, - PortableInterceptor::ObjectReferenceTemplate_ptr *buffer, + PortableInterceptor::ObjectReferenceTemplate ** buffer, CORBA::Boolean release ) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Valuetype_Sequence<PortableInterceptor::ObjectReferenceTemplate,PortableInterceptor::ObjectReferenceTemplate_var> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max, length, buffer, release) + : TAO_Unbounded_Valuetype_Sequence< + PortableInterceptor::ObjectReferenceTemplate, + PortableInterceptor::ObjectReferenceTemplate_var, + PortableInterceptor::tao_ObjectReferenceTemplate_life + > + (max, length, buffer, release) {} PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (const ObjectReferenceTemplateSeq &seq) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Valuetype_Sequence<PortableInterceptor::ObjectReferenceTemplate,PortableInterceptor::ObjectReferenceTemplate_var> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (seq) + : TAO_Unbounded_Valuetype_Sequence< + PortableInterceptor::ObjectReferenceTemplate, + PortableInterceptor::ObjectReferenceTemplate_var, + PortableInterceptor::tao_ObjectReferenceTemplate_life + > + (seq) {} -PortableInterceptor::ObjectReferenceTemplateSeq::~ObjectReferenceTemplateSeq (void) // dtor +PortableInterceptor::ObjectReferenceTemplateSeq::~ObjectReferenceTemplateSeq (void) {} void PortableInterceptor::ObjectReferenceTemplateSeq::_tao_any_destructor (void *_tao_void_pointer) @@ -1127,8 +691,54 @@ void PortableInterceptor::ObjectReferenceTemplateSeq::_tao_any_destructor (void delete tmp; } -#endif /* end #if !defined */ -#endif /* 0 */ +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + +template class + TAO_MngSeq_Var_T< + PortableInterceptor::ObjectReferenceTemplateSeq, + TAO_Valuetype_Manager< + PortableInterceptor::ObjectReferenceTemplate, + PortableInterceptor::ObjectReferenceTemplate_var, + PortableInterceptor::tao_ObjectReferenceTemplate_life + > + >; + +template class + TAO_Seq_Out_T< + PortableInterceptor::ObjectReferenceTemplateSeq, + PortableInterceptor::ObjectReferenceTemplateSeq_var, + TAO_Valuetype_Manager< + PortableInterceptor::ObjectReferenceTemplate, + PortableInterceptor::ObjectReferenceTemplate_var, + PortableInterceptor::tao_ObjectReferenceTemplate_life + > + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# pragma instantiate \ + TAO_MngSeq_Var_T< \ + PortableInterceptor::ObjectReferenceTemplateSeq, \ + TAO_Valuetype_Manager< \ + PortableInterceptor::ObjectReferenceTemplate, \ + PortableInterceptor::ObjectReferenceTemplate_var, \ + PortableInterceptor::tao_ObjectReferenceTemplate_life \ + > \ + > + +# pragma instantiate \ + TAO_Seq_Out_T< \ + PortableInterceptor::ObjectReferenceTemplateSeq, \ + PortableInterceptor::ObjectReferenceTemplateSeq_var, \ + TAO_Valuetype_Manager< \ + PortableInterceptor::ObjectReferenceTemplate, \ + PortableInterceptor::ObjectReferenceTemplate_var, \ + PortableInterceptor::tao_ObjectReferenceTemplate_life \ + > \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -1495,8 +1105,15 @@ CORBA::Boolean operator>>= ( ); } +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ + defined (ACE_HAS_GNU_REPO) + template class TAO::Any_Dual_Impl_T<PortableInterceptor::ObjectReferenceTemplateSeq>; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +# pragma instantiate TAO::Any_Dual_Impl_T<PortableInterceptor::ObjectReferenceTemplateSeq> +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:740 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:270 void CORBA::add_ref (PortableInterceptor::ObjectReferenceFactory * vt) @@ -1548,7 +1165,7 @@ operator>> ( // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:740 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:270 void CORBA::add_ref (PortableInterceptor::ObjectReferenceTemplate * vt) @@ -1600,7 +1217,7 @@ operator>> ( // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93 CORBA::Boolean operator<< ( TAO_OutputCDR &strm, diff --git a/TAO/tao/ObjectReferenceTemplateC.h b/TAO/tao/ObjectReferenceTemplateC.h index f2618436a8e..34bb72cb2fd 100644 --- a/TAO/tao/ObjectReferenceTemplateC.h +++ b/TAO/tao/ObjectReferenceTemplateC.h @@ -26,17 +26,14 @@ #define _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATEC_H_ #include "ace/pre.h" -#include "tao/corbafwd.h" +#include "OctetSeqC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/TAO_Export.h" -#include "OctetSeqC.h" #include "StringSeqC.h" #include "ValueBase.h" -#include "Exception.h" #include "Value_VarOut_T.h" #include "Seq_VarOut_T.h" @@ -70,7 +67,7 @@ TAO_NAMESPACE PortableInterceptor { // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:368 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:367 typedef char * ServerId; typedef CORBA::String_var ServerId_var; @@ -82,7 +79,7 @@ TAO_NAMESPACE PortableInterceptor TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerId; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:368 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:367 typedef char * ORBId; typedef CORBA::String_var ORBId_var; @@ -94,7 +91,7 @@ TAO_NAMESPACE PortableInterceptor TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ORBId; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:427 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:426 typedef CORBA::StringSeq AdapterName; typedef CORBA::StringSeq_var AdapterName_var; @@ -106,7 +103,7 @@ TAO_NAMESPACE PortableInterceptor TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterName; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:427 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:426 typedef CORBA::OctetSeq ObjectId; typedef CORBA::OctetSeq_var ObjectId_var; @@ -118,83 +115,21 @@ TAO_NAMESPACE PortableInterceptor TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectId; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:52 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:307 class ObjectReferenceFactory; - -#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY___PTR_CH_) -#define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY___PTR_CH_ - - typedef ObjectReferenceFactory *ObjectReferenceFactory_ptr; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY___VAR_CH_) -#define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY___VAR_CH_ + struct tao_ObjectReferenceFactory_life; + typedef TAO_Value_Var_T<ObjectReferenceFactory, tao_ObjectReferenceFactory_life> ObjectReferenceFactory_var; + typedef TAO_Value_Out_T<ObjectReferenceFactory, tao_ObjectReferenceFactory_life> ObjectReferenceFactory_out; - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:181 - - class TAO_Export ObjectReferenceFactory_var + struct tao_ObjectReferenceFactory_life { - public: - ObjectReferenceFactory_var (void); - ObjectReferenceFactory_var (ObjectReferenceFactory*); - ObjectReferenceFactory_var (const ObjectReferenceFactory*); // (TAO extension) - ObjectReferenceFactory_var (const ObjectReferenceFactory_var &); - ~ObjectReferenceFactory_var (void); - - ObjectReferenceFactory_var &operator= (ObjectReferenceFactory*); - ObjectReferenceFactory_var &operator= (const ObjectReferenceFactory_var &); - ObjectReferenceFactory* operator-> (void) const; - - operator const ObjectReferenceFactory* () const; - operator ObjectReferenceFactory*& (); - // in, inout, out, _retn - ObjectReferenceFactory* in (void) const; - ObjectReferenceFactory*& inout (void); - ObjectReferenceFactory*& out (void); - ObjectReferenceFactory* _retn (void); - ObjectReferenceFactory* ptr (void) const; - - // Hooks used by template sequence and valuetype manager classes - // for non-defined forward declared valuetypes. static void tao_add_ref (ObjectReferenceFactory *); static void tao_remove_ref (ObjectReferenceFactory *); - - private: - ObjectReferenceFactory* ptr_; - }; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY___OUT_CH_) -#define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY___OUT_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:490 - - class TAO_Export ObjectReferenceFactory_out - { - public: - ObjectReferenceFactory_out (ObjectReferenceFactory* &); - ObjectReferenceFactory_out (ObjectReferenceFactory_var &); - ObjectReferenceFactory_out (const ObjectReferenceFactory_out &); - ObjectReferenceFactory_out &operator= (const ObjectReferenceFactory_out &); - ObjectReferenceFactory_out &operator= (const ObjectReferenceFactory_var &); - ObjectReferenceFactory_out &operator= (ObjectReferenceFactory*); - operator ObjectReferenceFactory*& (); - ObjectReferenceFactory*& ptr (void); - ObjectReferenceFactory* operator-> (void); - - private: - ObjectReferenceFactory* &ptr_; }; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:96 - -#endif /* end #if !defined */ + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:56 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY_CH_ @@ -218,14 +153,14 @@ TAO_NAMESPACE PortableInterceptor static void _tao_any_destructor (void *); // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:473 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:427 virtual CORBA::Object_ptr make_object ( const char *, const PortableInterceptor::ObjectId & ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:315 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:272 protected: ObjectReferenceFactory (void); @@ -250,101 +185,22 @@ TAO_NAMESPACE PortableInterceptor TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceFactory; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:52 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:307 class ObjectReferenceTemplate; - struct ObjectReferenceTemplate_life; - typedef - TAO_Value_Var_T < - ObjectReferenceTemplate, - ObjectReferenceTemplate_life - > ObjectReferenceTemplate_var; - typedef - TAO_Value_Out_T < - ObjectReferenceTemplate, - ObjectReferenceTemplate_life - > ObjectReferenceTemplate_out; - struct ObjectReferenceTemplate_life - { - static void tao_add_ref (ObjectReferenceTemplate *); - static void tao_remove_ref (ObjectReferenceTemplate *); - }; - -#if 0 -#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE___PTR_CH_) -#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE___PTR_CH_ + struct tao_ObjectReferenceTemplate_life; + typedef TAO_Value_Var_T<ObjectReferenceTemplate, tao_ObjectReferenceTemplate_life> ObjectReferenceTemplate_var; + typedef TAO_Value_Out_T<ObjectReferenceTemplate, tao_ObjectReferenceTemplate_life> ObjectReferenceTemplate_out; - typedef ObjectReferenceTemplate *ObjectReferenceTemplate_ptr; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE___VAR_CH_) -#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE___VAR_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:181 - - class TAO_Export ObjectReferenceTemplate_var + struct tao_ObjectReferenceTemplate_life { - public: - ObjectReferenceTemplate_var (void); - ObjectReferenceTemplate_var (ObjectReferenceTemplate*); - ObjectReferenceTemplate_var (const ObjectReferenceTemplate*); // (TAO extension) - ObjectReferenceTemplate_var (const ObjectReferenceTemplate_var &); - ~ObjectReferenceTemplate_var (void); - - ObjectReferenceTemplate_var &operator= (ObjectReferenceTemplate*); - ObjectReferenceTemplate_var &operator= (const ObjectReferenceTemplate_var &); - ObjectReferenceTemplate* operator-> (void) const; - - operator const ObjectReferenceTemplate* () const; - operator ObjectReferenceTemplate*& (); - // in, inout, out, _retn - ObjectReferenceTemplate* in (void) const; - ObjectReferenceTemplate*& inout (void); - ObjectReferenceTemplate*& out (void); - ObjectReferenceTemplate* _retn (void); - ObjectReferenceTemplate* ptr (void) const; - - // Hooks used by template sequence and valuetype manager classes - // for non-defined forward declared valuetypes. static void tao_add_ref (ObjectReferenceTemplate *); static void tao_remove_ref (ObjectReferenceTemplate *); - - private: - ObjectReferenceTemplate* ptr_; - }; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE___OUT_CH_) -#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE___OUT_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:490 - - class TAO_Export ObjectReferenceTemplate_out - { - public: - ObjectReferenceTemplate_out (ObjectReferenceTemplate* &); - ObjectReferenceTemplate_out (ObjectReferenceTemplate_var &); - ObjectReferenceTemplate_out (const ObjectReferenceTemplate_out &); - ObjectReferenceTemplate_out &operator= (const ObjectReferenceTemplate_out &); - ObjectReferenceTemplate_out &operator= (const ObjectReferenceTemplate_var &); - ObjectReferenceTemplate_out &operator= (ObjectReferenceTemplate*); - operator ObjectReferenceTemplate*& (); - ObjectReferenceTemplate*& ptr (void); - ObjectReferenceTemplate* operator-> (void); - - private: - ObjectReferenceTemplate* &ptr_; }; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:96 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:56 -#endif /* end #if !defined */ -#endif /* 0 */ #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE_CH_ @@ -367,28 +223,28 @@ TAO_NAMESPACE PortableInterceptor static void _tao_any_destructor (void *); // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:473 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:427 virtual char * server_id ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) = 0; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:473 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:427 virtual char * orb_id ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) = 0; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:473 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:427 virtual ::PortableInterceptor::AdapterName * adapter_name ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) = 0; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:315 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:272 protected: ObjectReferenceTemplate (void); @@ -411,209 +267,67 @@ TAO_NAMESPACE PortableInterceptor // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplate; - -typedef - TAO_Unbounded_Valuetype_Sequence < - ObjectReferenceTemplate, - ObjectReferenceTemplate_var, - ObjectReferenceTemplate_life - > ObjectReferenceTemplateSeq; - -typedef - TAO_VarSeq_Var_T < - ObjectReferenceTemplateSeq, - TAO_Valuetype_Manager < - ObjectReferenceTemplate, - ObjectReferenceTemplate_var, - ObjectReferenceTemplate_life - > - > ObjectReferenceTemplateSeq_var; - -typedef - TAO_Seq_Out_T < - ObjectReferenceTemplateSeq, - ObjectReferenceTemplateSeq_var, - TAO_Valuetype_Manager < - ObjectReferenceTemplate, - ObjectReferenceTemplate_var, - ObjectReferenceTemplate_life - > - > ObjectReferenceTemplateSeq_out; - -#if 0 - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:62 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_VALUETYPE_SEQUENCE_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_) -#define __TAO_UNBOUNDED_VALUETYPE_SEQUENCE_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_ - - class TAO_Export _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq - : public TAO_Unbounded_Base_Sequence - { - public: - _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (void); - _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (CORBA::ULong maximum); - _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq ( - CORBA::ULong maximum, - CORBA::ULong length, - ObjectReferenceTemplate* *value, - CORBA::Boolean release = 0 - ); - _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq ( - const _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &rhs - ); - _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &operator= ( - const _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &rhs - ); - virtual ~_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (void); - - // = Accessors. - TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate,PortableInterceptor::ObjectReferenceTemplate_var> operator[] (CORBA::ULong index) const; - - // = Static operations. - static ObjectReferenceTemplate **allocbuf (CORBA::ULong nelems); - static void freebuf (ObjectReferenceTemplate **buffer); - - // Implement the TAO_Base_Sequence methods (see Sequence.h) - virtual void _allocate_buffer (CORBA::ULong length); - virtual void _deallocate_buffer (void); - ObjectReferenceTemplate* *get_buffer (CORBA::Boolean orphan = 0); - const ObjectReferenceTemplate* *get_buffer (void) const; - virtual void _shrink_buffer ( - CORBA::ULong nl, - CORBA::ULong ol - ); - }; - -#endif /* end #if !defined */ - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_) -#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75 class ObjectReferenceTemplateSeq; - class ObjectReferenceTemplateSeq_var; - - // ************************************************************* - // PortableInterceptor::ObjectReferenceTemplateSeq - // ************************************************************* - class TAO_Export ObjectReferenceTemplateSeq : public + typedef + TAO_MngSeq_Var_T< + ObjectReferenceTemplateSeq, + TAO_Valuetype_Manager< + PortableInterceptor::ObjectReferenceTemplate, + PortableInterceptor::ObjectReferenceTemplate_var, + PortableInterceptor::tao_ObjectReferenceTemplate_life + > + > + ObjectReferenceTemplateSeq_var; - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq -#else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Valuetype_Sequence<ObjectReferenceTemplate,ObjectReferenceTemplate_var> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + typedef + TAO_Seq_Out_T< + ObjectReferenceTemplateSeq, + ObjectReferenceTemplateSeq_var, + TAO_Valuetype_Manager< + PortableInterceptor::ObjectReferenceTemplate, + PortableInterceptor::ObjectReferenceTemplate_var, + PortableInterceptor::tao_ObjectReferenceTemplate_life + > + > + ObjectReferenceTemplateSeq_out; + + class TAO_Export ObjectReferenceTemplateSeq + : public + TAO_Unbounded_Valuetype_Sequence< + PortableInterceptor::ObjectReferenceTemplate, + PortableInterceptor::ObjectReferenceTemplate_var, + PortableInterceptor::tao_ObjectReferenceTemplate_life + > { public: ObjectReferenceTemplateSeq (void); ObjectReferenceTemplateSeq (CORBA::ULong max); ObjectReferenceTemplateSeq ( - CORBA::ULong max, - CORBA::ULong length, - ObjectReferenceTemplate_ptr *buffer, + CORBA::ULong max, + CORBA::ULong length, + ObjectReferenceTemplate ** buffer, CORBA::Boolean release = 0 ); ObjectReferenceTemplateSeq (const ObjectReferenceTemplateSeq &); ~ObjectReferenceTemplateSeq (void); - static void _tao_any_destructor (void*); + static void _tao_any_destructor (void *); typedef ObjectReferenceTemplateSeq_var _var_type; }; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ___VAR_CH_) -#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ___VAR_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549 - - // ************************************************************* - // class PortableInterceptor::ObjectReferenceTemplateSeq_var - // ************************************************************* - - class TAO_Export ObjectReferenceTemplateSeq_var - { - public: - ObjectReferenceTemplateSeq_var (void); - ObjectReferenceTemplateSeq_var (ObjectReferenceTemplateSeq *); - ObjectReferenceTemplateSeq_var (const ObjectReferenceTemplateSeq_var &); - ~ObjectReferenceTemplateSeq_var (void); - - ObjectReferenceTemplateSeq_var &operator= (ObjectReferenceTemplateSeq *); - ObjectReferenceTemplateSeq_var &operator= (const ObjectReferenceTemplateSeq_var &); - ObjectReferenceTemplateSeq *operator-> (void); - const ObjectReferenceTemplateSeq *operator-> (void) const; - - operator const ObjectReferenceTemplateSeq &() const; - operator ObjectReferenceTemplateSeq &(); - operator ObjectReferenceTemplateSeq &() const; - - // Variable-size base types only. - operator ObjectReferenceTemplateSeq *&(); - - TAO_Valuetype_Manager<ObjectReferenceTemplate, ObjectReferenceTemplate_var> operator[] (CORBA::ULong index); - - // in, inout, out, _retn - const ObjectReferenceTemplateSeq &in (void) const; - ObjectReferenceTemplateSeq &inout (void); - ObjectReferenceTemplateSeq *&out (void); - ObjectReferenceTemplateSeq *_retn (void); - ObjectReferenceTemplateSeq *ptr (void) const; - - private: - ObjectReferenceTemplateSeq *ptr_; - }; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ___OUT_CH_) -#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ___OUT_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753 - class TAO_Export ObjectReferenceTemplateSeq_out - { - public: - ObjectReferenceTemplateSeq_out (ObjectReferenceTemplateSeq *&); - ObjectReferenceTemplateSeq_out (ObjectReferenceTemplateSeq_var &); - ObjectReferenceTemplateSeq_out (const ObjectReferenceTemplateSeq_out &); - ObjectReferenceTemplateSeq_out &operator= (const ObjectReferenceTemplateSeq_out &); - ObjectReferenceTemplateSeq_out &operator= (ObjectReferenceTemplateSeq *); - operator ObjectReferenceTemplateSeq *&(); - ObjectReferenceTemplateSeq *&ptr (void); - ObjectReferenceTemplateSeq *operator-> (void); - TAO_Valuetype_Manager<ObjectReferenceTemplate, ObjectReferenceTemplate_var> operator[] (CORBA::ULong index); - - private: - ObjectReferenceTemplateSeq *&ptr_; - // Assignment from T_var not allowed. - void operator= (const ObjectReferenceTemplateSeq_var &); - }; - -#endif /* end #if !defined */ -#endif /* 0 */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplateSeq; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333 typedef CORBA::Long AdapterManagerId; typedef CORBA::Long_out AdapterManagerId_out; @@ -624,7 +338,7 @@ typedef TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterManagerId; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333 typedef CORBA::Short AdapterState; typedef CORBA::Short_out AdapterState_out; @@ -637,27 +351,27 @@ typedef // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::Short HOLDING = 0; + const PortableInterceptor::AdapterState HOLDING = 0; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::Short ACTIVE = 1; + const PortableInterceptor::AdapterState ACTIVE = 1; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::Short DISCARDING = 2; + const PortableInterceptor::AdapterState DISCARDING = 2; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::Short INACTIVE = 3; + const PortableInterceptor::AdapterState INACTIVE = 3; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::Short NON_EXISTENT = 4; + const PortableInterceptor::AdapterState NON_EXISTENT = 4; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67 @@ -704,7 +418,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterce #ifndef __ACE_INLINE__ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:682 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:212 TAO_NAMESPACE CORBA { @@ -720,7 +434,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ObjectReferenceFactory *&); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:682 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:212 TAO_NAMESPACE CORBA { @@ -758,7 +472,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* __ACE_INLINE__ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018 #if defined (__ACE_INLINE__) #include "ObjectReferenceTemplateC.i" diff --git a/TAO/tao/ObjectReferenceTemplateC.i b/TAO/tao/ObjectReferenceTemplateC.i index f55d9f2d188..800d9ea8aac 100644 --- a/TAO/tao/ObjectReferenceTemplateC.i +++ b/TAO/tao/ObjectReferenceTemplateC.i @@ -53,455 +53,9 @@ PortableInterceptor::ObjectReferenceTemplate::_tao_obv_static_repository_id () { return "IDL:omg.org/PortableInterceptor/ObjectReferenceTemplate:1.0"; } -#if 0 -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:108 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_VALUETYPE_SEQUENCE_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CI_) -#define __TAO_UNBOUNDED_VALUETYPE_SEQUENCE_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CI_ - -ACE_INLINE -PortableInterceptor::ObjectReferenceTemplate ** -PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::allocbuf (CORBA::ULong nelems) -{ - PortableInterceptor::ObjectReferenceTemplate **buf = 0; - - ACE_NEW_RETURN (buf, PortableInterceptor::ObjectReferenceTemplate*[nelems], 0); - - for (CORBA::ULong i = 0; i < nelems; i++) - { - buf[i] = 0; - } - - return buf; -} - -ACE_INLINE -void -PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::freebuf (PortableInterceptor::ObjectReferenceTemplate **buffer) -{ - if (buffer == 0) - { - return; - } - - delete[] buffer; -} - -ACE_INLINE -PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (void) -{ -} - -ACE_INLINE -PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq (CORBA::ULong maximum) - : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::allocbuf (maximum)) -{ -} - -ACE_INLINE -PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq ( - CORBA::ULong maximum, - CORBA::ULong length, - PortableInterceptor::ObjectReferenceTemplate* *value, - CORBA::Boolean release - ) - : TAO_Unbounded_Base_Sequence (maximum, length, value, release) -{ -} - -ACE_INLINE -PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq( - const _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &rhs - ) - : TAO_Unbounded_Base_Sequence (rhs) -{ - if (rhs.buffer_ != 0) - { - PortableInterceptor::ObjectReferenceTemplate **tmp1 = - _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::allocbuf (this->maximum_); - PortableInterceptor::ObjectReferenceTemplate ** const tmp2 = - ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate ** ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < rhs.length_; ++i) - { - if (tmp2[i] != 0) - { - tmp2[i]->_add_ref (); - } - - tmp1[i] = tmp2 [i]; - } - - this->buffer_ = tmp1; - } - else - { - this->buffer_ = 0; - } -} - -ACE_INLINE -PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq & -PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::operator= ( - const _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq &rhs - ) -{ - if (this == &rhs) - { - return *this; - } - - if (this->release_) - { - PortableInterceptor::ObjectReferenceTemplate **tmp = - ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate **, this->buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - if (tmp[i] != 0) - { - tmp[i]->_remove_ref (); - } - - tmp[i] = 0; - } - - if (this->maximum_ < rhs.maximum_) - { - _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::freebuf (tmp); - this->buffer_ = _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::allocbuf (rhs.maximum_); - } - } - else - { - this->buffer_ = - _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::allocbuf (rhs.maximum_); - } - - TAO_Unbounded_Base_Sequence::operator= (rhs); - - PortableInterceptor::ObjectReferenceTemplate **tmp1 = - ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate **, this->buffer_); - - PortableInterceptor::ObjectReferenceTemplate ** const tmp2 = - ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate ** ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < rhs.length_; ++i) - { - if (tmp2[i] != 0) - { - tmp2[i]->_add_ref (); - } - - tmp1[i] = tmp2 [i]; - } - - return *this; -} - -ACE_INLINE -TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate,PortableInterceptor::ObjectReferenceTemplate_var> -PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::operator[] (CORBA::ULong index) const -{ - ACE_ASSERT (index < this->maximum_); - PortableInterceptor::ObjectReferenceTemplate ** const tmp = - ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate ** ACE_CAST_CONST, this->buffer_); - return TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate,PortableInterceptor::ObjectReferenceTemplate_var> (tmp + index, this->release_); -} - -ACE_INLINE -PortableInterceptor::ObjectReferenceTemplate* * -PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::get_buffer (CORBA::Boolean orphan) -{ - PortableInterceptor::ObjectReferenceTemplate **result = 0; - - if (orphan == 0) - { - // We retain ownership. - if (this->buffer_ == 0) - { - result = - _TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::allocbuf (this->maximum_); - this->buffer_ = result; - this->release_ = 1; - } - else - { - result = - ACE_reinterpret_cast (PortableInterceptor::ObjectReferenceTemplate**, this->buffer_); - } - } - else // if (orphan == 1) - { - if (this->release_ != 0) - { - // We set the state back to default and relinquish ownership. - result = - ACE_reinterpret_cast(PortableInterceptor::ObjectReferenceTemplate**,this->buffer_); - this->maximum_ = 0; - this->length_ = 0; - this->buffer_ = 0; - this->release_ = 0; - } - } - - return result; -} - -ACE_INLINE -const PortableInterceptor::ObjectReferenceTemplate* * -PortableInterceptor::_TAO_Unbounded_Valuetype_Sequence_PortableInterceptor_ObjectReferenceTemplateSeq::get_buffer (void) const -{ - return ACE_reinterpret_cast (const PortableInterceptor::ObjectReferenceTemplate ** ACE_CAST_CONST, this->buffer_); -} - -#endif /* end #if !defined */ - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CI_) -#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CI_ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226 - -// ************************************************************* -// Inline operations for class PortableInterceptor::ObjectReferenceTemplateSeq_var -// ************************************************************* - -ACE_INLINE -PortableInterceptor::ObjectReferenceTemplateSeq_var::ObjectReferenceTemplateSeq_var (void) - : ptr_ (0) -{} - -ACE_INLINE -PortableInterceptor::ObjectReferenceTemplateSeq_var::ObjectReferenceTemplateSeq_var (ObjectReferenceTemplateSeq *p) - : ptr_ (p) -{} - -ACE_INLINE -PortableInterceptor::ObjectReferenceTemplateSeq_var::ObjectReferenceTemplateSeq_var (const ::PortableInterceptor::ObjectReferenceTemplateSeq_var &p) -{ - if (p.ptr_) - { - ACE_NEW (this->ptr_, ::PortableInterceptor::ObjectReferenceTemplateSeq (*p.ptr_)); - } - else - { - this->ptr_ = 0; - } -} - -ACE_INLINE -PortableInterceptor::ObjectReferenceTemplateSeq_var::~ObjectReferenceTemplateSeq_var (void) -{ - delete this->ptr_; -} - -ACE_INLINE -PortableInterceptor::ObjectReferenceTemplateSeq_var & -PortableInterceptor::ObjectReferenceTemplateSeq_var::operator= (ObjectReferenceTemplateSeq *p) -{ - delete this->ptr_; - this->ptr_ = p; - return *this; -} - -ACE_INLINE -::PortableInterceptor::ObjectReferenceTemplateSeq_var & -PortableInterceptor::ObjectReferenceTemplateSeq_var::operator= (const ::PortableInterceptor::ObjectReferenceTemplateSeq_var &p) -{ - if (this != &p) - { - if (p.ptr_ == 0) - { - delete this->ptr_; - this->ptr_ = 0; - } - else - { - ObjectReferenceTemplateSeq *deep_copy = 0; - ACE_NEW_RETURN ( - deep_copy, - ObjectReferenceTemplateSeq (*p.ptr_), - *this - ); - - if (deep_copy != 0) - { - ObjectReferenceTemplateSeq *tmp = deep_copy; - deep_copy = this->ptr_; - this->ptr_ = tmp; - delete deep_copy; - } - } - } - - return *this; -} - -ACE_INLINE -const ::PortableInterceptor::ObjectReferenceTemplateSeq * -PortableInterceptor::ObjectReferenceTemplateSeq_var::operator-> (void) const -{ - return this->ptr_; -} - -ACE_INLINE -::PortableInterceptor::ObjectReferenceTemplateSeq * -PortableInterceptor::ObjectReferenceTemplateSeq_var::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -PortableInterceptor::ObjectReferenceTemplateSeq_var::operator const ::PortableInterceptor::ObjectReferenceTemplateSeq &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE -PortableInterceptor::ObjectReferenceTemplateSeq_var::operator ::PortableInterceptor::ObjectReferenceTemplateSeq &() // cast -{ - return *this->ptr_; -} - -ACE_INLINE -PortableInterceptor::ObjectReferenceTemplateSeq_var::operator ::PortableInterceptor::ObjectReferenceTemplateSeq &() const // cast -{ - return *this->ptr_; -} - -// Variable-size types only. -ACE_INLINE -PortableInterceptor::ObjectReferenceTemplateSeq_var::operator ::PortableInterceptor::ObjectReferenceTemplateSeq *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE -TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate, PortableInterceptor::ObjectReferenceTemplate_var> -PortableInterceptor::ObjectReferenceTemplateSeq_var::operator[] (CORBA::ULong index) -{ - return this->ptr_->operator[] (index); -} - -ACE_INLINE -const ::PortableInterceptor::ObjectReferenceTemplateSeq & -PortableInterceptor::ObjectReferenceTemplateSeq_var::in (void) const -{ - return *this->ptr_; -} - -ACE_INLINE -::PortableInterceptor::ObjectReferenceTemplateSeq & -PortableInterceptor::ObjectReferenceTemplateSeq_var::inout (void) -{ - return *this->ptr_; -} - -ACE_INLINE -::PortableInterceptor::ObjectReferenceTemplateSeq *& -PortableInterceptor::ObjectReferenceTemplateSeq_var::out (void) -{ - delete this->ptr_; - this->ptr_ = 0; - return this->ptr_; -} - -ACE_INLINE -::PortableInterceptor::ObjectReferenceTemplateSeq * -PortableInterceptor::ObjectReferenceTemplateSeq_var::_retn (void) -{ - ::PortableInterceptor::ObjectReferenceTemplateSeq *tmp = this->ptr_; - this->ptr_ = 0; - return tmp; -} - -ACE_INLINE -::PortableInterceptor::ObjectReferenceTemplateSeq * -PortableInterceptor::ObjectReferenceTemplateSeq_var::ptr (void) const -{ - return this->ptr_; -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567 - -// ************************************************************* -// Inline operations for class PortableInterceptor::ObjectReferenceTemplateSeq_out -// ************************************************************* - -ACE_INLINE -PortableInterceptor::ObjectReferenceTemplateSeq_out::ObjectReferenceTemplateSeq_out (ObjectReferenceTemplateSeq *&p) - : ptr_ (p) -{ - this->ptr_ = 0; -} - -ACE_INLINE -PortableInterceptor::ObjectReferenceTemplateSeq_out::ObjectReferenceTemplateSeq_out (ObjectReferenceTemplateSeq_var &p) - : ptr_ (p.out ()) -{ - delete this->ptr_; - this->ptr_ = 0; -} - -ACE_INLINE -PortableInterceptor::ObjectReferenceTemplateSeq_out::ObjectReferenceTemplateSeq_out (const ::PortableInterceptor::ObjectReferenceTemplateSeq_out &p) - : ptr_ (ACE_const_cast (ObjectReferenceTemplateSeq_out&, p).ptr_) -{} - -ACE_INLINE -::PortableInterceptor::ObjectReferenceTemplateSeq_out & -PortableInterceptor::ObjectReferenceTemplateSeq_out::operator= (const ::PortableInterceptor::ObjectReferenceTemplateSeq_out &p) -{ - this->ptr_ = ACE_const_cast (ObjectReferenceTemplateSeq_out&, p).ptr_; - return *this; -} - -ACE_INLINE -::PortableInterceptor::ObjectReferenceTemplateSeq_out & -PortableInterceptor::ObjectReferenceTemplateSeq_out::operator= (ObjectReferenceTemplateSeq *p) -{ - this->ptr_ = p; - return *this; -} - -ACE_INLINE -PortableInterceptor::ObjectReferenceTemplateSeq_out::operator ::PortableInterceptor::ObjectReferenceTemplateSeq *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE -::PortableInterceptor::ObjectReferenceTemplateSeq *& -PortableInterceptor::ObjectReferenceTemplateSeq_out::ptr (void) // ptr -{ - return this->ptr_; -} - -ACE_INLINE -::PortableInterceptor::ObjectReferenceTemplateSeq * -PortableInterceptor::ObjectReferenceTemplateSeq_out::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate, PortableInterceptor::ObjectReferenceTemplate_var> -PortableInterceptor::ObjectReferenceTemplateSeq_out::operator[] (CORBA::ULong index) -{ - return this->ptr_->operator[] (index); -} -#endif /* end #if !defined */ -#endif /* 0 */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:712 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:242 #if defined (__ACE_INLINE__) @@ -521,7 +75,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ObjectReferenceFactory *&); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:712 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:242 #if defined (__ACE_INLINE__) diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp index 4e68b872b3c..8930c8bd5a5 100644 --- a/TAO/tao/Object_KeyC.cpp +++ b/TAO/tao/Object_KeyC.cpp @@ -24,8 +24,6 @@ #include "Object_KeyC.h" -#include "tao/Typecode.h" -#include "tao/CDR.h" #include "tao/ORB_Core.h" #if defined (__BORLANDC__) @@ -36,6 +34,79 @@ #include "Object_KeyC.i" #endif /* !defined INLINE */ +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50 + +TAO::ObjectKey::ObjectKey (void) +{} + +TAO::ObjectKey::ObjectKey (CORBA::ULong max) + : TAO_Unbounded_Sequence< + CORBA::Octet + > + (max) +{} + +TAO::ObjectKey::ObjectKey ( + CORBA::ULong max, + CORBA::ULong length, + CORBA::Octet *buffer, + CORBA::Boolean release + ) + : TAO_Unbounded_Sequence< + CORBA::Octet + > + (max, length, buffer, release) +{} + +TAO::ObjectKey::ObjectKey (const ObjectKey &seq) + : TAO_Unbounded_Sequence< + CORBA::Octet + > + (seq) +{} + +TAO::ObjectKey::~ObjectKey (void) +{} + +void TAO::ObjectKey::_tao_any_destructor (void *_tao_void_pointer) +{ + ObjectKey *tmp = ACE_static_cast (ObjectKey*, _tao_void_pointer); + delete tmp; +} + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + +template class + TAO_FixedSeq_Var_T< + ObjectKey, + CORBA::Octet + >; + +template class + TAO_Seq_Out_T< + ObjectKey, + ObjectKey_var, + CORBA::Octet + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# pragma instantiate \ + TAO_FixedSeq_Var_T< \ + ObjectKey, \ + CORBA::Octet \ + > + +# pragma instantiate \ + TAO_Seq_Out_T< \ + ObjectKey, \ + ObjectKey_var, \ + CORBA::Octet \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -79,8 +150,73 @@ TAO_NAMESPACE_DEFINE ( ) TAO_NAMESPACE_END +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54 + +// Copying insertion. +void operator<<= ( + CORBA::Any &_tao_any, + const TAO::ObjectKey &_tao_elem + ) +{ + TAO::Any_Dual_Impl_T<TAO::ObjectKey>::insert_copy ( + _tao_any, + TAO::ObjectKey::_tao_any_destructor, + TAO::_tc_ObjectKey, + _tao_elem + ); +} + +// Non-copying insertion. +void operator<<= ( + CORBA::Any &_tao_any, + TAO::ObjectKey *_tao_elem + ) +{ + TAO::Any_Dual_Impl_T<TAO::ObjectKey>::insert ( + _tao_any, + TAO::ObjectKey::_tao_any_destructor, + TAO::_tc_ObjectKey, + _tao_elem + ); +} + +// Extraction to non-const pointer (deprecated). +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + TAO::ObjectKey *&_tao_elem + ) +{ + return _tao_any >>= ACE_const_cast ( + const TAO::ObjectKey *&, + _tao_elem + ); +} + +// Extraction to const pointer. +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + const TAO::ObjectKey *&_tao_elem + ) +{ + return + TAO::Any_Dual_Impl_T<TAO::ObjectKey>::extract ( + _tao_any, + TAO::ObjectKey::_tao_any_destructor, + TAO::_tc_ObjectKey, + _tao_elem + ); +} + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ + defined (ACE_HAS_GNU_REPO) + template class TAO::Any_Dual_Impl_T<TAO::ObjectKey>; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +# pragma instantiate TAO::Any_Dual_Impl_T<TAO::ObjectKey> +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93 CORBA::Boolean operator<< ( TAO_OutputCDR &strm, @@ -169,6 +305,18 @@ CORBA::Boolean operator>> ( // **************************************************************** +TAO::ObjectKey & +TAO::ObjectKey::operator= (const TAO::ObjectKey &rhs) +{ + if (this == &rhs) + { + return *this; + } + + TAO_Unbounded_Sequence<CORBA::Octet>::operator= (rhs); + return *this; +} + void TAO::ObjectKey::encode_sequence_to_string (char * &str, const TAO_Unbounded_Sequence<CORBA::Octet> &seq) @@ -252,4 +400,3 @@ TAO::ObjectKey::decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> } // **************************************************************** - diff --git a/TAO/tao/Object_KeyC.h b/TAO/tao/Object_KeyC.h index fb1c2043991..ba4357d0234 100644 --- a/TAO/tao/Object_KeyC.h +++ b/TAO/tao/Object_KeyC.h @@ -1,5 +1,4 @@ -// -*- c++ -*- -// $Id$ +// -*- C++ -*- // // $Id$ @@ -28,13 +27,13 @@ #include "ace/pre.h" -#include "tao/corbafwd.h" +#include "tao/Sequence.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Sequence.h" +#include "tao/Seq_VarOut_T.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -59,135 +58,94 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -namespace TAO -{ +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48 -#if !defined (_TAO_OBJECTKEY_CH_) -#define _TAO_OBJECTKEY_CH_ +TAO_NAMESPACE TAO +{ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75 class ObjectKey; - class ObjectKey_var; - // ************************************************************* - // TAO::ObjectKey - // ************************************************************* + typedef + TAO_FixedSeq_Var_T< + ObjectKey, + CORBA::Octet + > + ObjectKey_var; - class TAO_Export ObjectKey : public + typedef + TAO_Seq_Out_T< + ObjectKey, + ObjectKey_var, + CORBA::Octet + > + ObjectKey_out; - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - TAO_Unbounded_Sequence<CORBA::Octet> -#else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<CORBA::Octet> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + class TAO_Export ObjectKey + : public + TAO_Unbounded_Sequence< + CORBA::Octet + > { public: ObjectKey (void); ObjectKey (CORBA::ULong max); ObjectKey ( - CORBA::ULong max, - CORBA::ULong length, + CORBA::ULong max, + CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release = 0 ); ObjectKey (const ObjectKey &); + ~ObjectKey (void); + ObjectKey& operator= (const ObjectKey &); - static void encode_sequence_to_string (char * &str, - const TAO_Unbounded_Sequence<CORBA::Octet> &seq); - static void decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> &seq, - const char *str); - }; - -#endif /* end #if !defined */ + static void encode_sequence_to_string ( + char * &str, + const TAO_Unbounded_Sequence<CORBA::Octet> &seq + ); + static void decode_string_to_sequence ( + TAO_Unbounded_Sequence<CORBA::Octet> &seq, + const char *str + ); -#if !defined (_TAO_OBJECTKEY___VAR_CH_) -#define _TAO_OBJECTKEY___VAR_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549 - - // ************************************************************* - // class TAO::ObjectKey_var - // ************************************************************* - - class TAO_Export ObjectKey_var - { - public: - ObjectKey_var (void); - ObjectKey_var (ObjectKey *); - ObjectKey_var (const ObjectKey_var &); - - // Fixed-size base types only. - ObjectKey_var (const ObjectKey &); + static void _tao_any_destructor (void *); - ~ObjectKey_var (void); - - ObjectKey_var &operator= (ObjectKey *); - ObjectKey_var &operator= (const ObjectKey_var &); - - // Fixed-size base types only. - ObjectKey_var &operator= (const ObjectKey &); - - ObjectKey *operator-> (void); - const ObjectKey *operator-> (void) const; - - operator const ObjectKey &() const; - operator ObjectKey &(); - operator ObjectKey &() const; - CORBA::Octet & operator[] (CORBA::ULong index); - const CORBA::Octet & operator[] (CORBA::ULong index) const; - - // in, inout, out, _retn - const ObjectKey &in (void) const; - ObjectKey &inout (void); - ObjectKey *&out (void); - ObjectKey *_retn (void); - ObjectKey *ptr (void) const; - - private: - ObjectKey *ptr_; - }; - -#endif /* end #if !defined */ + typedef ObjectKey_var _var_type; -#if !defined (_TAO_OBJECTKEY___OUT_CH_) -#define _TAO_OBJECTKEY___OUT_CH_ +#if (TAO_NO_COPY_OCTET_SEQUENCES == 1) + ObjectKey ( + CORBA::ULong length, + const ACE_Message_Block* mb + ) + : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {} +#endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */ + }; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - class TAO_Export ObjectKey_out - { - public: - ObjectKey_out (ObjectKey *&); - ObjectKey_out (ObjectKey_var &); - ObjectKey_out (const ObjectKey_out &); - ObjectKey_out &operator= (const ObjectKey_out &); - ObjectKey_out &operator= (ObjectKey *); - operator ObjectKey *&(); - ObjectKey *&ptr (void); - ObjectKey *operator-> (void); - CORBA::Octet & operator[] (CORBA::ULong index); - - private: - ObjectKey *&ptr_; - // Assignment from T_var not allowed. - void operator= (const ObjectKey_var &); - }; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectKey; + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67 -#endif /* end #if !defined */ - } TAO_NAMESPACE_CLOSE // module TAO // TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52 + +TAO_Export void operator<<= (CORBA::Any &, const TAO::ObjectKey &); // copying version +TAO_Export void operator<<= (CORBA::Any &, TAO::ObjectKey*); // noncopying version +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::ObjectKey *&); // deprecated +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO::ObjectKey *&); + +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48 #ifndef __ACE_INLINE__ @@ -215,7 +173,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* __ACE_INLINE__ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018 #if defined (__ACE_INLINE__) #include "Object_KeyC.i" diff --git a/TAO/tao/Object_KeyC.i b/TAO/tao/Object_KeyC.i index 31710a4403b..76b6920dba4 100644 --- a/TAO/tao/Object_KeyC.i +++ b/TAO/tao/Object_KeyC.i @@ -20,304 +20,21 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html -// ************************************************************* -// Inline operations for class TAO::ObjectKey -// ************************************************************* +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84 -ACE_INLINE -TAO::ObjectKey::ObjectKey (void) -{ -} +#if !defined _TAO_CDR_OP_TAO_ObjectKey_I_ +#define _TAO_CDR_OP_TAO_ObjectKey_I_ -ACE_INLINE -TAO::ObjectKey::ObjectKey (CORBA::ULong max) - : TAO_Unbounded_Sequence<CORBA::Octet> (max) -{ -} +CORBA::Boolean TAO_Export operator<< ( + TAO_OutputCDR &, + const TAO::ObjectKey & + ); -ACE_INLINE -TAO::ObjectKey::ObjectKey (CORBA::ULong max, - CORBA::ULong length, - CORBA::Octet *data, - CORBA::Boolean release) - : TAO_Unbounded_Sequence<CORBA::Octet> (max, length, data, release) -{ -} +CORBA::Boolean TAO_Export operator>> ( + TAO_InputCDR &, + TAO::ObjectKey & + ); -ACE_INLINE -TAO::ObjectKey::ObjectKey (const TAO::ObjectKey &rhs) - : TAO_Unbounded_Sequence<CORBA::Octet> (rhs) -{ -} - -ACE_INLINE TAO::ObjectKey & -TAO::ObjectKey::operator= (const TAO::ObjectKey &rhs) -{ - if (this == &rhs) - { - return *this; - } - - TAO_Unbounded_Sequence<CORBA::Octet>::operator= (rhs); - return *this; -} - -#if !defined (_TAO_OBJECTKEY_CI_) -#define _TAO_OBJECTKEY_CI_ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226 - -// ************************************************************* -// Inline operations for class TAO::ObjectKey_var -// ************************************************************* - -ACE_INLINE -TAO::ObjectKey_var::ObjectKey_var (void) - : ptr_ (0) -{} - -ACE_INLINE -TAO::ObjectKey_var::ObjectKey_var (ObjectKey *p) - : ptr_ (p) -{} - -ACE_INLINE -TAO::ObjectKey_var::ObjectKey_var (const ::TAO::ObjectKey_var &p) -{ - if (p.ptr_) - { - ACE_NEW (this->ptr_, ::TAO::ObjectKey (*p.ptr_)); - } - else - { - this->ptr_ = 0; - } -} - -// Fixed-size base types only. -ACE_INLINE -TAO::ObjectKey_var::ObjectKey_var (const ::TAO::ObjectKey &p) -{ - ACE_NEW (this->ptr_, ::TAO::ObjectKey (p)); -} - -ACE_INLINE -TAO::ObjectKey_var::~ObjectKey_var (void) -{ - delete this->ptr_; -} - -ACE_INLINE -TAO::ObjectKey_var & -TAO::ObjectKey_var::operator= (ObjectKey *p) -{ - delete this->ptr_; - this->ptr_ = p; - return *this; -} - -ACE_INLINE -::TAO::ObjectKey_var & -TAO::ObjectKey_var::operator= (const ::TAO::ObjectKey_var &p) -{ - if (this != &p) - { - if (p.ptr_ == 0) - { - delete this->ptr_; - this->ptr_ = 0; - } - else - { - ObjectKey *deep_copy = 0; - ACE_NEW_RETURN ( - deep_copy, - ObjectKey (*p.ptr_), - *this - ); - - if (deep_copy != 0) - { - ObjectKey *tmp = deep_copy; - deep_copy = this->ptr_; - this->ptr_ = tmp; - delete deep_copy; - } - } - } - - return *this; -} - -// Fixed-size types only. -ACE_INLINE -::TAO::ObjectKey_var & -TAO::ObjectKey_var::operator= (const ::TAO::ObjectKey &p) -{ - if (this->ptr_ != &p) - { - delete this->ptr_; - ACE_NEW_RETURN (this->ptr_, ::TAO::ObjectKey (p), *this); - } - - return *this; -} - -ACE_INLINE -const ::TAO::ObjectKey * -TAO::ObjectKey_var::operator-> (void) const -{ - return this->ptr_; -} - -ACE_INLINE -::TAO::ObjectKey * -TAO::ObjectKey_var::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -TAO::ObjectKey_var::operator const ::TAO::ObjectKey &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE -TAO::ObjectKey_var::operator ::TAO::ObjectKey &() // cast -{ - return *this->ptr_; -} - -ACE_INLINE -TAO::ObjectKey_var::operator ::TAO::ObjectKey &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE -CORBA::Octet & -TAO::ObjectKey_var::operator[] (CORBA::ULong index) -{ - return this->ptr_->operator[] (index); -} - -ACE_INLINE -const CORBA::Octet & -TAO::ObjectKey_var::operator[] (CORBA::ULong index) const -{ - return ACE_const_cast (const CORBA::Octet &, this->ptr_->operator[] (index)); -} - -ACE_INLINE -const ::TAO::ObjectKey & -TAO::ObjectKey_var::in (void) const -{ - return *this->ptr_; -} - -ACE_INLINE -::TAO::ObjectKey & -TAO::ObjectKey_var::inout (void) -{ - return *this->ptr_; -} - -ACE_INLINE -::TAO::ObjectKey *& -TAO::ObjectKey_var::out (void) -{ - delete this->ptr_; - this->ptr_ = 0; - return this->ptr_; -} - -ACE_INLINE -::TAO::ObjectKey * -TAO::ObjectKey_var::_retn (void) -{ - ::TAO::ObjectKey *tmp = this->ptr_; - this->ptr_ = 0; - return tmp; -} - -ACE_INLINE -::TAO::ObjectKey * -TAO::ObjectKey_var::ptr (void) const -{ - return this->ptr_; -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567 - -// ************************************************************* -// Inline operations for class TAO::ObjectKey_out -// ************************************************************* - -ACE_INLINE -TAO::ObjectKey_out::ObjectKey_out (ObjectKey *&p) - : ptr_ (p) -{ - this->ptr_ = 0; -} - -ACE_INLINE -TAO::ObjectKey_out::ObjectKey_out (ObjectKey_var &p) - : ptr_ (p.out ()) -{ - delete this->ptr_; - this->ptr_ = 0; -} - -ACE_INLINE -TAO::ObjectKey_out::ObjectKey_out (const ::TAO::ObjectKey_out &p) - : ptr_ (ACE_const_cast (ObjectKey_out&, p).ptr_) -{} - -ACE_INLINE -::TAO::ObjectKey_out & -TAO::ObjectKey_out::operator= (const ::TAO::ObjectKey_out &p) -{ - this->ptr_ = ACE_const_cast (ObjectKey_out&, p).ptr_; - return *this; -} - -ACE_INLINE -::TAO::ObjectKey_out & -TAO::ObjectKey_out::operator= (ObjectKey *p) -{ - this->ptr_ = p; - return *this; -} - -ACE_INLINE -TAO::ObjectKey_out::operator ::TAO::ObjectKey *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE -::TAO::ObjectKey *& -TAO::ObjectKey_out::ptr (void) // ptr -{ - return this->ptr_; -} - -ACE_INLINE -::TAO::ObjectKey * -TAO::ObjectKey_out::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -CORBA::Octet & -TAO::ObjectKey_out::operator[] (CORBA::ULong index) -{ - return this->ptr_->operator[] (index); -} - -#endif /* end #if !defined */ +#endif /* _TAO_CDR_OP_TAO_ObjectKey_I_ */ diff --git a/TAO/tao/OctetSeqC.cpp b/TAO/tao/OctetSeqC.cpp index 08a15a1a13a..4c81c8c04f2 100644 --- a/TAO/tao/OctetSeqC.cpp +++ b/TAO/tao/OctetSeqC.cpp @@ -24,6 +24,8 @@ #include "OctetSeqC.h" +#include "Any_T.h" +#include "ORB_Core.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig @@ -33,64 +35,38 @@ #include "OctetSeqC.i" #endif /* !defined INLINE */ -#include "Any_T.h" -#include "ORB_Core.h" - -#if !defined (_CORBA_OCTETSEQ_CS_) -#define _CORBA_OCTETSEQ_CS_ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250 - -// ************************************************************* -// CORBA::OctetSeq -// ************************************************************* +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50 CORBA::OctetSeq::OctetSeq (void) {} CORBA::OctetSeq::OctetSeq (CORBA::ULong max) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -TAO_Unbounded_Sequence<CORBA::Octet> -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<CORBA::Octet> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max) + : TAO_Unbounded_Sequence< + CORBA::Octet + > + (max) {} CORBA::OctetSeq::OctetSeq ( CORBA::ULong max, CORBA::ULong length, - CORBA::Octet *buffer, + CORBA::Octet* buffer, CORBA::Boolean release ) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -TAO_Unbounded_Sequence<CORBA::Octet> -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<CORBA::Octet> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max, length, buffer, release) + : TAO_Unbounded_Sequence< + CORBA::Octet + > + (max, length, buffer, release) {} CORBA::OctetSeq::OctetSeq (const OctetSeq &seq) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -TAO_Unbounded_Sequence<CORBA::Octet> -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<CORBA::Octet> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (seq) + : TAO_Unbounded_Sequence< + CORBA::Octet + > + (seq) {} -CORBA::OctetSeq::~OctetSeq (void) // dtor +CORBA::OctetSeq::~OctetSeq (void) {} void CORBA::OctetSeq::_tao_any_destructor (void *_tao_void_pointer) @@ -99,7 +75,37 @@ void CORBA::OctetSeq::_tao_any_destructor (void *_tao_void_pointer) delete tmp; } -#endif /* end #if !defined */ +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + +template class + TAO_FixedSeq_Var_T< + OctetSeq, + CORBA::Octet + >; + +template class + TAO_Seq_Out_T< + OctetSeq, + OctetSeq_var, + CORBA::Octet + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# pragma instantiate \ + TAO_FixedSeq_Var_T< \ + OctetSeq, \ + CORBA::Octet \ + > + +# pragma instantiate \ + TAO_Seq_Out_T< \ + OctetSeq, \ + OctetSeq_var, \ + CORBA::Octet \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -204,8 +210,15 @@ CORBA::Boolean operator>>= ( ); } +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ + defined (ACE_HAS_GNU_REPO) + template class TAO::Any_Dual_Impl_T<CORBA::OctetSeq>; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::OctetSeq> +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93 CORBA::Boolean operator<< ( TAO_OutputCDR &strm, diff --git a/TAO/tao/OctetSeqC.h b/TAO/tao/OctetSeqC.h index b03afe024c8..fb839943a7d 100644 --- a/TAO/tao/OctetSeqC.h +++ b/TAO/tao/OctetSeqC.h @@ -26,13 +26,13 @@ #define _TAO_IDL_ORIG_OCTETSEQC_H_ #include "ace/pre.h" -#include "corbafwd.h" +#include "Sequence.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Sequence.h" +#include "Seq_VarOut_T.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -57,43 +57,53 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -namespace CORBA -{ -#if !defined (_CORBA_OCTETSEQ_CH_) -#define _CORBA_OCTETSEQ_CH_ +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48 +TAO_NAMESPACE CORBA +{ + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75 + class OctetSeq; - class OctetSeq_var; - // ************************************************************* - // CORBA::OctetSeq - // ************************************************************* + typedef + TAO_FixedSeq_Var_T< + OctetSeq, + CORBA::Octet + > + OctetSeq_var; - class TAO_Export OctetSeq : public -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - TAO_Unbounded_Sequence<CORBA::Octet> -#else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<CORBA::Octet> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + typedef + TAO_Seq_Out_T< + OctetSeq, + OctetSeq_var, + CORBA::Octet + > + OctetSeq_out; + + class TAO_Export OctetSeq + : public + TAO_Unbounded_Sequence< + CORBA::Octet + > { public: - OctetSeq (void); // default ctor - OctetSeq (CORBA::ULong max); // uses max size + OctetSeq (void); + OctetSeq (CORBA::ULong max); OctetSeq ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::Octet *buffer, - CORBA::Boolean release = 0 - ); - OctetSeq (const OctetSeq &); // copy ctor + CORBA::ULong max, + CORBA::ULong length, + CORBA::Octet* buffer, + CORBA::Boolean release = 0 + ); + OctetSeq (const OctetSeq &); ~OctetSeq (void); - static void _tao_any_destructor (void*); - -#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + + static void _tao_any_destructor (void *); + typedef OctetSeq_var _var_type; -#endif /* ! __GNUC__ || g++ >= 2.8 */ - #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) OctetSeq ( @@ -103,77 +113,6 @@ namespace CORBA : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {} #endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */ }; - -#endif /* end #if !defined */ - -#if !defined (_CORBA_OCTETSEQ___VAR_CH_) -#define _CORBA_OCTETSEQ___VAR_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549 - - // ************************************************************* - // class CORBA::OctetSeq_var - // ************************************************************* - - class TAO_Export OctetSeq_var - { - public: - OctetSeq_var (void); // default constructor - OctetSeq_var (OctetSeq *); - OctetSeq_var (const OctetSeq_var &); // copy constructor - OctetSeq_var (const OctetSeq &); // fixed-size base types only - ~OctetSeq_var (void); // destructor - - OctetSeq_var &operator= (OctetSeq *); - OctetSeq_var &operator= (const OctetSeq_var &); - OctetSeq_var &operator= (const OctetSeq &); // fixed-size base types only - OctetSeq *operator-> (void); - const OctetSeq *operator-> (void) const; - - operator const OctetSeq &() const; - operator OctetSeq &(); - operator OctetSeq &() const; - - CORBA::Octet & operator[] (CORBA::ULong index); - const CORBA::Octet & operator[] (CORBA::ULong index) const; - - // in, inout, out, _retn - const OctetSeq &in (void) const; - OctetSeq &inout (void); - OctetSeq *&out (void); - OctetSeq *_retn (void); - OctetSeq *ptr (void) const; - - private: - OctetSeq *ptr_; - }; - -#endif /* end #if !defined */ - -#if !defined (_CORBA_OCTETSEQ___OUT_CH_) -#define _CORBA_OCTETSEQ___OUT_CH_ - - class TAO_Export OctetSeq_out - { - public: - OctetSeq_out (OctetSeq *&); - OctetSeq_out (OctetSeq_var &); - OctetSeq_out (const OctetSeq_out &); - OctetSeq_out &operator= (const OctetSeq_out &); - OctetSeq_out &operator= (OctetSeq *); - operator OctetSeq *&(); - OctetSeq *&ptr (void); - OctetSeq *operator-> (void); - CORBA::Octet & operator[] (CORBA::ULong index); - - private: - OctetSeq *&ptr_; - // assignment from T_var not allowed - void operator= (const OctetSeq_var &); - }; - -#endif /* end #if !defined */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 @@ -186,13 +125,17 @@ namespace CORBA } TAO_NAMESPACE_CLOSE // module CORBA -// Proxy Broker Factory function pointer declarations. +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52 TAO_Export void operator<<= (CORBA::Any &, const CORBA::OctetSeq &); // copying version TAO_Export void operator<<= (CORBA::Any &, CORBA::OctetSeq*); // noncopying version TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OctetSeq *&); // deprecated TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::OctetSeq *&); +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48 + #ifndef __ACE_INLINE__ // TAO_IDL - Generated from @@ -218,7 +161,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* __ACE_INLINE__ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018 #if defined (__ACE_INLINE__) #include "OctetSeqC.i" diff --git a/TAO/tao/OctetSeqC.i b/TAO/tao/OctetSeqC.i index 9fcc77e584e..d0f089c4a6e 100644 --- a/TAO/tao/OctetSeqC.i +++ b/TAO/tao/OctetSeqC.i @@ -20,265 +20,6 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html -#if !defined (_CORBA_OCTETSEQ_CI_) -#define _CORBA_OCTETSEQ_CI_ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226 - -// ************************************************************* -// Inline operations for class CORBA::OctetSeq_var -// ************************************************************* - -ACE_INLINE -CORBA::OctetSeq_var::OctetSeq_var (void) - : ptr_ (0) -{} - -ACE_INLINE -CORBA::OctetSeq_var::OctetSeq_var (OctetSeq *p) - : ptr_ (p) -{} - -ACE_INLINE -CORBA::OctetSeq_var::OctetSeq_var (const ::CORBA::OctetSeq_var &p) -{ - if (p.ptr_) - { - ACE_NEW (this->ptr_, ::CORBA::OctetSeq (*p.ptr_)); - } - else - { - this->ptr_ = 0; - } -} - -// Fixed-size base types only. -ACE_INLINE -CORBA::OctetSeq_var::OctetSeq_var (const ::CORBA::OctetSeq &p) -{ - ACE_NEW (this->ptr_, ::CORBA::OctetSeq (p)); -} - -ACE_INLINE -CORBA::OctetSeq_var::~OctetSeq_var (void) -{ - delete this->ptr_; -} - -ACE_INLINE -CORBA::OctetSeq_var & -CORBA::OctetSeq_var::operator= (OctetSeq *p) -{ - delete this->ptr_; - this->ptr_ = p; - return *this; -} - -ACE_INLINE -::CORBA::OctetSeq_var & -CORBA::OctetSeq_var::operator= (const ::CORBA::OctetSeq_var &p) -{ - if (this != &p) - { - if (p.ptr_ == 0) - { - delete this->ptr_; - this->ptr_ = 0; - } - else - { - OctetSeq *deep_copy = 0; - ACE_NEW_RETURN ( - deep_copy, - OctetSeq (*p.ptr_), - *this - ); - - if (deep_copy != 0) - { - OctetSeq *tmp = deep_copy; - deep_copy = this->ptr_; - this->ptr_ = tmp; - delete deep_copy; - } - } - } - - return *this; -} - -// Fixed-size types only. -ACE_INLINE -::CORBA::OctetSeq_var & -CORBA::OctetSeq_var::operator= (const ::CORBA::OctetSeq &p) -{ - if (this->ptr_ != &p) - { - delete this->ptr_; - ACE_NEW_RETURN (this->ptr_, ::CORBA::OctetSeq (p), *this); - } - - return *this; -} - -ACE_INLINE -const ::CORBA::OctetSeq * -CORBA::OctetSeq_var::operator-> (void) const -{ - return this->ptr_; -} - -ACE_INLINE -::CORBA::OctetSeq * -CORBA::OctetSeq_var::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -CORBA::OctetSeq_var::operator const ::CORBA::OctetSeq &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE -CORBA::OctetSeq_var::operator ::CORBA::OctetSeq &() // cast -{ - return *this->ptr_; -} - -ACE_INLINE -CORBA::OctetSeq_var::operator ::CORBA::OctetSeq &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE -CORBA::Octet & -CORBA::OctetSeq_var::operator[] (CORBA::ULong index) -{ - return this->ptr_->operator[] (index); -} - -ACE_INLINE -const CORBA::Octet & -CORBA::OctetSeq_var::operator[] (CORBA::ULong index) const -{ - return ACE_const_cast (const CORBA::Octet &, this->ptr_->operator[] (index)); -} - -ACE_INLINE -const ::CORBA::OctetSeq & -CORBA::OctetSeq_var::in (void) const -{ - return *this->ptr_; -} - -ACE_INLINE -::CORBA::OctetSeq & -CORBA::OctetSeq_var::inout (void) -{ - return *this->ptr_; -} - -ACE_INLINE -::CORBA::OctetSeq *& -CORBA::OctetSeq_var::out (void) -{ - delete this->ptr_; - this->ptr_ = 0; - return this->ptr_; -} - -ACE_INLINE -::CORBA::OctetSeq * -CORBA::OctetSeq_var::_retn (void) -{ - ::CORBA::OctetSeq *tmp = this->ptr_; - this->ptr_ = 0; - return tmp; -} - -ACE_INLINE -::CORBA::OctetSeq * -CORBA::OctetSeq_var::ptr (void) const -{ - return this->ptr_; -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567 - -// ************************************************************* -// Inline operations for class CORBA::OctetSeq_out -// ************************************************************* - -ACE_INLINE -CORBA::OctetSeq_out::OctetSeq_out (OctetSeq *&p) - : ptr_ (p) -{ - this->ptr_ = 0; -} - -ACE_INLINE -CORBA::OctetSeq_out::OctetSeq_out (OctetSeq_var &p) - : ptr_ (p.out ()) -{ - delete this->ptr_; - this->ptr_ = 0; -} - -ACE_INLINE -CORBA::OctetSeq_out::OctetSeq_out (const ::CORBA::OctetSeq_out &p) - : ptr_ (ACE_const_cast (OctetSeq_out&, p).ptr_) -{} - -ACE_INLINE -::CORBA::OctetSeq_out & -CORBA::OctetSeq_out::operator= (const ::CORBA::OctetSeq_out &p) -{ - this->ptr_ = ACE_const_cast (OctetSeq_out&, p).ptr_; - return *this; -} - -ACE_INLINE -::CORBA::OctetSeq_out & -CORBA::OctetSeq_out::operator= (OctetSeq *p) -{ - this->ptr_ = p; - return *this; -} - -ACE_INLINE -CORBA::OctetSeq_out::operator ::CORBA::OctetSeq *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE -::CORBA::OctetSeq *& -CORBA::OctetSeq_out::ptr (void) // ptr -{ - return this->ptr_; -} - -ACE_INLINE -::CORBA::OctetSeq * -CORBA::OctetSeq_out::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -CORBA::Octet & -CORBA::OctetSeq_out::operator[] (CORBA::ULong index) -{ - return this->ptr_->operator[] (index); -} - -#endif /* end #if !defined */ - // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84 diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp index 562868adf60..53a1c5ac720 100644 --- a/TAO/tao/PolicyC.cpp +++ b/TAO/tao/PolicyC.cpp @@ -34,8 +34,6 @@ #include "tao/ClientInterceptorAdapter.h" #endif /* TAO_HAS_INTERCEPTORS == 1 */ - - #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ @@ -114,7 +112,7 @@ CORBA::PolicyError::PolicyError (const ::CORBA::PolicyError &_tao_excp) CORBA::PolicyError& CORBA::PolicyError::operator= (const ::CORBA::PolicyError &_tao_excp) { - this->UserException::operator= (_tao_excp); + this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp); this->reason = _tao_excp.reason; return *this; } @@ -195,11 +193,10 @@ void CORBA::PolicyError::_tao_decode ( CORBA::PolicyError::PolicyError ( CORBA::PolicyErrorCode _tao_reason - ) - : CORBA::UserException ( - "IDL:omg.org/CORBA/PolicyError:1.0", - "PolicyError" - ) + ) : CORBA::UserException ( + "IDL:omg.org/CORBA/PolicyError:1.0", + "PolicyError" + ) { this->reason = _tao_reason; } @@ -276,116 +273,38 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CS_) -#define __TAO_UNBOUNDED_SEQUENCE_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CS_ - -void -CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_allocate_buffer (CORBA::ULong length) -{ - CORBA::UShort* tmp = 0; - tmp = _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (length); - - if (this->buffer_ != 0) - { - CORBA::UShort *old = - ACE_reinterpret_cast (CORBA::UShort *, this->buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - tmp[i] = old[i]; - } - - if (this->release_) - { - _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::freebuf (old); - } - } - - this->buffer_ = tmp; -} - -void -CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_deallocate_buffer (void) -{ - if (this->buffer_ == 0 || this->release_ == 0) - { - return; - } - - CORBA::UShort *tmp = - ACE_reinterpret_cast (CORBA::UShort *, this->buffer_); - _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::freebuf (tmp); - this->buffer_ = 0; -} - -CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::~_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (void) -{ - this->_deallocate_buffer (); -} - -#endif /* end #if !defined */ - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CS_) -#define _CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CS_ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250 - -// ************************************************************* -// CORBA::InvalidPolicies::_tao_seq_UShort -// ************************************************************* +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50 CORBA::InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort (void) {} CORBA::InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort (CORBA::ULong max) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<CORBA::UShort> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max) + : TAO_Unbounded_Sequence< + CORBA::UShort + > + (max) {} CORBA::InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort ( CORBA::ULong max, CORBA::ULong length, - CORBA::UShort *buffer, + CORBA::UShort* buffer, CORBA::Boolean release ) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<CORBA::UShort> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max, length, buffer, release) + : TAO_Unbounded_Sequence< + CORBA::UShort + > + (max, length, buffer, release) {} CORBA::InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort (const _tao_seq_UShort &seq) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<CORBA::UShort> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (seq) + : TAO_Unbounded_Sequence< + CORBA::UShort + > + (seq) {} -CORBA::InvalidPolicies::_tao_seq_UShort::~_tao_seq_UShort (void) // dtor +CORBA::InvalidPolicies::_tao_seq_UShort::~_tao_seq_UShort (void) {} void CORBA::InvalidPolicies::_tao_seq_UShort::_tao_any_destructor (void *_tao_void_pointer) @@ -394,8 +313,6 @@ void CORBA::InvalidPolicies::_tao_seq_UShort::_tao_any_destructor (void *_tao_vo delete tmp; } -#endif /* end #if !defined */ - // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63 @@ -423,7 +340,7 @@ CORBA::InvalidPolicies::InvalidPolicies (const ::CORBA::InvalidPolicies &_tao_ex CORBA::InvalidPolicies& CORBA::InvalidPolicies::operator= (const ::CORBA::InvalidPolicies &_tao_excp) { - this->UserException::operator= (_tao_excp); + this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp); this->indices = _tao_excp.indices; return *this; } @@ -504,8 +421,7 @@ void CORBA::InvalidPolicies::_tao_decode ( CORBA::InvalidPolicies::InvalidPolicies ( const CORBA::InvalidPolicies::_tao_seq_UShort & _tao_indices - ) - : CORBA::UserException ( + ) : CORBA::UserException ( "IDL:omg.org/CORBA/InvalidPolicies:1.0", "InvalidPolicies" ) @@ -600,6 +516,15 @@ CORBA::tao_Policy_life::tao_nil ( return CORBA::Policy::_nil (); } +CORBA::Boolean +CORBA::tao_Policy_life::tao_marshal ( + CORBA::Policy_ptr p, + TAO_OutputCDR &cdr + ) +{ + return p->marshal (cdr); +} + CORBA::Policy_ptr CORBA::tao_Policy_cast::tao_narrow ( CORBA::Object *p @@ -619,194 +544,32 @@ CORBA::tao_Policy_cast::tao_upcast ( return *tmp; } -#if 0 - -// ************************************************************* -// CORBA::Policy_var -// ************************************************************* - -CORBA::Policy_var::Policy_var (void) - : ptr_ (Policy::_nil ()) -{} - -::CORBA::Policy_ptr -CORBA::Policy_var::ptr (void) const -{ - return this->ptr_; -} - -CORBA::Policy_var::Policy_var (const ::CORBA::Policy_var &p) - : TAO_Base_var (), - ptr_ (Policy::_duplicate (p.ptr ())) -{} - -CORBA::Policy_var::~Policy_var (void) -{ - CORBA::release (this->ptr_); -} - -CORBA::Policy_var & -CORBA::Policy_var::operator= (Policy_ptr p) -{ - CORBA::release (this->ptr_); - this->ptr_ = p; - return *this; -} - -CORBA::Policy_var & -CORBA::Policy_var::operator= (const ::CORBA::Policy_var &p) -{ - if (this != &p) - { - CORBA::release (this->ptr_); - this->ptr_ = ::CORBA::Policy::_duplicate (p.ptr ()); - } - return *this; -} - -CORBA::Policy_var::operator const ::CORBA::Policy_ptr &() const // cast -{ - return this->ptr_; -} - -CORBA::Policy_var::operator ::CORBA::Policy_ptr &() // cast -{ - return this->ptr_; -} - -::CORBA::Policy_ptr -CORBA::Policy_var::operator-> (void) const -{ - return this->ptr_; -} - -::CORBA::Policy_ptr -CORBA::Policy_var::in (void) const -{ - return this->ptr_; -} - -::CORBA::Policy_ptr & -CORBA::Policy_var::inout (void) -{ - return this->ptr_; -} - -::CORBA::Policy_ptr & -CORBA::Policy_var::out (void) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::CORBA::Policy::_nil (); - return this->ptr_; -} - -::CORBA::Policy_ptr -CORBA::Policy_var::_retn (void) -{ - // yield ownership of managed obj reference - ::CORBA::Policy_ptr val = this->ptr_; - this->ptr_ = ::CORBA::Policy::_nil (); - return val; -} - -::CORBA::Policy_ptr -CORBA::Policy_var::tao_duplicate (Policy_ptr p) -{ - return ::CORBA::Policy::_duplicate (p); -} - -void -CORBA::Policy_var::tao_release (Policy_ptr p) -{ - CORBA::release (p); -} - -::CORBA::Policy_ptr -CORBA::Policy_var::tao_nil (void) -{ - return ::CORBA::Policy::_nil (); -} - -::CORBA::Policy_ptr -CORBA::Policy_var::tao_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return ::CORBA::Policy::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object * -CORBA::Policy_var::tao_upcast (void *src) -{ - Policy **tmp = - ACE_static_cast (Policy **, src); - return *tmp; -} +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + template class + TAO_Objref_Var_T< + CORBA::Policy, + CORBA::tao_Policy_life + >; + template class + TAO_Objref_Out_T< + CORBA::Policy, + CORBA::tao_Policy_life + >; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +# pragma instantiate \ + TAO_Objref_Var_T< \ + CORBA::Policy, \ + CORBA::tao_Policy_life \ + > +# pragma instantiate \ + TAO_Objref_Out_T< \ + CORBA::Policy, \ + CORBA::tao_Policy_life \ + > +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030 - -// ************************************************************* -// CORBA::Policy_out -// ************************************************************* - -CORBA::Policy_out::Policy_out (Policy_ptr &p) - : ptr_ (p) -{ - this->ptr_ = ::CORBA::Policy::_nil (); -} - -CORBA::Policy_out::Policy_out (Policy_var &p) - : ptr_ (p.out ()) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::CORBA::Policy::_nil (); -} - -CORBA::Policy_out::Policy_out (const ::CORBA::Policy_out &p) - : ptr_ (ACE_const_cast (Policy_out &, p).ptr_) -{} - -::CORBA::Policy_out & -CORBA::Policy_out::operator= (const ::CORBA::Policy_out &p) -{ - this->ptr_ = ACE_const_cast (Policy_out&, p).ptr_; - return *this; -} - -CORBA::Policy_out & -CORBA::Policy_out::operator= (const ::CORBA::Policy_var &p) -{ - this->ptr_ = ::CORBA::Policy::_duplicate (p.ptr ()); - return *this; -} - -CORBA::Policy_out & -CORBA::Policy_out::operator= (Policy_ptr p) -{ - this->ptr_ = p; - return *this; -} - -CORBA::Policy_out::operator ::CORBA::Policy_ptr &() // cast -{ - return this->ptr_; -} - -::CORBA::Policy_ptr & -CORBA::Policy_out::ptr (void) -{ - return this->ptr_; -} - -::CORBA::Policy_ptr -CORBA::Policy_out::operator-> (void) -{ - return this->ptr_; -} - -#endif /* 0 */ +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56 #if (TAO_HAS_INTERCEPTORS == 1) @@ -840,7 +603,7 @@ public: }; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376 TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::TAO_ClientRequestInfo_CORBA_Policy_policy_type_get ( TAO_GIOP_Invocation *_tao_invocation, @@ -927,7 +690,7 @@ public: }; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376 TAO_ClientRequestInfo_CORBA_Policy_copy::TAO_ClientRequestInfo_CORBA_Policy_copy ( TAO_GIOP_Invocation *_tao_invocation, @@ -1010,7 +773,7 @@ public: }; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376 TAO_ClientRequestInfo_CORBA_Policy_destroy::TAO_ClientRequestInfo_CORBA_Policy_destroy ( TAO_GIOP_Invocation *_tao_invocation, @@ -1144,73 +907,80 @@ CORBA::PolicyType CORBA::_TAO_Policy_Remote_Proxy_Impl::policy_type ( if (_invoke_status == TAO_INVOKE_RESTART) { _tao_call.restart_flag (1); - continue; } - + else + { + #endif /* TAO_HAS_INTERCEPTORS */ - - _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); - - _tao_call.prepare_header ( - ACE_static_cast (CORBA::Octet, _tao_response_flag) - ACE_ENV_ARG_PARAMETER - ); - TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); - - - _invoke_status = - _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); + + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); + TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); - if (_invoke_status == TAO_INVOKE_EXCEPTION) - { - TAO_INTERCEPTOR_THROW_RETURN ( - CORBA::UNKNOWN ( - CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES - ), - _tao_retval + _tao_call.prepare_header ( + ACE_static_cast (CORBA::Octet, _tao_response_flag) + ACE_ENV_ARG_PARAMETER ); - } - else if (_invoke_status == TAO_INVOKE_RESTART) - { - TAO_INTERCEPTOR ( + TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); + + + _invoke_status = + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); + TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); + + if (_invoke_status == TAO_INVOKE_EXCEPTION) + { + TAO_INTERCEPTOR_THROW_RETURN ( + CORBA::UNKNOWN ( + CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES + ), + _tao_retval + ); + } + else if (_invoke_status == TAO_INVOKE_RESTART) + { + _tao_call.restart_flag (1); + TAO_INTERCEPTOR ( + _tao_ri.reply_status (_invoke_status); + _tao_vfr.receive_other ( + &_tao_ri + ACE_ENV_ARG_PARAMETER + ); + ACE_TRY_CHECK; + ) + } + else + { + + TAO_InputCDR &_tao_in = _tao_call.inp_stream (); + _tao_call.transport()->assign_translators (&_tao_in,0); + + if (!( + (_tao_in >> _tao_retval) + )) + { + TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER); + TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); + + + } + +#if TAO_HAS_INTERCEPTORS == 1 + CORBA::PolicyType _tao_retval_info = + _tao_retval; + _tao_ri.result (_tao_retval_info); + _tao_ri.reply_status (_invoke_status); - _tao_vfr.receive_other ( + _tao_vfr.receive_reply ( &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - ) - - continue; - } - - TAO_InputCDR &_tao_in = _tao_call.inp_stream (); - - if (!( - (_tao_in >> _tao_retval) - )) - { - TAO_INTERCEPTOR_THROW_RETURN ( - CORBA::MARSHAL ( - TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES - ), - _tao_retval - ); - } - + +#endif /* TAO_HAS_INTERCEPTORS */ + } + #if TAO_HAS_INTERCEPTORS == 1 - CORBA::PolicyType _tao_retval_info = - _tao_retval; - _tao_ri.result (_tao_retval_info); - - _tao_ri.reply_status (_invoke_status); - _tao_vfr.receive_reply ( - &_tao_ri - ACE_ENV_ARG_PARAMETER - ); - ACE_TRY_CHECK; + } } ACE_CATCHANY { @@ -1221,7 +991,7 @@ CORBA::PolicyType CORBA::_TAO_Policy_Remote_Proxy_Impl::policy_type ( ); ACE_TRY_CHECK; - PortableInterceptor::ReplyStatus _tao_status = + const PortableInterceptor::ReplyStatus _tao_status = _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -1245,7 +1015,7 @@ CORBA::PolicyType CORBA::_TAO_Policy_Remote_Proxy_Impl::policy_type ( ); ACE_TRY_CHECK; - PortableInterceptor::ReplyStatus _tao_status = + const PortableInterceptor::ReplyStatus _tao_status = _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -1257,22 +1027,20 @@ CORBA::PolicyType CORBA::_TAO_Policy_Remote_Proxy_Impl::policy_type ( ACE_ENDTRY; ACE_CHECK_RETURN (_tao_retval); - PortableInterceptor::ReplyStatus _tao_status = + const PortableInterceptor::ReplyStatus _tao_status = _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval); - if (_tao_status == PortableInterceptor::LOCATION_FORWARD - || _tao_status == PortableInterceptor::TRANSPORT_RETRY) - { - continue; - } - + if (_tao_status != PortableInterceptor::LOCATION_FORWARD + && _tao_status != PortableInterceptor::TRANSPORT_RETRY) + #endif /* TAO_HAS_INTERCEPTORS */ - - break; + + if (_invoke_status != TAO_INVOKE_RESTART) + break; } - - return _tao_retval; + +return _tao_retval; } // TAO_IDL - Generated from @@ -1343,74 +1111,81 @@ CORBA::PolicyType CORBA::_TAO_Policy_Remote_Proxy_Impl::policy_type ( if (_invoke_status == TAO_INVOKE_RESTART) { _tao_call.restart_flag (1); - continue; } - + else + { + #endif /* TAO_HAS_INTERCEPTORS */ - - _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ()); - - _tao_call.prepare_header ( - ACE_static_cast (CORBA::Octet, _tao_response_flag) - ACE_ENV_ARG_PARAMETER - ); - TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ()); - - - _invoke_status = - _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ()); + + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); + TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ()); - if (_invoke_status == TAO_INVOKE_EXCEPTION) - { - TAO_INTERCEPTOR_THROW_RETURN ( - CORBA::UNKNOWN ( - CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES - ), - 0 + _tao_call.prepare_header ( + ACE_static_cast (CORBA::Octet, _tao_response_flag) + ACE_ENV_ARG_PARAMETER ); - } - else if (_invoke_status == TAO_INVOKE_RESTART) - { - TAO_INTERCEPTOR ( + TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ()); + + + _invoke_status = + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); + TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ()); + + if (_invoke_status == TAO_INVOKE_EXCEPTION) + { + TAO_INTERCEPTOR_THROW_RETURN ( + CORBA::UNKNOWN ( + CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES + ), + 0 + ); + } + else if (_invoke_status == TAO_INVOKE_RESTART) + { + _tao_call.restart_flag (1); + TAO_INTERCEPTOR ( + _tao_ri.reply_status (_invoke_status); + _tao_vfr.receive_other ( + &_tao_ri + ACE_ENV_ARG_PARAMETER + ); + ACE_TRY_CHECK; + ) + } + else + { + + TAO_InputCDR &_tao_in = _tao_call.inp_stream (); + _tao_call.transport()->assign_translators (&_tao_in,0); + + if (!( + (_tao_in >> _tao_retval.inout ()) + )) + { + TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER); + TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ()); + + + } + +#if TAO_HAS_INTERCEPTORS == 1 + ::CORBA::Policy_ptr _tao_retval_info = + _tao_retval._retn (); + _tao_ri.result (_tao_retval_info); + _tao_retval = _tao_retval_info; + _tao_ri.reply_status (_invoke_status); - _tao_vfr.receive_other ( + _tao_vfr.receive_reply ( &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - ) - - continue; - } - - TAO_InputCDR &_tao_in = _tao_call.inp_stream (); - - if (!( - (_tao_in >> _tao_retval.inout ()) - )) - { - TAO_INTERCEPTOR_THROW_RETURN ( - CORBA::MARSHAL ( - TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES - ), - 0 - ); - } - + +#endif /* TAO_HAS_INTERCEPTORS */ + } + #if TAO_HAS_INTERCEPTORS == 1 - ::CORBA::Policy_ptr _tao_retval_info = - _tao_retval._retn (); - _tao_ri.result (_tao_retval_info); - _tao_retval = _tao_retval_info; - - _tao_ri.reply_status (_invoke_status); - _tao_vfr.receive_reply ( - &_tao_ri - ACE_ENV_ARG_PARAMETER - ); - ACE_TRY_CHECK; + } } ACE_CATCHANY { @@ -1421,7 +1196,7 @@ CORBA::PolicyType CORBA::_TAO_Policy_Remote_Proxy_Impl::policy_type ( ); ACE_TRY_CHECK; - PortableInterceptor::ReplyStatus _tao_status = + const PortableInterceptor::ReplyStatus _tao_status = _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -1445,7 +1220,7 @@ CORBA::PolicyType CORBA::_TAO_Policy_Remote_Proxy_Impl::policy_type ( ); ACE_TRY_CHECK; - PortableInterceptor::ReplyStatus _tao_status = + const PortableInterceptor::ReplyStatus _tao_status = _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -1457,22 +1232,20 @@ CORBA::PolicyType CORBA::_TAO_Policy_Remote_Proxy_Impl::policy_type ( ACE_ENDTRY; ACE_CHECK_RETURN (_tao_retval._retn ()); - PortableInterceptor::ReplyStatus _tao_status = + const PortableInterceptor::ReplyStatus _tao_status = _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval._retn ()); - if (_tao_status == PortableInterceptor::LOCATION_FORWARD - || _tao_status == PortableInterceptor::TRANSPORT_RETRY) - { - continue; - } - + if (_tao_status != PortableInterceptor::LOCATION_FORWARD + && _tao_status != PortableInterceptor::TRANSPORT_RETRY) + #endif /* TAO_HAS_INTERCEPTORS */ - - break; + + if (_invoke_status != TAO_INVOKE_RESTART) + break; } - - return _tao_retval._retn (); + +return _tao_retval._retn (); } // TAO_IDL - Generated from @@ -1542,54 +1315,62 @@ void CORBA::_TAO_Policy_Remote_Proxy_Impl::destroy ( if (_invoke_status == TAO_INVOKE_RESTART) { _tao_call.restart_flag (1); - continue; } - + else + { + #endif /* TAO_HAS_INTERCEPTORS */ - - _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK; - - _tao_call.prepare_header ( - ACE_static_cast (CORBA::Octet, _tao_response_flag) - ACE_ENV_ARG_PARAMETER - ); - TAO_INTERCEPTOR_CHECK; + + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); + TAO_INTERCEPTOR_CHECK; - - _invoke_status = - _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK; + _tao_call.prepare_header ( + ACE_static_cast (CORBA::Octet, _tao_response_flag) + ACE_ENV_ARG_PARAMETER + ); + TAO_INTERCEPTOR_CHECK; - if (_invoke_status == TAO_INVOKE_EXCEPTION) - { - TAO_INTERCEPTOR_THROW ( - CORBA::UNKNOWN ( - CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES + + _invoke_status = + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); + TAO_INTERCEPTOR_CHECK; + + if (_invoke_status == TAO_INVOKE_EXCEPTION) + { + TAO_INTERCEPTOR_THROW ( + CORBA::UNKNOWN ( + CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES + ) + ); + } + else if (_invoke_status == TAO_INVOKE_RESTART) + { + _tao_call.restart_flag (1); + TAO_INTERCEPTOR ( + _tao_ri.reply_status (_invoke_status); + _tao_vfr.receive_other ( + &_tao_ri + ACE_ENV_ARG_PARAMETER + ); + ACE_TRY_CHECK; ) - ); - } - else if (_invoke_status == TAO_INVOKE_RESTART) - { - TAO_INTERCEPTOR ( + } + else + { +#if TAO_HAS_INTERCEPTORS == 1 + _tao_ri.reply_status (_invoke_status); - _tao_vfr.receive_other ( + _tao_vfr.receive_reply ( &_tao_ri ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - ) - - continue; - } + +#endif /* TAO_HAS_INTERCEPTORS */ + } + #if TAO_HAS_INTERCEPTORS == 1 - - _tao_ri.reply_status (_invoke_status); - _tao_vfr.receive_reply ( - &_tao_ri - ACE_ENV_ARG_PARAMETER - ); - ACE_TRY_CHECK; + } } ACE_CATCHANY { @@ -1600,7 +1381,7 @@ void CORBA::_TAO_Policy_Remote_Proxy_Impl::destroy ( ); ACE_TRY_CHECK; - PortableInterceptor::ReplyStatus _tao_status = + const PortableInterceptor::ReplyStatus _tao_status = _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -1624,7 +1405,7 @@ void CORBA::_TAO_Policy_Remote_Proxy_Impl::destroy ( ); ACE_TRY_CHECK; - PortableInterceptor::ReplyStatus _tao_status = + const PortableInterceptor::ReplyStatus _tao_status = _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -1636,19 +1417,17 @@ void CORBA::_TAO_Policy_Remote_Proxy_Impl::destroy ( ACE_ENDTRY; ACE_CHECK; - PortableInterceptor::ReplyStatus _tao_status = + const PortableInterceptor::ReplyStatus _tao_status = _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - if (_tao_status == PortableInterceptor::LOCATION_FORWARD - || _tao_status == PortableInterceptor::TRANSPORT_RETRY) - { - continue; - } - + if (_tao_status != PortableInterceptor::LOCATION_FORWARD + && _tao_status != PortableInterceptor::TRANSPORT_RETRY) + #endif /* TAO_HAS_INTERCEPTORS */ - - break; + + if (_invoke_status != TAO_INVOKE_RESTART) + break; } } @@ -1705,7 +1484,7 @@ CORBA::_TAO_Policy_Remote_Proxy_Broker::select_proxy ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 CORBA::Policy::Policy (int collocated) { @@ -1862,7 +1641,7 @@ CORBA::Policy::_is_a ( } else { - return this->Object::_is_a ( + return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a ( value ACE_ENV_ARG_PARAMETER ); @@ -1905,6 +1684,12 @@ const char* CORBA::Policy::_interface_repository_id (void) const return "IDL:omg.org/CORBA/Policy:1.0"; } +CORBA::Boolean +CORBA::Policy::marshal (TAO_OutputCDR &cdr) +{ + return (cdr << this); +} + // **************************************************************** CORBA::Boolean CORBA::Policy::_tao_encode (TAO_OutputCDR &) @@ -2034,7 +1819,7 @@ TAO_NAMESPACE_END int CORBA::PolicyManager::_tao_class_id = 0; CORBA::PolicyManager_ptr -tao_CORBA_PolicyManager_duplicate ( +CORBA::tao_PolicyManager_life::tao_duplicate ( CORBA::PolicyManager_ptr p ) { @@ -2042,7 +1827,7 @@ tao_CORBA_PolicyManager_duplicate ( } void -tao_CORBA_PolicyManager_release ( +CORBA::tao_PolicyManager_life::tao_release ( CORBA::PolicyManager_ptr p ) { @@ -2050,231 +1835,67 @@ tao_CORBA_PolicyManager_release ( } CORBA::PolicyManager_ptr -tao_CORBA_PolicyManager_nil ( +CORBA::tao_PolicyManager_life::tao_nil ( void ) { return CORBA::PolicyManager::_nil (); } -CORBA::PolicyManager_ptr -tao_CORBA_PolicyManager_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return CORBA::PolicyManager::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object * -tao_CORBA_PolicyManager_upcast ( - void *src - ) -{ - CORBA::PolicyManager **tmp = - ACE_static_cast (CORBA::PolicyManager **, src); - return *tmp; -} - CORBA::Boolean -tao_CORBA_PolicyManager_marshal ( +CORBA::tao_PolicyManager_life::tao_marshal ( CORBA::PolicyManager_ptr p, - TAO_OutputCDR &strm + TAO_OutputCDR &cdr ) { - return p->marshal (strm); -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721 - -// ************************************************************* -// CORBA::PolicyManager_var -// ************************************************************* - -CORBA::PolicyManager_var::PolicyManager_var (void) - : ptr_ (PolicyManager::_nil ()) -{} - -::CORBA::PolicyManager_ptr -CORBA::PolicyManager_var::ptr (void) const -{ - return this->ptr_; -} - -CORBA::PolicyManager_var::PolicyManager_var (const ::CORBA::PolicyManager_var &p) - : TAO_Base_var (), - ptr_ (PolicyManager::_duplicate (p.ptr ())) -{} - -CORBA::PolicyManager_var::~PolicyManager_var (void) -{ - CORBA::release (this->ptr_); + return p->marshal (cdr); } -CORBA::PolicyManager_var & -CORBA::PolicyManager_var::operator= (PolicyManager_ptr p) -{ - CORBA::release (this->ptr_); - this->ptr_ = p; - return *this; -} - -CORBA::PolicyManager_var & -CORBA::PolicyManager_var::operator= (const ::CORBA::PolicyManager_var &p) -{ - if (this != &p) - { - CORBA::release (this->ptr_); - this->ptr_ = ::CORBA::PolicyManager::_duplicate (p.ptr ()); - } - return *this; -} - -CORBA::PolicyManager_var::operator const ::CORBA::PolicyManager_ptr &() const // cast -{ - return this->ptr_; -} - -CORBA::PolicyManager_var::operator ::CORBA::PolicyManager_ptr &() // cast -{ - return this->ptr_; -} - -::CORBA::PolicyManager_ptr -CORBA::PolicyManager_var::operator-> (void) const -{ - return this->ptr_; -} - -::CORBA::PolicyManager_ptr -CORBA::PolicyManager_var::in (void) const -{ - return this->ptr_; -} - -::CORBA::PolicyManager_ptr & -CORBA::PolicyManager_var::inout (void) -{ - return this->ptr_; -} - -::CORBA::PolicyManager_ptr & -CORBA::PolicyManager_var::out (void) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::CORBA::PolicyManager::_nil (); - return this->ptr_; -} - -::CORBA::PolicyManager_ptr -CORBA::PolicyManager_var::_retn (void) -{ - // yield ownership of managed obj reference - ::CORBA::PolicyManager_ptr val = this->ptr_; - this->ptr_ = ::CORBA::PolicyManager::_nil (); - return val; -} - -::CORBA::PolicyManager_ptr -CORBA::PolicyManager_var::tao_duplicate (PolicyManager_ptr p) -{ - return ::CORBA::PolicyManager::_duplicate (p); -} - -void -CORBA::PolicyManager_var::tao_release (PolicyManager_ptr p) -{ - CORBA::release (p); -} - -::CORBA::PolicyManager_ptr -CORBA::PolicyManager_var::tao_nil (void) -{ - return ::CORBA::PolicyManager::_nil (); -} - -::CORBA::PolicyManager_ptr -CORBA::PolicyManager_var::tao_narrow ( +CORBA::PolicyManager_ptr +CORBA::tao_PolicyManager_cast::tao_narrow ( CORBA::Object *p ACE_ENV_ARG_DECL ) { - return ::CORBA::PolicyManager::_narrow (p ACE_ENV_ARG_PARAMETER); + return CORBA::PolicyManager::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * -CORBA::PolicyManager_var::tao_upcast (void *src) +CORBA::tao_PolicyManager_cast::tao_upcast ( + void *src + ) { - PolicyManager **tmp = - ACE_static_cast (PolicyManager **, src); + CORBA::PolicyManager **tmp = + ACE_static_cast (CORBA::PolicyManager **, src); return *tmp; } -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030 - -// ************************************************************* -// CORBA::PolicyManager_out -// ************************************************************* - -CORBA::PolicyManager_out::PolicyManager_out (PolicyManager_ptr &p) - : ptr_ (p) -{ - this->ptr_ = ::CORBA::PolicyManager::_nil (); -} - -CORBA::PolicyManager_out::PolicyManager_out (PolicyManager_var &p) - : ptr_ (p.out ()) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::CORBA::PolicyManager::_nil (); -} - -CORBA::PolicyManager_out::PolicyManager_out (const ::CORBA::PolicyManager_out &p) - : ptr_ (ACE_const_cast (PolicyManager_out &, p).ptr_) -{} - -::CORBA::PolicyManager_out & -CORBA::PolicyManager_out::operator= (const ::CORBA::PolicyManager_out &p) -{ - this->ptr_ = ACE_const_cast (PolicyManager_out&, p).ptr_; - return *this; -} - -CORBA::PolicyManager_out & -CORBA::PolicyManager_out::operator= (const ::CORBA::PolicyManager_var &p) -{ - this->ptr_ = ::CORBA::PolicyManager::_duplicate (p.ptr ()); - return *this; -} - -CORBA::PolicyManager_out & -CORBA::PolicyManager_out::operator= (PolicyManager_ptr p) -{ - this->ptr_ = p; - return *this; -} - -CORBA::PolicyManager_out::operator ::CORBA::PolicyManager_ptr &() // cast -{ - return this->ptr_; -} - -::CORBA::PolicyManager_ptr & -CORBA::PolicyManager_out::ptr (void) -{ - return this->ptr_; -} - -::CORBA::PolicyManager_ptr -CORBA::PolicyManager_out::operator-> (void) -{ - return this->ptr_; -} +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + template class + TAO_Objref_Var_T< + CORBA::PolicyManager, + CORBA::tao_PolicyManager_life + >; + template class + TAO_Objref_Out_T< + CORBA::PolicyManager, + CORBA::tao_PolicyManager_life + >; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +# pragma instantiate \ + TAO_Objref_Var_T< \ + CORBA::PolicyManager, \ + CORBA::tao_PolicyManager_life \ + > +# pragma instantiate \ + TAO_Objref_Out_T< \ + CORBA::PolicyManager, \ + CORBA::tao_PolicyManager_life \ + > +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 CORBA::PolicyManager::PolicyManager (void) {} @@ -2368,6 +1989,12 @@ const char* CORBA::PolicyManager::_interface_repository_id (void) const return "IDL:omg.org/CORBA/PolicyManager:1.0"; } +CORBA::Boolean +CORBA::PolicyManager::marshal (TAO_OutputCDR &) +{ + return 0; +} + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -2414,7 +2041,7 @@ TAO_NAMESPACE_END int CORBA::PolicyCurrent::_tao_class_id = 0; CORBA::PolicyCurrent_ptr -tao_CORBA_PolicyCurrent_duplicate ( +CORBA::tao_PolicyCurrent_life::tao_duplicate ( CORBA::PolicyCurrent_ptr p ) { @@ -2422,7 +2049,7 @@ tao_CORBA_PolicyCurrent_duplicate ( } void -tao_CORBA_PolicyCurrent_release ( +CORBA::tao_PolicyCurrent_life::tao_release ( CORBA::PolicyCurrent_ptr p ) { @@ -2430,231 +2057,67 @@ tao_CORBA_PolicyCurrent_release ( } CORBA::PolicyCurrent_ptr -tao_CORBA_PolicyCurrent_nil ( +CORBA::tao_PolicyCurrent_life::tao_nil ( void ) { return CORBA::PolicyCurrent::_nil (); } -CORBA::PolicyCurrent_ptr -tao_CORBA_PolicyCurrent_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return CORBA::PolicyCurrent::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object * -tao_CORBA_PolicyCurrent_upcast ( - void *src - ) -{ - CORBA::PolicyCurrent **tmp = - ACE_static_cast (CORBA::PolicyCurrent **, src); - return *tmp; -} - CORBA::Boolean -tao_CORBA_PolicyCurrent_marshal ( +CORBA::tao_PolicyCurrent_life::tao_marshal ( CORBA::PolicyCurrent_ptr p, - TAO_OutputCDR &strm + TAO_OutputCDR &cdr ) { - return p->marshal (strm); -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721 - -// ************************************************************* -// CORBA::PolicyCurrent_var -// ************************************************************* - -CORBA::PolicyCurrent_var::PolicyCurrent_var (void) - : ptr_ (PolicyCurrent::_nil ()) -{} - -::CORBA::PolicyCurrent_ptr -CORBA::PolicyCurrent_var::ptr (void) const -{ - return this->ptr_; -} - -CORBA::PolicyCurrent_var::PolicyCurrent_var (const ::CORBA::PolicyCurrent_var &p) - : TAO_Base_var (), - ptr_ (PolicyCurrent::_duplicate (p.ptr ())) -{} - -CORBA::PolicyCurrent_var::~PolicyCurrent_var (void) -{ - CORBA::release (this->ptr_); -} - -CORBA::PolicyCurrent_var & -CORBA::PolicyCurrent_var::operator= (PolicyCurrent_ptr p) -{ - CORBA::release (this->ptr_); - this->ptr_ = p; - return *this; -} - -CORBA::PolicyCurrent_var & -CORBA::PolicyCurrent_var::operator= (const ::CORBA::PolicyCurrent_var &p) -{ - if (this != &p) - { - CORBA::release (this->ptr_); - this->ptr_ = ::CORBA::PolicyCurrent::_duplicate (p.ptr ()); - } - return *this; -} - -CORBA::PolicyCurrent_var::operator const ::CORBA::PolicyCurrent_ptr &() const // cast -{ - return this->ptr_; -} - -CORBA::PolicyCurrent_var::operator ::CORBA::PolicyCurrent_ptr &() // cast -{ - return this->ptr_; -} - -::CORBA::PolicyCurrent_ptr -CORBA::PolicyCurrent_var::operator-> (void) const -{ - return this->ptr_; -} - -::CORBA::PolicyCurrent_ptr -CORBA::PolicyCurrent_var::in (void) const -{ - return this->ptr_; -} - -::CORBA::PolicyCurrent_ptr & -CORBA::PolicyCurrent_var::inout (void) -{ - return this->ptr_; -} - -::CORBA::PolicyCurrent_ptr & -CORBA::PolicyCurrent_var::out (void) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::CORBA::PolicyCurrent::_nil (); - return this->ptr_; -} - -::CORBA::PolicyCurrent_ptr -CORBA::PolicyCurrent_var::_retn (void) -{ - // yield ownership of managed obj reference - ::CORBA::PolicyCurrent_ptr val = this->ptr_; - this->ptr_ = ::CORBA::PolicyCurrent::_nil (); - return val; -} - -::CORBA::PolicyCurrent_ptr -CORBA::PolicyCurrent_var::tao_duplicate (PolicyCurrent_ptr p) -{ - return ::CORBA::PolicyCurrent::_duplicate (p); -} - -void -CORBA::PolicyCurrent_var::tao_release (PolicyCurrent_ptr p) -{ - CORBA::release (p); + return p->marshal (cdr); } -::CORBA::PolicyCurrent_ptr -CORBA::PolicyCurrent_var::tao_nil (void) -{ - return ::CORBA::PolicyCurrent::_nil (); -} - -::CORBA::PolicyCurrent_ptr -CORBA::PolicyCurrent_var::tao_narrow ( +CORBA::PolicyCurrent_ptr +CORBA::tao_PolicyCurrent_cast::tao_narrow ( CORBA::Object *p ACE_ENV_ARG_DECL ) { - return ::CORBA::PolicyCurrent::_narrow (p ACE_ENV_ARG_PARAMETER); + return CORBA::PolicyCurrent::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * -CORBA::PolicyCurrent_var::tao_upcast (void *src) +CORBA::tao_PolicyCurrent_cast::tao_upcast ( + void *src + ) { - PolicyCurrent **tmp = - ACE_static_cast (PolicyCurrent **, src); + CORBA::PolicyCurrent **tmp = + ACE_static_cast (CORBA::PolicyCurrent **, src); return *tmp; } -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030 - -// ************************************************************* -// CORBA::PolicyCurrent_out -// ************************************************************* - -CORBA::PolicyCurrent_out::PolicyCurrent_out (PolicyCurrent_ptr &p) - : ptr_ (p) -{ - this->ptr_ = ::CORBA::PolicyCurrent::_nil (); -} - -CORBA::PolicyCurrent_out::PolicyCurrent_out (PolicyCurrent_var &p) - : ptr_ (p.out ()) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::CORBA::PolicyCurrent::_nil (); -} - -CORBA::PolicyCurrent_out::PolicyCurrent_out (const ::CORBA::PolicyCurrent_out &p) - : ptr_ (ACE_const_cast (PolicyCurrent_out &, p).ptr_) -{} - -::CORBA::PolicyCurrent_out & -CORBA::PolicyCurrent_out::operator= (const ::CORBA::PolicyCurrent_out &p) -{ - this->ptr_ = ACE_const_cast (PolicyCurrent_out&, p).ptr_; - return *this; -} - -CORBA::PolicyCurrent_out & -CORBA::PolicyCurrent_out::operator= (const ::CORBA::PolicyCurrent_var &p) -{ - this->ptr_ = ::CORBA::PolicyCurrent::_duplicate (p.ptr ()); - return *this; -} - -CORBA::PolicyCurrent_out & -CORBA::PolicyCurrent_out::operator= (PolicyCurrent_ptr p) -{ - this->ptr_ = p; - return *this; -} - -CORBA::PolicyCurrent_out::operator ::CORBA::PolicyCurrent_ptr &() // cast -{ - return this->ptr_; -} - -::CORBA::PolicyCurrent_ptr & -CORBA::PolicyCurrent_out::ptr (void) -{ - return this->ptr_; -} - -::CORBA::PolicyCurrent_ptr -CORBA::PolicyCurrent_out::operator-> (void) -{ - return this->ptr_; -} +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + template class + TAO_Objref_Var_T< + CORBA::PolicyCurrent, + CORBA::tao_PolicyCurrent_life + >; + template class + TAO_Objref_Out_T< + CORBA::PolicyCurrent, + CORBA::tao_PolicyCurrent_life + >; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +# pragma instantiate \ + TAO_Objref_Var_T< \ + CORBA::PolicyCurrent, \ + CORBA::tao_PolicyCurrent_life \ + > +# pragma instantiate \ + TAO_Objref_Out_T< \ + CORBA::PolicyCurrent, \ + CORBA::tao_PolicyCurrent_life \ + > +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 CORBA::PolicyCurrent::PolicyCurrent (void) {} @@ -2776,6 +2239,12 @@ const char* CORBA::PolicyCurrent::_interface_repository_id (void) const return "IDL:omg.org/CORBA/PolicyCurrent:1.0"; } +CORBA::Boolean +CORBA::PolicyCurrent::marshal (TAO_OutputCDR &) +{ + return 0; +} + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -2878,7 +2347,7 @@ CORBA::Boolean operator>>= ( defined (ACE_HAS_GNU_REPO) template class TAO::Any_Dual_Impl_T<CORBA::PolicyError>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::PolicyError> +# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::PolicyError \> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from @@ -2943,7 +2412,7 @@ CORBA::Boolean operator>>= ( defined (ACE_HAS_GNU_REPO) template class TAO::Any_Dual_Impl_T<CORBA::InvalidPolicies>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::InvalidPolicies> +# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::InvalidPolicies \> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from @@ -3167,7 +2636,7 @@ TAO::Any_Impl_T<CORBA::PolicyCurrent>::demarshal_value (TAO_InputCDR &) #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93 #if !defined _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_UShort_CPP_ #define _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_UShort_CPP_ @@ -3224,7 +2693,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_UShort_CPP_ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63 CORBA::Boolean operator<< ( TAO_OutputCDR &strm, diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h index 9a7e0ff4475..baa0d2d889a 100644 --- a/TAO/tao/PolicyC.h +++ b/TAO/tao/PolicyC.h @@ -26,18 +26,14 @@ #define _TAO_IDL_ORIG_POLICYC_H_ #include "ace/pre.h" -#include "tao/corbafwd.h" +#include "CurrentC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/TAO_Export.h" -#include "CurrentC.h" #include "Policy_ForwardC.h" -#include "Exception.h" #include "Remote_Object_Proxy_Impl.h" -#include "Encodable.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -69,7 +65,7 @@ TAO_NAMESPACE CORBA { // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333 typedef CORBA::Short PolicyErrorCode; typedef CORBA::Short_out PolicyErrorCode_out; @@ -82,27 +78,27 @@ TAO_NAMESPACE CORBA // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::Short BAD_POLICY = 0; + const CORBA::PolicyErrorCode BAD_POLICY = 0; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::Short UNSUPPORTED_POLICY = 1; + const CORBA::PolicyErrorCode UNSUPPORTED_POLICY = 1; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::Short BAD_POLICY_TYPE = 2; + const CORBA::PolicyErrorCode BAD_POLICY_TYPE = 2; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::Short BAD_POLICY_VALUE = 3; + const CORBA::PolicyErrorCode BAD_POLICY_VALUE = 3; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::Short UNSUPPORTED_POLICY_VALUE = 4; + const CORBA::PolicyErrorCode UNSUPPORTED_POLICY_VALUE = 4; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51 @@ -172,101 +168,31 @@ TAO_NAMESPACE CORBA - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CH_) -#define __TAO_UNBOUNDED_SEQUENCE_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CH_ - - class TAO_Export _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort - : public TAO_Unbounded_Base_Sequence - { - public: - _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (void); - _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (CORBA::ULong maximum); - _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort ( - CORBA::ULong maximum, - CORBA::ULong length, - CORBA::UShort *data, - CORBA::Boolean release = 0 - ); - _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort ( - const _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &rhs - ); - _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &operator= ( - const _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &rhs - ); - virtual ~_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (void); - - // = Accessors. - CORBA::UShort &operator[] (CORBA::ULong i); - const CORBA::UShort &operator[] (CORBA::ULong i) const; - - // = Static operations. - static CORBA::UShort *allocbuf (CORBA::ULong size); - static void freebuf (CORBA::UShort *buffer); - - // Implement the TAO_Base_Sequence methods (see Sequence.h) - virtual void _allocate_buffer (CORBA::ULong length); - virtual void _deallocate_buffer (void); - CORBA::UShort *get_buffer (CORBA::Boolean orphan = 0); - const CORBA::UShort *get_buffer (void) const; - void replace ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::UShort *data, - CORBA::Boolean release - ); - }; - -#endif /* end #if !defined */ - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CH_) -#define _CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CH_ - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75 - class _tao_seq_UShort; - - // ************************************************************* - // CORBA::InvalidPolicies::_tao_seq_UShort - // ************************************************************* - - class TAO_Export _tao_seq_UShort : public - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort -#else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<CORBA::UShort> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + class TAO_Export _tao_seq_UShort + : public + TAO_Unbounded_Sequence< + CORBA::UShort + > { public: _tao_seq_UShort (void); _tao_seq_UShort (CORBA::ULong max); _tao_seq_UShort ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::UShort *buffer, + CORBA::ULong max, + CORBA::ULong length, + CORBA::UShort* buffer, CORBA::Boolean release = 0 ); _tao_seq_UShort (const _tao_seq_UShort &); ~_tao_seq_UShort (void); - static void _tao_any_destructor (void*); + static void _tao_any_destructor (void *); }; - -#endif /* end #if !defined */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_field/field_ch.cpp:447 @@ -319,114 +245,41 @@ TAO_NAMESPACE CORBA #endif /* end #if !defined */ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567 -#if !defined (_CORBA_POLICY___PTR_CH_) -#define _CORBA_POLICY___PTR_CH_ +#if !defined (_CORBA_POLICY__ODDS_N_ENDS_CH_) +#define _CORBA_POLICY__ODDS_N_ENDS_CH_ class Policy; typedef Policy *Policy_ptr; - struct tao_Policy_life; typedef TAO_Objref_Var_T<Policy, tao_Policy_life> Policy_var; typedef TAO_Objref_Out_T<Policy, tao_Policy_life> Policy_out; - + struct tao_Policy_life { static Policy_ptr tao_duplicate (Policy_ptr); static void tao_release (Policy_ptr); static Policy_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( + Policy_ptr, + TAO_OutputCDR & + ); }; - - struct tao_Policy_cast - { - static Policy_ptr tao_narrow (CORBA::Object_ptr - ACE_ENV_ARG_DECL); - static CORBA::Object_ptr tao_upcast (void *); - }; - -#endif /* end #if !defined */ - -#if 0 - -#if !defined (_CORBA_POLICY___VAR_CH_) -#define _CORBA_POLICY___VAR_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571 - class TAO_Export Policy_var : public TAO_Base_var + struct tao_Policy_cast { - public: - Policy_var (void); // default constructor - Policy_var (Policy_ptr p) : ptr_ (p) {} - Policy_var (const Policy_var &); // copy constructor - ~Policy_var (void); // destructor - - Policy_var &operator= (Policy_ptr); - Policy_var &operator= (const Policy_var &); - Policy_ptr operator-> (void) const; - - operator const Policy_ptr &() const; - operator Policy_ptr &(); - // in, inout, out, _retn - Policy_ptr in (void) const; - Policy_ptr &inout (void); - Policy_ptr &out (void); - Policy_ptr _retn (void); - Policy_ptr ptr (void) const; - - // Hooks used by template sequence and object manager classes - // for non-defined forward declared interfaces. - static Policy_ptr tao_duplicate (Policy_ptr); - static void tao_release (Policy_ptr); - static Policy_ptr tao_nil (void); static Policy_ptr tao_narrow ( - CORBA::Object * - ACE_ENV_ARG_DECL_NOT_USED + CORBA::Object_ptr + ACE_ENV_ARG_DECL ); - static CORBA::Object * tao_upcast (void *); - - private: - Policy_ptr ptr_; - // Unimplemented - prevents widening assignment. - Policy_var (const TAO_Base_var &rhs); - Policy_var &operator= (const TAO_Base_var &rhs); - }; - -#endif /* end #if !defined */ - -#if !defined (_CORBA_POLICY___OUT_CH_) -#define _CORBA_POLICY___OUT_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946 - - class TAO_Export Policy_out - { - public: - Policy_out (Policy_ptr &); - Policy_out (Policy_var &); - Policy_out (const Policy_out &); - Policy_out &operator= (const Policy_out &); - Policy_out &operator= (const Policy_var &); - Policy_out &operator= (Policy_ptr); - operator Policy_ptr &(); - Policy_ptr &ptr (void); - Policy_ptr operator-> (void); - - private: - Policy_ptr &ptr_; + static CORBA::Object_ptr tao_upcast (void *); }; #endif /* end #if !defined */ -#endif /* 0 */ - - // ************************************************************* - // CORBA::Policy // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_POLICY_CH_) #define _CORBA_POLICY_CH_ @@ -438,9 +291,6 @@ TAO_NAMESPACE CORBA class TAO_Export Policy : public virtual CORBA::Object - // **************************************************************** - , public virtual TAO_Encodable - // **************************************************************** { public: typedef Policy_ptr _ptr_type; @@ -498,7 +348,7 @@ TAO_NAMESPACE CORBA )); // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 virtual CORBA::Boolean _is_a ( const char *type_id @@ -729,94 +579,42 @@ TAO_NAMESPACE CORBA TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Policy; - typedef TAO_Unbounded_Object_Sequence<Policy, - Policy_var, - tao_Policy_life, - tao_Policy_cast> - PolicyList; - -#if !defined (_CORBA_POLICYMANAGER___PTR_CH_) -#define _CORBA_POLICYMANAGER___PTR_CH_ + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567 + +#if !defined (_CORBA_POLICYMANAGER__ODDS_N_ENDS_CH_) +#define _CORBA_POLICYMANAGER__ODDS_N_ENDS_CH_ class PolicyManager; typedef PolicyManager *PolicyManager_ptr; - -#endif /* end #if !defined */ - -#if !defined (_CORBA_POLICYMANAGER___VAR_CH_) -#define _CORBA_POLICYMANAGER___VAR_CH_ + struct tao_PolicyManager_life; + typedef TAO_Objref_Var_T<PolicyManager, tao_PolicyManager_life> PolicyManager_var; + typedef TAO_Objref_Out_T<PolicyManager, tao_PolicyManager_life> PolicyManager_out; - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571 - - class TAO_Export PolicyManager_var : public TAO_Base_var + struct tao_PolicyManager_life { - public: - PolicyManager_var (void); // default constructor - PolicyManager_var (PolicyManager_ptr p) : ptr_ (p) {} - PolicyManager_var (const PolicyManager_var &); // copy constructor - ~PolicyManager_var (void); // destructor - - PolicyManager_var &operator= (PolicyManager_ptr); - PolicyManager_var &operator= (const PolicyManager_var &); - PolicyManager_ptr operator-> (void) const; - - operator const PolicyManager_ptr &() const; - operator PolicyManager_ptr &(); - // in, inout, out, _retn - PolicyManager_ptr in (void) const; - PolicyManager_ptr &inout (void); - PolicyManager_ptr &out (void); - PolicyManager_ptr _retn (void); - PolicyManager_ptr ptr (void) const; - - // Hooks used by template sequence and object manager classes - // for non-defined forward declared interfaces. static PolicyManager_ptr tao_duplicate (PolicyManager_ptr); static void tao_release (PolicyManager_ptr); static PolicyManager_ptr tao_nil (void); - static PolicyManager_ptr tao_narrow ( - CORBA::Object * - ACE_ENV_ARG_DECL_NOT_USED + static CORBA::Boolean tao_marshal ( + PolicyManager_ptr, + TAO_OutputCDR & ); - static CORBA::Object * tao_upcast (void *); - - private: - PolicyManager_ptr ptr_; - // Unimplemented - prevents widening assignment. - PolicyManager_var (const TAO_Base_var &rhs); - PolicyManager_var &operator= (const TAO_Base_var &rhs); }; - -#endif /* end #if !defined */ - -#if !defined (_CORBA_POLICYMANAGER___OUT_CH_) -#define _CORBA_POLICYMANAGER___OUT_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946 - class TAO_Export PolicyManager_out + struct tao_PolicyManager_cast { - public: - PolicyManager_out (PolicyManager_ptr &); - PolicyManager_out (PolicyManager_var &); - PolicyManager_out (const PolicyManager_out &); - PolicyManager_out &operator= (const PolicyManager_out &); - PolicyManager_out &operator= (const PolicyManager_var &); - PolicyManager_out &operator= (PolicyManager_ptr); - operator PolicyManager_ptr &(); - PolicyManager_ptr &ptr (void); - PolicyManager_ptr operator-> (void); - - private: - PolicyManager_ptr &ptr_; + static PolicyManager_ptr tao_narrow ( + CORBA::Object_ptr + ACE_ENV_ARG_DECL + ); + static CORBA::Object_ptr tao_upcast (void *); }; #endif /* end #if !defined */ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_POLICYMANAGER_CH_) #define _CORBA_POLICYMANAGER_CH_ @@ -874,7 +672,7 @@ TAO_NAMESPACE CORBA )) = 0; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -884,7 +682,7 @@ TAO_NAMESPACE CORBA protected: PolicyManager (void); virtual ~PolicyManager (void); - + private: PolicyManager (const PolicyManager &); void operator= (const PolicyManager &); @@ -898,90 +696,41 @@ TAO_NAMESPACE CORBA TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyManager; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567 -#if !defined (_CORBA_POLICYCURRENT___PTR_CH_) -#define _CORBA_POLICYCURRENT___PTR_CH_ +#if !defined (_CORBA_POLICYCURRENT__ODDS_N_ENDS_CH_) +#define _CORBA_POLICYCURRENT__ODDS_N_ENDS_CH_ class PolicyCurrent; typedef PolicyCurrent *PolicyCurrent_ptr; - -#endif /* end #if !defined */ - -#if !defined (_CORBA_POLICYCURRENT___VAR_CH_) -#define _CORBA_POLICYCURRENT___VAR_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571 + struct tao_PolicyCurrent_life; + typedef TAO_Objref_Var_T<PolicyCurrent, tao_PolicyCurrent_life> PolicyCurrent_var; + typedef TAO_Objref_Out_T<PolicyCurrent, tao_PolicyCurrent_life> PolicyCurrent_out; - class TAO_Export PolicyCurrent_var : public TAO_Base_var + struct tao_PolicyCurrent_life { - public: - PolicyCurrent_var (void); // default constructor - PolicyCurrent_var (PolicyCurrent_ptr p) : ptr_ (p) {} - PolicyCurrent_var (const PolicyCurrent_var &); // copy constructor - ~PolicyCurrent_var (void); // destructor - - PolicyCurrent_var &operator= (PolicyCurrent_ptr); - PolicyCurrent_var &operator= (const PolicyCurrent_var &); - PolicyCurrent_ptr operator-> (void) const; - - operator const PolicyCurrent_ptr &() const; - operator PolicyCurrent_ptr &(); - // in, inout, out, _retn - PolicyCurrent_ptr in (void) const; - PolicyCurrent_ptr &inout (void); - PolicyCurrent_ptr &out (void); - PolicyCurrent_ptr _retn (void); - PolicyCurrent_ptr ptr (void) const; - - // Hooks used by template sequence and object manager classes - // for non-defined forward declared interfaces. static PolicyCurrent_ptr tao_duplicate (PolicyCurrent_ptr); static void tao_release (PolicyCurrent_ptr); static PolicyCurrent_ptr tao_nil (void); - static PolicyCurrent_ptr tao_narrow ( - CORBA::Object * - ACE_ENV_ARG_DECL_NOT_USED + static CORBA::Boolean tao_marshal ( + PolicyCurrent_ptr, + TAO_OutputCDR & ); - static CORBA::Object * tao_upcast (void *); - - private: - PolicyCurrent_ptr ptr_; - // Unimplemented - prevents widening assignment. - PolicyCurrent_var (const TAO_Base_var &rhs); - PolicyCurrent_var &operator= (const TAO_Base_var &rhs); }; - -#endif /* end #if !defined */ - -#if !defined (_CORBA_POLICYCURRENT___OUT_CH_) -#define _CORBA_POLICYCURRENT___OUT_CH_ - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946 - - class TAO_Export PolicyCurrent_out + struct tao_PolicyCurrent_cast { - public: - PolicyCurrent_out (PolicyCurrent_ptr &); - PolicyCurrent_out (PolicyCurrent_var &); - PolicyCurrent_out (const PolicyCurrent_out &); - PolicyCurrent_out &operator= (const PolicyCurrent_out &); - PolicyCurrent_out &operator= (const PolicyCurrent_var &); - PolicyCurrent_out &operator= (PolicyCurrent_ptr); - operator PolicyCurrent_ptr &(); - PolicyCurrent_ptr &ptr (void); - PolicyCurrent_ptr operator-> (void); - - private: - PolicyCurrent_ptr &ptr_; + static PolicyCurrent_ptr tao_narrow ( + CORBA::Object_ptr + ACE_ENV_ARG_DECL + ); + static CORBA::Object_ptr tao_upcast (void *); }; #endif /* end #if !defined */ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_POLICYCURRENT_CH_) #define _CORBA_POLICYCURRENT_CH_ @@ -1016,7 +765,7 @@ TAO_NAMESPACE CORBA static void _tao_any_destructor (void *); // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -1026,7 +775,7 @@ TAO_NAMESPACE CORBA protected: PolicyCurrent (void); virtual ~PolicyCurrent (void); - + private: PolicyCurrent (const PolicyCurrent &); void operator= (const PolicyCurrent &); @@ -1139,7 +888,7 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Policy_ptr &); #endif /* __ACE_INLINE__ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018 #if defined (__ACE_INLINE__) #include "PolicyC.i" diff --git a/TAO/tao/PolicyC.i b/TAO/tao/PolicyC.i index 2e8ecab0895..466d238d71f 100644 --- a/TAO/tao/PolicyC.i +++ b/TAO/tao/PolicyC.i @@ -20,219 +20,6 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CI_) -#define __TAO_UNBOUNDED_SEQUENCE_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CI_ - -ACE_INLINE -CORBA::UShort * -CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (CORBA::ULong size) -{ - CORBA::UShort *retval = 0; - ACE_NEW_RETURN (retval, CORBA::UShort[size], 0); - return retval; -} - -ACE_INLINE -void CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::freebuf (CORBA::UShort *buffer) -{ - delete [] buffer; -} - -ACE_INLINE -CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (void) -{ -} - -ACE_INLINE -CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (CORBA::ULong maximum) - : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (maximum)) -{ -} - -ACE_INLINE -CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort ( - CORBA::ULong maximum, - CORBA::ULong length, - CORBA::UShort *data, - CORBA::Boolean release - ) - : TAO_Unbounded_Base_Sequence (maximum, length, data, release) -{ -} - -ACE_INLINE -CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort ( - const _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &rhs - ) - : TAO_Unbounded_Base_Sequence (rhs) -{ - if (rhs.buffer_ != 0) - { - CORBA::UShort *tmp1 = - _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (this->maximum_); - CORBA::UShort * const tmp2 = - ACE_reinterpret_cast (CORBA::UShort * ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - tmp1[i] = tmp2[i]; - } - - this->buffer_ = tmp1; - } - else - { - this->buffer_ = 0; - } -} - -ACE_INLINE -CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort & -CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::operator= ( - const _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &rhs - ) -{ - if (this == &rhs) - { - return *this; - } - - if (this->release_) - { - if (this->maximum_ < rhs.maximum_) - { - // Free the old buffer. - CORBA::UShort *tmp = - ACE_reinterpret_cast (CORBA::UShort *, this->buffer_); - - _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::freebuf (tmp); - - this->buffer_ = - _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (rhs.maximum_); - } - } - else - { - this->buffer_ = - _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (rhs.maximum_); - } - - TAO_Unbounded_Base_Sequence::operator= (rhs); - - CORBA::UShort *tmp1 = - ACE_reinterpret_cast (CORBA::UShort *, this->buffer_); - CORBA::UShort * const tmp2 = - ACE_reinterpret_cast (CORBA::UShort * ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - tmp1[i] = tmp2[i]; - } - - return *this; -} - -// = Accessors. -ACE_INLINE -CORBA::UShort & -CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::operator[] (CORBA::ULong i) -{ - ACE_ASSERT (i < this->maximum_); - CORBA::UShort* tmp = - ACE_reinterpret_cast (CORBA::UShort*, this->buffer_); - return tmp[i]; -} - -ACE_INLINE -const CORBA::UShort & -CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::operator[] (CORBA::ULong i) const -{ - ACE_ASSERT (i < this->maximum_); - CORBA::UShort * const tmp = - ACE_reinterpret_cast (CORBA::UShort* ACE_CAST_CONST, this->buffer_); - return tmp[i]; -} - -// Implement the TAO_Base_Sequence methods (see Sequence.h) - -ACE_INLINE -CORBA::UShort * -CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::get_buffer (CORBA::Boolean orphan) -{ - CORBA::UShort *result = 0; - - if (orphan == 0) - { - // We retain ownership. - if (this->buffer_ == 0) - { - result = - _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (this->length_); - this->buffer_ = result; - this->release_ = 1; - } - else - { - result = - ACE_reinterpret_cast (CORBA::UShort*, this->buffer_); - } - } - else // if (orphan == 1) - { - if (this->release_ != 0) - { - // We set the state back to default and relinquish ownership. - result = - ACE_reinterpret_cast(CORBA::UShort*,this->buffer_); - this->maximum_ = 0; - this->length_ = 0; - this->buffer_ = 0; - this->release_ = 0; - } - } - - return result; -} - -ACE_INLINE -const CORBA::UShort * -CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::get_buffer (void) const -{ - return ACE_reinterpret_cast (const CORBA::UShort * ACE_CAST_CONST, this->buffer_); -} - -ACE_INLINE -void -CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::replace ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::UShort *data, - CORBA::Boolean release - ) -{ - this->maximum_ = max; - this->length_ = length; - - if (this->buffer_ && this->release_ == 1) - { - CORBA::UShort *tmp = - ACE_reinterpret_cast (CORBA::UShort*, this->buffer_); - _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::freebuf (tmp); - } - - this->buffer_ = data; - this->release_ = release; -} - -#endif /* end #if !defined */ - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68 @@ -245,18 +32,11 @@ CORBA::Policy::Policy ( CORBA::Boolean _tao_collocated, TAO_Abstract_ServantBase *servant ) - : Object (objref, _tao_collocated, servant) + : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant) { this->CORBA_Policy_setup_collocation (_tao_collocated); } -ACE_INLINE -CORBA::Boolean -CORBA::Policy::marshal (TAO_OutputCDR &cdr) -{ - return (cdr << this); -} - #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -265,13 +45,6 @@ CORBA::Policy::marshal (TAO_OutputCDR &cdr) #if !defined (_CORBA_POLICYMANAGER___CI_) #define _CORBA_POLICYMANAGER___CI_ -ACE_INLINE -CORBA::Boolean -CORBA::PolicyManager::marshal (TAO_OutputCDR &) -{ - return 0; -} - #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -280,17 +53,10 @@ CORBA::PolicyManager::marshal (TAO_OutputCDR &) #if !defined (_CORBA_POLICYCURRENT___CI_) #define _CORBA_POLICYCURRENT___CI_ -ACE_INLINE -CORBA::Boolean -CORBA::PolicyCurrent::marshal (TAO_OutputCDR &) -{ - return 0; -} - #endif /* end #if !defined */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:71 ACE_INLINE CORBA::Boolean operator<< ( @@ -357,7 +123,7 @@ CORBA::Boolean TAO_Export operator>> ( #endif /* _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_UShort_I_ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:71 ACE_INLINE CORBA::Boolean operator<< ( diff --git a/TAO/tao/Policy_ForwardC.cpp b/TAO/tao/Policy_ForwardC.cpp index 1b680735563..b6ac4484bc2 100644 --- a/TAO/tao/Policy_ForwardC.cpp +++ b/TAO/tao/Policy_ForwardC.cpp @@ -25,14 +25,6 @@ #include "Policy_ForwardC.h" #include "tao/Stub.h" -#include "tao/Invocation.h" -#include "tao/PortableInterceptor.h" - -#if TAO_HAS_INTERCEPTORS == 1 -#include "tao/RequestInfo_Util.h" -#include "tao/ClientRequestInfo_i.h" -#include "tao/ClientInterceptorAdapter.h" -#endif /* TAO_HAS_INTERCEPTORS == 1 */ #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig @@ -83,156 +75,48 @@ TAO_NAMESPACE_DEFINE ( ) TAO_NAMESPACE_END -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:103 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_POLICYLIST_CS_) -#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_POLICYLIST_CS_ - -// The Base_Sequence functions, please see tao/Sequence.h -void -CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_allocate_buffer (CORBA::ULong length) -{ - CORBA::Policy **tmp = 0; - tmp = _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (length); - - if (this->buffer_ != 0) - { - CORBA::Policy **old = ACE_reinterpret_cast (CORBA::Policy**, this->buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - if (!this->release_) - { - tmp[i] = tao_CORBA_Policy_duplicate (old[i]); - } - else - { - tmp[i] = old[i]; - } - } - - if (this->release_) - { - delete [] old; - } - } - - this->buffer_ = tmp; -} - -void -CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_deallocate_buffer (void) -{ - if (this->buffer_ == 0 || this->release_ == 0) - { - return; - } - - CORBA::Policy **tmp = ACE_reinterpret_cast (CORBA::Policy**, this->buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - tao_CORBA_Policy_release (tmp[i]); - tmp[i] = tao_CORBA_Policy_nil (); - } - - _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::freebuf (tmp); - this->buffer_ = 0; -} - -CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::~_TAO_Unbounded_Object_Sequence_CORBA_PolicyList (void) -{ - this->_deallocate_buffer (); -} - -void -CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol) -{ - CORBA::Policy **tmp = ACE_reinterpret_cast (CORBA::Policy**, this->buffer_); - - for (CORBA::ULong i = nl; i < ol; ++i) - { - tao_CORBA_Policy_release (tmp[i]); - tmp[i] = tao_CORBA_Policy_nil (); - } -} - -void -CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_downcast ( - void* target, - CORBA::Object *src - ACE_ENV_ARG_DECL - ) -{ - CORBA::Policy **tmp = ACE_static_cast (CORBA::Policy**, target); - *tmp = tao_CORBA_Policy_narrow (src ACE_ENV_ARG_PARAMETER); - ACE_CHECK; -} - -CORBA::Object* -CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_upcast (void *src) const -{ - return tao_CORBA_Policy_upcast (src); -} - -#endif /* end #if !defined */ - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if 0 - -// ************************************************************* -// CORBA::PolicyList -// ************************************************************* +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50 CORBA::PolicyList::PolicyList (void) {} CORBA::PolicyList::PolicyList (CORBA::ULong max) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -_TAO_Unbounded_Object_Sequence_CORBA_PolicyList -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Object_Sequence<CORBA::Policy,CORBA::Policy_var> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max) + : TAO_Unbounded_Object_Sequence< + CORBA::Policy, + CORBA::Policy_var, + CORBA::tao_Policy_life, + CORBA::tao_Policy_cast + > + (max) {} CORBA::PolicyList::PolicyList ( CORBA::ULong max, CORBA::ULong length, - CORBA::Policy_ptr *buffer, + CORBA::Policy_ptr* buffer, CORBA::Boolean release ) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -_TAO_Unbounded_Object_Sequence_CORBA_PolicyList -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Object_Sequence<CORBA::Policy,CORBA::Policy_var> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max, length, buffer, release) + : TAO_Unbounded_Object_Sequence< + CORBA::Policy, + CORBA::Policy_var, + CORBA::tao_Policy_life, + CORBA::tao_Policy_cast + > + (max, length, buffer, release) {} CORBA::PolicyList::PolicyList (const PolicyList &seq) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -_TAO_Unbounded_Object_Sequence_CORBA_PolicyList -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Object_Sequence<CORBA::Policy,CORBA::Policy_var> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (seq) + : TAO_Unbounded_Object_Sequence< + CORBA::Policy, + CORBA::Policy_var, + CORBA::tao_Policy_life, + CORBA::tao_Policy_cast + > + (seq) {} -CORBA::PolicyList::~PolicyList (void) // dtor +CORBA::PolicyList::~PolicyList (void) {} void CORBA::PolicyList::_tao_any_destructor (void *_tao_void_pointer) @@ -241,573 +125,585 @@ void CORBA::PolicyList::_tao_any_destructor (void *_tao_void_pointer) delete tmp; } -#endif /* 0 */ +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + +template class + TAO_MngSeq_Var_T< + CORBA::PolicyList, + TAO_Object_Manager< + CORBA::Policy, + CORBA::Policy_var, + CORBA::tao_Policy_life + > + >; + +template class + TAO_Seq_Out_T< + CORBA::PolicyList, + CORBA::PolicyList_var, + TAO_Object_Manager< + CORBA::Policy, + CORBA::Policy_var, + CORBA::tao_Policy_life + > + >; -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -static const CORBA::Long _oc_CORBA_PolicyList[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 33, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f506f), - ACE_NTOHL (0x6c696379), - ACE_NTOHL (0x4c697374), - ACE_NTOHL (0x3a312e30), - ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/PolicyList:1.0 - 11, - ACE_NTOHL (0x506f6c69), - ACE_NTOHL (0x63794c69), - ACE_NTOHL (0x73740000), // name = PolicyList - CORBA::tk_sequence, // typecode kind - 68, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - CORBA::tk_objref, // typecode kind - 52, // encapsulation length +# pragma instantiate \ + TAO_MngSeq_Var_T< \ + CORBA::PolicyList, \ + TAO_Object_Manager< \ + CORBA::Policy, \ + CORBA::Policy_var, \ + CORBA::tao_Policy_life \ + > \ + > + +# pragma instantiate \ + TAO_Seq_Out_T< \ + CORBA::PolicyList, \ + CORBA::PolicyList_var, \ + TAO_Object_Manager< \ + CORBA::Policy, \ + CORBA::Policy_var, \ + CORBA::tao_Policy_life \ + > \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 + + static const CORBA::Long _oc_CORBA_PolicyList[] = + { + TAO_ENCAP_BYTE_ORDER, // byte order + 33, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f506f), + ACE_NTOHL (0x6c696379), + ACE_NTOHL (0x4c697374), + ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/PolicyList:1.0 + 11, + ACE_NTOHL (0x506f6c69), + ACE_NTOHL (0x63794c69), + ACE_NTOHL (0x73740000), // name = PolicyList + CORBA::tk_sequence, // typecode kind + 68, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order - 29, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f506f), - ACE_NTOHL (0x6c696379), - ACE_NTOHL (0x3a312e30), - ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Policy:1.0 - 7, - ACE_NTOHL (0x506f6c69), - ACE_NTOHL (0x63790000), // name = Policy - - 0U, + CORBA::tk_objref, // typecode kind + 52, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + 29, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f506f), + ACE_NTOHL (0x6c696379), + ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Policy:1.0 + 7, + ACE_NTOHL (0x506f6c69), + ACE_NTOHL (0x63790000), // name = Policy + + 0U, }; + + static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyList ( + CORBA::tk_alias, + sizeof (_oc_CORBA_PolicyList), + (char *) &_oc_CORBA_PolicyList, + 0, + sizeof (CORBA::PolicyList) + ); + + TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) + TAO_NAMESPACE_BEGIN (CORBA) + TAO_NAMESPACE_DEFINE ( + ::CORBA::TypeCode_ptr, + _tc_PolicyList, + &_tc_TAO_tc_CORBA_PolicyList + ) + TAO_NAMESPACE_END + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50 + + CORBA::PolicyTypeSeq::PolicyTypeSeq (void) + {} + + CORBA::PolicyTypeSeq::PolicyTypeSeq (CORBA::ULong max) + : TAO_Unbounded_Sequence< + CORBA::PolicyType + > + (max) + {} + + CORBA::PolicyTypeSeq::PolicyTypeSeq ( + CORBA::ULong max, + CORBA::ULong length, + CORBA::ULong* buffer, + CORBA::Boolean release + ) + : TAO_Unbounded_Sequence< + CORBA::PolicyType + > + (max, length, buffer, release) + {} + + CORBA::PolicyTypeSeq::PolicyTypeSeq (const PolicyTypeSeq &seq) + : TAO_Unbounded_Sequence< + CORBA::PolicyType + > + (seq) + {} + + CORBA::PolicyTypeSeq::~PolicyTypeSeq (void) + {} + + void CORBA::PolicyTypeSeq::_tao_any_destructor (void *_tao_void_pointer) + { + PolicyTypeSeq *tmp = ACE_static_cast (PolicyTypeSeq*, _tao_void_pointer); + delete tmp; + } -static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyList ( - CORBA::tk_alias, - sizeof (_oc_CORBA_PolicyList), - (char *) &_oc_CORBA_PolicyList, - 0, - sizeof (CORBA::PolicyList) - ); - -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_PolicyList, - &_tc_TAO_tc_CORBA_PolicyList - ) -TAO_NAMESPACE_END - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CS_) -#define __TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CS_ - -void -CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_allocate_buffer (CORBA::ULong length) -{ - CORBA::ULong* tmp = 0; - tmp = _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (length); - - if (this->buffer_ != 0) - { - CORBA::ULong *old = - ACE_reinterpret_cast (CORBA::ULong *, this->buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - tmp[i] = old[i]; - } - - if (this->release_) - { - _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::freebuf (old); - } - } - - this->buffer_ = tmp; -} - -void -CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_deallocate_buffer (void) -{ - if (this->buffer_ == 0 || this->release_ == 0) - { - return; - } - - CORBA::ULong *tmp = - ACE_reinterpret_cast (CORBA::ULong *, this->buffer_); - _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::freebuf (tmp); - this->buffer_ = 0; -} - -CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::~_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (void) -{ - this->_deallocate_buffer (); -} - -#endif /* end #if !defined */ - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_CORBA_POLICYTYPESEQ_CS_) -#define _CORBA_POLICYTYPESEQ_CS_ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250 - -// ************************************************************* -// CORBA::PolicyTypeSeq -// ************************************************************* - -CORBA::PolicyTypeSeq::PolicyTypeSeq (void) -{} - -CORBA::PolicyTypeSeq::PolicyTypeSeq (CORBA::ULong max) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<CORBA::ULong> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max) -{} - -CORBA::PolicyTypeSeq::PolicyTypeSeq ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::ULong *buffer, - CORBA::Boolean release - ) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<CORBA::ULong> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max, length, buffer, release) -{} - -CORBA::PolicyTypeSeq::PolicyTypeSeq (const PolicyTypeSeq &seq) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<CORBA::ULong> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (seq) -{} - -CORBA::PolicyTypeSeq::~PolicyTypeSeq (void) // dtor -{} - -void CORBA::PolicyTypeSeq::_tao_any_destructor (void *_tao_void_pointer) -{ - PolicyTypeSeq *tmp = ACE_static_cast (PolicyTypeSeq*, _tao_void_pointer); - delete tmp; -} - -#endif /* end #if !defined */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + + template class + TAO_FixedSeq_Var_T< + PolicyTypeSeq, + CORBA::PolicyType + >; + + template class + TAO_Seq_Out_T< + PolicyTypeSeq, + PolicyTypeSeq_var, + CORBA::PolicyType + >; -static const CORBA::Long _oc_CORBA_PolicyTypeSeq[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 36, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f506f), - ACE_NTOHL (0x6c696379), - ACE_NTOHL (0x54797065), - ACE_NTOHL (0x5365713a), - ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/PolicyTypeSeq:1.0 - 14, - ACE_NTOHL (0x506f6c69), - ACE_NTOHL (0x63795479), - ACE_NTOHL (0x70655365), - ACE_NTOHL (0x71000000), // name = PolicyTypeSeq - CORBA::tk_sequence, // typecode kind - 80, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - CORBA::tk_alias, // typecode kind for typedefs - 64, // encapsulation length +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + + # pragma instantiate \ + TAO_FixedSeq_Var_T< \ + PolicyTypeSeq, \ + CORBA::PolicyType \ + > + + # pragma instantiate \ + TAO_Seq_Out_T< \ + PolicyTypeSeq, \ + PolicyTypeSeq_var, \ + CORBA::PolicyType \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 + + static const CORBA::Long _oc_CORBA_PolicyTypeSeq[] = + { + TAO_ENCAP_BYTE_ORDER, // byte order + 36, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f506f), + ACE_NTOHL (0x6c696379), + ACE_NTOHL (0x54797065), + ACE_NTOHL (0x5365713a), + ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/PolicyTypeSeq:1.0 + 14, + ACE_NTOHL (0x506f6c69), + ACE_NTOHL (0x63795479), + ACE_NTOHL (0x70655365), + ACE_NTOHL (0x71000000), // name = PolicyTypeSeq + CORBA::tk_sequence, // typecode kind + 80, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order - 33, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f506f), - ACE_NTOHL (0x6c696379), - ACE_NTOHL (0x54797065), - ACE_NTOHL (0x3a312e30), - ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/PolicyType:1.0 - 11, - ACE_NTOHL (0x506f6c69), - ACE_NTOHL (0x63795479), - ACE_NTOHL (0x70650000), // name = PolicyType - CORBA::tk_ulong, - - - 0U, + CORBA::tk_alias, // typecode kind for typedefs + 64, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + 33, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f506f), + ACE_NTOHL (0x6c696379), + ACE_NTOHL (0x54797065), + ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/PolicyType:1.0 + 11, + ACE_NTOHL (0x506f6c69), + ACE_NTOHL (0x63795479), + ACE_NTOHL (0x70650000), // name = PolicyType + CORBA::tk_ulong, + + + 0U, }; - -static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyTypeSeq ( - CORBA::tk_alias, - sizeof (_oc_CORBA_PolicyTypeSeq), - (char *) &_oc_CORBA_PolicyTypeSeq, - 0, - sizeof (CORBA::PolicyTypeSeq) - ); - -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_PolicyTypeSeq, - &_tc_TAO_tc_CORBA_PolicyTypeSeq - ) -TAO_NAMESPACE_END - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 - -static const CORBA::Long _oc_CORBA_SetOverrideType[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 38, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f5365), - ACE_NTOHL (0x744f7665), - ACE_NTOHL (0x72726964), - ACE_NTOHL (0x65547970), - ACE_NTOHL (0x653a312e), - ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CORBA/SetOverrideType:1.0 - 16, - ACE_NTOHL (0x5365744f), - ACE_NTOHL (0x76657272), - ACE_NTOHL (0x69646554), - ACE_NTOHL (0x79706500), // name = SetOverrideType - 2, // member count - 13, - ACE_NTOHL (0x5345545f), - ACE_NTOHL (0x4f564552), - ACE_NTOHL (0x52494445), - ACE_NTOHL (0x0), // name = SET_OVERRIDE - 13, - ACE_NTOHL (0x4144445f), - ACE_NTOHL (0x4f564552), - ACE_NTOHL (0x52494445), - ACE_NTOHL (0x0), // name = ADD_OVERRIDE - }; - -static CORBA::TypeCode _tc_TAO_tc_CORBA_SetOverrideType ( - CORBA::tk_enum, - sizeof (_oc_CORBA_SetOverrideType), - (char *) &_oc_CORBA_SetOverrideType, - 0, - sizeof (CORBA::SetOverrideType) - ); - -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_SetOverrideType, - &_tc_TAO_tc_CORBA_SetOverrideType - ) -TAO_NAMESPACE_END - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54 - -// Copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - const CORBA::PolicyList &_tao_elem - ) -{ - TAO::Any_Dual_Impl_T<CORBA::PolicyList>::insert_copy ( - _tao_any, - CORBA::PolicyList::_tao_any_destructor, - CORBA::_tc_PolicyList, - _tao_elem - ); -} - -// Non-copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - CORBA::PolicyList *_tao_elem - ) -{ - TAO::Any_Dual_Impl_T<CORBA::PolicyList>::insert ( - _tao_any, - CORBA::PolicyList::_tao_any_destructor, - CORBA::_tc_PolicyList, - _tao_elem + + static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyTypeSeq ( + CORBA::tk_alias, + sizeof (_oc_CORBA_PolicyTypeSeq), + (char *) &_oc_CORBA_PolicyTypeSeq, + 0, + sizeof (CORBA::PolicyTypeSeq) ); -} - -// Extraction to non-const pointer (deprecated). -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - CORBA::PolicyList *&_tao_elem - ) -{ - return _tao_any >>= ACE_const_cast ( - const CORBA::PolicyList *&, - _tao_elem + + TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) + TAO_NAMESPACE_BEGIN (CORBA) + TAO_NAMESPACE_DEFINE ( + ::CORBA::TypeCode_ptr, + _tc_PolicyTypeSeq, + &_tc_TAO_tc_CORBA_PolicyTypeSeq + ) + TAO_NAMESPACE_END + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 + + static const CORBA::Long _oc_CORBA_SetOverrideType[] = + { + TAO_ENCAP_BYTE_ORDER, // byte order + 38, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f5365), + ACE_NTOHL (0x744f7665), + ACE_NTOHL (0x72726964), + ACE_NTOHL (0x65547970), + ACE_NTOHL (0x653a312e), + ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CORBA/SetOverrideType:1.0 + 16, + ACE_NTOHL (0x5365744f), + ACE_NTOHL (0x76657272), + ACE_NTOHL (0x69646554), + ACE_NTOHL (0x79706500), // name = SetOverrideType + 2, // member count + 13, + ACE_NTOHL (0x5345545f), + ACE_NTOHL (0x4f564552), + ACE_NTOHL (0x52494445), + ACE_NTOHL (0x0), // name = SET_OVERRIDE + 13, + ACE_NTOHL (0x4144445f), + ACE_NTOHL (0x4f564552), + ACE_NTOHL (0x52494445), + ACE_NTOHL (0x0), // name = ADD_OVERRIDE + }; + + static CORBA::TypeCode _tc_TAO_tc_CORBA_SetOverrideType ( + CORBA::tk_enum, + sizeof (_oc_CORBA_SetOverrideType), + (char *) &_oc_CORBA_SetOverrideType, + 0, + sizeof (CORBA::SetOverrideType) ); -} - -// Extraction to const pointer. -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - const CORBA::PolicyList *&_tao_elem - ) -{ - return - TAO::Any_Dual_Impl_T<CORBA::PolicyList>::extract ( + + TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) + TAO_NAMESPACE_BEGIN (CORBA) + TAO_NAMESPACE_DEFINE ( + ::CORBA::TypeCode_ptr, + _tc_SetOverrideType, + &_tc_TAO_tc_CORBA_SetOverrideType + ) + TAO_NAMESPACE_END + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54 + + // Copying insertion. + void operator<<= ( + CORBA::Any &_tao_any, + const CORBA::PolicyList &_tao_elem + ) + { + TAO::Any_Dual_Impl_T<CORBA::PolicyList>::insert_copy ( _tao_any, CORBA::PolicyList::_tao_any_destructor, CORBA::_tc_PolicyList, _tao_elem ); -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54 - -// Copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - const CORBA::PolicyTypeSeq &_tao_elem - ) -{ - TAO::Any_Dual_Impl_T<CORBA::PolicyTypeSeq>::insert_copy ( - _tao_any, - CORBA::PolicyTypeSeq::_tao_any_destructor, - CORBA::_tc_PolicyTypeSeq, - _tao_elem - ); -} - -// Non-copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - CORBA::PolicyTypeSeq *_tao_elem - ) -{ - TAO::Any_Dual_Impl_T<CORBA::PolicyTypeSeq>::insert ( - _tao_any, - CORBA::PolicyTypeSeq::_tao_any_destructor, - CORBA::_tc_PolicyTypeSeq, - _tao_elem - ); -} - -// Extraction to non-const pointer (deprecated). -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - CORBA::PolicyTypeSeq *&_tao_elem - ) -{ - return _tao_any >>= ACE_const_cast ( - const CORBA::PolicyTypeSeq *&, - _tao_elem - ); -} - -// Extraction to const pointer. -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - const CORBA::PolicyTypeSeq *&_tao_elem - ) -{ - return - TAO::Any_Dual_Impl_T<CORBA::PolicyTypeSeq>::extract ( + } + + // Non-copying insertion. + void operator<<= ( + CORBA::Any &_tao_any, + CORBA::PolicyList *_tao_elem + ) + { + TAO::Any_Dual_Impl_T<CORBA::PolicyList>::insert ( + _tao_any, + CORBA::PolicyList::_tao_any_destructor, + CORBA::_tc_PolicyList, + _tao_elem + ); + } + + // Extraction to non-const pointer (deprecated). + CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + CORBA::PolicyList *&_tao_elem + ) + { + return _tao_any >>= ACE_const_cast ( + const CORBA::PolicyList *&, + _tao_elem + ); + } + + // Extraction to const pointer. + CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + const CORBA::PolicyList *&_tao_elem + ) + { + return + TAO::Any_Dual_Impl_T<CORBA::PolicyList>::extract ( + _tao_any, + CORBA::PolicyList::_tao_any_destructor, + CORBA::_tc_PolicyList, + _tao_elem + ); + } + + #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ + defined (ACE_HAS_GNU_REPO) + template class TAO::Any_Dual_Impl_T<CORBA::PolicyList>; + #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + # pragma instantiate TAO::Any_Dual_Impl_T<CORBA::PolicyList> + #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54 + + // Copying insertion. + void operator<<= ( + CORBA::Any &_tao_any, + const CORBA::PolicyTypeSeq &_tao_elem + ) + { + TAO::Any_Dual_Impl_T<CORBA::PolicyTypeSeq>::insert_copy ( _tao_any, CORBA::PolicyTypeSeq::_tao_any_destructor, CORBA::_tc_PolicyTypeSeq, _tao_elem ); -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_cs.cpp:52 - -void operator<<= ( - CORBA::Any &_tao_any, - CORBA::SetOverrideType _tao_elem - ) -{ - TAO::Any_Basic_Impl_T<CORBA::SetOverrideType>::insert ( - _tao_any, - CORBA::_tc_SetOverrideType, - _tao_elem - ); -} - -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - CORBA::SetOverrideType &_tao_elem - ) -{ - return - TAO::Any_Basic_Impl_T<CORBA::SetOverrideType>::extract ( + } + + // Non-copying insertion. + void operator<<= ( + CORBA::Any &_tao_any, + CORBA::PolicyTypeSeq *_tao_elem + ) + { + TAO::Any_Dual_Impl_T<CORBA::PolicyTypeSeq>::insert ( + _tao_any, + CORBA::PolicyTypeSeq::_tao_any_destructor, + CORBA::_tc_PolicyTypeSeq, + _tao_elem + ); + } + + // Extraction to non-const pointer (deprecated). + CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + CORBA::PolicyTypeSeq *&_tao_elem + ) + { + return _tao_any >>= ACE_const_cast ( + const CORBA::PolicyTypeSeq *&, + _tao_elem + ); + } + + // Extraction to const pointer. + CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + const CORBA::PolicyTypeSeq *&_tao_elem + ) + { + return + TAO::Any_Dual_Impl_T<CORBA::PolicyTypeSeq>::extract ( + _tao_any, + CORBA::PolicyTypeSeq::_tao_any_destructor, + CORBA::_tc_PolicyTypeSeq, + _tao_elem + ); + } + + #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ + defined (ACE_HAS_GNU_REPO) + template class TAO::Any_Dual_Impl_T<CORBA::PolicyTypeSeq>; + #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + # pragma instantiate TAO::Any_Dual_Impl_T<CORBA::PolicyTypeSeq> + #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_cs.cpp:52 + + void operator<<= ( + CORBA::Any &_tao_any, + CORBA::SetOverrideType _tao_elem + ) + { + TAO::Any_Basic_Impl_T<CORBA::SetOverrideType>::insert ( _tao_any, CORBA::_tc_SetOverrideType, - _tao_elem + _tao_elem ); -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Basic_Impl_T<CORBA::SetOverrideType>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Basic_Impl_T<CORBA::SetOverrideType> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125 - -CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, - const CORBA::PolicyList &_tao_sequence - ) -{ - CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - CORBA::Boolean _tao_marshal_flag = 1; - - 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 0; -} - -CORBA::Boolean operator>> ( - TAO_InputCDR &strm, - CORBA::PolicyList &_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 0; - } - - // 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 1; - } - - // Retrieve all the elements. - CORBA::Boolean _tao_marshal_flag = 1; - - 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 0; -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125 - -CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, - const CORBA::PolicyTypeSeq &_tao_sequence - ) -{ - CORBA::ULong _tao_seq_len = _tao_sequence.length (); + } - if (strm << _tao_seq_len) - { - // Encode all elements. - return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - } + CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + CORBA::SetOverrideType &_tao_elem + ) + { + return + TAO::Any_Basic_Impl_T<CORBA::SetOverrideType>::extract ( + _tao_any, + CORBA::_tc_SetOverrideType, + _tao_elem + ); + } - return 0; -} - -CORBA::Boolean operator>> ( - TAO_InputCDR &strm, - CORBA::PolicyTypeSeq &_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 0; - } - - // 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 1; - } - - // Retrieve all the elements. - return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - } - - return 0; -} + #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ + defined (ACE_HAS_GNU_REPO) + template class TAO::Any_Basic_Impl_T<CORBA::SetOverrideType>; + #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + # pragma instantiate TAO::Any_Basic_Impl_T<CORBA::SetOverrideType \> + #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93 + + CORBA::Boolean operator<< ( + TAO_OutputCDR &strm, + const CORBA::PolicyList &_tao_sequence + ) + { + CORBA::ULong _tao_seq_len = _tao_sequence.length (); + + if (strm << _tao_seq_len) + { + // Encode all elements. + CORBA::Boolean _tao_marshal_flag = 1; + + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) + { + _tao_marshal_flag = + CORBA::tao_Policy_life::tao_marshal (_tao_sequence[i].in (), strm); + } + + return _tao_marshal_flag; + } + + return 0; + } + + CORBA::Boolean operator>> ( + TAO_InputCDR &strm, + CORBA::PolicyList &_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 0; + } + + // 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 1; + } + + // Retrieve all the elements. + CORBA::Boolean _tao_marshal_flag = 1; + + 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 0; + } + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93 + + CORBA::Boolean operator<< ( + TAO_OutputCDR &strm, + const CORBA::PolicyTypeSeq &_tao_sequence + ) + { + CORBA::ULong _tao_seq_len = _tao_sequence.length (); + + if (strm << _tao_seq_len) + { + // Encode all elements. + return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); + } + + return 0; + } + + CORBA::Boolean operator>> ( + TAO_InputCDR &strm, + CORBA::PolicyTypeSeq &_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 0; + } + + // 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 1; + } + + // Retrieve all the elements. + return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); + } + + return 0; + } diff --git a/TAO/tao/Policy_ForwardC.h b/TAO/tao/Policy_ForwardC.h index 5b9aa1153a8..372d433b5fe 100644 --- a/TAO/tao/Policy_ForwardC.h +++ b/TAO/tao/Policy_ForwardC.h @@ -26,18 +26,15 @@ #define _TAO_IDL_ORIG_POLICY_FORWARDC_H_ #include "ace/pre.h" -#include "tao/corbafwd.h" -#include "tao/Objref_Varout_T.h" -#include "tao/Seq_VarOut_T.h" +#include "tao/Sequence.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/TAO_Export.h" -#include "Sequence.h" -#include "CDR.h" -#include "varbase.h" +#include "tao/CDR.h" +#include "tao/Objref_Varout_T.h" +#include "tao/Seq_VarOut_T.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -69,7 +66,7 @@ TAO_NAMESPACE CORBA { // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333 typedef CORBA::ULong PolicyType; typedef CORBA::ULong_out PolicyType_out; @@ -80,291 +77,140 @@ TAO_NAMESPACE CORBA TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyType; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:566 - class Policy; - -#if !defined (_CORBA_POLICY___PTR_CH_) -#define _CORBA_POLICY___PTR_CH_ +#if !defined (_CORBA_POLICY__ODDS_N_ENDS_CH_) +#define _CORBA_POLICY__ODDS_N_ENDS_CH_ + class Policy; typedef Policy *Policy_ptr; + struct tao_Policy_life; + typedef TAO_Objref_Var_T<Policy, tao_Policy_life> Policy_var; + typedef TAO_Objref_Out_T<Policy, tao_Policy_life> Policy_out; - struct tao_Policy_life; - typedef TAO_Objref_Var_T<Policy, tao_Policy_life> Policy_var; - typedef TAO_Objref_Out_T<Policy, tao_Policy_life> Policy_out; - - struct tao_Policy_life - { - static Policy_ptr tao_duplicate (Policy_ptr); - static void tao_release (Policy_ptr); - static Policy_ptr tao_nil (void); - }; - - struct tao_Policy_cast - { - static Policy_ptr tao_narrow (CORBA::Object_ptr - ACE_ENV_ARG_DECL); - static CORBA::Object_ptr tao_upcast (void *); - }; - -#endif /* end #if !defined */ - - typedef TAO_Unbounded_Object_Sequence<Policy, - Policy_var, - tao_Policy_life, - tao_Policy_cast> - PolicyList; - -#if !defined (_CORBA_POLICYLIST___VAR_CH_) -#define _CORBA_POLICYLIST___VAR_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549 - - // ************************************************************* - // class CORBA::PolicyList_var - // ************************************************************* - - class TAO_Export PolicyList_var + struct tao_Policy_life { - public: - PolicyList_var (void); - PolicyList_var (PolicyList *); - PolicyList_var (const PolicyList_var &); - ~PolicyList_var (void); - - PolicyList_var &operator= (PolicyList *); - PolicyList_var &operator= (const PolicyList_var &); - PolicyList *operator-> (void); - const PolicyList *operator-> (void) const; - - operator const PolicyList &() const; - operator PolicyList &(); - operator PolicyList &() const; - - // Variable-size base types only. - operator PolicyList *&(); - - TAO_Object_Manager<Policy,Policy_var,tao_Policy_life> operator[] (CORBA::ULong index); - - // in, inout, out, _retn - const PolicyList &in (void) const; - PolicyList &inout (void); - PolicyList *&out (void); - PolicyList *_retn (void); - PolicyList *ptr (void) const; - - private: - PolicyList *ptr_; + static Policy_ptr tao_duplicate (Policy_ptr); + static void tao_release (Policy_ptr); + static Policy_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( + Policy_ptr, + TAO_OutputCDR & + ); }; - -#endif /* end #if !defined */ - -#if !defined (_CORBA_POLICYLIST___OUT_CH_) -#define _CORBA_POLICYLIST___OUT_CH_ - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753 - - class TAO_Export PolicyList_out + struct tao_Policy_cast { - public: - PolicyList_out (PolicyList *&); - PolicyList_out (PolicyList_var &); - PolicyList_out (const PolicyList_out &); - PolicyList_out &operator= (const PolicyList_out &); - PolicyList_out &operator= (PolicyList *); - operator PolicyList *&(); - PolicyList *&ptr (void); - PolicyList *operator-> (void); - TAO_Object_Manager<Policy,Policy_var,tao_Policy_life> operator[] (CORBA::ULong index); - - private: - PolicyList *&ptr_; - // Assignment from T_var not allowed. - void operator= (const PolicyList_var &); + static Policy_ptr tao_narrow ( + CORBA::Object_ptr + ACE_ENV_ARG_DECL + ); + static CORBA::Object_ptr tao_upcast (void *); }; - + #endif /* end #if !defined */ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyList; - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CH_) -#define __TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CH_ - - class TAO_Export _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq - : public TAO_Unbounded_Base_Sequence + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75 + + class PolicyList; + + typedef + TAO_MngSeq_Var_T< + PolicyList, + TAO_Object_Manager< + CORBA::Policy, + CORBA::Policy_var, + CORBA::tao_Policy_life + > + > + PolicyList_var; + + typedef + TAO_Seq_Out_T< + PolicyList, + PolicyList_var, + TAO_Object_Manager< + CORBA::Policy, + CORBA::Policy_var, + CORBA::tao_Policy_life + > + > + PolicyList_out; + + class TAO_Export PolicyList + : public + TAO_Unbounded_Object_Sequence< + CORBA::Policy, + CORBA::Policy_var, + CORBA::tao_Policy_life, + CORBA::tao_Policy_cast + > { public: - _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (void); - _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (CORBA::ULong maximum); - _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq ( - CORBA::ULong maximum, + PolicyList (void); + PolicyList (CORBA::ULong max); + PolicyList ( + CORBA::ULong max, CORBA::ULong length, - CORBA::ULong *data, + Policy_ptr* buffer, CORBA::Boolean release = 0 ); - _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq ( - const _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq &rhs - ); - _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq &operator= ( - const _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq &rhs - ); - virtual ~_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (void); - - // = Accessors. - CORBA::ULong &operator[] (CORBA::ULong i); - const CORBA::ULong &operator[] (CORBA::ULong i) const; + PolicyList (const PolicyList &); + ~PolicyList (void); - // = Static operations. - static CORBA::ULong *allocbuf (CORBA::ULong size); - static void freebuf (CORBA::ULong *buffer); + static void _tao_any_destructor (void *); - // Implement the TAO_Base_Sequence methods (see Sequence.h) - virtual void _allocate_buffer (CORBA::ULong length); - virtual void _deallocate_buffer (void); - CORBA::ULong *get_buffer (CORBA::Boolean orphan = 0); - const CORBA::ULong *get_buffer (void) const; - void replace ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::ULong *data, - CORBA::Boolean release - ); + typedef PolicyList_var _var_type; }; - -#endif /* end #if !defined */ - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_CORBA_POLICYTYPESEQ_CH_) -#define _CORBA_POLICYTYPESEQ_CH_ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - class PolicyTypeSeq; - class PolicyTypeSeq_var; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyList; - // ************************************************************* - // CORBA::PolicyTypeSeq - // ************************************************************* + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75 - class TAO_Export PolicyTypeSeq : public + class PolicyTypeSeq; - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq -#else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<CORBA::ULong> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + typedef + TAO_FixedSeq_Var_T< + PolicyTypeSeq, + CORBA::PolicyType + > + PolicyTypeSeq_var; + + typedef + TAO_Seq_Out_T< + PolicyTypeSeq, + PolicyTypeSeq_var, + CORBA::PolicyType + > + PolicyTypeSeq_out; + + class TAO_Export PolicyTypeSeq + : public + TAO_Unbounded_Sequence< + CORBA::PolicyType + > { public: PolicyTypeSeq (void); PolicyTypeSeq (CORBA::ULong max); PolicyTypeSeq ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::ULong *buffer, + CORBA::ULong max, + CORBA::ULong length, + CORBA::ULong* buffer, CORBA::Boolean release = 0 ); PolicyTypeSeq (const PolicyTypeSeq &); ~PolicyTypeSeq (void); - static void _tao_any_destructor (void*); + static void _tao_any_destructor (void *); typedef PolicyTypeSeq_var _var_type; }; - -#endif /* end #if !defined */ - -#if !defined (_CORBA_POLICYTYPESEQ___VAR_CH_) -#define _CORBA_POLICYTYPESEQ___VAR_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549 - - // ************************************************************* - // class CORBA::PolicyTypeSeq_var - // ************************************************************* - - class TAO_Export PolicyTypeSeq_var - { - public: - PolicyTypeSeq_var (void); - PolicyTypeSeq_var (PolicyTypeSeq *); - PolicyTypeSeq_var (const PolicyTypeSeq_var &); - - // Fixed-size base types only. - PolicyTypeSeq_var (const PolicyTypeSeq &); - - ~PolicyTypeSeq_var (void); - - PolicyTypeSeq_var &operator= (PolicyTypeSeq *); - PolicyTypeSeq_var &operator= (const PolicyTypeSeq_var &); - - // Fixed-size base types only. - PolicyTypeSeq_var &operator= (const PolicyTypeSeq &); - - PolicyTypeSeq *operator-> (void); - const PolicyTypeSeq *operator-> (void) const; - - operator const PolicyTypeSeq &() const; - operator PolicyTypeSeq &(); - operator PolicyTypeSeq &() const; - PolicyType & operator[] (CORBA::ULong index); - const PolicyType & operator[] (CORBA::ULong index) const; - - // in, inout, out, _retn - const PolicyTypeSeq &in (void) const; - PolicyTypeSeq &inout (void); - PolicyTypeSeq *&out (void); - PolicyTypeSeq *_retn (void); - PolicyTypeSeq *ptr (void) const; - - private: - PolicyTypeSeq *ptr_; - }; - -#endif /* end #if !defined */ - -#if !defined (_CORBA_POLICYTYPESEQ___OUT_CH_) -#define _CORBA_POLICYTYPESEQ___OUT_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:753 - - class TAO_Export PolicyTypeSeq_out - { - public: - PolicyTypeSeq_out (PolicyTypeSeq *&); - PolicyTypeSeq_out (PolicyTypeSeq_var &); - PolicyTypeSeq_out (const PolicyTypeSeq_out &); - PolicyTypeSeq_out &operator= (const PolicyTypeSeq_out &); - PolicyTypeSeq_out &operator= (PolicyTypeSeq *); - operator PolicyTypeSeq *&(); - PolicyTypeSeq *&ptr (void); - PolicyTypeSeq *operator-> (void); - PolicyType & operator[] (CORBA::ULong index); - - private: - PolicyTypeSeq *&ptr_; - // Assignment from T_var not allowed. - void operator= (const PolicyTypeSeq_var &); - }; - -#endif /* end #if !defined */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 @@ -393,8 +239,11 @@ TAO_NAMESPACE CORBA } TAO_NAMESPACE_CLOSE // module CORBA -// Any operators for interface CORBA::Policy -TAO_Export void operator<<= (CORBA::Any &, CORBA::Policy_ptr); +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/any_op_ch.cpp:65 + +TAO_Export void operator<<= (CORBA::Any &, CORBA::Policy_ptr); // copying +TAO_Export void operator<<= (CORBA::Any &, CORBA::Policy_ptr *); // non-copying TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Policy *&); // TAO_IDL - Generated from @@ -477,7 +326,7 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::SetOverrideType &); #endif /* __ACE_INLINE__ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018 #if defined (__ACE_INLINE__) #include "Policy_ForwardC.i" diff --git a/TAO/tao/Policy_ForwardC.i b/TAO/tao/Policy_ForwardC.i index 58e14095703..2a094345f0a 100644 --- a/TAO/tao/Policy_ForwardC.i +++ b/TAO/tao/Policy_ForwardC.i @@ -20,908 +20,6 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:108 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_POLICYLIST_CI_) -#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_POLICYLIST_CI_ - -ACE_INLINE -CORBA::Policy ** -CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (CORBA::ULong nelems) -{ - CORBA::Policy **buf = 0; - - ACE_NEW_RETURN (buf, CORBA::Policy*[nelems], 0); - - for (CORBA::ULong i = 0; i < nelems; i++) - { - buf[i] = tao_CORBA_Policy_nil (); - } - - return buf; -} - -ACE_INLINE -void -CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::freebuf (CORBA::Policy **buffer) -{ - if (buffer == 0) - { - return; - } - - delete[] buffer; -} - -ACE_INLINE -CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList (void) -{ -} - -ACE_INLINE -CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList (CORBA::ULong maximum) - : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (maximum)) -{ -} - -ACE_INLINE -CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList ( - CORBA::ULong maximum, - CORBA::ULong length, - CORBA::Policy* *value, - CORBA::Boolean release - ) - : TAO_Unbounded_Base_Sequence (maximum, length, value, release) -{ -} - -ACE_INLINE -CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList( - const _TAO_Unbounded_Object_Sequence_CORBA_PolicyList &rhs - ) - : TAO_Unbounded_Base_Sequence (rhs) -{ - if (rhs.buffer_ != 0) - { - CORBA::Policy **tmp1 = - _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (this->maximum_); - CORBA::Policy ** const tmp2 = - ACE_reinterpret_cast (CORBA::Policy ** ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < rhs.length_; ++i) - { - tmp1[i] = tao_CORBA_Policy_duplicate (tmp2[i]); - } - - this->buffer_ = tmp1; - } - else - { - this->buffer_ = 0; - } -} - -ACE_INLINE -CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList & -CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::operator= ( - const _TAO_Unbounded_Object_Sequence_CORBA_PolicyList &rhs - ) -{ - if (this == &rhs) - { - return *this; - } - - if (this->release_) - { - CORBA::Policy **tmp = - ACE_reinterpret_cast (CORBA::Policy **, this->buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - tao_CORBA_Policy_release (tmp[i]); - tmp[i] = tao_CORBA_Policy_nil (); - } - - if (this->maximum_ < rhs.maximum_) - { - _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::freebuf (tmp); - this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (rhs.maximum_); - } - } - else - { - this->buffer_ = - _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (rhs.maximum_); - } - - TAO_Unbounded_Base_Sequence::operator= (rhs); - - CORBA::Policy **tmp1 = - ACE_reinterpret_cast (CORBA::Policy **, this->buffer_); - - CORBA::Policy ** const tmp2 = - ACE_reinterpret_cast (CORBA::Policy ** ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < rhs.length_; ++i) - { - tmp1[i] = tao_CORBA_Policy_duplicate (tmp2[i]); - } - - return *this; -} - -ACE_INLINE -TAO_Object_Manager<CORBA::Policy,CORBA::Policy_var> -CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::operator[] (CORBA::ULong index) const -{ - ACE_ASSERT (index < this->maximum_); - CORBA::Policy ** const tmp = - ACE_reinterpret_cast (CORBA::Policy ** ACE_CAST_CONST, this->buffer_); - return TAO_Object_Manager<CORBA::Policy,CORBA::Policy_var> (tmp + index, this->release_); -} - -ACE_INLINE -CORBA::Policy* * -CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::get_buffer (CORBA::Boolean orphan) -{ - CORBA::Policy **result = 0; - - if (orphan == 0) - { - // We retain ownership. - if (this->buffer_ == 0) - { - result = - _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (this->maximum_); - this->buffer_ = result; - this->release_ = 1; - } - else - { - result = - ACE_reinterpret_cast (CORBA::Policy**, this->buffer_); - } - } - else // if (orphan == 1) - { - if (this->release_ != 0) - { - // We set the state back to default and relinquish ownership. - result = - ACE_reinterpret_cast(CORBA::Policy**,this->buffer_); - this->maximum_ = 0; - this->length_ = 0; - this->buffer_ = 0; - this->release_ = 0; - } - } - - return result; -} - -ACE_INLINE -const CORBA::Policy* * -CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::get_buffer (void) const -{ - return ACE_reinterpret_cast (const CORBA::Policy ** ACE_CAST_CONST, this->buffer_); -} - -#endif /* end #if !defined */ - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_CORBA_POLICYLIST_CI_) -#define _CORBA_POLICYLIST_CI_ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226 - -// ************************************************************* -// Inline operations for class CORBA::PolicyList_var -// ************************************************************* - -ACE_INLINE -CORBA::PolicyList_var::PolicyList_var (void) - : ptr_ (0) -{} - -ACE_INLINE -CORBA::PolicyList_var::PolicyList_var (PolicyList *p) - : ptr_ (p) -{} - -ACE_INLINE -CORBA::PolicyList_var::PolicyList_var (const ::CORBA::PolicyList_var &p) -{ - if (p.ptr_) - { - ACE_NEW (this->ptr_, ::CORBA::PolicyList (*p.ptr_)); - } - else - { - this->ptr_ = 0; - } -} - -ACE_INLINE -CORBA::PolicyList_var::~PolicyList_var (void) -{ - delete this->ptr_; -} - -ACE_INLINE -CORBA::PolicyList_var & -CORBA::PolicyList_var::operator= (PolicyList *p) -{ - delete this->ptr_; - this->ptr_ = p; - return *this; -} - -ACE_INLINE -::CORBA::PolicyList_var & -CORBA::PolicyList_var::operator= (const ::CORBA::PolicyList_var &p) -{ - if (this != &p) - { - if (p.ptr_ == 0) - { - delete this->ptr_; - this->ptr_ = 0; - } - else - { - PolicyList *deep_copy = 0; - ACE_NEW_RETURN ( - deep_copy, - PolicyList (*p.ptr_), - *this - ); - - if (deep_copy != 0) - { - PolicyList *tmp = deep_copy; - deep_copy = this->ptr_; - this->ptr_ = tmp; - delete deep_copy; - } - } - } - - return *this; -} - -ACE_INLINE -const ::CORBA::PolicyList * -CORBA::PolicyList_var::operator-> (void) const -{ - return this->ptr_; -} - -ACE_INLINE -::CORBA::PolicyList * -CORBA::PolicyList_var::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -CORBA::PolicyList_var::operator const ::CORBA::PolicyList &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE -CORBA::PolicyList_var::operator ::CORBA::PolicyList &() // cast -{ - return *this->ptr_; -} - -ACE_INLINE -CORBA::PolicyList_var::operator ::CORBA::PolicyList &() const // cast -{ - return *this->ptr_; -} - -// Variable-size types only. -ACE_INLINE -CORBA::PolicyList_var::operator ::CORBA::PolicyList *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE TAO_Object_Manager<CORBA::Policy, CORBA::Policy_var, CORBA::tao_Policy_life> -CORBA::PolicyList_var::operator[] (CORBA::ULong index) -{ - return this->ptr_->operator[] (index); -} - -ACE_INLINE -const ::CORBA::PolicyList & -CORBA::PolicyList_var::in (void) const -{ - return *this->ptr_; -} - -ACE_INLINE -::CORBA::PolicyList & -CORBA::PolicyList_var::inout (void) -{ - return *this->ptr_; -} - -ACE_INLINE -::CORBA::PolicyList *& -CORBA::PolicyList_var::out (void) -{ - delete this->ptr_; - this->ptr_ = 0; - return this->ptr_; -} - -ACE_INLINE -::CORBA::PolicyList * -CORBA::PolicyList_var::_retn (void) -{ - ::CORBA::PolicyList *tmp = this->ptr_; - this->ptr_ = 0; - return tmp; -} - -ACE_INLINE -::CORBA::PolicyList * -CORBA::PolicyList_var::ptr (void) const -{ - return this->ptr_; -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567 - -// ************************************************************* -// Inline operations for class CORBA::PolicyList_out -// ************************************************************* - -ACE_INLINE -CORBA::PolicyList_out::PolicyList_out (PolicyList *&p) - : ptr_ (p) -{ - this->ptr_ = 0; -} - -ACE_INLINE -CORBA::PolicyList_out::PolicyList_out (PolicyList_var &p) - : ptr_ (p.out ()) -{ - delete this->ptr_; - this->ptr_ = 0; -} - -ACE_INLINE -CORBA::PolicyList_out::PolicyList_out (const ::CORBA::PolicyList_out &p) - : ptr_ (ACE_const_cast (PolicyList_out&, p).ptr_) -{} - -ACE_INLINE -::CORBA::PolicyList_out & -CORBA::PolicyList_out::operator= (const ::CORBA::PolicyList_out &p) -{ - this->ptr_ = ACE_const_cast (PolicyList_out&, p).ptr_; - return *this; -} - -ACE_INLINE -::CORBA::PolicyList_out & -CORBA::PolicyList_out::operator= (PolicyList *p) -{ - this->ptr_ = p; - return *this; -} - -ACE_INLINE -CORBA::PolicyList_out::operator ::CORBA::PolicyList *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE -::CORBA::PolicyList *& -CORBA::PolicyList_out::ptr (void) // ptr -{ - return this->ptr_; -} - -ACE_INLINE -::CORBA::PolicyList * -CORBA::PolicyList_out::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE TAO_Object_Manager<CORBA::Policy, CORBA::Policy_var, CORBA::tao_Policy_life> -CORBA::PolicyList_out::operator[] (CORBA::ULong index) -{ - return this->ptr_->operator[] (index); -} - -#endif /* end #if !defined */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CI_) -#define __TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CI_ - -ACE_INLINE -CORBA::ULong * -CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (CORBA::ULong size) -{ - CORBA::ULong *retval = 0; - ACE_NEW_RETURN (retval, CORBA::ULong[size], 0); - return retval; -} - -ACE_INLINE -void CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::freebuf (CORBA::ULong *buffer) -{ - delete [] buffer; -} - -ACE_INLINE -CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (void) -{ -} - -ACE_INLINE -CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (CORBA::ULong maximum) - : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (maximum)) -{ -} - -ACE_INLINE -CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq ( - CORBA::ULong maximum, - CORBA::ULong length, - CORBA::ULong *data, - CORBA::Boolean release - ) - : TAO_Unbounded_Base_Sequence (maximum, length, data, release) -{ -} - -ACE_INLINE -CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq ( - const _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq &rhs - ) - : TAO_Unbounded_Base_Sequence (rhs) -{ - if (rhs.buffer_ != 0) - { - CORBA::ULong *tmp1 = - _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (this->maximum_); - CORBA::ULong * const tmp2 = - ACE_reinterpret_cast (CORBA::ULong * ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - tmp1[i] = tmp2[i]; - } - - this->buffer_ = tmp1; - } - else - { - this->buffer_ = 0; - } -} - -ACE_INLINE -CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq & -CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::operator= ( - const _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq &rhs - ) -{ - if (this == &rhs) - { - return *this; - } - - if (this->release_) - { - if (this->maximum_ < rhs.maximum_) - { - // Free the old buffer. - CORBA::ULong *tmp = - ACE_reinterpret_cast (CORBA::ULong *, this->buffer_); - - _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::freebuf (tmp); - - this->buffer_ = - _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (rhs.maximum_); - } - } - else - { - this->buffer_ = - _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (rhs.maximum_); - } - - TAO_Unbounded_Base_Sequence::operator= (rhs); - - CORBA::ULong *tmp1 = - ACE_reinterpret_cast (CORBA::ULong *, this->buffer_); - CORBA::ULong * const tmp2 = - ACE_reinterpret_cast (CORBA::ULong * ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - tmp1[i] = tmp2[i]; - } - - return *this; -} - -// = Accessors. -ACE_INLINE -CORBA::ULong & -CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::operator[] (CORBA::ULong i) -{ - ACE_ASSERT (i < this->maximum_); - CORBA::ULong* tmp = - ACE_reinterpret_cast (CORBA::ULong*, this->buffer_); - return tmp[i]; -} - -ACE_INLINE -const CORBA::ULong & -CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::operator[] (CORBA::ULong i) const -{ - ACE_ASSERT (i < this->maximum_); - CORBA::ULong * const tmp = - ACE_reinterpret_cast (CORBA::ULong* ACE_CAST_CONST, this->buffer_); - return tmp[i]; -} - -// Implement the TAO_Base_Sequence methods (see Sequence.h) - -ACE_INLINE -CORBA::ULong * -CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::get_buffer (CORBA::Boolean orphan) -{ - CORBA::ULong *result = 0; - - if (orphan == 0) - { - // We retain ownership. - if (this->buffer_ == 0) - { - result = - _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (this->length_); - this->buffer_ = result; - this->release_ = 1; - } - else - { - result = - ACE_reinterpret_cast (CORBA::ULong*, this->buffer_); - } - } - else // if (orphan == 1) - { - if (this->release_ != 0) - { - // We set the state back to default and relinquish ownership. - result = - ACE_reinterpret_cast(CORBA::ULong*,this->buffer_); - this->maximum_ = 0; - this->length_ = 0; - this->buffer_ = 0; - this->release_ = 0; - } - } - - return result; -} - -ACE_INLINE -const CORBA::ULong * -CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::get_buffer (void) const -{ - return ACE_reinterpret_cast (const CORBA::ULong * ACE_CAST_CONST, this->buffer_); -} - -ACE_INLINE -void -CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::replace ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::ULong *data, - CORBA::Boolean release - ) -{ - this->maximum_ = max; - this->length_ = length; - - if (this->buffer_ && this->release_ == 1) - { - CORBA::ULong *tmp = - ACE_reinterpret_cast (CORBA::ULong*, this->buffer_); - _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::freebuf (tmp); - } - - this->buffer_ = data; - this->release_ = release; -} - -#endif /* end #if !defined */ - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_CORBA_POLICYTYPESEQ_CI_) -#define _CORBA_POLICYTYPESEQ_CI_ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226 - -// ************************************************************* -// Inline operations for class CORBA::PolicyTypeSeq_var -// ************************************************************* - -ACE_INLINE -CORBA::PolicyTypeSeq_var::PolicyTypeSeq_var (void) - : ptr_ (0) -{} - -ACE_INLINE -CORBA::PolicyTypeSeq_var::PolicyTypeSeq_var (PolicyTypeSeq *p) - : ptr_ (p) -{} - -ACE_INLINE -CORBA::PolicyTypeSeq_var::PolicyTypeSeq_var (const ::CORBA::PolicyTypeSeq_var &p) -{ - if (p.ptr_) - { - ACE_NEW (this->ptr_, ::CORBA::PolicyTypeSeq (*p.ptr_)); - } - else - { - this->ptr_ = 0; - } -} - -// Fixed-size base types only. -ACE_INLINE -CORBA::PolicyTypeSeq_var::PolicyTypeSeq_var (const ::CORBA::PolicyTypeSeq &p) -{ - ACE_NEW (this->ptr_, ::CORBA::PolicyTypeSeq (p)); -} - -ACE_INLINE -CORBA::PolicyTypeSeq_var::~PolicyTypeSeq_var (void) -{ - delete this->ptr_; -} - -ACE_INLINE -CORBA::PolicyTypeSeq_var & -CORBA::PolicyTypeSeq_var::operator= (PolicyTypeSeq *p) -{ - delete this->ptr_; - this->ptr_ = p; - return *this; -} - -ACE_INLINE -::CORBA::PolicyTypeSeq_var & -CORBA::PolicyTypeSeq_var::operator= (const ::CORBA::PolicyTypeSeq_var &p) -{ - if (this != &p) - { - if (p.ptr_ == 0) - { - delete this->ptr_; - this->ptr_ = 0; - } - else - { - PolicyTypeSeq *deep_copy = 0; - ACE_NEW_RETURN ( - deep_copy, - PolicyTypeSeq (*p.ptr_), - *this - ); - - if (deep_copy != 0) - { - PolicyTypeSeq *tmp = deep_copy; - deep_copy = this->ptr_; - this->ptr_ = tmp; - delete deep_copy; - } - } - } - - return *this; -} - -// Fixed-size types only. -ACE_INLINE -::CORBA::PolicyTypeSeq_var & -CORBA::PolicyTypeSeq_var::operator= (const ::CORBA::PolicyTypeSeq &p) -{ - if (this->ptr_ != &p) - { - delete this->ptr_; - ACE_NEW_RETURN (this->ptr_, ::CORBA::PolicyTypeSeq (p), *this); - } - - return *this; -} - -ACE_INLINE -const ::CORBA::PolicyTypeSeq * -CORBA::PolicyTypeSeq_var::operator-> (void) const -{ - return this->ptr_; -} - -ACE_INLINE -::CORBA::PolicyTypeSeq * -CORBA::PolicyTypeSeq_var::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -CORBA::PolicyTypeSeq_var::operator const ::CORBA::PolicyTypeSeq &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE -CORBA::PolicyTypeSeq_var::operator ::CORBA::PolicyTypeSeq &() // cast -{ - return *this->ptr_; -} - -ACE_INLINE -CORBA::PolicyTypeSeq_var::operator ::CORBA::PolicyTypeSeq &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE -CORBA::PolicyType & -CORBA::PolicyTypeSeq_var::operator[] (CORBA::ULong index) -{ - return this->ptr_->operator[] (index); -} - -ACE_INLINE -const CORBA::PolicyType & -CORBA::PolicyTypeSeq_var::operator[] (CORBA::ULong index) const -{ - return ACE_const_cast (const CORBA::PolicyType &, this->ptr_->operator[] (index)); -} - -ACE_INLINE -const ::CORBA::PolicyTypeSeq & -CORBA::PolicyTypeSeq_var::in (void) const -{ - return *this->ptr_; -} - -ACE_INLINE -::CORBA::PolicyTypeSeq & -CORBA::PolicyTypeSeq_var::inout (void) -{ - return *this->ptr_; -} - -ACE_INLINE -::CORBA::PolicyTypeSeq *& -CORBA::PolicyTypeSeq_var::out (void) -{ - delete this->ptr_; - this->ptr_ = 0; - return this->ptr_; -} - -ACE_INLINE -::CORBA::PolicyTypeSeq * -CORBA::PolicyTypeSeq_var::_retn (void) -{ - ::CORBA::PolicyTypeSeq *tmp = this->ptr_; - this->ptr_ = 0; - return tmp; -} - -ACE_INLINE -::CORBA::PolicyTypeSeq * -CORBA::PolicyTypeSeq_var::ptr (void) const -{ - return this->ptr_; -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567 - -// ************************************************************* -// Inline operations for class CORBA::PolicyTypeSeq_out -// ************************************************************* - -ACE_INLINE -CORBA::PolicyTypeSeq_out::PolicyTypeSeq_out (PolicyTypeSeq *&p) - : ptr_ (p) -{ - this->ptr_ = 0; -} - -ACE_INLINE -CORBA::PolicyTypeSeq_out::PolicyTypeSeq_out (PolicyTypeSeq_var &p) - : ptr_ (p.out ()) -{ - delete this->ptr_; - this->ptr_ = 0; -} - -ACE_INLINE -CORBA::PolicyTypeSeq_out::PolicyTypeSeq_out (const ::CORBA::PolicyTypeSeq_out &p) - : ptr_ (ACE_const_cast (PolicyTypeSeq_out&, p).ptr_) -{} - -ACE_INLINE -::CORBA::PolicyTypeSeq_out & -CORBA::PolicyTypeSeq_out::operator= (const ::CORBA::PolicyTypeSeq_out &p) -{ - this->ptr_ = ACE_const_cast (PolicyTypeSeq_out&, p).ptr_; - return *this; -} - -ACE_INLINE -::CORBA::PolicyTypeSeq_out & -CORBA::PolicyTypeSeq_out::operator= (PolicyTypeSeq *p) -{ - this->ptr_ = p; - return *this; -} - -ACE_INLINE -CORBA::PolicyTypeSeq_out::operator ::CORBA::PolicyTypeSeq *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE -::CORBA::PolicyTypeSeq *& -CORBA::PolicyTypeSeq_out::ptr (void) // ptr -{ - return this->ptr_; -} - -ACE_INLINE -::CORBA::PolicyTypeSeq * -CORBA::PolicyTypeSeq_out::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -CORBA::PolicyType & -CORBA::PolicyTypeSeq_out::operator[] (CORBA::ULong index) -{ - return this->ptr_->operator[] (index); -} - -#endif /* end #if !defined */ - // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59 diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp index c7ac789610e..6ee351cd664 100644 --- a/TAO/tao/PollableC.cpp +++ b/TAO/tao/PollableC.cpp @@ -37,8 +37,6 @@ #include "tao/ClientInterceptorAdapter.h" #endif /* TAO_HAS_INTERCEPTORS == 1 */ - - #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ @@ -53,7 +51,7 @@ int CORBA::Pollable::_tao_class_id = 0; CORBA::Pollable_ptr -tao_CORBA_Pollable_duplicate ( +CORBA::tao_Pollable_life::tao_duplicate ( CORBA::Pollable_ptr p ) { @@ -61,7 +59,7 @@ tao_CORBA_Pollable_duplicate ( } void -tao_CORBA_Pollable_release ( +CORBA::tao_Pollable_life::tao_release ( CORBA::Pollable_ptr p ) { @@ -69,231 +67,67 @@ tao_CORBA_Pollable_release ( } CORBA::Pollable_ptr -tao_CORBA_Pollable_nil ( +CORBA::tao_Pollable_life::tao_nil ( void ) { return CORBA::Pollable::_nil (); } -CORBA::Pollable_ptr -tao_CORBA_Pollable_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return CORBA::Pollable::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object * -tao_CORBA_Pollable_upcast ( - void *src - ) -{ - CORBA::Pollable **tmp = - ACE_static_cast (CORBA::Pollable **, src); - return *tmp; -} - CORBA::Boolean -tao_CORBA_Pollable_marshal ( +CORBA::tao_Pollable_life::tao_marshal ( CORBA::Pollable_ptr p, - TAO_OutputCDR &strm + TAO_OutputCDR &cdr ) { - return p->marshal (strm); -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721 - -// ************************************************************* -// CORBA::Pollable_var -// ************************************************************* - -CORBA::Pollable_var::Pollable_var (void) - : ptr_ (Pollable::_nil ()) -{} - -::CORBA::Pollable_ptr -CORBA::Pollable_var::ptr (void) const -{ - return this->ptr_; -} - -CORBA::Pollable_var::Pollable_var (const ::CORBA::Pollable_var &p) - : TAO_Base_var (), - ptr_ (Pollable::_duplicate (p.ptr ())) -{} - -CORBA::Pollable_var::~Pollable_var (void) -{ - CORBA::release (this->ptr_); -} - -CORBA::Pollable_var & -CORBA::Pollable_var::operator= (Pollable_ptr p) -{ - CORBA::release (this->ptr_); - this->ptr_ = p; - return *this; -} - -CORBA::Pollable_var & -CORBA::Pollable_var::operator= (const ::CORBA::Pollable_var &p) -{ - if (this != &p) - { - CORBA::release (this->ptr_); - this->ptr_ = ::CORBA::Pollable::_duplicate (p.ptr ()); - } - return *this; -} - -CORBA::Pollable_var::operator const ::CORBA::Pollable_ptr &() const // cast -{ - return this->ptr_; + return p->marshal (cdr); } -CORBA::Pollable_var::operator ::CORBA::Pollable_ptr &() // cast -{ - return this->ptr_; -} - -::CORBA::Pollable_ptr -CORBA::Pollable_var::operator-> (void) const -{ - return this->ptr_; -} - -::CORBA::Pollable_ptr -CORBA::Pollable_var::in (void) const -{ - return this->ptr_; -} - -::CORBA::Pollable_ptr & -CORBA::Pollable_var::inout (void) -{ - return this->ptr_; -} - -::CORBA::Pollable_ptr & -CORBA::Pollable_var::out (void) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::CORBA::Pollable::_nil (); - return this->ptr_; -} - -::CORBA::Pollable_ptr -CORBA::Pollable_var::_retn (void) -{ - // yield ownership of managed obj reference - ::CORBA::Pollable_ptr val = this->ptr_; - this->ptr_ = ::CORBA::Pollable::_nil (); - return val; -} - -::CORBA::Pollable_ptr -CORBA::Pollable_var::tao_duplicate (Pollable_ptr p) -{ - return ::CORBA::Pollable::_duplicate (p); -} - -void -CORBA::Pollable_var::tao_release (Pollable_ptr p) -{ - CORBA::release (p); -} - -::CORBA::Pollable_ptr -CORBA::Pollable_var::tao_nil (void) -{ - return ::CORBA::Pollable::_nil (); -} - -::CORBA::Pollable_ptr -CORBA::Pollable_var::tao_narrow ( +CORBA::Pollable_ptr +CORBA::tao_Pollable_cast::tao_narrow ( CORBA::Object *p ACE_ENV_ARG_DECL ) { - return ::CORBA::Pollable::_narrow (p ACE_ENV_ARG_PARAMETER); + return CORBA::Pollable::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * -CORBA::Pollable_var::tao_upcast (void *src) +CORBA::tao_Pollable_cast::tao_upcast ( + void *src + ) { - Pollable **tmp = - ACE_static_cast (Pollable **, src); + CORBA::Pollable **tmp = + ACE_static_cast (CORBA::Pollable **, src); return *tmp; } -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030 - -// ************************************************************* -// CORBA::Pollable_out -// ************************************************************* - -CORBA::Pollable_out::Pollable_out (Pollable_ptr &p) - : ptr_ (p) -{ - this->ptr_ = ::CORBA::Pollable::_nil (); -} - -CORBA::Pollable_out::Pollable_out (Pollable_var &p) - : ptr_ (p.out ()) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::CORBA::Pollable::_nil (); -} - -CORBA::Pollable_out::Pollable_out (const ::CORBA::Pollable_out &p) - : ptr_ (ACE_const_cast (Pollable_out &, p).ptr_) -{} - -::CORBA::Pollable_out & -CORBA::Pollable_out::operator= (const ::CORBA::Pollable_out &p) -{ - this->ptr_ = ACE_const_cast (Pollable_out&, p).ptr_; - return *this; -} - -CORBA::Pollable_out & -CORBA::Pollable_out::operator= (const ::CORBA::Pollable_var &p) -{ - this->ptr_ = ::CORBA::Pollable::_duplicate (p.ptr ()); - return *this; -} - -CORBA::Pollable_out & -CORBA::Pollable_out::operator= (Pollable_ptr p) -{ - this->ptr_ = p; - return *this; -} - -CORBA::Pollable_out::operator ::CORBA::Pollable_ptr &() // cast -{ - return this->ptr_; -} - -::CORBA::Pollable_ptr & -CORBA::Pollable_out::ptr (void) -{ - return this->ptr_; -} - -::CORBA::Pollable_ptr -CORBA::Pollable_out::operator-> (void) -{ - return this->ptr_; -} +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + template class + TAO_Objref_Var_T< + CORBA::Pollable, + CORBA::tao_Pollable_life + >; + template class + TAO_Objref_Out_T< + CORBA::Pollable, + CORBA::tao_Pollable_life + >; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +# pragma instantiate \ + TAO_Objref_Var_T< \ + CORBA::Pollable, \ + CORBA::tao_Pollable_life \ + > +# pragma instantiate \ + TAO_Objref_Out_T< \ + CORBA::Pollable, \ + CORBA::tao_Pollable_life \ + > +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 CORBA::Pollable::Pollable (void) {} @@ -380,13 +214,19 @@ const char* CORBA::Pollable::_interface_repository_id (void) const return "IDL:omg.org/CORBA/Pollable:1.0"; } +CORBA::Boolean +CORBA::Pollable::marshal (TAO_OutputCDR &) +{ + return 0; +} + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61 int CORBA::DIIPollable::_tao_class_id = 0; CORBA::DIIPollable_ptr -tao_CORBA_DIIPollable_duplicate ( +CORBA::tao_DIIPollable_life::tao_duplicate ( CORBA::DIIPollable_ptr p ) { @@ -394,7 +234,7 @@ tao_CORBA_DIIPollable_duplicate ( } void -tao_CORBA_DIIPollable_release ( +CORBA::tao_DIIPollable_life::tao_release ( CORBA::DIIPollable_ptr p ) { @@ -402,231 +242,67 @@ tao_CORBA_DIIPollable_release ( } CORBA::DIIPollable_ptr -tao_CORBA_DIIPollable_nil ( +CORBA::tao_DIIPollable_life::tao_nil ( void ) { return CORBA::DIIPollable::_nil (); } -CORBA::DIIPollable_ptr -tao_CORBA_DIIPollable_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return CORBA::DIIPollable::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object * -tao_CORBA_DIIPollable_upcast ( - void *src - ) -{ - CORBA::DIIPollable **tmp = - ACE_static_cast (CORBA::DIIPollable **, src); - return *tmp; -} - CORBA::Boolean -tao_CORBA_DIIPollable_marshal ( +CORBA::tao_DIIPollable_life::tao_marshal ( CORBA::DIIPollable_ptr p, - TAO_OutputCDR &strm + TAO_OutputCDR &cdr ) { - return p->marshal (strm); -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721 - -// ************************************************************* -// CORBA::DIIPollable_var -// ************************************************************* - -CORBA::DIIPollable_var::DIIPollable_var (void) - : ptr_ (DIIPollable::_nil ()) -{} - -::CORBA::DIIPollable_ptr -CORBA::DIIPollable_var::ptr (void) const -{ - return this->ptr_; -} - -CORBA::DIIPollable_var::DIIPollable_var (const ::CORBA::DIIPollable_var &p) - : TAO_Base_var (), - ptr_ (DIIPollable::_duplicate (p.ptr ())) -{} - -CORBA::DIIPollable_var::~DIIPollable_var (void) -{ - CORBA::release (this->ptr_); -} - -CORBA::DIIPollable_var & -CORBA::DIIPollable_var::operator= (DIIPollable_ptr p) -{ - CORBA::release (this->ptr_); - this->ptr_ = p; - return *this; -} - -CORBA::DIIPollable_var & -CORBA::DIIPollable_var::operator= (const ::CORBA::DIIPollable_var &p) -{ - if (this != &p) - { - CORBA::release (this->ptr_); - this->ptr_ = ::CORBA::DIIPollable::_duplicate (p.ptr ()); - } - return *this; -} - -CORBA::DIIPollable_var::operator const ::CORBA::DIIPollable_ptr &() const // cast -{ - return this->ptr_; -} - -CORBA::DIIPollable_var::operator ::CORBA::DIIPollable_ptr &() // cast -{ - return this->ptr_; -} - -::CORBA::DIIPollable_ptr -CORBA::DIIPollable_var::operator-> (void) const -{ - return this->ptr_; -} - -::CORBA::DIIPollable_ptr -CORBA::DIIPollable_var::in (void) const -{ - return this->ptr_; -} - -::CORBA::DIIPollable_ptr & -CORBA::DIIPollable_var::inout (void) -{ - return this->ptr_; -} - -::CORBA::DIIPollable_ptr & -CORBA::DIIPollable_var::out (void) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::CORBA::DIIPollable::_nil (); - return this->ptr_; + return p->marshal (cdr); } -::CORBA::DIIPollable_ptr -CORBA::DIIPollable_var::_retn (void) -{ - // yield ownership of managed obj reference - ::CORBA::DIIPollable_ptr val = this->ptr_; - this->ptr_ = ::CORBA::DIIPollable::_nil (); - return val; -} - -::CORBA::DIIPollable_ptr -CORBA::DIIPollable_var::tao_duplicate (DIIPollable_ptr p) -{ - return ::CORBA::DIIPollable::_duplicate (p); -} - -void -CORBA::DIIPollable_var::tao_release (DIIPollable_ptr p) -{ - CORBA::release (p); -} - -::CORBA::DIIPollable_ptr -CORBA::DIIPollable_var::tao_nil (void) -{ - return ::CORBA::DIIPollable::_nil (); -} - -::CORBA::DIIPollable_ptr -CORBA::DIIPollable_var::tao_narrow ( +CORBA::DIIPollable_ptr +CORBA::tao_DIIPollable_cast::tao_narrow ( CORBA::Object *p ACE_ENV_ARG_DECL ) { - return ::CORBA::DIIPollable::_narrow (p ACE_ENV_ARG_PARAMETER); + return CORBA::DIIPollable::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * -CORBA::DIIPollable_var::tao_upcast (void *src) +CORBA::tao_DIIPollable_cast::tao_upcast ( + void *src + ) { - DIIPollable **tmp = - ACE_static_cast (DIIPollable **, src); + CORBA::DIIPollable **tmp = + ACE_static_cast (CORBA::DIIPollable **, src); return *tmp; } -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030 - -// ************************************************************* -// CORBA::DIIPollable_out -// ************************************************************* - -CORBA::DIIPollable_out::DIIPollable_out (DIIPollable_ptr &p) - : ptr_ (p) -{ - this->ptr_ = ::CORBA::DIIPollable::_nil (); -} - -CORBA::DIIPollable_out::DIIPollable_out (DIIPollable_var &p) - : ptr_ (p.out ()) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::CORBA::DIIPollable::_nil (); -} - -CORBA::DIIPollable_out::DIIPollable_out (const ::CORBA::DIIPollable_out &p) - : ptr_ (ACE_const_cast (DIIPollable_out &, p).ptr_) -{} - -::CORBA::DIIPollable_out & -CORBA::DIIPollable_out::operator= (const ::CORBA::DIIPollable_out &p) -{ - this->ptr_ = ACE_const_cast (DIIPollable_out&, p).ptr_; - return *this; -} - -CORBA::DIIPollable_out & -CORBA::DIIPollable_out::operator= (const ::CORBA::DIIPollable_var &p) -{ - this->ptr_ = ::CORBA::DIIPollable::_duplicate (p.ptr ()); - return *this; -} - -CORBA::DIIPollable_out & -CORBA::DIIPollable_out::operator= (DIIPollable_ptr p) -{ - this->ptr_ = p; - return *this; -} - -CORBA::DIIPollable_out::operator ::CORBA::DIIPollable_ptr &() // cast -{ - return this->ptr_; -} - -::CORBA::DIIPollable_ptr & -CORBA::DIIPollable_out::ptr (void) -{ - return this->ptr_; -} - -::CORBA::DIIPollable_ptr -CORBA::DIIPollable_out::operator-> (void) -{ - return this->ptr_; -} +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + template class + TAO_Objref_Var_T< + CORBA::DIIPollable, + CORBA::tao_DIIPollable_life + >; + template class + TAO_Objref_Out_T< + CORBA::DIIPollable, + CORBA::tao_DIIPollable_life + >; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +# pragma instantiate \ + TAO_Objref_Var_T< \ + CORBA::DIIPollable, \ + CORBA::tao_DIIPollable_life \ + > +# pragma instantiate \ + TAO_Objref_Out_T< \ + CORBA::DIIPollable, \ + CORBA::tao_DIIPollable_life \ + > +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 CORBA::DIIPollable::DIIPollable (void) {} @@ -727,13 +403,19 @@ const char* CORBA::DIIPollable::_interface_repository_id (void) const return "IDL:omg.org/CORBA/DIIPollable:1.0"; } +CORBA::Boolean +CORBA::DIIPollable::marshal (TAO_OutputCDR &) +{ + return 0; +} + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61 int CORBA::PollableSet::_tao_class_id = 0; CORBA::PollableSet_ptr -tao_CORBA_PollableSet_duplicate ( +CORBA::tao_PollableSet_life::tao_duplicate ( CORBA::PollableSet_ptr p ) { @@ -741,7 +423,7 @@ tao_CORBA_PollableSet_duplicate ( } void -tao_CORBA_PollableSet_release ( +CORBA::tao_PollableSet_life::tao_release ( CORBA::PollableSet_ptr p ) { @@ -749,231 +431,67 @@ tao_CORBA_PollableSet_release ( } CORBA::PollableSet_ptr -tao_CORBA_PollableSet_nil ( +CORBA::tao_PollableSet_life::tao_nil ( void ) { return CORBA::PollableSet::_nil (); } -CORBA::PollableSet_ptr -tao_CORBA_PollableSet_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return CORBA::PollableSet::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object * -tao_CORBA_PollableSet_upcast ( - void *src - ) -{ - CORBA::PollableSet **tmp = - ACE_static_cast (CORBA::PollableSet **, src); - return *tmp; -} - CORBA::Boolean -tao_CORBA_PollableSet_marshal ( +CORBA::tao_PollableSet_life::tao_marshal ( CORBA::PollableSet_ptr p, - TAO_OutputCDR &strm + TAO_OutputCDR &cdr ) { - return p->marshal (strm); -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721 - -// ************************************************************* -// CORBA::PollableSet_var -// ************************************************************* - -CORBA::PollableSet_var::PollableSet_var (void) - : ptr_ (PollableSet::_nil ()) -{} - -::CORBA::PollableSet_ptr -CORBA::PollableSet_var::ptr (void) const -{ - return this->ptr_; -} - -CORBA::PollableSet_var::PollableSet_var (const ::CORBA::PollableSet_var &p) - : TAO_Base_var (), - ptr_ (PollableSet::_duplicate (p.ptr ())) -{} - -CORBA::PollableSet_var::~PollableSet_var (void) -{ - CORBA::release (this->ptr_); -} - -CORBA::PollableSet_var & -CORBA::PollableSet_var::operator= (PollableSet_ptr p) -{ - CORBA::release (this->ptr_); - this->ptr_ = p; - return *this; -} - -CORBA::PollableSet_var & -CORBA::PollableSet_var::operator= (const ::CORBA::PollableSet_var &p) -{ - if (this != &p) - { - CORBA::release (this->ptr_); - this->ptr_ = ::CORBA::PollableSet::_duplicate (p.ptr ()); - } - return *this; -} - -CORBA::PollableSet_var::operator const ::CORBA::PollableSet_ptr &() const // cast -{ - return this->ptr_; -} - -CORBA::PollableSet_var::operator ::CORBA::PollableSet_ptr &() // cast -{ - return this->ptr_; -} - -::CORBA::PollableSet_ptr -CORBA::PollableSet_var::operator-> (void) const -{ - return this->ptr_; -} - -::CORBA::PollableSet_ptr -CORBA::PollableSet_var::in (void) const -{ - return this->ptr_; + return p->marshal (cdr); } -::CORBA::PollableSet_ptr & -CORBA::PollableSet_var::inout (void) -{ - return this->ptr_; -} - -::CORBA::PollableSet_ptr & -CORBA::PollableSet_var::out (void) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::CORBA::PollableSet::_nil (); - return this->ptr_; -} - -::CORBA::PollableSet_ptr -CORBA::PollableSet_var::_retn (void) -{ - // yield ownership of managed obj reference - ::CORBA::PollableSet_ptr val = this->ptr_; - this->ptr_ = ::CORBA::PollableSet::_nil (); - return val; -} - -::CORBA::PollableSet_ptr -CORBA::PollableSet_var::tao_duplicate (PollableSet_ptr p) -{ - return ::CORBA::PollableSet::_duplicate (p); -} - -void -CORBA::PollableSet_var::tao_release (PollableSet_ptr p) -{ - CORBA::release (p); -} - -::CORBA::PollableSet_ptr -CORBA::PollableSet_var::tao_nil (void) -{ - return ::CORBA::PollableSet::_nil (); -} - -::CORBA::PollableSet_ptr -CORBA::PollableSet_var::tao_narrow ( +CORBA::PollableSet_ptr +CORBA::tao_PollableSet_cast::tao_narrow ( CORBA::Object *p ACE_ENV_ARG_DECL ) { - return ::CORBA::PollableSet::_narrow (p ACE_ENV_ARG_PARAMETER); + return CORBA::PollableSet::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * -CORBA::PollableSet_var::tao_upcast (void *src) +CORBA::tao_PollableSet_cast::tao_upcast ( + void *src + ) { - PollableSet **tmp = - ACE_static_cast (PollableSet **, src); + CORBA::PollableSet **tmp = + ACE_static_cast (CORBA::PollableSet **, src); return *tmp; } -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030 - -// ************************************************************* -// CORBA::PollableSet_out -// ************************************************************* - -CORBA::PollableSet_out::PollableSet_out (PollableSet_ptr &p) - : ptr_ (p) -{ - this->ptr_ = ::CORBA::PollableSet::_nil (); -} - -CORBA::PollableSet_out::PollableSet_out (PollableSet_var &p) - : ptr_ (p.out ()) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::CORBA::PollableSet::_nil (); -} - -CORBA::PollableSet_out::PollableSet_out (const ::CORBA::PollableSet_out &p) - : ptr_ (ACE_const_cast (PollableSet_out &, p).ptr_) -{} - -::CORBA::PollableSet_out & -CORBA::PollableSet_out::operator= (const ::CORBA::PollableSet_out &p) -{ - this->ptr_ = ACE_const_cast (PollableSet_out&, p).ptr_; - return *this; -} - -CORBA::PollableSet_out & -CORBA::PollableSet_out::operator= (const ::CORBA::PollableSet_var &p) -{ - this->ptr_ = ::CORBA::PollableSet::_duplicate (p.ptr ()); - return *this; -} - -CORBA::PollableSet_out & -CORBA::PollableSet_out::operator= (PollableSet_ptr p) -{ - this->ptr_ = p; - return *this; -} - -CORBA::PollableSet_out::operator ::CORBA::PollableSet_ptr &() // cast -{ - return this->ptr_; -} - -::CORBA::PollableSet_ptr & -CORBA::PollableSet_out::ptr (void) -{ - return this->ptr_; -} - -::CORBA::PollableSet_ptr -CORBA::PollableSet_out::operator-> (void) -{ - return this->ptr_; -} +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + template class + TAO_Objref_Var_T< + CORBA::PollableSet, + CORBA::tao_PollableSet_life + >; + template class + TAO_Objref_Out_T< + CORBA::PollableSet, + CORBA::tao_PollableSet_life + >; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +# pragma instantiate \ + TAO_Objref_Var_T< \ + CORBA::PollableSet, \ + CORBA::tao_PollableSet_life \ + > +# pragma instantiate \ + TAO_Objref_Out_T< \ + CORBA::PollableSet, \ + CORBA::tao_PollableSet_life \ + > +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 CORBA::PollableSet::PollableSet (void) {} @@ -1060,6 +578,12 @@ const char* CORBA::PollableSet::_interface_repository_id (void) const return "IDL:omg.org/CORBA/PollableSet:1.0"; } +CORBA::Boolean +CORBA::PollableSet::marshal (TAO_OutputCDR &) +{ + return 0; +} + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63 @@ -1086,7 +610,7 @@ CORBA::PollableSet::NoPossiblePollable::NoPossiblePollable (const ::CORBA::Polla CORBA::PollableSet::NoPossiblePollable& CORBA::PollableSet::NoPossiblePollable::operator= (const ::CORBA::PollableSet::NoPossiblePollable &_tao_excp) { - this->UserException::operator= (_tao_excp); + this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp); return *this; } @@ -1171,7 +695,7 @@ CORBA::PollableSet::UnknownPollable::UnknownPollable (const ::CORBA::PollableSet CORBA::PollableSet::UnknownPollable& CORBA::PollableSet::UnknownPollable::operator= (const ::CORBA::PollableSet::UnknownPollable &_tao_excp) { - this->UserException::operator= (_tao_excp); + this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp); return *this; } @@ -1228,7 +752,7 @@ void CORBA::PollableSet::UnknownPollable::_tao_decode ( ACE_THROW (CORBA::MARSHAL ()); } -#endif /* TAO_HAS_AMI_POLLER == 1 */ +#endif /* TAO_HAS_AMI_POLLER == 1 */ diff --git a/TAO/tao/PollableC.h b/TAO/tao/PollableC.h index e82096e2673..09f06f9fad7 100644 --- a/TAO/tao/PollableC.h +++ b/TAO/tao/PollableC.h @@ -26,7 +26,7 @@ #define _TAO_IDL_ORIG_POLLABLEC_H_ #include "ace/pre.h" -#include "tao/corbafwd.h" +#include "Exception.h" #if (TAO_HAS_AMI_POLLER == 1) @@ -34,8 +34,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "TAO_Export.h" -#include "Exception.h" #include "Object.h" #if defined (TAO_EXPORT_MACRO) @@ -68,174 +66,75 @@ TAO_NAMESPACE CORBA { // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/interface_fwd_ch.cpp:53 - - class PollableSet; + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567 -#if !defined (_CORBA_POLLABLESET___PTR_CH_) -#define _CORBA_POLLABLESET___PTR_CH_ +#if !defined (_CORBA_POLLABLESET__ODDS_N_ENDS_CH_) +#define _CORBA_POLLABLESET__ODDS_N_ENDS_CH_ + class PollableSet; typedef PollableSet *PollableSet_ptr; - -#endif /* end #if !defined */ - -#if !defined (_CORBA_POLLABLESET___VAR_CH_) -#define _CORBA_POLLABLESET___VAR_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571 + struct tao_PollableSet_life; + typedef TAO_Objref_Var_T<PollableSet, tao_PollableSet_life> PollableSet_var; + typedef TAO_Objref_Out_T<PollableSet, tao_PollableSet_life> PollableSet_out; - class TAO_Export PollableSet_var : public TAO_Base_var + struct tao_PollableSet_life { - public: - PollableSet_var (void); // default constructor - PollableSet_var (PollableSet_ptr p) : ptr_ (p) {} - PollableSet_var (const PollableSet_var &); // copy constructor - ~PollableSet_var (void); // destructor - - PollableSet_var &operator= (PollableSet_ptr); - PollableSet_var &operator= (const PollableSet_var &); - PollableSet_ptr operator-> (void) const; - - operator const PollableSet_ptr &() const; - operator PollableSet_ptr &(); - // in, inout, out, _retn - PollableSet_ptr in (void) const; - PollableSet_ptr &inout (void); - PollableSet_ptr &out (void); - PollableSet_ptr _retn (void); - PollableSet_ptr ptr (void) const; - - // Hooks used by template sequence and object manager classes - // for non-defined forward declared interfaces. static PollableSet_ptr tao_duplicate (PollableSet_ptr); static void tao_release (PollableSet_ptr); static PollableSet_ptr tao_nil (void); - static PollableSet_ptr tao_narrow ( - CORBA::Object * - ACE_ENV_ARG_DECL_NOT_USED + static CORBA::Boolean tao_marshal ( + PollableSet_ptr, + TAO_OutputCDR & ); - static CORBA::Object * tao_upcast (void *); - - private: - PollableSet_ptr ptr_; - // Unimplemented - prevents widening assignment. - PollableSet_var (const TAO_Base_var &rhs); - PollableSet_var &operator= (const TAO_Base_var &rhs); }; - -#endif /* end #if !defined */ - -#if !defined (_CORBA_POLLABLESET___OUT_CH_) -#define _CORBA_POLLABLESET___OUT_CH_ - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946 - - class TAO_Export PollableSet_out + struct tao_PollableSet_cast { - public: - PollableSet_out (PollableSet_ptr &); - PollableSet_out (PollableSet_var &); - PollableSet_out (const PollableSet_out &); - PollableSet_out &operator= (const PollableSet_out &); - PollableSet_out &operator= (const PollableSet_var &); - PollableSet_out &operator= (PollableSet_ptr); - operator PollableSet_ptr &(); - PollableSet_ptr &ptr (void); - PollableSet_ptr operator-> (void); - - private: - PollableSet_ptr &ptr_; + static PollableSet_ptr tao_narrow ( + CORBA::Object_ptr + ACE_ENV_ARG_DECL + ); + static CORBA::Object_ptr tao_upcast (void *); }; #endif /* end #if !defined */ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567 -#if !defined (_CORBA_POLLABLE___PTR_CH_) -#define _CORBA_POLLABLE___PTR_CH_ +#if !defined (_CORBA_POLLABLE__ODDS_N_ENDS_CH_) +#define _CORBA_POLLABLE__ODDS_N_ENDS_CH_ class Pollable; typedef Pollable *Pollable_ptr; - -#endif /* end #if !defined */ - -#if !defined (_CORBA_POLLABLE___VAR_CH_) -#define _CORBA_POLLABLE___VAR_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571 + struct tao_Pollable_life; + typedef TAO_Objref_Var_T<Pollable, tao_Pollable_life> Pollable_var; + typedef TAO_Objref_Out_T<Pollable, tao_Pollable_life> Pollable_out; - class TAO_Export Pollable_var : public TAO_Base_var + struct tao_Pollable_life { - public: - Pollable_var (void); // default constructor - Pollable_var (Pollable_ptr p) : ptr_ (p) {} - Pollable_var (const Pollable_var &); // copy constructor - ~Pollable_var (void); // destructor - - Pollable_var &operator= (Pollable_ptr); - Pollable_var &operator= (const Pollable_var &); - Pollable_ptr operator-> (void) const; - - operator const Pollable_ptr &() const; - operator Pollable_ptr &(); - // in, inout, out, _retn - Pollable_ptr in (void) const; - Pollable_ptr &inout (void); - Pollable_ptr &out (void); - Pollable_ptr _retn (void); - Pollable_ptr ptr (void) const; - - // Hooks used by template sequence and object manager classes - // for non-defined forward declared interfaces. static Pollable_ptr tao_duplicate (Pollable_ptr); static void tao_release (Pollable_ptr); static Pollable_ptr tao_nil (void); - static Pollable_ptr tao_narrow ( - CORBA::Object * - ACE_ENV_ARG_DECL_NOT_USED + static CORBA::Boolean tao_marshal ( + Pollable_ptr, + TAO_OutputCDR & ); - static CORBA::Object * tao_upcast (void *); - - private: - Pollable_ptr ptr_; - // Unimplemented - prevents widening assignment. - Pollable_var (const TAO_Base_var &rhs); - Pollable_var &operator= (const TAO_Base_var &rhs); }; - -#endif /* end #if !defined */ - -#if !defined (_CORBA_POLLABLE___OUT_CH_) -#define _CORBA_POLLABLE___OUT_CH_ - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946 - - class TAO_Export Pollable_out + struct tao_Pollable_cast { - public: - Pollable_out (Pollable_ptr &); - Pollable_out (Pollable_var &); - Pollable_out (const Pollable_out &); - Pollable_out &operator= (const Pollable_out &); - Pollable_out &operator= (const Pollable_var &); - Pollable_out &operator= (Pollable_ptr); - operator Pollable_ptr &(); - Pollable_ptr &ptr (void); - Pollable_ptr operator-> (void); - - private: - Pollable_ptr &ptr_; + static Pollable_ptr tao_narrow ( + CORBA::Object_ptr + ACE_ENV_ARG_DECL + ); + static CORBA::Object_ptr tao_upcast (void *); }; #endif /* end #if !defined */ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_POLLABLE_CH_) #define _CORBA_POLLABLE_CH_ @@ -290,7 +189,7 @@ TAO_NAMESPACE CORBA )) = 0; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -300,7 +199,7 @@ TAO_NAMESPACE CORBA protected: Pollable (void); virtual ~Pollable (void); - + private: Pollable (const Pollable &); void operator= (const Pollable &); @@ -309,90 +208,41 @@ TAO_NAMESPACE CORBA #endif /* end #if !defined */ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567 -#if !defined (_CORBA_DIIPOLLABLE___PTR_CH_) -#define _CORBA_DIIPOLLABLE___PTR_CH_ +#if !defined (_CORBA_DIIPOLLABLE__ODDS_N_ENDS_CH_) +#define _CORBA_DIIPOLLABLE__ODDS_N_ENDS_CH_ class DIIPollable; typedef DIIPollable *DIIPollable_ptr; - -#endif /* end #if !defined */ - -#if !defined (_CORBA_DIIPOLLABLE___VAR_CH_) -#define _CORBA_DIIPOLLABLE___VAR_CH_ + struct tao_DIIPollable_life; + typedef TAO_Objref_Var_T<DIIPollable, tao_DIIPollable_life> DIIPollable_var; + typedef TAO_Objref_Out_T<DIIPollable, tao_DIIPollable_life> DIIPollable_out; - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571 - - class TAO_Export DIIPollable_var : public TAO_Base_var + struct tao_DIIPollable_life { - public: - DIIPollable_var (void); // default constructor - DIIPollable_var (DIIPollable_ptr p) : ptr_ (p) {} - DIIPollable_var (const DIIPollable_var &); // copy constructor - ~DIIPollable_var (void); // destructor - - DIIPollable_var &operator= (DIIPollable_ptr); - DIIPollable_var &operator= (const DIIPollable_var &); - DIIPollable_ptr operator-> (void) const; - - operator const DIIPollable_ptr &() const; - operator DIIPollable_ptr &(); - // in, inout, out, _retn - DIIPollable_ptr in (void) const; - DIIPollable_ptr &inout (void); - DIIPollable_ptr &out (void); - DIIPollable_ptr _retn (void); - DIIPollable_ptr ptr (void) const; - - // Hooks used by template sequence and object manager classes - // for non-defined forward declared interfaces. static DIIPollable_ptr tao_duplicate (DIIPollable_ptr); static void tao_release (DIIPollable_ptr); static DIIPollable_ptr tao_nil (void); - static DIIPollable_ptr tao_narrow ( - CORBA::Object * - ACE_ENV_ARG_DECL_NOT_USED + static CORBA::Boolean tao_marshal ( + DIIPollable_ptr, + TAO_OutputCDR & ); - static CORBA::Object * tao_upcast (void *); - - private: - DIIPollable_ptr ptr_; - // Unimplemented - prevents widening assignment. - DIIPollable_var (const TAO_Base_var &rhs); - DIIPollable_var &operator= (const TAO_Base_var &rhs); }; - -#endif /* end #if !defined */ - -#if !defined (_CORBA_DIIPOLLABLE___OUT_CH_) -#define _CORBA_DIIPOLLABLE___OUT_CH_ - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946 - - class TAO_Export DIIPollable_out + struct tao_DIIPollable_cast { - public: - DIIPollable_out (DIIPollable_ptr &); - DIIPollable_out (DIIPollable_var &); - DIIPollable_out (const DIIPollable_out &); - DIIPollable_out &operator= (const DIIPollable_out &); - DIIPollable_out &operator= (const DIIPollable_var &); - DIIPollable_out &operator= (DIIPollable_ptr); - operator DIIPollable_ptr &(); - DIIPollable_ptr &ptr (void); - DIIPollable_ptr operator-> (void); - - private: - DIIPollable_ptr &ptr_; + static DIIPollable_ptr tao_narrow ( + CORBA::Object_ptr + ACE_ENV_ARG_DECL + ); + static CORBA::Object_ptr tao_upcast (void *); }; #endif /* end #if !defined */ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_DIIPOLLABLE_CH_) #define _CORBA_DIIPOLLABLE_CH_ @@ -426,7 +276,7 @@ TAO_NAMESPACE CORBA // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -436,7 +286,7 @@ TAO_NAMESPACE CORBA protected: DIIPollable (void); virtual ~DIIPollable (void); - + private: DIIPollable (const DIIPollable &); void operator= (const DIIPollable &); @@ -445,90 +295,7 @@ TAO_NAMESPACE CORBA #endif /* end #if !defined */ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52 - -#if !defined (_CORBA_POLLABLESET___PTR_CH_) -#define _CORBA_POLLABLESET___PTR_CH_ - - class PollableSet; - typedef PollableSet *PollableSet_ptr; - -#endif /* end #if !defined */ - -#if !defined (_CORBA_POLLABLESET___VAR_CH_) -#define _CORBA_POLLABLESET___VAR_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571 - - class TAO_Export PollableSet_var : public TAO_Base_var - { - public: - PollableSet_var (void); // default constructor - PollableSet_var (PollableSet_ptr p) : ptr_ (p) {} - PollableSet_var (const PollableSet_var &); // copy constructor - ~PollableSet_var (void); // destructor - - PollableSet_var &operator= (PollableSet_ptr); - PollableSet_var &operator= (const PollableSet_var &); - PollableSet_ptr operator-> (void) const; - - operator const PollableSet_ptr &() const; - operator PollableSet_ptr &(); - // in, inout, out, _retn - PollableSet_ptr in (void) const; - PollableSet_ptr &inout (void); - PollableSet_ptr &out (void); - PollableSet_ptr _retn (void); - PollableSet_ptr ptr (void) const; - - // Hooks used by template sequence and object manager classes - // for non-defined forward declared interfaces. - static PollableSet_ptr tao_duplicate (PollableSet_ptr); - static void tao_release (PollableSet_ptr); - static PollableSet_ptr tao_nil (void); - static PollableSet_ptr tao_narrow ( - CORBA::Object * - ACE_ENV_ARG_DECL_NOT_USED - ); - static CORBA::Object * tao_upcast (void *); - - private: - PollableSet_ptr ptr_; - // Unimplemented - prevents widening assignment. - PollableSet_var (const TAO_Base_var &rhs); - PollableSet_var &operator= (const TAO_Base_var &rhs); - }; - -#endif /* end #if !defined */ - -#if !defined (_CORBA_POLLABLESET___OUT_CH_) -#define _CORBA_POLLABLESET___OUT_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946 - - class TAO_Export PollableSet_out - { - public: - PollableSet_out (PollableSet_ptr &); - PollableSet_out (PollableSet_var &); - PollableSet_out (const PollableSet_out &); - PollableSet_out &operator= (const PollableSet_out &); - PollableSet_out &operator= (const PollableSet_var &); - PollableSet_out &operator= (PollableSet_ptr); - operator PollableSet_ptr &(); - PollableSet_ptr &ptr (void); - PollableSet_ptr operator-> (void); - - private: - PollableSet_ptr &ptr_; - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_POLLABLESET_CH_) #define _CORBA_POLLABLESET_CH_ @@ -695,7 +462,7 @@ TAO_NAMESPACE CORBA )) = 0; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -705,10 +472,6 @@ TAO_NAMESPACE CORBA protected: PollableSet (void); virtual ~PollableSet (void); - - friend class _TAO_PollableSet_Remote_Proxy_Impl; - friend class _TAO_PollableSet_ThruPOA_Proxy_Impl; - friend class _TAO_PollableSet_Direct_Proxy_Impl; private: PollableSet (const PollableSet &); @@ -734,7 +497,7 @@ TAO_NAMESPACE_CLOSE // module CORBA #endif /* __ACE_INLINE__ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018 #if defined (__ACE_INLINE__) #include "PollableC.i" diff --git a/TAO/tao/PollableC.i b/TAO/tao/PollableC.i index 437f3407c58..042e3d1523b 100644 --- a/TAO/tao/PollableC.i +++ b/TAO/tao/PollableC.i @@ -26,13 +26,6 @@ #if !defined (_CORBA_POLLABLE___CI_) #define _CORBA_POLLABLE___CI_ -ACE_INLINE -CORBA::Boolean -CORBA::Pollable::marshal (TAO_OutputCDR &) -{ - return 0; -} - #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -41,13 +34,6 @@ CORBA::Pollable::marshal (TAO_OutputCDR &) #if !defined (_CORBA_DIIPOLLABLE___CI_) #define _CORBA_DIIPOLLABLE___CI_ -ACE_INLINE -CORBA::Boolean -CORBA::DIIPollable::marshal (TAO_OutputCDR &) -{ - return 0; -} - #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -56,12 +42,5 @@ CORBA::DIIPollable::marshal (TAO_OutputCDR &) #if !defined (_CORBA_POLLABLESET___CI_) #define _CORBA_POLLABLESET___CI_ -ACE_INLINE -CORBA::Boolean -CORBA::PollableSet::marshal (TAO_OutputCDR &) -{ - return 0; -} - #endif /* end #if !defined */ diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp index 370145569ef..2d881a38007 100644 --- a/TAO/tao/PortableInterceptorC.cpp +++ b/TAO/tao/PortableInterceptorC.cpp @@ -35,7 +35,6 @@ #endif /* TAO_HAS_INTERCEPTORS == 1 */ - #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ @@ -50,7 +49,7 @@ int PortableInterceptor::Interceptor::_tao_class_id = 0; PortableInterceptor::Interceptor_ptr -tao_PortableInterceptor_Interceptor_duplicate ( +PortableInterceptor::tao_Interceptor_life::tao_duplicate ( PortableInterceptor::Interceptor_ptr p ) { @@ -58,7 +57,7 @@ tao_PortableInterceptor_Interceptor_duplicate ( } void -tao_PortableInterceptor_Interceptor_release ( +PortableInterceptor::tao_Interceptor_life::tao_release ( PortableInterceptor::Interceptor_ptr p ) { @@ -66,231 +65,67 @@ tao_PortableInterceptor_Interceptor_release ( } PortableInterceptor::Interceptor_ptr -tao_PortableInterceptor_Interceptor_nil ( +PortableInterceptor::tao_Interceptor_life::tao_nil ( void ) { return PortableInterceptor::Interceptor::_nil (); } -PortableInterceptor::Interceptor_ptr -tao_PortableInterceptor_Interceptor_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return PortableInterceptor::Interceptor::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object * -tao_PortableInterceptor_Interceptor_upcast ( - void *src - ) -{ - PortableInterceptor::Interceptor **tmp = - ACE_static_cast (PortableInterceptor::Interceptor **, src); - return *tmp; -} - CORBA::Boolean -tao_PortableInterceptor_Interceptor_marshal ( +PortableInterceptor::tao_Interceptor_life::tao_marshal ( PortableInterceptor::Interceptor_ptr p, - TAO_OutputCDR &strm + TAO_OutputCDR &cdr ) { - return p->marshal (strm); -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721 - -// ************************************************************* -// PortableInterceptor::Interceptor_var -// ************************************************************* - -PortableInterceptor::Interceptor_var::Interceptor_var (void) - : ptr_ (Interceptor::_nil ()) -{} - -::PortableInterceptor::Interceptor_ptr -PortableInterceptor::Interceptor_var::ptr (void) const -{ - return this->ptr_; -} - -PortableInterceptor::Interceptor_var::Interceptor_var (const ::PortableInterceptor::Interceptor_var &p) - : TAO_Base_var (), - ptr_ (Interceptor::_duplicate (p.ptr ())) -{} - -PortableInterceptor::Interceptor_var::~Interceptor_var (void) -{ - CORBA::release (this->ptr_); -} - -PortableInterceptor::Interceptor_var & -PortableInterceptor::Interceptor_var::operator= (Interceptor_ptr p) -{ - CORBA::release (this->ptr_); - this->ptr_ = p; - return *this; + return p->marshal (cdr); } -PortableInterceptor::Interceptor_var & -PortableInterceptor::Interceptor_var::operator= (const ::PortableInterceptor::Interceptor_var &p) -{ - if (this != &p) - { - CORBA::release (this->ptr_); - this->ptr_ = ::PortableInterceptor::Interceptor::_duplicate (p.ptr ()); - } - return *this; -} - -PortableInterceptor::Interceptor_var::operator const ::PortableInterceptor::Interceptor_ptr &() const // cast -{ - return this->ptr_; -} - -PortableInterceptor::Interceptor_var::operator ::PortableInterceptor::Interceptor_ptr &() // cast -{ - return this->ptr_; -} - -::PortableInterceptor::Interceptor_ptr -PortableInterceptor::Interceptor_var::operator-> (void) const -{ - return this->ptr_; -} - -::PortableInterceptor::Interceptor_ptr -PortableInterceptor::Interceptor_var::in (void) const -{ - return this->ptr_; -} - -::PortableInterceptor::Interceptor_ptr & -PortableInterceptor::Interceptor_var::inout (void) -{ - return this->ptr_; -} - -::PortableInterceptor::Interceptor_ptr & -PortableInterceptor::Interceptor_var::out (void) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::PortableInterceptor::Interceptor::_nil (); - return this->ptr_; -} - -::PortableInterceptor::Interceptor_ptr -PortableInterceptor::Interceptor_var::_retn (void) -{ - // yield ownership of managed obj reference - ::PortableInterceptor::Interceptor_ptr val = this->ptr_; - this->ptr_ = ::PortableInterceptor::Interceptor::_nil (); - return val; -} - -::PortableInterceptor::Interceptor_ptr -PortableInterceptor::Interceptor_var::tao_duplicate (Interceptor_ptr p) -{ - return ::PortableInterceptor::Interceptor::_duplicate (p); -} - -void -PortableInterceptor::Interceptor_var::tao_release (Interceptor_ptr p) -{ - CORBA::release (p); -} - -::PortableInterceptor::Interceptor_ptr -PortableInterceptor::Interceptor_var::tao_nil (void) -{ - return ::PortableInterceptor::Interceptor::_nil (); -} - -::PortableInterceptor::Interceptor_ptr -PortableInterceptor::Interceptor_var::tao_narrow ( +PortableInterceptor::Interceptor_ptr +PortableInterceptor::tao_Interceptor_cast::tao_narrow ( CORBA::Object *p ACE_ENV_ARG_DECL ) { - return ::PortableInterceptor::Interceptor::_narrow (p ACE_ENV_ARG_PARAMETER); + return PortableInterceptor::Interceptor::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * -PortableInterceptor::Interceptor_var::tao_upcast (void *src) +PortableInterceptor::tao_Interceptor_cast::tao_upcast ( + void *src + ) { - Interceptor **tmp = - ACE_static_cast (Interceptor **, src); + PortableInterceptor::Interceptor **tmp = + ACE_static_cast (PortableInterceptor::Interceptor **, src); return *tmp; } -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030 - -// ************************************************************* -// PortableInterceptor::Interceptor_out -// ************************************************************* - -PortableInterceptor::Interceptor_out::Interceptor_out (Interceptor_ptr &p) - : ptr_ (p) -{ - this->ptr_ = ::PortableInterceptor::Interceptor::_nil (); -} - -PortableInterceptor::Interceptor_out::Interceptor_out (Interceptor_var &p) - : ptr_ (p.out ()) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::PortableInterceptor::Interceptor::_nil (); -} - -PortableInterceptor::Interceptor_out::Interceptor_out (const ::PortableInterceptor::Interceptor_out &p) - : ptr_ (ACE_const_cast (Interceptor_out &, p).ptr_) -{} - -::PortableInterceptor::Interceptor_out & -PortableInterceptor::Interceptor_out::operator= (const ::PortableInterceptor::Interceptor_out &p) -{ - this->ptr_ = ACE_const_cast (Interceptor_out&, p).ptr_; - return *this; -} - -PortableInterceptor::Interceptor_out & -PortableInterceptor::Interceptor_out::operator= (const ::PortableInterceptor::Interceptor_var &p) -{ - this->ptr_ = ::PortableInterceptor::Interceptor::_duplicate (p.ptr ()); - return *this; -} - -PortableInterceptor::Interceptor_out & -PortableInterceptor::Interceptor_out::operator= (Interceptor_ptr p) -{ - this->ptr_ = p; - return *this; -} - -PortableInterceptor::Interceptor_out::operator ::PortableInterceptor::Interceptor_ptr &() // cast -{ - return this->ptr_; -} - -::PortableInterceptor::Interceptor_ptr & -PortableInterceptor::Interceptor_out::ptr (void) -{ - return this->ptr_; -} - -::PortableInterceptor::Interceptor_ptr -PortableInterceptor::Interceptor_out::operator-> (void) -{ - return this->ptr_; -} +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + template class + TAO_Objref_Var_T< + PortableInterceptor::Interceptor, + PortableInterceptor::tao_Interceptor_life + >; + template class + TAO_Objref_Out_T< + PortableInterceptor::Interceptor, + PortableInterceptor::tao_Interceptor_life + >; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +# pragma instantiate \ + TAO_Objref_Var_T< \ + PortableInterceptor::Interceptor, \ + PortableInterceptor::tao_Interceptor_life \ + > +# pragma instantiate \ + TAO_Objref_Out_T< \ + PortableInterceptor::Interceptor, \ + PortableInterceptor::tao_Interceptor_life \ + > +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 PortableInterceptor::Interceptor::Interceptor (void) {} @@ -384,6 +219,12 @@ const char* PortableInterceptor::Interceptor::_interface_repository_id (void) co return "IDL:omg.org/PortableInterceptor/Interceptor:1.0"; } +CORBA::Boolean +PortableInterceptor::Interceptor::marshal (TAO_OutputCDR &) +{ + return 0; +} + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -581,7 +422,23 @@ static const CORBA::Long _oc_PortableInterceptor_ForwardRequest[] = 8, ACE_NTOHL (0x666f7277), ACE_NTOHL (0x61726400), // name = forward - 10, + CORBA::tk_objref, + 52, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + 29, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f4f62), + ACE_NTOHL (0x6a656374), + ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Object:1.0 + 7, + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63740000), // name = Object + + 10, ACE_NTOHL (0x7065726d), ACE_NTOHL (0x616e656e), ACE_NTOHL (0x74000000), // name = permanent @@ -846,7 +703,7 @@ TAO_NAMESPACE_END int PortableInterceptor::Current::_tao_class_id = 0; PortableInterceptor::Current_ptr -tao_PortableInterceptor_Current_duplicate ( +PortableInterceptor::tao_Current_life::tao_duplicate ( PortableInterceptor::Current_ptr p ) { @@ -854,7 +711,7 @@ tao_PortableInterceptor_Current_duplicate ( } void -tao_PortableInterceptor_Current_release ( +PortableInterceptor::tao_Current_life::tao_release ( PortableInterceptor::Current_ptr p ) { @@ -862,231 +719,67 @@ tao_PortableInterceptor_Current_release ( } PortableInterceptor::Current_ptr -tao_PortableInterceptor_Current_nil ( +PortableInterceptor::tao_Current_life::tao_nil ( void ) { return PortableInterceptor::Current::_nil (); } -PortableInterceptor::Current_ptr -tao_PortableInterceptor_Current_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return PortableInterceptor::Current::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object * -tao_PortableInterceptor_Current_upcast ( - void *src - ) -{ - PortableInterceptor::Current **tmp = - ACE_static_cast (PortableInterceptor::Current **, src); - return *tmp; -} - CORBA::Boolean -tao_PortableInterceptor_Current_marshal ( +PortableInterceptor::tao_Current_life::tao_marshal ( PortableInterceptor::Current_ptr p, - TAO_OutputCDR &strm + TAO_OutputCDR &cdr ) { - return p->marshal (strm); -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721 - -// ************************************************************* -// PortableInterceptor::Current_var -// ************************************************************* - -PortableInterceptor::Current_var::Current_var (void) - : ptr_ (Current::_nil ()) -{} - -::PortableInterceptor::Current_ptr -PortableInterceptor::Current_var::ptr (void) const -{ - return this->ptr_; -} - -PortableInterceptor::Current_var::Current_var (const ::PortableInterceptor::Current_var &p) - : TAO_Base_var (), - ptr_ (Current::_duplicate (p.ptr ())) -{} - -PortableInterceptor::Current_var::~Current_var (void) -{ - CORBA::release (this->ptr_); -} - -PortableInterceptor::Current_var & -PortableInterceptor::Current_var::operator= (Current_ptr p) -{ - CORBA::release (this->ptr_); - this->ptr_ = p; - return *this; -} - -PortableInterceptor::Current_var & -PortableInterceptor::Current_var::operator= (const ::PortableInterceptor::Current_var &p) -{ - if (this != &p) - { - CORBA::release (this->ptr_); - this->ptr_ = ::PortableInterceptor::Current::_duplicate (p.ptr ()); - } - return *this; -} - -PortableInterceptor::Current_var::operator const ::PortableInterceptor::Current_ptr &() const // cast -{ - return this->ptr_; -} - -PortableInterceptor::Current_var::operator ::PortableInterceptor::Current_ptr &() // cast -{ - return this->ptr_; -} - -::PortableInterceptor::Current_ptr -PortableInterceptor::Current_var::operator-> (void) const -{ - return this->ptr_; -} - -::PortableInterceptor::Current_ptr -PortableInterceptor::Current_var::in (void) const -{ - return this->ptr_; -} - -::PortableInterceptor::Current_ptr & -PortableInterceptor::Current_var::inout (void) -{ - return this->ptr_; -} - -::PortableInterceptor::Current_ptr & -PortableInterceptor::Current_var::out (void) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::PortableInterceptor::Current::_nil (); - return this->ptr_; -} - -::PortableInterceptor::Current_ptr -PortableInterceptor::Current_var::_retn (void) -{ - // yield ownership of managed obj reference - ::PortableInterceptor::Current_ptr val = this->ptr_; - this->ptr_ = ::PortableInterceptor::Current::_nil (); - return val; -} - -::PortableInterceptor::Current_ptr -PortableInterceptor::Current_var::tao_duplicate (Current_ptr p) -{ - return ::PortableInterceptor::Current::_duplicate (p); -} - -void -PortableInterceptor::Current_var::tao_release (Current_ptr p) -{ - CORBA::release (p); -} - -::PortableInterceptor::Current_ptr -PortableInterceptor::Current_var::tao_nil (void) -{ - return ::PortableInterceptor::Current::_nil (); + return p->marshal (cdr); } -::PortableInterceptor::Current_ptr -PortableInterceptor::Current_var::tao_narrow ( +PortableInterceptor::Current_ptr +PortableInterceptor::tao_Current_cast::tao_narrow ( CORBA::Object *p ACE_ENV_ARG_DECL ) { - return ::PortableInterceptor::Current::_narrow (p ACE_ENV_ARG_PARAMETER); + return PortableInterceptor::Current::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * -PortableInterceptor::Current_var::tao_upcast (void *src) +PortableInterceptor::tao_Current_cast::tao_upcast ( + void *src + ) { - Current **tmp = - ACE_static_cast (Current **, src); + PortableInterceptor::Current **tmp = + ACE_static_cast (PortableInterceptor::Current **, src); return *tmp; } -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030 - -// ************************************************************* -// PortableInterceptor::Current_out -// ************************************************************* - -PortableInterceptor::Current_out::Current_out (Current_ptr &p) - : ptr_ (p) -{ - this->ptr_ = ::PortableInterceptor::Current::_nil (); -} - -PortableInterceptor::Current_out::Current_out (Current_var &p) - : ptr_ (p.out ()) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::PortableInterceptor::Current::_nil (); -} - -PortableInterceptor::Current_out::Current_out (const ::PortableInterceptor::Current_out &p) - : ptr_ (ACE_const_cast (Current_out &, p).ptr_) -{} - -::PortableInterceptor::Current_out & -PortableInterceptor::Current_out::operator= (const ::PortableInterceptor::Current_out &p) -{ - this->ptr_ = ACE_const_cast (Current_out&, p).ptr_; - return *this; -} - -PortableInterceptor::Current_out & -PortableInterceptor::Current_out::operator= (const ::PortableInterceptor::Current_var &p) -{ - this->ptr_ = ::PortableInterceptor::Current::_duplicate (p.ptr ()); - return *this; -} - -PortableInterceptor::Current_out & -PortableInterceptor::Current_out::operator= (Current_ptr p) -{ - this->ptr_ = p; - return *this; -} - -PortableInterceptor::Current_out::operator ::PortableInterceptor::Current_ptr &() // cast -{ - return this->ptr_; -} - -::PortableInterceptor::Current_ptr & -PortableInterceptor::Current_out::ptr (void) -{ - return this->ptr_; -} - -::PortableInterceptor::Current_ptr -PortableInterceptor::Current_out::operator-> (void) -{ - return this->ptr_; -} +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + template class + TAO_Objref_Var_T< + PortableInterceptor::Current, + PortableInterceptor::tao_Current_life + >; + template class + TAO_Objref_Out_T< + PortableInterceptor::Current, + PortableInterceptor::tao_Current_life + >; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +# pragma instantiate \ + TAO_Objref_Var_T< \ + PortableInterceptor::Current, \ + PortableInterceptor::tao_Current_life \ + > +# pragma instantiate \ + TAO_Objref_Out_T< \ + PortableInterceptor::Current, \ + PortableInterceptor::tao_Current_life \ + > +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 PortableInterceptor::Current::Current (void) {} @@ -1194,6 +887,12 @@ const char* PortableInterceptor::Current::_interface_repository_id (void) const return "IDL:omg.org/PortableInterceptor/Current:1.0"; } +CORBA::Boolean +PortableInterceptor::Current::marshal (TAO_OutputCDR &) +{ + return 0; +} + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -1240,7 +939,7 @@ TAO_NAMESPACE_END int PortableInterceptor::RequestInfo::_tao_class_id = 0; PortableInterceptor::RequestInfo_ptr -tao_PortableInterceptor_RequestInfo_duplicate ( +PortableInterceptor::tao_RequestInfo_life::tao_duplicate ( PortableInterceptor::RequestInfo_ptr p ) { @@ -1248,7 +947,7 @@ tao_PortableInterceptor_RequestInfo_duplicate ( } void -tao_PortableInterceptor_RequestInfo_release ( +PortableInterceptor::tao_RequestInfo_life::tao_release ( PortableInterceptor::RequestInfo_ptr p ) { @@ -1256,231 +955,67 @@ tao_PortableInterceptor_RequestInfo_release ( } PortableInterceptor::RequestInfo_ptr -tao_PortableInterceptor_RequestInfo_nil ( +PortableInterceptor::tao_RequestInfo_life::tao_nil ( void ) { return PortableInterceptor::RequestInfo::_nil (); } -PortableInterceptor::RequestInfo_ptr -tao_PortableInterceptor_RequestInfo_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return PortableInterceptor::RequestInfo::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object * -tao_PortableInterceptor_RequestInfo_upcast ( - void *src - ) -{ - PortableInterceptor::RequestInfo **tmp = - ACE_static_cast (PortableInterceptor::RequestInfo **, src); - return *tmp; -} - CORBA::Boolean -tao_PortableInterceptor_RequestInfo_marshal ( +PortableInterceptor::tao_RequestInfo_life::tao_marshal ( PortableInterceptor::RequestInfo_ptr p, - TAO_OutputCDR &strm + TAO_OutputCDR &cdr ) { - return p->marshal (strm); -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721 - -// ************************************************************* -// PortableInterceptor::RequestInfo_var -// ************************************************************* - -PortableInterceptor::RequestInfo_var::RequestInfo_var (void) - : ptr_ (RequestInfo::_nil ()) -{} - -::PortableInterceptor::RequestInfo_ptr -PortableInterceptor::RequestInfo_var::ptr (void) const -{ - return this->ptr_; + return p->marshal (cdr); } -PortableInterceptor::RequestInfo_var::RequestInfo_var (const ::PortableInterceptor::RequestInfo_var &p) - : TAO_Base_var (), - ptr_ (RequestInfo::_duplicate (p.ptr ())) -{} - -PortableInterceptor::RequestInfo_var::~RequestInfo_var (void) -{ - CORBA::release (this->ptr_); -} - -PortableInterceptor::RequestInfo_var & -PortableInterceptor::RequestInfo_var::operator= (RequestInfo_ptr p) -{ - CORBA::release (this->ptr_); - this->ptr_ = p; - return *this; -} - -PortableInterceptor::RequestInfo_var & -PortableInterceptor::RequestInfo_var::operator= (const ::PortableInterceptor::RequestInfo_var &p) -{ - if (this != &p) - { - CORBA::release (this->ptr_); - this->ptr_ = ::PortableInterceptor::RequestInfo::_duplicate (p.ptr ()); - } - return *this; -} - -PortableInterceptor::RequestInfo_var::operator const ::PortableInterceptor::RequestInfo_ptr &() const // cast -{ - return this->ptr_; -} - -PortableInterceptor::RequestInfo_var::operator ::PortableInterceptor::RequestInfo_ptr &() // cast -{ - return this->ptr_; -} - -::PortableInterceptor::RequestInfo_ptr -PortableInterceptor::RequestInfo_var::operator-> (void) const -{ - return this->ptr_; -} - -::PortableInterceptor::RequestInfo_ptr -PortableInterceptor::RequestInfo_var::in (void) const -{ - return this->ptr_; -} - -::PortableInterceptor::RequestInfo_ptr & -PortableInterceptor::RequestInfo_var::inout (void) -{ - return this->ptr_; -} - -::PortableInterceptor::RequestInfo_ptr & -PortableInterceptor::RequestInfo_var::out (void) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::PortableInterceptor::RequestInfo::_nil (); - return this->ptr_; -} - -::PortableInterceptor::RequestInfo_ptr -PortableInterceptor::RequestInfo_var::_retn (void) -{ - // yield ownership of managed obj reference - ::PortableInterceptor::RequestInfo_ptr val = this->ptr_; - this->ptr_ = ::PortableInterceptor::RequestInfo::_nil (); - return val; -} - -::PortableInterceptor::RequestInfo_ptr -PortableInterceptor::RequestInfo_var::tao_duplicate (RequestInfo_ptr p) -{ - return ::PortableInterceptor::RequestInfo::_duplicate (p); -} - -void -PortableInterceptor::RequestInfo_var::tao_release (RequestInfo_ptr p) -{ - CORBA::release (p); -} - -::PortableInterceptor::RequestInfo_ptr -PortableInterceptor::RequestInfo_var::tao_nil (void) -{ - return ::PortableInterceptor::RequestInfo::_nil (); -} - -::PortableInterceptor::RequestInfo_ptr -PortableInterceptor::RequestInfo_var::tao_narrow ( +PortableInterceptor::RequestInfo_ptr +PortableInterceptor::tao_RequestInfo_cast::tao_narrow ( CORBA::Object *p ACE_ENV_ARG_DECL ) { - return ::PortableInterceptor::RequestInfo::_narrow (p ACE_ENV_ARG_PARAMETER); + return PortableInterceptor::RequestInfo::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * -PortableInterceptor::RequestInfo_var::tao_upcast (void *src) +PortableInterceptor::tao_RequestInfo_cast::tao_upcast ( + void *src + ) { - RequestInfo **tmp = - ACE_static_cast (RequestInfo **, src); + PortableInterceptor::RequestInfo **tmp = + ACE_static_cast (PortableInterceptor::RequestInfo **, src); return *tmp; } -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030 - -// ************************************************************* -// PortableInterceptor::RequestInfo_out -// ************************************************************* - -PortableInterceptor::RequestInfo_out::RequestInfo_out (RequestInfo_ptr &p) - : ptr_ (p) -{ - this->ptr_ = ::PortableInterceptor::RequestInfo::_nil (); -} - -PortableInterceptor::RequestInfo_out::RequestInfo_out (RequestInfo_var &p) - : ptr_ (p.out ()) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::PortableInterceptor::RequestInfo::_nil (); -} - -PortableInterceptor::RequestInfo_out::RequestInfo_out (const ::PortableInterceptor::RequestInfo_out &p) - : ptr_ (ACE_const_cast (RequestInfo_out &, p).ptr_) -{} - -::PortableInterceptor::RequestInfo_out & -PortableInterceptor::RequestInfo_out::operator= (const ::PortableInterceptor::RequestInfo_out &p) -{ - this->ptr_ = ACE_const_cast (RequestInfo_out&, p).ptr_; - return *this; -} - -PortableInterceptor::RequestInfo_out & -PortableInterceptor::RequestInfo_out::operator= (const ::PortableInterceptor::RequestInfo_var &p) -{ - this->ptr_ = ::PortableInterceptor::RequestInfo::_duplicate (p.ptr ()); - return *this; -} - -PortableInterceptor::RequestInfo_out & -PortableInterceptor::RequestInfo_out::operator= (RequestInfo_ptr p) -{ - this->ptr_ = p; - return *this; -} - -PortableInterceptor::RequestInfo_out::operator ::PortableInterceptor::RequestInfo_ptr &() // cast -{ - return this->ptr_; -} - -::PortableInterceptor::RequestInfo_ptr & -PortableInterceptor::RequestInfo_out::ptr (void) -{ - return this->ptr_; -} - -::PortableInterceptor::RequestInfo_ptr -PortableInterceptor::RequestInfo_out::operator-> (void) -{ - return this->ptr_; -} +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + template class + TAO_Objref_Var_T< + PortableInterceptor::RequestInfo, + PortableInterceptor::tao_RequestInfo_life + >; + template class + TAO_Objref_Out_T< + PortableInterceptor::RequestInfo, + PortableInterceptor::tao_RequestInfo_life + >; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +# pragma instantiate \ + TAO_Objref_Var_T< \ + PortableInterceptor::RequestInfo, \ + PortableInterceptor::tao_RequestInfo_life \ + > +# pragma instantiate \ + TAO_Objref_Out_T< \ + PortableInterceptor::RequestInfo, \ + PortableInterceptor::tao_RequestInfo_life \ + > +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 PortableInterceptor::RequestInfo::RequestInfo (void) {} @@ -1574,6 +1109,12 @@ const char* PortableInterceptor::RequestInfo::_interface_repository_id (void) co return "IDL:omg.org/PortableInterceptor/RequestInfo:1.0"; } +CORBA::Boolean +PortableInterceptor::RequestInfo::marshal (TAO_OutputCDR &) +{ + return 0; +} + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -1622,7 +1163,7 @@ TAO_NAMESPACE_END int PortableInterceptor::ClientRequestInfo::_tao_class_id = 0; PortableInterceptor::ClientRequestInfo_ptr -tao_PortableInterceptor_ClientRequestInfo_duplicate ( +PortableInterceptor::tao_ClientRequestInfo_life::tao_duplicate ( PortableInterceptor::ClientRequestInfo_ptr p ) { @@ -1630,7 +1171,7 @@ tao_PortableInterceptor_ClientRequestInfo_duplicate ( } void -tao_PortableInterceptor_ClientRequestInfo_release ( +PortableInterceptor::tao_ClientRequestInfo_life::tao_release ( PortableInterceptor::ClientRequestInfo_ptr p ) { @@ -1638,231 +1179,67 @@ tao_PortableInterceptor_ClientRequestInfo_release ( } PortableInterceptor::ClientRequestInfo_ptr -tao_PortableInterceptor_ClientRequestInfo_nil ( +PortableInterceptor::tao_ClientRequestInfo_life::tao_nil ( void ) { return PortableInterceptor::ClientRequestInfo::_nil (); } -PortableInterceptor::ClientRequestInfo_ptr -tao_PortableInterceptor_ClientRequestInfo_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return PortableInterceptor::ClientRequestInfo::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object * -tao_PortableInterceptor_ClientRequestInfo_upcast ( - void *src - ) -{ - PortableInterceptor::ClientRequestInfo **tmp = - ACE_static_cast (PortableInterceptor::ClientRequestInfo **, src); - return *tmp; -} - CORBA::Boolean -tao_PortableInterceptor_ClientRequestInfo_marshal ( +PortableInterceptor::tao_ClientRequestInfo_life::tao_marshal ( PortableInterceptor::ClientRequestInfo_ptr p, - TAO_OutputCDR &strm + TAO_OutputCDR &cdr ) { - return p->marshal (strm); -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721 - -// ************************************************************* -// PortableInterceptor::ClientRequestInfo_var -// ************************************************************* - -PortableInterceptor::ClientRequestInfo_var::ClientRequestInfo_var (void) - : ptr_ (ClientRequestInfo::_nil ()) -{} - -::PortableInterceptor::ClientRequestInfo_ptr -PortableInterceptor::ClientRequestInfo_var::ptr (void) const -{ - return this->ptr_; -} - -PortableInterceptor::ClientRequestInfo_var::ClientRequestInfo_var (const ::PortableInterceptor::ClientRequestInfo_var &p) - : TAO_Base_var (), - ptr_ (ClientRequestInfo::_duplicate (p.ptr ())) -{} - -PortableInterceptor::ClientRequestInfo_var::~ClientRequestInfo_var (void) -{ - CORBA::release (this->ptr_); -} - -PortableInterceptor::ClientRequestInfo_var & -PortableInterceptor::ClientRequestInfo_var::operator= (ClientRequestInfo_ptr p) -{ - CORBA::release (this->ptr_); - this->ptr_ = p; - return *this; -} - -PortableInterceptor::ClientRequestInfo_var & -PortableInterceptor::ClientRequestInfo_var::operator= (const ::PortableInterceptor::ClientRequestInfo_var &p) -{ - if (this != &p) - { - CORBA::release (this->ptr_); - this->ptr_ = ::PortableInterceptor::ClientRequestInfo::_duplicate (p.ptr ()); - } - return *this; -} - -PortableInterceptor::ClientRequestInfo_var::operator const ::PortableInterceptor::ClientRequestInfo_ptr &() const // cast -{ - return this->ptr_; + return p->marshal (cdr); } -PortableInterceptor::ClientRequestInfo_var::operator ::PortableInterceptor::ClientRequestInfo_ptr &() // cast -{ - return this->ptr_; -} - -::PortableInterceptor::ClientRequestInfo_ptr -PortableInterceptor::ClientRequestInfo_var::operator-> (void) const -{ - return this->ptr_; -} - -::PortableInterceptor::ClientRequestInfo_ptr -PortableInterceptor::ClientRequestInfo_var::in (void) const -{ - return this->ptr_; -} - -::PortableInterceptor::ClientRequestInfo_ptr & -PortableInterceptor::ClientRequestInfo_var::inout (void) -{ - return this->ptr_; -} - -::PortableInterceptor::ClientRequestInfo_ptr & -PortableInterceptor::ClientRequestInfo_var::out (void) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::PortableInterceptor::ClientRequestInfo::_nil (); - return this->ptr_; -} - -::PortableInterceptor::ClientRequestInfo_ptr -PortableInterceptor::ClientRequestInfo_var::_retn (void) -{ - // yield ownership of managed obj reference - ::PortableInterceptor::ClientRequestInfo_ptr val = this->ptr_; - this->ptr_ = ::PortableInterceptor::ClientRequestInfo::_nil (); - return val; -} - -::PortableInterceptor::ClientRequestInfo_ptr -PortableInterceptor::ClientRequestInfo_var::tao_duplicate (ClientRequestInfo_ptr p) -{ - return ::PortableInterceptor::ClientRequestInfo::_duplicate (p); -} - -void -PortableInterceptor::ClientRequestInfo_var::tao_release (ClientRequestInfo_ptr p) -{ - CORBA::release (p); -} - -::PortableInterceptor::ClientRequestInfo_ptr -PortableInterceptor::ClientRequestInfo_var::tao_nil (void) -{ - return ::PortableInterceptor::ClientRequestInfo::_nil (); -} - -::PortableInterceptor::ClientRequestInfo_ptr -PortableInterceptor::ClientRequestInfo_var::tao_narrow ( +PortableInterceptor::ClientRequestInfo_ptr +PortableInterceptor::tao_ClientRequestInfo_cast::tao_narrow ( CORBA::Object *p ACE_ENV_ARG_DECL ) { - return ::PortableInterceptor::ClientRequestInfo::_narrow (p ACE_ENV_ARG_PARAMETER); + return PortableInterceptor::ClientRequestInfo::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * -PortableInterceptor::ClientRequestInfo_var::tao_upcast (void *src) +PortableInterceptor::tao_ClientRequestInfo_cast::tao_upcast ( + void *src + ) { - ClientRequestInfo **tmp = - ACE_static_cast (ClientRequestInfo **, src); + PortableInterceptor::ClientRequestInfo **tmp = + ACE_static_cast (PortableInterceptor::ClientRequestInfo **, src); return *tmp; } -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030 - -// ************************************************************* -// PortableInterceptor::ClientRequestInfo_out -// ************************************************************* - -PortableInterceptor::ClientRequestInfo_out::ClientRequestInfo_out (ClientRequestInfo_ptr &p) - : ptr_ (p) -{ - this->ptr_ = ::PortableInterceptor::ClientRequestInfo::_nil (); -} - -PortableInterceptor::ClientRequestInfo_out::ClientRequestInfo_out (ClientRequestInfo_var &p) - : ptr_ (p.out ()) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::PortableInterceptor::ClientRequestInfo::_nil (); -} - -PortableInterceptor::ClientRequestInfo_out::ClientRequestInfo_out (const ::PortableInterceptor::ClientRequestInfo_out &p) - : ptr_ (ACE_const_cast (ClientRequestInfo_out &, p).ptr_) -{} - -::PortableInterceptor::ClientRequestInfo_out & -PortableInterceptor::ClientRequestInfo_out::operator= (const ::PortableInterceptor::ClientRequestInfo_out &p) -{ - this->ptr_ = ACE_const_cast (ClientRequestInfo_out&, p).ptr_; - return *this; -} - -PortableInterceptor::ClientRequestInfo_out & -PortableInterceptor::ClientRequestInfo_out::operator= (const ::PortableInterceptor::ClientRequestInfo_var &p) -{ - this->ptr_ = ::PortableInterceptor::ClientRequestInfo::_duplicate (p.ptr ()); - return *this; -} - -PortableInterceptor::ClientRequestInfo_out & -PortableInterceptor::ClientRequestInfo_out::operator= (ClientRequestInfo_ptr p) -{ - this->ptr_ = p; - return *this; -} - -PortableInterceptor::ClientRequestInfo_out::operator ::PortableInterceptor::ClientRequestInfo_ptr &() // cast -{ - return this->ptr_; -} - -::PortableInterceptor::ClientRequestInfo_ptr & -PortableInterceptor::ClientRequestInfo_out::ptr (void) -{ - return this->ptr_; -} - -::PortableInterceptor::ClientRequestInfo_ptr -PortableInterceptor::ClientRequestInfo_out::operator-> (void) -{ - return this->ptr_; -} +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + template class + TAO_Objref_Var_T< + PortableInterceptor::ClientRequestInfo, + PortableInterceptor::tao_ClientRequestInfo_life + >; + template class + TAO_Objref_Out_T< + PortableInterceptor::ClientRequestInfo, + PortableInterceptor::tao_ClientRequestInfo_life + >; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +# pragma instantiate \ + TAO_Objref_Var_T< \ + PortableInterceptor::ClientRequestInfo, \ + PortableInterceptor::tao_ClientRequestInfo_life \ + > +# pragma instantiate \ + TAO_Objref_Out_T< \ + PortableInterceptor::ClientRequestInfo, \ + PortableInterceptor::tao_ClientRequestInfo_life \ + > +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 PortableInterceptor::ClientRequestInfo::ClientRequestInfo (void) {} @@ -1970,6 +1347,12 @@ const char* PortableInterceptor::ClientRequestInfo::_interface_repository_id (vo return "IDL:omg.org/PortableInterceptor/ClientRequestInfo:1.0"; } +CORBA::Boolean +PortableInterceptor::ClientRequestInfo::marshal (TAO_OutputCDR &) +{ + return 0; +} + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -2022,7 +1405,7 @@ TAO_NAMESPACE_END int PortableInterceptor::ServerRequestInfo::_tao_class_id = 0; PortableInterceptor::ServerRequestInfo_ptr -tao_PortableInterceptor_ServerRequestInfo_duplicate ( +PortableInterceptor::tao_ServerRequestInfo_life::tao_duplicate ( PortableInterceptor::ServerRequestInfo_ptr p ) { @@ -2030,7 +1413,7 @@ tao_PortableInterceptor_ServerRequestInfo_duplicate ( } void -tao_PortableInterceptor_ServerRequestInfo_release ( +PortableInterceptor::tao_ServerRequestInfo_life::tao_release ( PortableInterceptor::ServerRequestInfo_ptr p ) { @@ -2038,231 +1421,67 @@ tao_PortableInterceptor_ServerRequestInfo_release ( } PortableInterceptor::ServerRequestInfo_ptr -tao_PortableInterceptor_ServerRequestInfo_nil ( +PortableInterceptor::tao_ServerRequestInfo_life::tao_nil ( void ) { return PortableInterceptor::ServerRequestInfo::_nil (); } -PortableInterceptor::ServerRequestInfo_ptr -tao_PortableInterceptor_ServerRequestInfo_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return PortableInterceptor::ServerRequestInfo::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object * -tao_PortableInterceptor_ServerRequestInfo_upcast ( - void *src - ) -{ - PortableInterceptor::ServerRequestInfo **tmp = - ACE_static_cast (PortableInterceptor::ServerRequestInfo **, src); - return *tmp; -} - CORBA::Boolean -tao_PortableInterceptor_ServerRequestInfo_marshal ( +PortableInterceptor::tao_ServerRequestInfo_life::tao_marshal ( PortableInterceptor::ServerRequestInfo_ptr p, - TAO_OutputCDR &strm + TAO_OutputCDR &cdr ) { - return p->marshal (strm); -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721 - -// ************************************************************* -// PortableInterceptor::ServerRequestInfo_var -// ************************************************************* - -PortableInterceptor::ServerRequestInfo_var::ServerRequestInfo_var (void) - : ptr_ (ServerRequestInfo::_nil ()) -{} - -::PortableInterceptor::ServerRequestInfo_ptr -PortableInterceptor::ServerRequestInfo_var::ptr (void) const -{ - return this->ptr_; -} - -PortableInterceptor::ServerRequestInfo_var::ServerRequestInfo_var (const ::PortableInterceptor::ServerRequestInfo_var &p) - : TAO_Base_var (), - ptr_ (ServerRequestInfo::_duplicate (p.ptr ())) -{} - -PortableInterceptor::ServerRequestInfo_var::~ServerRequestInfo_var (void) -{ - CORBA::release (this->ptr_); -} - -PortableInterceptor::ServerRequestInfo_var & -PortableInterceptor::ServerRequestInfo_var::operator= (ServerRequestInfo_ptr p) -{ - CORBA::release (this->ptr_); - this->ptr_ = p; - return *this; -} - -PortableInterceptor::ServerRequestInfo_var & -PortableInterceptor::ServerRequestInfo_var::operator= (const ::PortableInterceptor::ServerRequestInfo_var &p) -{ - if (this != &p) - { - CORBA::release (this->ptr_); - this->ptr_ = ::PortableInterceptor::ServerRequestInfo::_duplicate (p.ptr ()); - } - return *this; -} - -PortableInterceptor::ServerRequestInfo_var::operator const ::PortableInterceptor::ServerRequestInfo_ptr &() const // cast -{ - return this->ptr_; -} - -PortableInterceptor::ServerRequestInfo_var::operator ::PortableInterceptor::ServerRequestInfo_ptr &() // cast -{ - return this->ptr_; -} - -::PortableInterceptor::ServerRequestInfo_ptr -PortableInterceptor::ServerRequestInfo_var::operator-> (void) const -{ - return this->ptr_; -} - -::PortableInterceptor::ServerRequestInfo_ptr -PortableInterceptor::ServerRequestInfo_var::in (void) const -{ - return this->ptr_; -} - -::PortableInterceptor::ServerRequestInfo_ptr & -PortableInterceptor::ServerRequestInfo_var::inout (void) -{ - return this->ptr_; -} - -::PortableInterceptor::ServerRequestInfo_ptr & -PortableInterceptor::ServerRequestInfo_var::out (void) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::PortableInterceptor::ServerRequestInfo::_nil (); - return this->ptr_; -} - -::PortableInterceptor::ServerRequestInfo_ptr -PortableInterceptor::ServerRequestInfo_var::_retn (void) -{ - // yield ownership of managed obj reference - ::PortableInterceptor::ServerRequestInfo_ptr val = this->ptr_; - this->ptr_ = ::PortableInterceptor::ServerRequestInfo::_nil (); - return val; -} - -::PortableInterceptor::ServerRequestInfo_ptr -PortableInterceptor::ServerRequestInfo_var::tao_duplicate (ServerRequestInfo_ptr p) -{ - return ::PortableInterceptor::ServerRequestInfo::_duplicate (p); -} - -void -PortableInterceptor::ServerRequestInfo_var::tao_release (ServerRequestInfo_ptr p) -{ - CORBA::release (p); -} - -::PortableInterceptor::ServerRequestInfo_ptr -PortableInterceptor::ServerRequestInfo_var::tao_nil (void) -{ - return ::PortableInterceptor::ServerRequestInfo::_nil (); + return p->marshal (cdr); } -::PortableInterceptor::ServerRequestInfo_ptr -PortableInterceptor::ServerRequestInfo_var::tao_narrow ( +PortableInterceptor::ServerRequestInfo_ptr +PortableInterceptor::tao_ServerRequestInfo_cast::tao_narrow ( CORBA::Object *p ACE_ENV_ARG_DECL ) { - return ::PortableInterceptor::ServerRequestInfo::_narrow (p ACE_ENV_ARG_PARAMETER); + return PortableInterceptor::ServerRequestInfo::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * -PortableInterceptor::ServerRequestInfo_var::tao_upcast (void *src) +PortableInterceptor::tao_ServerRequestInfo_cast::tao_upcast ( + void *src + ) { - ServerRequestInfo **tmp = - ACE_static_cast (ServerRequestInfo **, src); + PortableInterceptor::ServerRequestInfo **tmp = + ACE_static_cast (PortableInterceptor::ServerRequestInfo **, src); return *tmp; } -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030 - -// ************************************************************* -// PortableInterceptor::ServerRequestInfo_out -// ************************************************************* - -PortableInterceptor::ServerRequestInfo_out::ServerRequestInfo_out (ServerRequestInfo_ptr &p) - : ptr_ (p) -{ - this->ptr_ = ::PortableInterceptor::ServerRequestInfo::_nil (); -} - -PortableInterceptor::ServerRequestInfo_out::ServerRequestInfo_out (ServerRequestInfo_var &p) - : ptr_ (p.out ()) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::PortableInterceptor::ServerRequestInfo::_nil (); -} - -PortableInterceptor::ServerRequestInfo_out::ServerRequestInfo_out (const ::PortableInterceptor::ServerRequestInfo_out &p) - : ptr_ (ACE_const_cast (ServerRequestInfo_out &, p).ptr_) -{} - -::PortableInterceptor::ServerRequestInfo_out & -PortableInterceptor::ServerRequestInfo_out::operator= (const ::PortableInterceptor::ServerRequestInfo_out &p) -{ - this->ptr_ = ACE_const_cast (ServerRequestInfo_out&, p).ptr_; - return *this; -} - -PortableInterceptor::ServerRequestInfo_out & -PortableInterceptor::ServerRequestInfo_out::operator= (const ::PortableInterceptor::ServerRequestInfo_var &p) -{ - this->ptr_ = ::PortableInterceptor::ServerRequestInfo::_duplicate (p.ptr ()); - return *this; -} - -PortableInterceptor::ServerRequestInfo_out & -PortableInterceptor::ServerRequestInfo_out::operator= (ServerRequestInfo_ptr p) -{ - this->ptr_ = p; - return *this; -} - -PortableInterceptor::ServerRequestInfo_out::operator ::PortableInterceptor::ServerRequestInfo_ptr &() // cast -{ - return this->ptr_; -} - -::PortableInterceptor::ServerRequestInfo_ptr & -PortableInterceptor::ServerRequestInfo_out::ptr (void) -{ - return this->ptr_; -} - -::PortableInterceptor::ServerRequestInfo_ptr -PortableInterceptor::ServerRequestInfo_out::operator-> (void) -{ - return this->ptr_; -} +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + template class + TAO_Objref_Var_T< + PortableInterceptor::ServerRequestInfo, + PortableInterceptor::tao_ServerRequestInfo_life + >; + template class + TAO_Objref_Out_T< + PortableInterceptor::ServerRequestInfo, + PortableInterceptor::tao_ServerRequestInfo_life + >; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +# pragma instantiate \ + TAO_Objref_Var_T< \ + PortableInterceptor::ServerRequestInfo, \ + PortableInterceptor::tao_ServerRequestInfo_life \ + > +# pragma instantiate \ + TAO_Objref_Out_T< \ + PortableInterceptor::ServerRequestInfo, \ + PortableInterceptor::tao_ServerRequestInfo_life \ + > +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 PortableInterceptor::ServerRequestInfo::ServerRequestInfo (void) {} @@ -2370,6 +1589,12 @@ const char* PortableInterceptor::ServerRequestInfo::_interface_repository_id (vo return "IDL:omg.org/PortableInterceptor/ServerRequestInfo:1.0"; } +CORBA::Boolean +PortableInterceptor::ServerRequestInfo::marshal (TAO_OutputCDR &) +{ + return 0; +} + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -2422,7 +1647,7 @@ TAO_NAMESPACE_END int PortableInterceptor::ClientRequestInterceptor::_tao_class_id = 0; PortableInterceptor::ClientRequestInterceptor_ptr -tao_PortableInterceptor_ClientRequestInterceptor_duplicate ( +PortableInterceptor::tao_ClientRequestInterceptor_life::tao_duplicate ( PortableInterceptor::ClientRequestInterceptor_ptr p ) { @@ -2430,7 +1655,7 @@ tao_PortableInterceptor_ClientRequestInterceptor_duplicate ( } void -tao_PortableInterceptor_ClientRequestInterceptor_release ( +PortableInterceptor::tao_ClientRequestInterceptor_life::tao_release ( PortableInterceptor::ClientRequestInterceptor_ptr p ) { @@ -2438,231 +1663,67 @@ tao_PortableInterceptor_ClientRequestInterceptor_release ( } PortableInterceptor::ClientRequestInterceptor_ptr -tao_PortableInterceptor_ClientRequestInterceptor_nil ( +PortableInterceptor::tao_ClientRequestInterceptor_life::tao_nil ( void ) { return PortableInterceptor::ClientRequestInterceptor::_nil (); } -PortableInterceptor::ClientRequestInterceptor_ptr -tao_PortableInterceptor_ClientRequestInterceptor_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return PortableInterceptor::ClientRequestInterceptor::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object * -tao_PortableInterceptor_ClientRequestInterceptor_upcast ( - void *src - ) -{ - PortableInterceptor::ClientRequestInterceptor **tmp = - ACE_static_cast (PortableInterceptor::ClientRequestInterceptor **, src); - return *tmp; -} - CORBA::Boolean -tao_PortableInterceptor_ClientRequestInterceptor_marshal ( +PortableInterceptor::tao_ClientRequestInterceptor_life::tao_marshal ( PortableInterceptor::ClientRequestInterceptor_ptr p, - TAO_OutputCDR &strm + TAO_OutputCDR &cdr ) { - return p->marshal (strm); + return p->marshal (cdr); } -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721 - -// ************************************************************* -// PortableInterceptor::ClientRequestInterceptor_var -// ************************************************************* - -PortableInterceptor::ClientRequestInterceptor_var::ClientRequestInterceptor_var (void) - : ptr_ (ClientRequestInterceptor::_nil ()) -{} - -::PortableInterceptor::ClientRequestInterceptor_ptr -PortableInterceptor::ClientRequestInterceptor_var::ptr (void) const -{ - return this->ptr_; -} - -PortableInterceptor::ClientRequestInterceptor_var::ClientRequestInterceptor_var (const ::PortableInterceptor::ClientRequestInterceptor_var &p) - : TAO_Base_var (), - ptr_ (ClientRequestInterceptor::_duplicate (p.ptr ())) -{} - -PortableInterceptor::ClientRequestInterceptor_var::~ClientRequestInterceptor_var (void) -{ - CORBA::release (this->ptr_); -} - -PortableInterceptor::ClientRequestInterceptor_var & -PortableInterceptor::ClientRequestInterceptor_var::operator= (ClientRequestInterceptor_ptr p) -{ - CORBA::release (this->ptr_); - this->ptr_ = p; - return *this; -} - -PortableInterceptor::ClientRequestInterceptor_var & -PortableInterceptor::ClientRequestInterceptor_var::operator= (const ::PortableInterceptor::ClientRequestInterceptor_var &p) -{ - if (this != &p) - { - CORBA::release (this->ptr_); - this->ptr_ = ::PortableInterceptor::ClientRequestInterceptor::_duplicate (p.ptr ()); - } - return *this; -} - -PortableInterceptor::ClientRequestInterceptor_var::operator const ::PortableInterceptor::ClientRequestInterceptor_ptr &() const // cast -{ - return this->ptr_; -} - -PortableInterceptor::ClientRequestInterceptor_var::operator ::PortableInterceptor::ClientRequestInterceptor_ptr &() // cast -{ - return this->ptr_; -} - -::PortableInterceptor::ClientRequestInterceptor_ptr -PortableInterceptor::ClientRequestInterceptor_var::operator-> (void) const -{ - return this->ptr_; -} - -::PortableInterceptor::ClientRequestInterceptor_ptr -PortableInterceptor::ClientRequestInterceptor_var::in (void) const -{ - return this->ptr_; -} - -::PortableInterceptor::ClientRequestInterceptor_ptr & -PortableInterceptor::ClientRequestInterceptor_var::inout (void) -{ - return this->ptr_; -} - -::PortableInterceptor::ClientRequestInterceptor_ptr & -PortableInterceptor::ClientRequestInterceptor_var::out (void) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::PortableInterceptor::ClientRequestInterceptor::_nil (); - return this->ptr_; -} - -::PortableInterceptor::ClientRequestInterceptor_ptr -PortableInterceptor::ClientRequestInterceptor_var::_retn (void) -{ - // yield ownership of managed obj reference - ::PortableInterceptor::ClientRequestInterceptor_ptr val = this->ptr_; - this->ptr_ = ::PortableInterceptor::ClientRequestInterceptor::_nil (); - return val; -} - -::PortableInterceptor::ClientRequestInterceptor_ptr -PortableInterceptor::ClientRequestInterceptor_var::tao_duplicate (ClientRequestInterceptor_ptr p) -{ - return ::PortableInterceptor::ClientRequestInterceptor::_duplicate (p); -} - -void -PortableInterceptor::ClientRequestInterceptor_var::tao_release (ClientRequestInterceptor_ptr p) -{ - CORBA::release (p); -} - -::PortableInterceptor::ClientRequestInterceptor_ptr -PortableInterceptor::ClientRequestInterceptor_var::tao_nil (void) -{ - return ::PortableInterceptor::ClientRequestInterceptor::_nil (); -} - -::PortableInterceptor::ClientRequestInterceptor_ptr -PortableInterceptor::ClientRequestInterceptor_var::tao_narrow ( +PortableInterceptor::ClientRequestInterceptor_ptr +PortableInterceptor::tao_ClientRequestInterceptor_cast::tao_narrow ( CORBA::Object *p ACE_ENV_ARG_DECL ) { - return ::PortableInterceptor::ClientRequestInterceptor::_narrow (p ACE_ENV_ARG_PARAMETER); + return PortableInterceptor::ClientRequestInterceptor::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * -PortableInterceptor::ClientRequestInterceptor_var::tao_upcast (void *src) +PortableInterceptor::tao_ClientRequestInterceptor_cast::tao_upcast ( + void *src + ) { - ClientRequestInterceptor **tmp = - ACE_static_cast (ClientRequestInterceptor **, src); + PortableInterceptor::ClientRequestInterceptor **tmp = + ACE_static_cast (PortableInterceptor::ClientRequestInterceptor **, src); return *tmp; } -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030 - -// ************************************************************* -// PortableInterceptor::ClientRequestInterceptor_out -// ************************************************************* - -PortableInterceptor::ClientRequestInterceptor_out::ClientRequestInterceptor_out (ClientRequestInterceptor_ptr &p) - : ptr_ (p) -{ - this->ptr_ = ::PortableInterceptor::ClientRequestInterceptor::_nil (); -} - -PortableInterceptor::ClientRequestInterceptor_out::ClientRequestInterceptor_out (ClientRequestInterceptor_var &p) - : ptr_ (p.out ()) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::PortableInterceptor::ClientRequestInterceptor::_nil (); -} - -PortableInterceptor::ClientRequestInterceptor_out::ClientRequestInterceptor_out (const ::PortableInterceptor::ClientRequestInterceptor_out &p) - : ptr_ (ACE_const_cast (ClientRequestInterceptor_out &, p).ptr_) -{} - -::PortableInterceptor::ClientRequestInterceptor_out & -PortableInterceptor::ClientRequestInterceptor_out::operator= (const ::PortableInterceptor::ClientRequestInterceptor_out &p) -{ - this->ptr_ = ACE_const_cast (ClientRequestInterceptor_out&, p).ptr_; - return *this; -} - -PortableInterceptor::ClientRequestInterceptor_out & -PortableInterceptor::ClientRequestInterceptor_out::operator= (const ::PortableInterceptor::ClientRequestInterceptor_var &p) -{ - this->ptr_ = ::PortableInterceptor::ClientRequestInterceptor::_duplicate (p.ptr ()); - return *this; -} - -PortableInterceptor::ClientRequestInterceptor_out & -PortableInterceptor::ClientRequestInterceptor_out::operator= (ClientRequestInterceptor_ptr p) -{ - this->ptr_ = p; - return *this; -} - -PortableInterceptor::ClientRequestInterceptor_out::operator ::PortableInterceptor::ClientRequestInterceptor_ptr &() // cast -{ - return this->ptr_; -} - -::PortableInterceptor::ClientRequestInterceptor_ptr & -PortableInterceptor::ClientRequestInterceptor_out::ptr (void) -{ - return this->ptr_; -} - -::PortableInterceptor::ClientRequestInterceptor_ptr -PortableInterceptor::ClientRequestInterceptor_out::operator-> (void) -{ - return this->ptr_; -} +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + template class + TAO_Objref_Var_T< + PortableInterceptor::ClientRequestInterceptor, + PortableInterceptor::tao_ClientRequestInterceptor_life + >; + template class + TAO_Objref_Out_T< + PortableInterceptor::ClientRequestInterceptor, + PortableInterceptor::tao_ClientRequestInterceptor_life + >; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +# pragma instantiate \ + TAO_Objref_Var_T< \ + PortableInterceptor::ClientRequestInterceptor, \ + PortableInterceptor::tao_ClientRequestInterceptor_life \ + > +# pragma instantiate \ + TAO_Objref_Out_T< \ + PortableInterceptor::ClientRequestInterceptor, \ + PortableInterceptor::tao_ClientRequestInterceptor_life \ + > +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 PortableInterceptor::ClientRequestInterceptor::ClientRequestInterceptor (void) {} @@ -2770,6 +1831,12 @@ const char* PortableInterceptor::ClientRequestInterceptor::_interface_repository return "IDL:omg.org/PortableInterceptor/ClientRequestInterceptor:1.0"; } +CORBA::Boolean +PortableInterceptor::ClientRequestInterceptor::marshal (TAO_OutputCDR &) +{ + return 0; +} + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -2826,7 +1893,7 @@ TAO_NAMESPACE_END int PortableInterceptor::ServerRequestInterceptor::_tao_class_id = 0; PortableInterceptor::ServerRequestInterceptor_ptr -tao_PortableInterceptor_ServerRequestInterceptor_duplicate ( +PortableInterceptor::tao_ServerRequestInterceptor_life::tao_duplicate ( PortableInterceptor::ServerRequestInterceptor_ptr p ) { @@ -2834,7 +1901,7 @@ tao_PortableInterceptor_ServerRequestInterceptor_duplicate ( } void -tao_PortableInterceptor_ServerRequestInterceptor_release ( +PortableInterceptor::tao_ServerRequestInterceptor_life::tao_release ( PortableInterceptor::ServerRequestInterceptor_ptr p ) { @@ -2842,231 +1909,67 @@ tao_PortableInterceptor_ServerRequestInterceptor_release ( } PortableInterceptor::ServerRequestInterceptor_ptr -tao_PortableInterceptor_ServerRequestInterceptor_nil ( +PortableInterceptor::tao_ServerRequestInterceptor_life::tao_nil ( void ) { return PortableInterceptor::ServerRequestInterceptor::_nil (); } -PortableInterceptor::ServerRequestInterceptor_ptr -tao_PortableInterceptor_ServerRequestInterceptor_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return PortableInterceptor::ServerRequestInterceptor::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object * -tao_PortableInterceptor_ServerRequestInterceptor_upcast ( - void *src - ) -{ - PortableInterceptor::ServerRequestInterceptor **tmp = - ACE_static_cast (PortableInterceptor::ServerRequestInterceptor **, src); - return *tmp; -} - CORBA::Boolean -tao_PortableInterceptor_ServerRequestInterceptor_marshal ( +PortableInterceptor::tao_ServerRequestInterceptor_life::tao_marshal ( PortableInterceptor::ServerRequestInterceptor_ptr p, - TAO_OutputCDR &strm + TAO_OutputCDR &cdr ) { - return p->marshal (strm); -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721 - -// ************************************************************* -// PortableInterceptor::ServerRequestInterceptor_var -// ************************************************************* - -PortableInterceptor::ServerRequestInterceptor_var::ServerRequestInterceptor_var (void) - : ptr_ (ServerRequestInterceptor::_nil ()) -{} - -::PortableInterceptor::ServerRequestInterceptor_ptr -PortableInterceptor::ServerRequestInterceptor_var::ptr (void) const -{ - return this->ptr_; -} - -PortableInterceptor::ServerRequestInterceptor_var::ServerRequestInterceptor_var (const ::PortableInterceptor::ServerRequestInterceptor_var &p) - : TAO_Base_var (), - ptr_ (ServerRequestInterceptor::_duplicate (p.ptr ())) -{} - -PortableInterceptor::ServerRequestInterceptor_var::~ServerRequestInterceptor_var (void) -{ - CORBA::release (this->ptr_); -} - -PortableInterceptor::ServerRequestInterceptor_var & -PortableInterceptor::ServerRequestInterceptor_var::operator= (ServerRequestInterceptor_ptr p) -{ - CORBA::release (this->ptr_); - this->ptr_ = p; - return *this; + return p->marshal (cdr); } -PortableInterceptor::ServerRequestInterceptor_var & -PortableInterceptor::ServerRequestInterceptor_var::operator= (const ::PortableInterceptor::ServerRequestInterceptor_var &p) -{ - if (this != &p) - { - CORBA::release (this->ptr_); - this->ptr_ = ::PortableInterceptor::ServerRequestInterceptor::_duplicate (p.ptr ()); - } - return *this; -} - -PortableInterceptor::ServerRequestInterceptor_var::operator const ::PortableInterceptor::ServerRequestInterceptor_ptr &() const // cast -{ - return this->ptr_; -} - -PortableInterceptor::ServerRequestInterceptor_var::operator ::PortableInterceptor::ServerRequestInterceptor_ptr &() // cast -{ - return this->ptr_; -} - -::PortableInterceptor::ServerRequestInterceptor_ptr -PortableInterceptor::ServerRequestInterceptor_var::operator-> (void) const -{ - return this->ptr_; -} - -::PortableInterceptor::ServerRequestInterceptor_ptr -PortableInterceptor::ServerRequestInterceptor_var::in (void) const -{ - return this->ptr_; -} - -::PortableInterceptor::ServerRequestInterceptor_ptr & -PortableInterceptor::ServerRequestInterceptor_var::inout (void) -{ - return this->ptr_; -} - -::PortableInterceptor::ServerRequestInterceptor_ptr & -PortableInterceptor::ServerRequestInterceptor_var::out (void) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::PortableInterceptor::ServerRequestInterceptor::_nil (); - return this->ptr_; -} - -::PortableInterceptor::ServerRequestInterceptor_ptr -PortableInterceptor::ServerRequestInterceptor_var::_retn (void) -{ - // yield ownership of managed obj reference - ::PortableInterceptor::ServerRequestInterceptor_ptr val = this->ptr_; - this->ptr_ = ::PortableInterceptor::ServerRequestInterceptor::_nil (); - return val; -} - -::PortableInterceptor::ServerRequestInterceptor_ptr -PortableInterceptor::ServerRequestInterceptor_var::tao_duplicate (ServerRequestInterceptor_ptr p) -{ - return ::PortableInterceptor::ServerRequestInterceptor::_duplicate (p); -} - -void -PortableInterceptor::ServerRequestInterceptor_var::tao_release (ServerRequestInterceptor_ptr p) -{ - CORBA::release (p); -} - -::PortableInterceptor::ServerRequestInterceptor_ptr -PortableInterceptor::ServerRequestInterceptor_var::tao_nil (void) -{ - return ::PortableInterceptor::ServerRequestInterceptor::_nil (); -} - -::PortableInterceptor::ServerRequestInterceptor_ptr -PortableInterceptor::ServerRequestInterceptor_var::tao_narrow ( +PortableInterceptor::ServerRequestInterceptor_ptr +PortableInterceptor::tao_ServerRequestInterceptor_cast::tao_narrow ( CORBA::Object *p ACE_ENV_ARG_DECL ) { - return ::PortableInterceptor::ServerRequestInterceptor::_narrow (p ACE_ENV_ARG_PARAMETER); + return PortableInterceptor::ServerRequestInterceptor::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * -PortableInterceptor::ServerRequestInterceptor_var::tao_upcast (void *src) +PortableInterceptor::tao_ServerRequestInterceptor_cast::tao_upcast ( + void *src + ) { - ServerRequestInterceptor **tmp = - ACE_static_cast (ServerRequestInterceptor **, src); + PortableInterceptor::ServerRequestInterceptor **tmp = + ACE_static_cast (PortableInterceptor::ServerRequestInterceptor **, src); return *tmp; } -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030 - -// ************************************************************* -// PortableInterceptor::ServerRequestInterceptor_out -// ************************************************************* - -PortableInterceptor::ServerRequestInterceptor_out::ServerRequestInterceptor_out (ServerRequestInterceptor_ptr &p) - : ptr_ (p) -{ - this->ptr_ = ::PortableInterceptor::ServerRequestInterceptor::_nil (); -} - -PortableInterceptor::ServerRequestInterceptor_out::ServerRequestInterceptor_out (ServerRequestInterceptor_var &p) - : ptr_ (p.out ()) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::PortableInterceptor::ServerRequestInterceptor::_nil (); -} - -PortableInterceptor::ServerRequestInterceptor_out::ServerRequestInterceptor_out (const ::PortableInterceptor::ServerRequestInterceptor_out &p) - : ptr_ (ACE_const_cast (ServerRequestInterceptor_out &, p).ptr_) -{} - -::PortableInterceptor::ServerRequestInterceptor_out & -PortableInterceptor::ServerRequestInterceptor_out::operator= (const ::PortableInterceptor::ServerRequestInterceptor_out &p) -{ - this->ptr_ = ACE_const_cast (ServerRequestInterceptor_out&, p).ptr_; - return *this; -} - -PortableInterceptor::ServerRequestInterceptor_out & -PortableInterceptor::ServerRequestInterceptor_out::operator= (const ::PortableInterceptor::ServerRequestInterceptor_var &p) -{ - this->ptr_ = ::PortableInterceptor::ServerRequestInterceptor::_duplicate (p.ptr ()); - return *this; -} - -PortableInterceptor::ServerRequestInterceptor_out & -PortableInterceptor::ServerRequestInterceptor_out::operator= (ServerRequestInterceptor_ptr p) -{ - this->ptr_ = p; - return *this; -} - -PortableInterceptor::ServerRequestInterceptor_out::operator ::PortableInterceptor::ServerRequestInterceptor_ptr &() // cast -{ - return this->ptr_; -} - -::PortableInterceptor::ServerRequestInterceptor_ptr & -PortableInterceptor::ServerRequestInterceptor_out::ptr (void) -{ - return this->ptr_; -} - -::PortableInterceptor::ServerRequestInterceptor_ptr -PortableInterceptor::ServerRequestInterceptor_out::operator-> (void) -{ - return this->ptr_; -} +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + template class + TAO_Objref_Var_T< + PortableInterceptor::ServerRequestInterceptor, + PortableInterceptor::tao_ServerRequestInterceptor_life + >; + template class + TAO_Objref_Out_T< + PortableInterceptor::ServerRequestInterceptor, + PortableInterceptor::tao_ServerRequestInterceptor_life + >; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +# pragma instantiate \ + TAO_Objref_Var_T< \ + PortableInterceptor::ServerRequestInterceptor, \ + PortableInterceptor::tao_ServerRequestInterceptor_life \ + > +# pragma instantiate \ + TAO_Objref_Out_T< \ + PortableInterceptor::ServerRequestInterceptor, \ + PortableInterceptor::tao_ServerRequestInterceptor_life \ + > +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 PortableInterceptor::ServerRequestInterceptor::ServerRequestInterceptor (void) {} @@ -3174,6 +2077,12 @@ const char* PortableInterceptor::ServerRequestInterceptor::_interface_repository return "IDL:omg.org/PortableInterceptor/ServerRequestInterceptor:1.0"; } +CORBA::Boolean +PortableInterceptor::ServerRequestInterceptor::marshal (TAO_OutputCDR &) +{ + return 0; +} + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -3230,7 +2139,7 @@ TAO_NAMESPACE_END int PortableInterceptor::IORInfo::_tao_class_id = 0; PortableInterceptor::IORInfo_ptr -tao_PortableInterceptor_IORInfo_duplicate ( +PortableInterceptor::tao_IORInfo_life::tao_duplicate ( PortableInterceptor::IORInfo_ptr p ) { @@ -3238,7 +2147,7 @@ tao_PortableInterceptor_IORInfo_duplicate ( } void -tao_PortableInterceptor_IORInfo_release ( +PortableInterceptor::tao_IORInfo_life::tao_release ( PortableInterceptor::IORInfo_ptr p ) { @@ -3246,231 +2155,67 @@ tao_PortableInterceptor_IORInfo_release ( } PortableInterceptor::IORInfo_ptr -tao_PortableInterceptor_IORInfo_nil ( +PortableInterceptor::tao_IORInfo_life::tao_nil ( void ) { return PortableInterceptor::IORInfo::_nil (); } -PortableInterceptor::IORInfo_ptr -tao_PortableInterceptor_IORInfo_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return PortableInterceptor::IORInfo::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object * -tao_PortableInterceptor_IORInfo_upcast ( - void *src - ) -{ - PortableInterceptor::IORInfo **tmp = - ACE_static_cast (PortableInterceptor::IORInfo **, src); - return *tmp; -} - CORBA::Boolean -tao_PortableInterceptor_IORInfo_marshal ( +PortableInterceptor::tao_IORInfo_life::tao_marshal ( PortableInterceptor::IORInfo_ptr p, - TAO_OutputCDR &strm + TAO_OutputCDR &cdr ) { - return p->marshal (strm); -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721 - -// ************************************************************* -// PortableInterceptor::IORInfo_var -// ************************************************************* - -PortableInterceptor::IORInfo_var::IORInfo_var (void) - : ptr_ (IORInfo::_nil ()) -{} - -::PortableInterceptor::IORInfo_ptr -PortableInterceptor::IORInfo_var::ptr (void) const -{ - return this->ptr_; -} - -PortableInterceptor::IORInfo_var::IORInfo_var (const ::PortableInterceptor::IORInfo_var &p) - : TAO_Base_var (), - ptr_ (IORInfo::_duplicate (p.ptr ())) -{} - -PortableInterceptor::IORInfo_var::~IORInfo_var (void) -{ - CORBA::release (this->ptr_); -} - -PortableInterceptor::IORInfo_var & -PortableInterceptor::IORInfo_var::operator= (IORInfo_ptr p) -{ - CORBA::release (this->ptr_); - this->ptr_ = p; - return *this; -} - -PortableInterceptor::IORInfo_var & -PortableInterceptor::IORInfo_var::operator= (const ::PortableInterceptor::IORInfo_var &p) -{ - if (this != &p) - { - CORBA::release (this->ptr_); - this->ptr_ = ::PortableInterceptor::IORInfo::_duplicate (p.ptr ()); - } - return *this; -} - -PortableInterceptor::IORInfo_var::operator const ::PortableInterceptor::IORInfo_ptr &() const // cast -{ - return this->ptr_; -} - -PortableInterceptor::IORInfo_var::operator ::PortableInterceptor::IORInfo_ptr &() // cast -{ - return this->ptr_; -} - -::PortableInterceptor::IORInfo_ptr -PortableInterceptor::IORInfo_var::operator-> (void) const -{ - return this->ptr_; -} - -::PortableInterceptor::IORInfo_ptr -PortableInterceptor::IORInfo_var::in (void) const -{ - return this->ptr_; -} - -::PortableInterceptor::IORInfo_ptr & -PortableInterceptor::IORInfo_var::inout (void) -{ - return this->ptr_; -} - -::PortableInterceptor::IORInfo_ptr & -PortableInterceptor::IORInfo_var::out (void) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::PortableInterceptor::IORInfo::_nil (); - return this->ptr_; + return p->marshal (cdr); } -::PortableInterceptor::IORInfo_ptr -PortableInterceptor::IORInfo_var::_retn (void) -{ - // yield ownership of managed obj reference - ::PortableInterceptor::IORInfo_ptr val = this->ptr_; - this->ptr_ = ::PortableInterceptor::IORInfo::_nil (); - return val; -} - -::PortableInterceptor::IORInfo_ptr -PortableInterceptor::IORInfo_var::tao_duplicate (IORInfo_ptr p) -{ - return ::PortableInterceptor::IORInfo::_duplicate (p); -} - -void -PortableInterceptor::IORInfo_var::tao_release (IORInfo_ptr p) -{ - CORBA::release (p); -} - -::PortableInterceptor::IORInfo_ptr -PortableInterceptor::IORInfo_var::tao_nil (void) -{ - return ::PortableInterceptor::IORInfo::_nil (); -} - -::PortableInterceptor::IORInfo_ptr -PortableInterceptor::IORInfo_var::tao_narrow ( +PortableInterceptor::IORInfo_ptr +PortableInterceptor::tao_IORInfo_cast::tao_narrow ( CORBA::Object *p ACE_ENV_ARG_DECL ) { - return ::PortableInterceptor::IORInfo::_narrow (p ACE_ENV_ARG_PARAMETER); + return PortableInterceptor::IORInfo::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * -PortableInterceptor::IORInfo_var::tao_upcast (void *src) +PortableInterceptor::tao_IORInfo_cast::tao_upcast ( + void *src + ) { - IORInfo **tmp = - ACE_static_cast (IORInfo **, src); + PortableInterceptor::IORInfo **tmp = + ACE_static_cast (PortableInterceptor::IORInfo **, src); return *tmp; } -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030 - -// ************************************************************* -// PortableInterceptor::IORInfo_out -// ************************************************************* - -PortableInterceptor::IORInfo_out::IORInfo_out (IORInfo_ptr &p) - : ptr_ (p) -{ - this->ptr_ = ::PortableInterceptor::IORInfo::_nil (); -} - -PortableInterceptor::IORInfo_out::IORInfo_out (IORInfo_var &p) - : ptr_ (p.out ()) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::PortableInterceptor::IORInfo::_nil (); -} - -PortableInterceptor::IORInfo_out::IORInfo_out (const ::PortableInterceptor::IORInfo_out &p) - : ptr_ (ACE_const_cast (IORInfo_out &, p).ptr_) -{} - -::PortableInterceptor::IORInfo_out & -PortableInterceptor::IORInfo_out::operator= (const ::PortableInterceptor::IORInfo_out &p) -{ - this->ptr_ = ACE_const_cast (IORInfo_out&, p).ptr_; - return *this; -} - -PortableInterceptor::IORInfo_out & -PortableInterceptor::IORInfo_out::operator= (const ::PortableInterceptor::IORInfo_var &p) -{ - this->ptr_ = ::PortableInterceptor::IORInfo::_duplicate (p.ptr ()); - return *this; -} - -PortableInterceptor::IORInfo_out & -PortableInterceptor::IORInfo_out::operator= (IORInfo_ptr p) -{ - this->ptr_ = p; - return *this; -} - -PortableInterceptor::IORInfo_out::operator ::PortableInterceptor::IORInfo_ptr &() // cast -{ - return this->ptr_; -} - -::PortableInterceptor::IORInfo_ptr & -PortableInterceptor::IORInfo_out::ptr (void) -{ - return this->ptr_; -} - -::PortableInterceptor::IORInfo_ptr -PortableInterceptor::IORInfo_out::operator-> (void) -{ - return this->ptr_; -} +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + template class + TAO_Objref_Var_T< + PortableInterceptor::IORInfo, + PortableInterceptor::tao_IORInfo_life + >; + template class + TAO_Objref_Out_T< + PortableInterceptor::IORInfo, + PortableInterceptor::tao_IORInfo_life + >; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +# pragma instantiate \ + TAO_Objref_Var_T< \ + PortableInterceptor::IORInfo, \ + PortableInterceptor::tao_IORInfo_life \ + > +# pragma instantiate \ + TAO_Objref_Out_T< \ + PortableInterceptor::IORInfo, \ + PortableInterceptor::tao_IORInfo_life \ + > +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 PortableInterceptor::IORInfo::IORInfo (void) {} @@ -3564,6 +2309,12 @@ const char* PortableInterceptor::IORInfo::_interface_repository_id (void) const return "IDL:omg.org/PortableInterceptor/IORInfo:1.0"; } +CORBA::Boolean +PortableInterceptor::IORInfo::marshal (TAO_OutputCDR &) +{ + return 0; +} + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -3610,7 +2361,7 @@ TAO_NAMESPACE_END int PortableInterceptor::IORInterceptor::_tao_class_id = 0; PortableInterceptor::IORInterceptor_ptr -tao_PortableInterceptor_IORInterceptor_duplicate ( +PortableInterceptor::tao_IORInterceptor_life::tao_duplicate ( PortableInterceptor::IORInterceptor_ptr p ) { @@ -3618,7 +2369,7 @@ tao_PortableInterceptor_IORInterceptor_duplicate ( } void -tao_PortableInterceptor_IORInterceptor_release ( +PortableInterceptor::tao_IORInterceptor_life::tao_release ( PortableInterceptor::IORInterceptor_ptr p ) { @@ -3626,231 +2377,67 @@ tao_PortableInterceptor_IORInterceptor_release ( } PortableInterceptor::IORInterceptor_ptr -tao_PortableInterceptor_IORInterceptor_nil ( +PortableInterceptor::tao_IORInterceptor_life::tao_nil ( void ) { return PortableInterceptor::IORInterceptor::_nil (); } -PortableInterceptor::IORInterceptor_ptr -tao_PortableInterceptor_IORInterceptor_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return PortableInterceptor::IORInterceptor::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object * -tao_PortableInterceptor_IORInterceptor_upcast ( - void *src - ) -{ - PortableInterceptor::IORInterceptor **tmp = - ACE_static_cast (PortableInterceptor::IORInterceptor **, src); - return *tmp; -} - CORBA::Boolean -tao_PortableInterceptor_IORInterceptor_marshal ( +PortableInterceptor::tao_IORInterceptor_life::tao_marshal ( PortableInterceptor::IORInterceptor_ptr p, - TAO_OutputCDR &strm + TAO_OutputCDR &cdr ) { - return p->marshal (strm); + return p->marshal (cdr); } -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721 - -// ************************************************************* -// PortableInterceptor::IORInterceptor_var -// ************************************************************* - -PortableInterceptor::IORInterceptor_var::IORInterceptor_var (void) - : ptr_ (IORInterceptor::_nil ()) -{} - -::PortableInterceptor::IORInterceptor_ptr -PortableInterceptor::IORInterceptor_var::ptr (void) const -{ - return this->ptr_; -} - -PortableInterceptor::IORInterceptor_var::IORInterceptor_var (const ::PortableInterceptor::IORInterceptor_var &p) - : TAO_Base_var (), - ptr_ (IORInterceptor::_duplicate (p.ptr ())) -{} - -PortableInterceptor::IORInterceptor_var::~IORInterceptor_var (void) -{ - CORBA::release (this->ptr_); -} - -PortableInterceptor::IORInterceptor_var & -PortableInterceptor::IORInterceptor_var::operator= (IORInterceptor_ptr p) -{ - CORBA::release (this->ptr_); - this->ptr_ = p; - return *this; -} - -PortableInterceptor::IORInterceptor_var & -PortableInterceptor::IORInterceptor_var::operator= (const ::PortableInterceptor::IORInterceptor_var &p) -{ - if (this != &p) - { - CORBA::release (this->ptr_); - this->ptr_ = ::PortableInterceptor::IORInterceptor::_duplicate (p.ptr ()); - } - return *this; -} - -PortableInterceptor::IORInterceptor_var::operator const ::PortableInterceptor::IORInterceptor_ptr &() const // cast -{ - return this->ptr_; -} - -PortableInterceptor::IORInterceptor_var::operator ::PortableInterceptor::IORInterceptor_ptr &() // cast -{ - return this->ptr_; -} - -::PortableInterceptor::IORInterceptor_ptr -PortableInterceptor::IORInterceptor_var::operator-> (void) const -{ - return this->ptr_; -} - -::PortableInterceptor::IORInterceptor_ptr -PortableInterceptor::IORInterceptor_var::in (void) const -{ - return this->ptr_; -} - -::PortableInterceptor::IORInterceptor_ptr & -PortableInterceptor::IORInterceptor_var::inout (void) -{ - return this->ptr_; -} - -::PortableInterceptor::IORInterceptor_ptr & -PortableInterceptor::IORInterceptor_var::out (void) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::PortableInterceptor::IORInterceptor::_nil (); - return this->ptr_; -} - -::PortableInterceptor::IORInterceptor_ptr -PortableInterceptor::IORInterceptor_var::_retn (void) -{ - // yield ownership of managed obj reference - ::PortableInterceptor::IORInterceptor_ptr val = this->ptr_; - this->ptr_ = ::PortableInterceptor::IORInterceptor::_nil (); - return val; -} - -::PortableInterceptor::IORInterceptor_ptr -PortableInterceptor::IORInterceptor_var::tao_duplicate (IORInterceptor_ptr p) -{ - return ::PortableInterceptor::IORInterceptor::_duplicate (p); -} - -void -PortableInterceptor::IORInterceptor_var::tao_release (IORInterceptor_ptr p) -{ - CORBA::release (p); -} - -::PortableInterceptor::IORInterceptor_ptr -PortableInterceptor::IORInterceptor_var::tao_nil (void) -{ - return ::PortableInterceptor::IORInterceptor::_nil (); -} - -::PortableInterceptor::IORInterceptor_ptr -PortableInterceptor::IORInterceptor_var::tao_narrow ( +PortableInterceptor::IORInterceptor_ptr +PortableInterceptor::tao_IORInterceptor_cast::tao_narrow ( CORBA::Object *p ACE_ENV_ARG_DECL ) { - return ::PortableInterceptor::IORInterceptor::_narrow (p ACE_ENV_ARG_PARAMETER); + return PortableInterceptor::IORInterceptor::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * -PortableInterceptor::IORInterceptor_var::tao_upcast (void *src) +PortableInterceptor::tao_IORInterceptor_cast::tao_upcast ( + void *src + ) { - IORInterceptor **tmp = - ACE_static_cast (IORInterceptor **, src); + PortableInterceptor::IORInterceptor **tmp = + ACE_static_cast (PortableInterceptor::IORInterceptor **, src); return *tmp; } -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030 - -// ************************************************************* -// PortableInterceptor::IORInterceptor_out -// ************************************************************* - -PortableInterceptor::IORInterceptor_out::IORInterceptor_out (IORInterceptor_ptr &p) - : ptr_ (p) -{ - this->ptr_ = ::PortableInterceptor::IORInterceptor::_nil (); -} - -PortableInterceptor::IORInterceptor_out::IORInterceptor_out (IORInterceptor_var &p) - : ptr_ (p.out ()) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::PortableInterceptor::IORInterceptor::_nil (); -} - -PortableInterceptor::IORInterceptor_out::IORInterceptor_out (const ::PortableInterceptor::IORInterceptor_out &p) - : ptr_ (ACE_const_cast (IORInterceptor_out &, p).ptr_) -{} - -::PortableInterceptor::IORInterceptor_out & -PortableInterceptor::IORInterceptor_out::operator= (const ::PortableInterceptor::IORInterceptor_out &p) -{ - this->ptr_ = ACE_const_cast (IORInterceptor_out&, p).ptr_; - return *this; -} - -PortableInterceptor::IORInterceptor_out & -PortableInterceptor::IORInterceptor_out::operator= (const ::PortableInterceptor::IORInterceptor_var &p) -{ - this->ptr_ = ::PortableInterceptor::IORInterceptor::_duplicate (p.ptr ()); - return *this; -} - -PortableInterceptor::IORInterceptor_out & -PortableInterceptor::IORInterceptor_out::operator= (IORInterceptor_ptr p) -{ - this->ptr_ = p; - return *this; -} - -PortableInterceptor::IORInterceptor_out::operator ::PortableInterceptor::IORInterceptor_ptr &() // cast -{ - return this->ptr_; -} - -::PortableInterceptor::IORInterceptor_ptr & -PortableInterceptor::IORInterceptor_out::ptr (void) -{ - return this->ptr_; -} - -::PortableInterceptor::IORInterceptor_ptr -PortableInterceptor::IORInterceptor_out::operator-> (void) -{ - return this->ptr_; -} +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + template class + TAO_Objref_Var_T< + PortableInterceptor::IORInterceptor, + PortableInterceptor::tao_IORInterceptor_life + >; + template class + TAO_Objref_Out_T< + PortableInterceptor::IORInterceptor, + PortableInterceptor::tao_IORInterceptor_life + >; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +# pragma instantiate \ + TAO_Objref_Var_T< \ + PortableInterceptor::IORInterceptor, \ + PortableInterceptor::tao_IORInterceptor_life \ + > +# pragma instantiate \ + TAO_Objref_Out_T< \ + PortableInterceptor::IORInterceptor, \ + PortableInterceptor::tao_IORInterceptor_life \ + > +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 PortableInterceptor::IORInterceptor::IORInterceptor (void) {} @@ -3958,6 +2545,12 @@ const char* PortableInterceptor::IORInterceptor::_interface_repository_id (void) return "IDL:omg.org/PortableInterceptor/IORInterceptor:1.0"; } +CORBA::Boolean +PortableInterceptor::IORInterceptor::marshal (TAO_OutputCDR &) +{ + return 0; +} + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -4008,7 +2601,7 @@ TAO_NAMESPACE_END int PortableInterceptor::PolicyFactory::_tao_class_id = 0; PortableInterceptor::PolicyFactory_ptr -tao_PortableInterceptor_PolicyFactory_duplicate ( +PortableInterceptor::tao_PolicyFactory_life::tao_duplicate ( PortableInterceptor::PolicyFactory_ptr p ) { @@ -4016,7 +2609,7 @@ tao_PortableInterceptor_PolicyFactory_duplicate ( } void -tao_PortableInterceptor_PolicyFactory_release ( +PortableInterceptor::tao_PolicyFactory_life::tao_release ( PortableInterceptor::PolicyFactory_ptr p ) { @@ -4024,231 +2617,67 @@ tao_PortableInterceptor_PolicyFactory_release ( } PortableInterceptor::PolicyFactory_ptr -tao_PortableInterceptor_PolicyFactory_nil ( +PortableInterceptor::tao_PolicyFactory_life::tao_nil ( void ) { return PortableInterceptor::PolicyFactory::_nil (); } -PortableInterceptor::PolicyFactory_ptr -tao_PortableInterceptor_PolicyFactory_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return PortableInterceptor::PolicyFactory::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object * -tao_PortableInterceptor_PolicyFactory_upcast ( - void *src - ) -{ - PortableInterceptor::PolicyFactory **tmp = - ACE_static_cast (PortableInterceptor::PolicyFactory **, src); - return *tmp; -} - CORBA::Boolean -tao_PortableInterceptor_PolicyFactory_marshal ( +PortableInterceptor::tao_PolicyFactory_life::tao_marshal ( PortableInterceptor::PolicyFactory_ptr p, - TAO_OutputCDR &strm + TAO_OutputCDR &cdr ) { - return p->marshal (strm); -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721 - -// ************************************************************* -// PortableInterceptor::PolicyFactory_var -// ************************************************************* - -PortableInterceptor::PolicyFactory_var::PolicyFactory_var (void) - : ptr_ (PolicyFactory::_nil ()) -{} - -::PortableInterceptor::PolicyFactory_ptr -PortableInterceptor::PolicyFactory_var::ptr (void) const -{ - return this->ptr_; -} - -PortableInterceptor::PolicyFactory_var::PolicyFactory_var (const ::PortableInterceptor::PolicyFactory_var &p) - : TAO_Base_var (), - ptr_ (PolicyFactory::_duplicate (p.ptr ())) -{} - -PortableInterceptor::PolicyFactory_var::~PolicyFactory_var (void) -{ - CORBA::release (this->ptr_); -} - -PortableInterceptor::PolicyFactory_var & -PortableInterceptor::PolicyFactory_var::operator= (PolicyFactory_ptr p) -{ - CORBA::release (this->ptr_); - this->ptr_ = p; - return *this; -} - -PortableInterceptor::PolicyFactory_var & -PortableInterceptor::PolicyFactory_var::operator= (const ::PortableInterceptor::PolicyFactory_var &p) -{ - if (this != &p) - { - CORBA::release (this->ptr_); - this->ptr_ = ::PortableInterceptor::PolicyFactory::_duplicate (p.ptr ()); - } - return *this; + return p->marshal (cdr); } -PortableInterceptor::PolicyFactory_var::operator const ::PortableInterceptor::PolicyFactory_ptr &() const // cast -{ - return this->ptr_; -} - -PortableInterceptor::PolicyFactory_var::operator ::PortableInterceptor::PolicyFactory_ptr &() // cast -{ - return this->ptr_; -} - -::PortableInterceptor::PolicyFactory_ptr -PortableInterceptor::PolicyFactory_var::operator-> (void) const -{ - return this->ptr_; -} - -::PortableInterceptor::PolicyFactory_ptr -PortableInterceptor::PolicyFactory_var::in (void) const -{ - return this->ptr_; -} - -::PortableInterceptor::PolicyFactory_ptr & -PortableInterceptor::PolicyFactory_var::inout (void) -{ - return this->ptr_; -} - -::PortableInterceptor::PolicyFactory_ptr & -PortableInterceptor::PolicyFactory_var::out (void) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::PortableInterceptor::PolicyFactory::_nil (); - return this->ptr_; -} - -::PortableInterceptor::PolicyFactory_ptr -PortableInterceptor::PolicyFactory_var::_retn (void) -{ - // yield ownership of managed obj reference - ::PortableInterceptor::PolicyFactory_ptr val = this->ptr_; - this->ptr_ = ::PortableInterceptor::PolicyFactory::_nil (); - return val; -} - -::PortableInterceptor::PolicyFactory_ptr -PortableInterceptor::PolicyFactory_var::tao_duplicate (PolicyFactory_ptr p) -{ - return ::PortableInterceptor::PolicyFactory::_duplicate (p); -} - -void -PortableInterceptor::PolicyFactory_var::tao_release (PolicyFactory_ptr p) -{ - CORBA::release (p); -} - -::PortableInterceptor::PolicyFactory_ptr -PortableInterceptor::PolicyFactory_var::tao_nil (void) -{ - return ::PortableInterceptor::PolicyFactory::_nil (); -} - -::PortableInterceptor::PolicyFactory_ptr -PortableInterceptor::PolicyFactory_var::tao_narrow ( +PortableInterceptor::PolicyFactory_ptr +PortableInterceptor::tao_PolicyFactory_cast::tao_narrow ( CORBA::Object *p ACE_ENV_ARG_DECL ) { - return ::PortableInterceptor::PolicyFactory::_narrow (p ACE_ENV_ARG_PARAMETER); + return PortableInterceptor::PolicyFactory::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * -PortableInterceptor::PolicyFactory_var::tao_upcast (void *src) +PortableInterceptor::tao_PolicyFactory_cast::tao_upcast ( + void *src + ) { - PolicyFactory **tmp = - ACE_static_cast (PolicyFactory **, src); + PortableInterceptor::PolicyFactory **tmp = + ACE_static_cast (PortableInterceptor::PolicyFactory **, src); return *tmp; } -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030 - -// ************************************************************* -// PortableInterceptor::PolicyFactory_out -// ************************************************************* - -PortableInterceptor::PolicyFactory_out::PolicyFactory_out (PolicyFactory_ptr &p) - : ptr_ (p) -{ - this->ptr_ = ::PortableInterceptor::PolicyFactory::_nil (); -} - -PortableInterceptor::PolicyFactory_out::PolicyFactory_out (PolicyFactory_var &p) - : ptr_ (p.out ()) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::PortableInterceptor::PolicyFactory::_nil (); -} - -PortableInterceptor::PolicyFactory_out::PolicyFactory_out (const ::PortableInterceptor::PolicyFactory_out &p) - : ptr_ (ACE_const_cast (PolicyFactory_out &, p).ptr_) -{} - -::PortableInterceptor::PolicyFactory_out & -PortableInterceptor::PolicyFactory_out::operator= (const ::PortableInterceptor::PolicyFactory_out &p) -{ - this->ptr_ = ACE_const_cast (PolicyFactory_out&, p).ptr_; - return *this; -} - -PortableInterceptor::PolicyFactory_out & -PortableInterceptor::PolicyFactory_out::operator= (const ::PortableInterceptor::PolicyFactory_var &p) -{ - this->ptr_ = ::PortableInterceptor::PolicyFactory::_duplicate (p.ptr ()); - return *this; -} - -PortableInterceptor::PolicyFactory_out & -PortableInterceptor::PolicyFactory_out::operator= (PolicyFactory_ptr p) -{ - this->ptr_ = p; - return *this; -} - -PortableInterceptor::PolicyFactory_out::operator ::PortableInterceptor::PolicyFactory_ptr &() // cast -{ - return this->ptr_; -} - -::PortableInterceptor::PolicyFactory_ptr & -PortableInterceptor::PolicyFactory_out::ptr (void) -{ - return this->ptr_; -} - -::PortableInterceptor::PolicyFactory_ptr -PortableInterceptor::PolicyFactory_out::operator-> (void) -{ - return this->ptr_; -} +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + template class + TAO_Objref_Var_T< + PortableInterceptor::PolicyFactory, + PortableInterceptor::tao_PolicyFactory_life + >; + template class + TAO_Objref_Out_T< + PortableInterceptor::PolicyFactory, + PortableInterceptor::tao_PolicyFactory_life + >; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +# pragma instantiate \ + TAO_Objref_Var_T< \ + PortableInterceptor::PolicyFactory, \ + PortableInterceptor::tao_PolicyFactory_life \ + > +# pragma instantiate \ + TAO_Objref_Out_T< \ + PortableInterceptor::PolicyFactory, \ + PortableInterceptor::tao_PolicyFactory_life \ + > +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 PortableInterceptor::PolicyFactory::PolicyFactory (void) {} @@ -4354,6 +2783,12 @@ const char* PortableInterceptor::PolicyFactory::_interface_repository_id (void) return "IDL:omg.org/PortableInterceptor/PolicyFactory:1.0"; } +CORBA::Boolean +PortableInterceptor::PolicyFactory::marshal (TAO_OutputCDR &) +{ + return 0; +} + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -4404,7 +2839,7 @@ TAO_NAMESPACE_END int PortableInterceptor::ORBInitInfo::_tao_class_id = 0; PortableInterceptor::ORBInitInfo_ptr -tao_PortableInterceptor_ORBInitInfo_duplicate ( +PortableInterceptor::tao_ORBInitInfo_life::tao_duplicate ( PortableInterceptor::ORBInitInfo_ptr p ) { @@ -4412,7 +2847,7 @@ tao_PortableInterceptor_ORBInitInfo_duplicate ( } void -tao_PortableInterceptor_ORBInitInfo_release ( +PortableInterceptor::tao_ORBInitInfo_life::tao_release ( PortableInterceptor::ORBInitInfo_ptr p ) { @@ -4420,231 +2855,67 @@ tao_PortableInterceptor_ORBInitInfo_release ( } PortableInterceptor::ORBInitInfo_ptr -tao_PortableInterceptor_ORBInitInfo_nil ( +PortableInterceptor::tao_ORBInitInfo_life::tao_nil ( void ) { return PortableInterceptor::ORBInitInfo::_nil (); } -PortableInterceptor::ORBInitInfo_ptr -tao_PortableInterceptor_ORBInitInfo_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return PortableInterceptor::ORBInitInfo::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object * -tao_PortableInterceptor_ORBInitInfo_upcast ( - void *src - ) -{ - PortableInterceptor::ORBInitInfo **tmp = - ACE_static_cast (PortableInterceptor::ORBInitInfo **, src); - return *tmp; -} - CORBA::Boolean -tao_PortableInterceptor_ORBInitInfo_marshal ( +PortableInterceptor::tao_ORBInitInfo_life::tao_marshal ( PortableInterceptor::ORBInitInfo_ptr p, - TAO_OutputCDR &strm + TAO_OutputCDR &cdr ) { - return p->marshal (strm); -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721 - -// ************************************************************* -// PortableInterceptor::ORBInitInfo_var -// ************************************************************* - -PortableInterceptor::ORBInitInfo_var::ORBInitInfo_var (void) - : ptr_ (ORBInitInfo::_nil ()) -{} - -::PortableInterceptor::ORBInitInfo_ptr -PortableInterceptor::ORBInitInfo_var::ptr (void) const -{ - return this->ptr_; + return p->marshal (cdr); } -PortableInterceptor::ORBInitInfo_var::ORBInitInfo_var (const ::PortableInterceptor::ORBInitInfo_var &p) - : TAO_Base_var (), - ptr_ (ORBInitInfo::_duplicate (p.ptr ())) -{} - -PortableInterceptor::ORBInitInfo_var::~ORBInitInfo_var (void) -{ - CORBA::release (this->ptr_); -} - -PortableInterceptor::ORBInitInfo_var & -PortableInterceptor::ORBInitInfo_var::operator= (ORBInitInfo_ptr p) -{ - CORBA::release (this->ptr_); - this->ptr_ = p; - return *this; -} - -PortableInterceptor::ORBInitInfo_var & -PortableInterceptor::ORBInitInfo_var::operator= (const ::PortableInterceptor::ORBInitInfo_var &p) -{ - if (this != &p) - { - CORBA::release (this->ptr_); - this->ptr_ = ::PortableInterceptor::ORBInitInfo::_duplicate (p.ptr ()); - } - return *this; -} - -PortableInterceptor::ORBInitInfo_var::operator const ::PortableInterceptor::ORBInitInfo_ptr &() const // cast -{ - return this->ptr_; -} - -PortableInterceptor::ORBInitInfo_var::operator ::PortableInterceptor::ORBInitInfo_ptr &() // cast -{ - return this->ptr_; -} - -::PortableInterceptor::ORBInitInfo_ptr -PortableInterceptor::ORBInitInfo_var::operator-> (void) const -{ - return this->ptr_; -} - -::PortableInterceptor::ORBInitInfo_ptr -PortableInterceptor::ORBInitInfo_var::in (void) const -{ - return this->ptr_; -} - -::PortableInterceptor::ORBInitInfo_ptr & -PortableInterceptor::ORBInitInfo_var::inout (void) -{ - return this->ptr_; -} - -::PortableInterceptor::ORBInitInfo_ptr & -PortableInterceptor::ORBInitInfo_var::out (void) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::PortableInterceptor::ORBInitInfo::_nil (); - return this->ptr_; -} - -::PortableInterceptor::ORBInitInfo_ptr -PortableInterceptor::ORBInitInfo_var::_retn (void) -{ - // yield ownership of managed obj reference - ::PortableInterceptor::ORBInitInfo_ptr val = this->ptr_; - this->ptr_ = ::PortableInterceptor::ORBInitInfo::_nil (); - return val; -} - -::PortableInterceptor::ORBInitInfo_ptr -PortableInterceptor::ORBInitInfo_var::tao_duplicate (ORBInitInfo_ptr p) -{ - return ::PortableInterceptor::ORBInitInfo::_duplicate (p); -} - -void -PortableInterceptor::ORBInitInfo_var::tao_release (ORBInitInfo_ptr p) -{ - CORBA::release (p); -} - -::PortableInterceptor::ORBInitInfo_ptr -PortableInterceptor::ORBInitInfo_var::tao_nil (void) -{ - return ::PortableInterceptor::ORBInitInfo::_nil (); -} - -::PortableInterceptor::ORBInitInfo_ptr -PortableInterceptor::ORBInitInfo_var::tao_narrow ( +PortableInterceptor::ORBInitInfo_ptr +PortableInterceptor::tao_ORBInitInfo_cast::tao_narrow ( CORBA::Object *p ACE_ENV_ARG_DECL ) { - return ::PortableInterceptor::ORBInitInfo::_narrow (p ACE_ENV_ARG_PARAMETER); + return PortableInterceptor::ORBInitInfo::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * -PortableInterceptor::ORBInitInfo_var::tao_upcast (void *src) +PortableInterceptor::tao_ORBInitInfo_cast::tao_upcast ( + void *src + ) { - ORBInitInfo **tmp = - ACE_static_cast (ORBInitInfo **, src); + PortableInterceptor::ORBInitInfo **tmp = + ACE_static_cast (PortableInterceptor::ORBInitInfo **, src); return *tmp; } -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030 - -// ************************************************************* -// PortableInterceptor::ORBInitInfo_out -// ************************************************************* - -PortableInterceptor::ORBInitInfo_out::ORBInitInfo_out (ORBInitInfo_ptr &p) - : ptr_ (p) -{ - this->ptr_ = ::PortableInterceptor::ORBInitInfo::_nil (); -} - -PortableInterceptor::ORBInitInfo_out::ORBInitInfo_out (ORBInitInfo_var &p) - : ptr_ (p.out ()) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::PortableInterceptor::ORBInitInfo::_nil (); -} - -PortableInterceptor::ORBInitInfo_out::ORBInitInfo_out (const ::PortableInterceptor::ORBInitInfo_out &p) - : ptr_ (ACE_const_cast (ORBInitInfo_out &, p).ptr_) -{} - -::PortableInterceptor::ORBInitInfo_out & -PortableInterceptor::ORBInitInfo_out::operator= (const ::PortableInterceptor::ORBInitInfo_out &p) -{ - this->ptr_ = ACE_const_cast (ORBInitInfo_out&, p).ptr_; - return *this; -} - -PortableInterceptor::ORBInitInfo_out & -PortableInterceptor::ORBInitInfo_out::operator= (const ::PortableInterceptor::ORBInitInfo_var &p) -{ - this->ptr_ = ::PortableInterceptor::ORBInitInfo::_duplicate (p.ptr ()); - return *this; -} - -PortableInterceptor::ORBInitInfo_out & -PortableInterceptor::ORBInitInfo_out::operator= (ORBInitInfo_ptr p) -{ - this->ptr_ = p; - return *this; -} - -PortableInterceptor::ORBInitInfo_out::operator ::PortableInterceptor::ORBInitInfo_ptr &() // cast -{ - return this->ptr_; -} - -::PortableInterceptor::ORBInitInfo_ptr & -PortableInterceptor::ORBInitInfo_out::ptr (void) -{ - return this->ptr_; -} - -::PortableInterceptor::ORBInitInfo_ptr -PortableInterceptor::ORBInitInfo_out::operator-> (void) -{ - return this->ptr_; -} +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + template class + TAO_Objref_Var_T< + PortableInterceptor::ORBInitInfo, + PortableInterceptor::tao_ORBInitInfo_life + >; + template class + TAO_Objref_Out_T< + PortableInterceptor::ORBInitInfo, + PortableInterceptor::tao_ORBInitInfo_life + >; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +# pragma instantiate \ + TAO_Objref_Var_T< \ + PortableInterceptor::ORBInitInfo, \ + PortableInterceptor::tao_ORBInitInfo_life \ + > +# pragma instantiate \ + TAO_Objref_Out_T< \ + PortableInterceptor::ORBInitInfo, \ + PortableInterceptor::tao_ORBInitInfo_life \ + > +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 PortableInterceptor::ORBInitInfo::ORBInitInfo (void) {} @@ -4738,6 +3009,12 @@ const char* PortableInterceptor::ORBInitInfo::_interface_repository_id (void) co return "IDL:omg.org/PortableInterceptor/ORBInitInfo:1.0"; } +CORBA::Boolean +PortableInterceptor::ORBInitInfo::marshal (TAO_OutputCDR &) +{ + return 0; +} + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -5121,7 +3398,7 @@ TAO_NAMESPACE_END int PortableInterceptor::ORBInitializer::_tao_class_id = 0; PortableInterceptor::ORBInitializer_ptr -tao_PortableInterceptor_ORBInitializer_duplicate ( +PortableInterceptor::tao_ORBInitializer_life::tao_duplicate ( PortableInterceptor::ORBInitializer_ptr p ) { @@ -5129,7 +3406,7 @@ tao_PortableInterceptor_ORBInitializer_duplicate ( } void -tao_PortableInterceptor_ORBInitializer_release ( +PortableInterceptor::tao_ORBInitializer_life::tao_release ( PortableInterceptor::ORBInitializer_ptr p ) { @@ -5137,231 +3414,67 @@ tao_PortableInterceptor_ORBInitializer_release ( } PortableInterceptor::ORBInitializer_ptr -tao_PortableInterceptor_ORBInitializer_nil ( +PortableInterceptor::tao_ORBInitializer_life::tao_nil ( void ) { return PortableInterceptor::ORBInitializer::_nil (); } -PortableInterceptor::ORBInitializer_ptr -tao_PortableInterceptor_ORBInitializer_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return PortableInterceptor::ORBInitializer::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object * -tao_PortableInterceptor_ORBInitializer_upcast ( - void *src - ) -{ - PortableInterceptor::ORBInitializer **tmp = - ACE_static_cast (PortableInterceptor::ORBInitializer **, src); - return *tmp; -} - CORBA::Boolean -tao_PortableInterceptor_ORBInitializer_marshal ( +PortableInterceptor::tao_ORBInitializer_life::tao_marshal ( PortableInterceptor::ORBInitializer_ptr p, - TAO_OutputCDR &strm + TAO_OutputCDR &cdr ) { - return p->marshal (strm); -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721 - -// ************************************************************* -// PortableInterceptor::ORBInitializer_var -// ************************************************************* - -PortableInterceptor::ORBInitializer_var::ORBInitializer_var (void) - : ptr_ (ORBInitializer::_nil ()) -{} - -::PortableInterceptor::ORBInitializer_ptr -PortableInterceptor::ORBInitializer_var::ptr (void) const -{ - return this->ptr_; -} - -PortableInterceptor::ORBInitializer_var::ORBInitializer_var (const ::PortableInterceptor::ORBInitializer_var &p) - : TAO_Base_var (), - ptr_ (ORBInitializer::_duplicate (p.ptr ())) -{} - -PortableInterceptor::ORBInitializer_var::~ORBInitializer_var (void) -{ - CORBA::release (this->ptr_); -} - -PortableInterceptor::ORBInitializer_var & -PortableInterceptor::ORBInitializer_var::operator= (ORBInitializer_ptr p) -{ - CORBA::release (this->ptr_); - this->ptr_ = p; - return *this; -} - -PortableInterceptor::ORBInitializer_var & -PortableInterceptor::ORBInitializer_var::operator= (const ::PortableInterceptor::ORBInitializer_var &p) -{ - if (this != &p) - { - CORBA::release (this->ptr_); - this->ptr_ = ::PortableInterceptor::ORBInitializer::_duplicate (p.ptr ()); - } - return *this; -} - -PortableInterceptor::ORBInitializer_var::operator const ::PortableInterceptor::ORBInitializer_ptr &() const // cast -{ - return this->ptr_; -} - -PortableInterceptor::ORBInitializer_var::operator ::PortableInterceptor::ORBInitializer_ptr &() // cast -{ - return this->ptr_; -} - -::PortableInterceptor::ORBInitializer_ptr -PortableInterceptor::ORBInitializer_var::operator-> (void) const -{ - return this->ptr_; -} - -::PortableInterceptor::ORBInitializer_ptr -PortableInterceptor::ORBInitializer_var::in (void) const -{ - return this->ptr_; + return p->marshal (cdr); } -::PortableInterceptor::ORBInitializer_ptr & -PortableInterceptor::ORBInitializer_var::inout (void) -{ - return this->ptr_; -} - -::PortableInterceptor::ORBInitializer_ptr & -PortableInterceptor::ORBInitializer_var::out (void) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::PortableInterceptor::ORBInitializer::_nil (); - return this->ptr_; -} - -::PortableInterceptor::ORBInitializer_ptr -PortableInterceptor::ORBInitializer_var::_retn (void) -{ - // yield ownership of managed obj reference - ::PortableInterceptor::ORBInitializer_ptr val = this->ptr_; - this->ptr_ = ::PortableInterceptor::ORBInitializer::_nil (); - return val; -} - -::PortableInterceptor::ORBInitializer_ptr -PortableInterceptor::ORBInitializer_var::tao_duplicate (ORBInitializer_ptr p) -{ - return ::PortableInterceptor::ORBInitializer::_duplicate (p); -} - -void -PortableInterceptor::ORBInitializer_var::tao_release (ORBInitializer_ptr p) -{ - CORBA::release (p); -} - -::PortableInterceptor::ORBInitializer_ptr -PortableInterceptor::ORBInitializer_var::tao_nil (void) -{ - return ::PortableInterceptor::ORBInitializer::_nil (); -} - -::PortableInterceptor::ORBInitializer_ptr -PortableInterceptor::ORBInitializer_var::tao_narrow ( +PortableInterceptor::ORBInitializer_ptr +PortableInterceptor::tao_ORBInitializer_cast::tao_narrow ( CORBA::Object *p ACE_ENV_ARG_DECL ) { - return ::PortableInterceptor::ORBInitializer::_narrow (p ACE_ENV_ARG_PARAMETER); + return PortableInterceptor::ORBInitializer::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * -PortableInterceptor::ORBInitializer_var::tao_upcast (void *src) +PortableInterceptor::tao_ORBInitializer_cast::tao_upcast ( + void *src + ) { - ORBInitializer **tmp = - ACE_static_cast (ORBInitializer **, src); + PortableInterceptor::ORBInitializer **tmp = + ACE_static_cast (PortableInterceptor::ORBInitializer **, src); return *tmp; } -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030 - -// ************************************************************* -// PortableInterceptor::ORBInitializer_out -// ************************************************************* - -PortableInterceptor::ORBInitializer_out::ORBInitializer_out (ORBInitializer_ptr &p) - : ptr_ (p) -{ - this->ptr_ = ::PortableInterceptor::ORBInitializer::_nil (); -} - -PortableInterceptor::ORBInitializer_out::ORBInitializer_out (ORBInitializer_var &p) - : ptr_ (p.out ()) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::PortableInterceptor::ORBInitializer::_nil (); -} - -PortableInterceptor::ORBInitializer_out::ORBInitializer_out (const ::PortableInterceptor::ORBInitializer_out &p) - : ptr_ (ACE_const_cast (ORBInitializer_out &, p).ptr_) -{} - -::PortableInterceptor::ORBInitializer_out & -PortableInterceptor::ORBInitializer_out::operator= (const ::PortableInterceptor::ORBInitializer_out &p) -{ - this->ptr_ = ACE_const_cast (ORBInitializer_out&, p).ptr_; - return *this; -} - -PortableInterceptor::ORBInitializer_out & -PortableInterceptor::ORBInitializer_out::operator= (const ::PortableInterceptor::ORBInitializer_var &p) -{ - this->ptr_ = ::PortableInterceptor::ORBInitializer::_duplicate (p.ptr ()); - return *this; -} - -PortableInterceptor::ORBInitializer_out & -PortableInterceptor::ORBInitializer_out::operator= (ORBInitializer_ptr p) -{ - this->ptr_ = p; - return *this; -} - -PortableInterceptor::ORBInitializer_out::operator ::PortableInterceptor::ORBInitializer_ptr &() // cast -{ - return this->ptr_; -} - -::PortableInterceptor::ORBInitializer_ptr & -PortableInterceptor::ORBInitializer_out::ptr (void) -{ - return this->ptr_; -} - -::PortableInterceptor::ORBInitializer_ptr -PortableInterceptor::ORBInitializer_out::operator-> (void) -{ - return this->ptr_; -} +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + template class + TAO_Objref_Var_T< + PortableInterceptor::ORBInitializer, + PortableInterceptor::tao_ORBInitializer_life + >; + template class + TAO_Objref_Out_T< + PortableInterceptor::ORBInitializer, + PortableInterceptor::tao_ORBInitializer_life + >; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +# pragma instantiate \ + TAO_Objref_Var_T< \ + PortableInterceptor::ORBInitializer, \ + PortableInterceptor::tao_ORBInitializer_life \ + > +# pragma instantiate \ + TAO_Objref_Out_T< \ + PortableInterceptor::ORBInitializer, \ + PortableInterceptor::tao_ORBInitializer_life \ + > +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 PortableInterceptor::ORBInitializer::ORBInitializer (void) {} @@ -5455,6 +3568,12 @@ const char* PortableInterceptor::ORBInitializer::_interface_repository_id (void) return "IDL:omg.org/PortableInterceptor/ORBInitializer:1.0"; } +CORBA::Boolean +PortableInterceptor::ORBInitializer::marshal (TAO_OutputCDR &) +{ + return 0; +} + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -5639,7 +3758,7 @@ CORBA::Boolean operator>>= ( defined (ACE_HAS_GNU_REPO) template class TAO::Any_Dual_Impl_T<PortableInterceptor::ForwardRequest>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<PortableInterceptor::ForwardRequest> +# pragma instantiate TAO::Any_Dual_Impl_T<PortableInterceptor::ForwardRequest \> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from @@ -5704,7 +3823,7 @@ CORBA::Boolean operator>>= ( defined (ACE_HAS_GNU_REPO) template class TAO::Any_Dual_Impl_T<PortableInterceptor::InvalidSlot>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<PortableInterceptor::InvalidSlot> +# pragma instantiate TAO::Any_Dual_Impl_T<PortableInterceptor::InvalidSlot \> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h index 35fa933d859..fd0ba545c2c 100644 --- a/TAO/tao/PortableInterceptorC.h +++ b/TAO/tao/PortableInterceptorC.h @@ -26,14 +26,12 @@ #define _TAO_IDL_ORIG_PORTABLEINTERCEPTORC_H_ #include "ace/pre.h" -#include "tao/corbafwd.h" +#include "CurrentC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "TAO_Export.h" -#include "CurrentC.h" #include "DynamicC.h" #include "ObjectReferenceTemplateC.h" #include "Messaging_SyncScopeC.h" @@ -70,90 +68,41 @@ TAO_NAMESPACE PortableInterceptor { // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567 -#if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR___PTR_CH_) -#define _PORTABLEINTERCEPTOR_INTERCEPTOR___PTR_CH_ +#if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR__ODDS_N_ENDS_CH_) +#define _PORTABLEINTERCEPTOR_INTERCEPTOR__ODDS_N_ENDS_CH_ class Interceptor; typedef Interceptor *Interceptor_ptr; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR___VAR_CH_) -#define _PORTABLEINTERCEPTOR_INTERCEPTOR___VAR_CH_ + struct tao_Interceptor_life; + typedef TAO_Objref_Var_T<Interceptor, tao_Interceptor_life> Interceptor_var; + typedef TAO_Objref_Out_T<Interceptor, tao_Interceptor_life> Interceptor_out; - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571 - - class TAO_Export Interceptor_var : public TAO_Base_var + struct tao_Interceptor_life { - public: - Interceptor_var (void); // default constructor - Interceptor_var (Interceptor_ptr p) : ptr_ (p) {} - Interceptor_var (const Interceptor_var &); // copy constructor - ~Interceptor_var (void); // destructor - - Interceptor_var &operator= (Interceptor_ptr); - Interceptor_var &operator= (const Interceptor_var &); - Interceptor_ptr operator-> (void) const; - - operator const Interceptor_ptr &() const; - operator Interceptor_ptr &(); - // in, inout, out, _retn - Interceptor_ptr in (void) const; - Interceptor_ptr &inout (void); - Interceptor_ptr &out (void); - Interceptor_ptr _retn (void); - Interceptor_ptr ptr (void) const; - - // Hooks used by template sequence and object manager classes - // for non-defined forward declared interfaces. static Interceptor_ptr tao_duplicate (Interceptor_ptr); static void tao_release (Interceptor_ptr); static Interceptor_ptr tao_nil (void); - static Interceptor_ptr tao_narrow ( - CORBA::Object * - ACE_ENV_ARG_DECL_NOT_USED + static CORBA::Boolean tao_marshal ( + Interceptor_ptr, + TAO_OutputCDR & ); - static CORBA::Object * tao_upcast (void *); - - private: - Interceptor_ptr ptr_; - // Unimplemented - prevents widening assignment. - Interceptor_var (const TAO_Base_var &rhs); - Interceptor_var &operator= (const TAO_Base_var &rhs); }; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR___OUT_CH_) -#define _PORTABLEINTERCEPTOR_INTERCEPTOR___OUT_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946 - class TAO_Export Interceptor_out + struct tao_Interceptor_cast { - public: - Interceptor_out (Interceptor_ptr &); - Interceptor_out (Interceptor_var &); - Interceptor_out (const Interceptor_out &); - Interceptor_out &operator= (const Interceptor_out &); - Interceptor_out &operator= (const Interceptor_var &); - Interceptor_out &operator= (Interceptor_ptr); - operator Interceptor_ptr &(); - Interceptor_ptr &ptr (void); - Interceptor_ptr operator-> (void); - - private: - Interceptor_ptr &ptr_; + static Interceptor_ptr tao_narrow ( + CORBA::Object_ptr + ACE_ENV_ARG_DECL + ); + static CORBA::Object_ptr tao_upcast (void *); }; #endif /* end #if !defined */ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR_CH_) #define _PORTABLEINTERCEPTOR_INTERCEPTOR_CH_ @@ -207,7 +156,7 @@ TAO_NAMESPACE PortableInterceptor )) = 0; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -217,7 +166,7 @@ TAO_NAMESPACE PortableInterceptor protected: Interceptor (void); virtual ~Interceptor (void); - + private: Interceptor (const Interceptor &); void operator= (const Interceptor &); @@ -289,7 +238,7 @@ TAO_NAMESPACE PortableInterceptor #endif /* end #if !defined */ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333 typedef CORBA::Short ReplyStatus; typedef CORBA::Short_out ReplyStatus_out; @@ -302,40 +251,40 @@ TAO_NAMESPACE PortableInterceptor // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::Short SUCCESSFUL = 0; + const PortableInterceptor::ReplyStatus SUCCESSFUL = 0; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::Short SYSTEM_EXCEPTION = 1; + const PortableInterceptor::ReplyStatus SYSTEM_EXCEPTION = 1; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::Short USER_EXCEPTION = 2; + const PortableInterceptor::ReplyStatus USER_EXCEPTION = 2; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::Short LOCATION_FORWARD = 3; + const PortableInterceptor::ReplyStatus LOCATION_FORWARD = 3; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::Short LOCATION_FORWARD_PERMANENT = 4; + const PortableInterceptor::ReplyStatus LOCATION_FORWARD_PERMANENT = 4; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::Short TRANSPORT_RETRY = 5; + const PortableInterceptor::ReplyStatus TRANSPORT_RETRY = 5; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::Short UNKNOWN = 6; + const PortableInterceptor::ReplyStatus UNKNOWN = 6; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333 typedef CORBA::ULong SlotId; typedef CORBA::ULong_out SlotId_out; @@ -394,90 +343,41 @@ TAO_NAMESPACE PortableInterceptor #endif /* end #if !defined */ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567 -#if !defined (_PORTABLEINTERCEPTOR_CURRENT___PTR_CH_) -#define _PORTABLEINTERCEPTOR_CURRENT___PTR_CH_ +#if !defined (_PORTABLEINTERCEPTOR_CURRENT__ODDS_N_ENDS_CH_) +#define _PORTABLEINTERCEPTOR_CURRENT__ODDS_N_ENDS_CH_ class Current; typedef Current *Current_ptr; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_CURRENT___VAR_CH_) -#define _PORTABLEINTERCEPTOR_CURRENT___VAR_CH_ + struct tao_Current_life; + typedef TAO_Objref_Var_T<Current, tao_Current_life> Current_var; + typedef TAO_Objref_Out_T<Current, tao_Current_life> Current_out; - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571 - - class TAO_Export Current_var : public TAO_Base_var + struct tao_Current_life { - public: - Current_var (void); // default constructor - Current_var (Current_ptr p) : ptr_ (p) {} - Current_var (const Current_var &); // copy constructor - ~Current_var (void); // destructor - - Current_var &operator= (Current_ptr); - Current_var &operator= (const Current_var &); - Current_ptr operator-> (void) const; - - operator const Current_ptr &() const; - operator Current_ptr &(); - // in, inout, out, _retn - Current_ptr in (void) const; - Current_ptr &inout (void); - Current_ptr &out (void); - Current_ptr _retn (void); - Current_ptr ptr (void) const; - - // Hooks used by template sequence and object manager classes - // for non-defined forward declared interfaces. static Current_ptr tao_duplicate (Current_ptr); static void tao_release (Current_ptr); static Current_ptr tao_nil (void); - static Current_ptr tao_narrow ( - CORBA::Object * - ACE_ENV_ARG_DECL_NOT_USED + static CORBA::Boolean tao_marshal ( + Current_ptr, + TAO_OutputCDR & ); - static CORBA::Object * tao_upcast (void *); - - private: - Current_ptr ptr_; - // Unimplemented - prevents widening assignment. - Current_var (const TAO_Base_var &rhs); - Current_var &operator= (const TAO_Base_var &rhs); }; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_CURRENT___OUT_CH_) -#define _PORTABLEINTERCEPTOR_CURRENT___OUT_CH_ - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946 - - class TAO_Export Current_out + struct tao_Current_cast { - public: - Current_out (Current_ptr &); - Current_out (Current_var &); - Current_out (const Current_out &); - Current_out &operator= (const Current_out &); - Current_out &operator= (const Current_var &); - Current_out &operator= (Current_ptr); - operator Current_ptr &(); - Current_ptr &ptr (void); - Current_ptr operator-> (void); - - private: - Current_ptr &ptr_; + static Current_ptr tao_narrow ( + CORBA::Object_ptr + ACE_ENV_ARG_DECL + ); + static CORBA::Object_ptr tao_upcast (void *); }; #endif /* end #if !defined */ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLEINTERCEPTOR_CURRENT_CH_) #define _PORTABLEINTERCEPTOR_CURRENT_CH_ @@ -536,7 +436,7 @@ TAO_NAMESPACE PortableInterceptor )) = 0; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -546,7 +446,7 @@ TAO_NAMESPACE PortableInterceptor protected: Current (void); virtual ~Current (void); - + private: Current (const Current &); void operator= (const Current &); @@ -560,90 +460,41 @@ TAO_NAMESPACE PortableInterceptor TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Current; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567 -#if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO___PTR_CH_) -#define _PORTABLEINTERCEPTOR_REQUESTINFO___PTR_CH_ +#if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO__ODDS_N_ENDS_CH_) +#define _PORTABLEINTERCEPTOR_REQUESTINFO__ODDS_N_ENDS_CH_ class RequestInfo; typedef RequestInfo *RequestInfo_ptr; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO___VAR_CH_) -#define _PORTABLEINTERCEPTOR_REQUESTINFO___VAR_CH_ + struct tao_RequestInfo_life; + typedef TAO_Objref_Var_T<RequestInfo, tao_RequestInfo_life> RequestInfo_var; + typedef TAO_Objref_Out_T<RequestInfo, tao_RequestInfo_life> RequestInfo_out; - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571 - - class TAO_Export RequestInfo_var : public TAO_Base_var + struct tao_RequestInfo_life { - public: - RequestInfo_var (void); // default constructor - RequestInfo_var (RequestInfo_ptr p) : ptr_ (p) {} - RequestInfo_var (const RequestInfo_var &); // copy constructor - ~RequestInfo_var (void); // destructor - - RequestInfo_var &operator= (RequestInfo_ptr); - RequestInfo_var &operator= (const RequestInfo_var &); - RequestInfo_ptr operator-> (void) const; - - operator const RequestInfo_ptr &() const; - operator RequestInfo_ptr &(); - // in, inout, out, _retn - RequestInfo_ptr in (void) const; - RequestInfo_ptr &inout (void); - RequestInfo_ptr &out (void); - RequestInfo_ptr _retn (void); - RequestInfo_ptr ptr (void) const; - - // Hooks used by template sequence and object manager classes - // for non-defined forward declared interfaces. static RequestInfo_ptr tao_duplicate (RequestInfo_ptr); static void tao_release (RequestInfo_ptr); static RequestInfo_ptr tao_nil (void); - static RequestInfo_ptr tao_narrow ( - CORBA::Object * - ACE_ENV_ARG_DECL_NOT_USED + static CORBA::Boolean tao_marshal ( + RequestInfo_ptr, + TAO_OutputCDR & ); - static CORBA::Object * tao_upcast (void *); - - private: - RequestInfo_ptr ptr_; - // Unimplemented - prevents widening assignment. - RequestInfo_var (const TAO_Base_var &rhs); - RequestInfo_var &operator= (const TAO_Base_var &rhs); }; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO___OUT_CH_) -#define _PORTABLEINTERCEPTOR_REQUESTINFO___OUT_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946 - class TAO_Export RequestInfo_out + struct tao_RequestInfo_cast { - public: - RequestInfo_out (RequestInfo_ptr &); - RequestInfo_out (RequestInfo_var &); - RequestInfo_out (const RequestInfo_out &); - RequestInfo_out &operator= (const RequestInfo_out &); - RequestInfo_out &operator= (const RequestInfo_var &); - RequestInfo_out &operator= (RequestInfo_ptr); - operator RequestInfo_ptr &(); - RequestInfo_ptr &ptr (void); - RequestInfo_ptr operator-> (void); - - private: - RequestInfo_ptr &ptr_; + static RequestInfo_ptr tao_narrow ( + CORBA::Object_ptr + ACE_ENV_ARG_DECL + ); + static CORBA::Object_ptr tao_upcast (void *); }; #endif /* end #if !defined */ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO_CH_) #define _PORTABLEINTERCEPTOR_REQUESTINFO_CH_ @@ -821,7 +672,7 @@ TAO_NAMESPACE PortableInterceptor )) = 0; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -831,7 +682,7 @@ TAO_NAMESPACE PortableInterceptor protected: RequestInfo (void); virtual ~RequestInfo (void); - + private: RequestInfo (const RequestInfo &); void operator= (const RequestInfo &); @@ -845,90 +696,41 @@ TAO_NAMESPACE PortableInterceptor TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RequestInfo; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567 -#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___PTR_CH_) -#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___PTR_CH_ +#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__ODDS_N_ENDS_CH_) +#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__ODDS_N_ENDS_CH_ class ClientRequestInfo; typedef ClientRequestInfo *ClientRequestInfo_ptr; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___VAR_CH_) -#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___VAR_CH_ + struct tao_ClientRequestInfo_life; + typedef TAO_Objref_Var_T<ClientRequestInfo, tao_ClientRequestInfo_life> ClientRequestInfo_var; + typedef TAO_Objref_Out_T<ClientRequestInfo, tao_ClientRequestInfo_life> ClientRequestInfo_out; - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571 - - class TAO_Export ClientRequestInfo_var : public TAO_Base_var + struct tao_ClientRequestInfo_life { - public: - ClientRequestInfo_var (void); // default constructor - ClientRequestInfo_var (ClientRequestInfo_ptr p) : ptr_ (p) {} - ClientRequestInfo_var (const ClientRequestInfo_var &); // copy constructor - ~ClientRequestInfo_var (void); // destructor - - ClientRequestInfo_var &operator= (ClientRequestInfo_ptr); - ClientRequestInfo_var &operator= (const ClientRequestInfo_var &); - ClientRequestInfo_ptr operator-> (void) const; - - operator const ClientRequestInfo_ptr &() const; - operator ClientRequestInfo_ptr &(); - // in, inout, out, _retn - ClientRequestInfo_ptr in (void) const; - ClientRequestInfo_ptr &inout (void); - ClientRequestInfo_ptr &out (void); - ClientRequestInfo_ptr _retn (void); - ClientRequestInfo_ptr ptr (void) const; - - // Hooks used by template sequence and object manager classes - // for non-defined forward declared interfaces. static ClientRequestInfo_ptr tao_duplicate (ClientRequestInfo_ptr); static void tao_release (ClientRequestInfo_ptr); static ClientRequestInfo_ptr tao_nil (void); - static ClientRequestInfo_ptr tao_narrow ( - CORBA::Object * - ACE_ENV_ARG_DECL_NOT_USED + static CORBA::Boolean tao_marshal ( + ClientRequestInfo_ptr, + TAO_OutputCDR & ); - static CORBA::Object * tao_upcast (void *); - - private: - ClientRequestInfo_ptr ptr_; - // Unimplemented - prevents widening assignment. - ClientRequestInfo_var (const TAO_Base_var &rhs); - ClientRequestInfo_var &operator= (const TAO_Base_var &rhs); }; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___OUT_CH_) -#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___OUT_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946 - class TAO_Export ClientRequestInfo_out + struct tao_ClientRequestInfo_cast { - public: - ClientRequestInfo_out (ClientRequestInfo_ptr &); - ClientRequestInfo_out (ClientRequestInfo_var &); - ClientRequestInfo_out (const ClientRequestInfo_out &); - ClientRequestInfo_out &operator= (const ClientRequestInfo_out &); - ClientRequestInfo_out &operator= (const ClientRequestInfo_var &); - ClientRequestInfo_out &operator= (ClientRequestInfo_ptr); - operator ClientRequestInfo_ptr &(); - ClientRequestInfo_ptr &ptr (void); - ClientRequestInfo_ptr operator-> (void); - - private: - ClientRequestInfo_ptr &ptr_; + static ClientRequestInfo_ptr tao_narrow ( + CORBA::Object_ptr + ACE_ENV_ARG_DECL + ); + static CORBA::Object_ptr tao_upcast (void *); }; #endif /* end #if !defined */ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO_CH_) #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO_CH_ @@ -1057,7 +859,7 @@ TAO_NAMESPACE PortableInterceptor )) = 0; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -1067,7 +869,7 @@ TAO_NAMESPACE PortableInterceptor protected: ClientRequestInfo (void); virtual ~ClientRequestInfo (void); - + private: ClientRequestInfo (const ClientRequestInfo &); void operator= (const ClientRequestInfo &); @@ -1081,90 +883,41 @@ TAO_NAMESPACE PortableInterceptor TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ClientRequestInfo; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567 -#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO___PTR_CH_) -#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO___PTR_CH_ +#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__ODDS_N_ENDS_CH_) +#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__ODDS_N_ENDS_CH_ class ServerRequestInfo; typedef ServerRequestInfo *ServerRequestInfo_ptr; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO___VAR_CH_) -#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO___VAR_CH_ + struct tao_ServerRequestInfo_life; + typedef TAO_Objref_Var_T<ServerRequestInfo, tao_ServerRequestInfo_life> ServerRequestInfo_var; + typedef TAO_Objref_Out_T<ServerRequestInfo, tao_ServerRequestInfo_life> ServerRequestInfo_out; - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571 - - class TAO_Export ServerRequestInfo_var : public TAO_Base_var + struct tao_ServerRequestInfo_life { - public: - ServerRequestInfo_var (void); // default constructor - ServerRequestInfo_var (ServerRequestInfo_ptr p) : ptr_ (p) {} - ServerRequestInfo_var (const ServerRequestInfo_var &); // copy constructor - ~ServerRequestInfo_var (void); // destructor - - ServerRequestInfo_var &operator= (ServerRequestInfo_ptr); - ServerRequestInfo_var &operator= (const ServerRequestInfo_var &); - ServerRequestInfo_ptr operator-> (void) const; - - operator const ServerRequestInfo_ptr &() const; - operator ServerRequestInfo_ptr &(); - // in, inout, out, _retn - ServerRequestInfo_ptr in (void) const; - ServerRequestInfo_ptr &inout (void); - ServerRequestInfo_ptr &out (void); - ServerRequestInfo_ptr _retn (void); - ServerRequestInfo_ptr ptr (void) const; - - // Hooks used by template sequence and object manager classes - // for non-defined forward declared interfaces. static ServerRequestInfo_ptr tao_duplicate (ServerRequestInfo_ptr); static void tao_release (ServerRequestInfo_ptr); static ServerRequestInfo_ptr tao_nil (void); - static ServerRequestInfo_ptr tao_narrow ( - CORBA::Object * - ACE_ENV_ARG_DECL_NOT_USED + static CORBA::Boolean tao_marshal ( + ServerRequestInfo_ptr, + TAO_OutputCDR & ); - static CORBA::Object * tao_upcast (void *); - - private: - ServerRequestInfo_ptr ptr_; - // Unimplemented - prevents widening assignment. - ServerRequestInfo_var (const TAO_Base_var &rhs); - ServerRequestInfo_var &operator= (const TAO_Base_var &rhs); }; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO___OUT_CH_) -#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO___OUT_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946 - class TAO_Export ServerRequestInfo_out + struct tao_ServerRequestInfo_cast { - public: - ServerRequestInfo_out (ServerRequestInfo_ptr &); - ServerRequestInfo_out (ServerRequestInfo_var &); - ServerRequestInfo_out (const ServerRequestInfo_out &); - ServerRequestInfo_out &operator= (const ServerRequestInfo_out &); - ServerRequestInfo_out &operator= (const ServerRequestInfo_var &); - ServerRequestInfo_out &operator= (ServerRequestInfo_ptr); - operator ServerRequestInfo_ptr &(); - ServerRequestInfo_ptr &ptr (void); - ServerRequestInfo_ptr operator-> (void); - - private: - ServerRequestInfo_ptr &ptr_; + static ServerRequestInfo_ptr tao_narrow ( + CORBA::Object_ptr + ACE_ENV_ARG_DECL + ); + static CORBA::Object_ptr tao_upcast (void *); }; #endif /* end #if !defined */ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO_CH_) #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO_CH_ @@ -1315,7 +1068,7 @@ TAO_NAMESPACE PortableInterceptor )) = 0; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -1325,7 +1078,7 @@ TAO_NAMESPACE PortableInterceptor protected: ServerRequestInfo (void); virtual ~ServerRequestInfo (void); - + private: ServerRequestInfo (const ServerRequestInfo &); void operator= (const ServerRequestInfo &); @@ -1339,90 +1092,41 @@ TAO_NAMESPACE PortableInterceptor TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerRequestInfo; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567 -#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___PTR_CH_) -#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___PTR_CH_ +#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__ODDS_N_ENDS_CH_) +#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__ODDS_N_ENDS_CH_ class ClientRequestInterceptor; typedef ClientRequestInterceptor *ClientRequestInterceptor_ptr; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___VAR_CH_) -#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___VAR_CH_ + struct tao_ClientRequestInterceptor_life; + typedef TAO_Objref_Var_T<ClientRequestInterceptor, tao_ClientRequestInterceptor_life> ClientRequestInterceptor_var; + typedef TAO_Objref_Out_T<ClientRequestInterceptor, tao_ClientRequestInterceptor_life> ClientRequestInterceptor_out; - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571 - - class TAO_Export ClientRequestInterceptor_var : public TAO_Base_var + struct tao_ClientRequestInterceptor_life { - public: - ClientRequestInterceptor_var (void); // default constructor - ClientRequestInterceptor_var (ClientRequestInterceptor_ptr p) : ptr_ (p) {} - ClientRequestInterceptor_var (const ClientRequestInterceptor_var &); // copy constructor - ~ClientRequestInterceptor_var (void); // destructor - - ClientRequestInterceptor_var &operator= (ClientRequestInterceptor_ptr); - ClientRequestInterceptor_var &operator= (const ClientRequestInterceptor_var &); - ClientRequestInterceptor_ptr operator-> (void) const; - - operator const ClientRequestInterceptor_ptr &() const; - operator ClientRequestInterceptor_ptr &(); - // in, inout, out, _retn - ClientRequestInterceptor_ptr in (void) const; - ClientRequestInterceptor_ptr &inout (void); - ClientRequestInterceptor_ptr &out (void); - ClientRequestInterceptor_ptr _retn (void); - ClientRequestInterceptor_ptr ptr (void) const; - - // Hooks used by template sequence and object manager classes - // for non-defined forward declared interfaces. static ClientRequestInterceptor_ptr tao_duplicate (ClientRequestInterceptor_ptr); static void tao_release (ClientRequestInterceptor_ptr); static ClientRequestInterceptor_ptr tao_nil (void); - static ClientRequestInterceptor_ptr tao_narrow ( - CORBA::Object * - ACE_ENV_ARG_DECL_NOT_USED + static CORBA::Boolean tao_marshal ( + ClientRequestInterceptor_ptr, + TAO_OutputCDR & ); - static CORBA::Object * tao_upcast (void *); - - private: - ClientRequestInterceptor_ptr ptr_; - // Unimplemented - prevents widening assignment. - ClientRequestInterceptor_var (const TAO_Base_var &rhs); - ClientRequestInterceptor_var &operator= (const TAO_Base_var &rhs); }; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___OUT_CH_) -#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___OUT_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946 - class TAO_Export ClientRequestInterceptor_out + struct tao_ClientRequestInterceptor_cast { - public: - ClientRequestInterceptor_out (ClientRequestInterceptor_ptr &); - ClientRequestInterceptor_out (ClientRequestInterceptor_var &); - ClientRequestInterceptor_out (const ClientRequestInterceptor_out &); - ClientRequestInterceptor_out &operator= (const ClientRequestInterceptor_out &); - ClientRequestInterceptor_out &operator= (const ClientRequestInterceptor_var &); - ClientRequestInterceptor_out &operator= (ClientRequestInterceptor_ptr); - operator ClientRequestInterceptor_ptr &(); - ClientRequestInterceptor_ptr &ptr (void); - ClientRequestInterceptor_ptr operator-> (void); - - private: - ClientRequestInterceptor_ptr &ptr_; + static ClientRequestInterceptor_ptr tao_narrow ( + CORBA::Object_ptr + ACE_ENV_ARG_DECL + ); + static CORBA::Object_ptr tao_upcast (void *); }; #endif /* end #if !defined */ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR_CH_) #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR_CH_ @@ -1514,7 +1218,7 @@ TAO_NAMESPACE PortableInterceptor )) = 0; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -1524,7 +1228,7 @@ TAO_NAMESPACE PortableInterceptor protected: ClientRequestInterceptor (void); virtual ~ClientRequestInterceptor (void); - + private: ClientRequestInterceptor (const ClientRequestInterceptor &); void operator= (const ClientRequestInterceptor &); @@ -1538,90 +1242,41 @@ TAO_NAMESPACE PortableInterceptor TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ClientRequestInterceptor; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567 -#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___PTR_CH_) -#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___PTR_CH_ +#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__ODDS_N_ENDS_CH_) +#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__ODDS_N_ENDS_CH_ class ServerRequestInterceptor; typedef ServerRequestInterceptor *ServerRequestInterceptor_ptr; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___VAR_CH_) -#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___VAR_CH_ + struct tao_ServerRequestInterceptor_life; + typedef TAO_Objref_Var_T<ServerRequestInterceptor, tao_ServerRequestInterceptor_life> ServerRequestInterceptor_var; + typedef TAO_Objref_Out_T<ServerRequestInterceptor, tao_ServerRequestInterceptor_life> ServerRequestInterceptor_out; - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571 - - class TAO_Export ServerRequestInterceptor_var : public TAO_Base_var + struct tao_ServerRequestInterceptor_life { - public: - ServerRequestInterceptor_var (void); // default constructor - ServerRequestInterceptor_var (ServerRequestInterceptor_ptr p) : ptr_ (p) {} - ServerRequestInterceptor_var (const ServerRequestInterceptor_var &); // copy constructor - ~ServerRequestInterceptor_var (void); // destructor - - ServerRequestInterceptor_var &operator= (ServerRequestInterceptor_ptr); - ServerRequestInterceptor_var &operator= (const ServerRequestInterceptor_var &); - ServerRequestInterceptor_ptr operator-> (void) const; - - operator const ServerRequestInterceptor_ptr &() const; - operator ServerRequestInterceptor_ptr &(); - // in, inout, out, _retn - ServerRequestInterceptor_ptr in (void) const; - ServerRequestInterceptor_ptr &inout (void); - ServerRequestInterceptor_ptr &out (void); - ServerRequestInterceptor_ptr _retn (void); - ServerRequestInterceptor_ptr ptr (void) const; - - // Hooks used by template sequence and object manager classes - // for non-defined forward declared interfaces. static ServerRequestInterceptor_ptr tao_duplicate (ServerRequestInterceptor_ptr); static void tao_release (ServerRequestInterceptor_ptr); static ServerRequestInterceptor_ptr tao_nil (void); - static ServerRequestInterceptor_ptr tao_narrow ( - CORBA::Object * - ACE_ENV_ARG_DECL_NOT_USED + static CORBA::Boolean tao_marshal ( + ServerRequestInterceptor_ptr, + TAO_OutputCDR & ); - static CORBA::Object * tao_upcast (void *); - - private: - ServerRequestInterceptor_ptr ptr_; - // Unimplemented - prevents widening assignment. - ServerRequestInterceptor_var (const TAO_Base_var &rhs); - ServerRequestInterceptor_var &operator= (const TAO_Base_var &rhs); }; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___OUT_CH_) -#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___OUT_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946 - class TAO_Export ServerRequestInterceptor_out + struct tao_ServerRequestInterceptor_cast { - public: - ServerRequestInterceptor_out (ServerRequestInterceptor_ptr &); - ServerRequestInterceptor_out (ServerRequestInterceptor_var &); - ServerRequestInterceptor_out (const ServerRequestInterceptor_out &); - ServerRequestInterceptor_out &operator= (const ServerRequestInterceptor_out &); - ServerRequestInterceptor_out &operator= (const ServerRequestInterceptor_var &); - ServerRequestInterceptor_out &operator= (ServerRequestInterceptor_ptr); - operator ServerRequestInterceptor_ptr &(); - ServerRequestInterceptor_ptr &ptr (void); - ServerRequestInterceptor_ptr operator-> (void); - - private: - ServerRequestInterceptor_ptr &ptr_; + static ServerRequestInterceptor_ptr tao_narrow ( + CORBA::Object_ptr + ACE_ENV_ARG_DECL + ); + static CORBA::Object_ptr tao_upcast (void *); }; #endif /* end #if !defined */ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR_CH_) #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR_CH_ @@ -1714,7 +1369,7 @@ TAO_NAMESPACE PortableInterceptor )) = 0; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -1724,7 +1379,7 @@ TAO_NAMESPACE PortableInterceptor protected: ServerRequestInterceptor (void); virtual ~ServerRequestInterceptor (void); - + private: ServerRequestInterceptor (const ServerRequestInterceptor &); void operator= (const ServerRequestInterceptor &); @@ -1738,90 +1393,41 @@ TAO_NAMESPACE PortableInterceptor TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerRequestInterceptor; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567 -#if !defined (_PORTABLEINTERCEPTOR_IORINFO___PTR_CH_) -#define _PORTABLEINTERCEPTOR_IORINFO___PTR_CH_ +#if !defined (_PORTABLEINTERCEPTOR_IORINFO__ODDS_N_ENDS_CH_) +#define _PORTABLEINTERCEPTOR_IORINFO__ODDS_N_ENDS_CH_ class IORInfo; typedef IORInfo *IORInfo_ptr; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_IORINFO___VAR_CH_) -#define _PORTABLEINTERCEPTOR_IORINFO___VAR_CH_ + struct tao_IORInfo_life; + typedef TAO_Objref_Var_T<IORInfo, tao_IORInfo_life> IORInfo_var; + typedef TAO_Objref_Out_T<IORInfo, tao_IORInfo_life> IORInfo_out; - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571 - - class TAO_Export IORInfo_var : public TAO_Base_var + struct tao_IORInfo_life { - public: - IORInfo_var (void); // default constructor - IORInfo_var (IORInfo_ptr p) : ptr_ (p) {} - IORInfo_var (const IORInfo_var &); // copy constructor - ~IORInfo_var (void); // destructor - - IORInfo_var &operator= (IORInfo_ptr); - IORInfo_var &operator= (const IORInfo_var &); - IORInfo_ptr operator-> (void) const; - - operator const IORInfo_ptr &() const; - operator IORInfo_ptr &(); - // in, inout, out, _retn - IORInfo_ptr in (void) const; - IORInfo_ptr &inout (void); - IORInfo_ptr &out (void); - IORInfo_ptr _retn (void); - IORInfo_ptr ptr (void) const; - - // Hooks used by template sequence and object manager classes - // for non-defined forward declared interfaces. static IORInfo_ptr tao_duplicate (IORInfo_ptr); static void tao_release (IORInfo_ptr); static IORInfo_ptr tao_nil (void); - static IORInfo_ptr tao_narrow ( - CORBA::Object * - ACE_ENV_ARG_DECL_NOT_USED + static CORBA::Boolean tao_marshal ( + IORInfo_ptr, + TAO_OutputCDR & ); - static CORBA::Object * tao_upcast (void *); - - private: - IORInfo_ptr ptr_; - // Unimplemented - prevents widening assignment. - IORInfo_var (const TAO_Base_var &rhs); - IORInfo_var &operator= (const TAO_Base_var &rhs); }; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_IORINFO___OUT_CH_) -#define _PORTABLEINTERCEPTOR_IORINFO___OUT_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946 - class TAO_Export IORInfo_out + struct tao_IORInfo_cast { - public: - IORInfo_out (IORInfo_ptr &); - IORInfo_out (IORInfo_var &); - IORInfo_out (const IORInfo_out &); - IORInfo_out &operator= (const IORInfo_out &); - IORInfo_out &operator= (const IORInfo_var &); - IORInfo_out &operator= (IORInfo_ptr); - operator IORInfo_ptr &(); - IORInfo_ptr &ptr (void); - IORInfo_ptr operator-> (void); - - private: - IORInfo_ptr &ptr_; + static IORInfo_ptr tao_narrow ( + CORBA::Object_ptr + ACE_ENV_ARG_DECL + ); + static CORBA::Object_ptr tao_upcast (void *); }; #endif /* end #if !defined */ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLEINTERCEPTOR_IORINFO_CH_) #define _PORTABLEINTERCEPTOR_IORINFO_CH_ @@ -1940,7 +1546,7 @@ TAO_NAMESPACE PortableInterceptor )) = 0; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -1950,7 +1556,7 @@ TAO_NAMESPACE PortableInterceptor protected: IORInfo (void); virtual ~IORInfo (void); - + private: IORInfo (const IORInfo &); void operator= (const IORInfo &); @@ -1964,90 +1570,41 @@ TAO_NAMESPACE PortableInterceptor TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IORInfo; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567 -#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR___PTR_CH_) -#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR___PTR_CH_ +#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__ODDS_N_ENDS_CH_) +#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__ODDS_N_ENDS_CH_ class IORInterceptor; typedef IORInterceptor *IORInterceptor_ptr; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR___VAR_CH_) -#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR___VAR_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571 + struct tao_IORInterceptor_life; + typedef TAO_Objref_Var_T<IORInterceptor, tao_IORInterceptor_life> IORInterceptor_var; + typedef TAO_Objref_Out_T<IORInterceptor, tao_IORInterceptor_life> IORInterceptor_out; - class TAO_Export IORInterceptor_var : public TAO_Base_var + struct tao_IORInterceptor_life { - public: - IORInterceptor_var (void); // default constructor - IORInterceptor_var (IORInterceptor_ptr p) : ptr_ (p) {} - IORInterceptor_var (const IORInterceptor_var &); // copy constructor - ~IORInterceptor_var (void); // destructor - - IORInterceptor_var &operator= (IORInterceptor_ptr); - IORInterceptor_var &operator= (const IORInterceptor_var &); - IORInterceptor_ptr operator-> (void) const; - - operator const IORInterceptor_ptr &() const; - operator IORInterceptor_ptr &(); - // in, inout, out, _retn - IORInterceptor_ptr in (void) const; - IORInterceptor_ptr &inout (void); - IORInterceptor_ptr &out (void); - IORInterceptor_ptr _retn (void); - IORInterceptor_ptr ptr (void) const; - - // Hooks used by template sequence and object manager classes - // for non-defined forward declared interfaces. static IORInterceptor_ptr tao_duplicate (IORInterceptor_ptr); static void tao_release (IORInterceptor_ptr); static IORInterceptor_ptr tao_nil (void); - static IORInterceptor_ptr tao_narrow ( - CORBA::Object * - ACE_ENV_ARG_DECL_NOT_USED + static CORBA::Boolean tao_marshal ( + IORInterceptor_ptr, + TAO_OutputCDR & ); - static CORBA::Object * tao_upcast (void *); - - private: - IORInterceptor_ptr ptr_; - // Unimplemented - prevents widening assignment. - IORInterceptor_var (const TAO_Base_var &rhs); - IORInterceptor_var &operator= (const TAO_Base_var &rhs); }; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR___OUT_CH_) -#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR___OUT_CH_ - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946 - - class TAO_Export IORInterceptor_out + struct tao_IORInterceptor_cast { - public: - IORInterceptor_out (IORInterceptor_ptr &); - IORInterceptor_out (IORInterceptor_var &); - IORInterceptor_out (const IORInterceptor_out &); - IORInterceptor_out &operator= (const IORInterceptor_out &); - IORInterceptor_out &operator= (const IORInterceptor_var &); - IORInterceptor_out &operator= (IORInterceptor_ptr); - operator IORInterceptor_ptr &(); - IORInterceptor_ptr &ptr (void); - IORInterceptor_ptr operator-> (void); - - private: - IORInterceptor_ptr &ptr_; + static IORInterceptor_ptr tao_narrow ( + CORBA::Object_ptr + ACE_ENV_ARG_DECL + ); + static CORBA::Object_ptr tao_upcast (void *); }; #endif /* end #if !defined */ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR_CH_) #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR_CH_ @@ -2127,7 +1684,7 @@ TAO_NAMESPACE PortableInterceptor )) = 0; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -2137,7 +1694,7 @@ TAO_NAMESPACE PortableInterceptor protected: IORInterceptor (void); virtual ~IORInterceptor (void); - + private: IORInterceptor (const IORInterceptor &); void operator= (const IORInterceptor &); @@ -2151,90 +1708,41 @@ TAO_NAMESPACE PortableInterceptor TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IORInterceptor; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567 -#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY___PTR_CH_) -#define _PORTABLEINTERCEPTOR_POLICYFACTORY___PTR_CH_ +#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__ODDS_N_ENDS_CH_) +#define _PORTABLEINTERCEPTOR_POLICYFACTORY__ODDS_N_ENDS_CH_ class PolicyFactory; typedef PolicyFactory *PolicyFactory_ptr; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY___VAR_CH_) -#define _PORTABLEINTERCEPTOR_POLICYFACTORY___VAR_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571 + struct tao_PolicyFactory_life; + typedef TAO_Objref_Var_T<PolicyFactory, tao_PolicyFactory_life> PolicyFactory_var; + typedef TAO_Objref_Out_T<PolicyFactory, tao_PolicyFactory_life> PolicyFactory_out; - class TAO_Export PolicyFactory_var : public TAO_Base_var + struct tao_PolicyFactory_life { - public: - PolicyFactory_var (void); // default constructor - PolicyFactory_var (PolicyFactory_ptr p) : ptr_ (p) {} - PolicyFactory_var (const PolicyFactory_var &); // copy constructor - ~PolicyFactory_var (void); // destructor - - PolicyFactory_var &operator= (PolicyFactory_ptr); - PolicyFactory_var &operator= (const PolicyFactory_var &); - PolicyFactory_ptr operator-> (void) const; - - operator const PolicyFactory_ptr &() const; - operator PolicyFactory_ptr &(); - // in, inout, out, _retn - PolicyFactory_ptr in (void) const; - PolicyFactory_ptr &inout (void); - PolicyFactory_ptr &out (void); - PolicyFactory_ptr _retn (void); - PolicyFactory_ptr ptr (void) const; - - // Hooks used by template sequence and object manager classes - // for non-defined forward declared interfaces. static PolicyFactory_ptr tao_duplicate (PolicyFactory_ptr); static void tao_release (PolicyFactory_ptr); static PolicyFactory_ptr tao_nil (void); - static PolicyFactory_ptr tao_narrow ( - CORBA::Object * - ACE_ENV_ARG_DECL_NOT_USED + static CORBA::Boolean tao_marshal ( + PolicyFactory_ptr, + TAO_OutputCDR & ); - static CORBA::Object * tao_upcast (void *); - - private: - PolicyFactory_ptr ptr_; - // Unimplemented - prevents widening assignment. - PolicyFactory_var (const TAO_Base_var &rhs); - PolicyFactory_var &operator= (const TAO_Base_var &rhs); }; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY___OUT_CH_) -#define _PORTABLEINTERCEPTOR_POLICYFACTORY___OUT_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946 - class TAO_Export PolicyFactory_out + struct tao_PolicyFactory_cast { - public: - PolicyFactory_out (PolicyFactory_ptr &); - PolicyFactory_out (PolicyFactory_var &); - PolicyFactory_out (const PolicyFactory_out &); - PolicyFactory_out &operator= (const PolicyFactory_out &); - PolicyFactory_out &operator= (const PolicyFactory_var &); - PolicyFactory_out &operator= (PolicyFactory_ptr); - operator PolicyFactory_ptr &(); - PolicyFactory_ptr &ptr (void); - PolicyFactory_ptr operator-> (void); - - private: - PolicyFactory_ptr &ptr_; + static PolicyFactory_ptr tao_narrow ( + CORBA::Object_ptr + ACE_ENV_ARG_DECL + ); + static CORBA::Object_ptr tao_upcast (void *); }; #endif /* end #if !defined */ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY_CH_) #define _PORTABLEINTERCEPTOR_POLICYFACTORY_CH_ @@ -2279,7 +1787,7 @@ TAO_NAMESPACE PortableInterceptor CORBA::SystemException , CORBA::PolicyError )) = 0; - + // Hand-crafted addition. virtual ::CORBA::Policy_ptr _create_policy ( @@ -2292,7 +1800,7 @@ TAO_NAMESPACE PortableInterceptor )); // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -2302,7 +1810,7 @@ TAO_NAMESPACE PortableInterceptor protected: PolicyFactory (void); virtual ~PolicyFactory (void); - + private: PolicyFactory (const PolicyFactory &); void operator= (const PolicyFactory &); @@ -2316,90 +1824,41 @@ TAO_NAMESPACE PortableInterceptor TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyFactory; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567 -#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO___PTR_CH_) -#define _PORTABLEINTERCEPTOR_ORBINITINFO___PTR_CH_ +#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__ODDS_N_ENDS_CH_) +#define _PORTABLEINTERCEPTOR_ORBINITINFO__ODDS_N_ENDS_CH_ class ORBInitInfo; typedef ORBInitInfo *ORBInitInfo_ptr; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO___VAR_CH_) -#define _PORTABLEINTERCEPTOR_ORBINITINFO___VAR_CH_ + struct tao_ORBInitInfo_life; + typedef TAO_Objref_Var_T<ORBInitInfo, tao_ORBInitInfo_life> ORBInitInfo_var; + typedef TAO_Objref_Out_T<ORBInitInfo, tao_ORBInitInfo_life> ORBInitInfo_out; - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571 - - class TAO_Export ORBInitInfo_var : public TAO_Base_var + struct tao_ORBInitInfo_life { - public: - ORBInitInfo_var (void); // default constructor - ORBInitInfo_var (ORBInitInfo_ptr p) : ptr_ (p) {} - ORBInitInfo_var (const ORBInitInfo_var &); // copy constructor - ~ORBInitInfo_var (void); // destructor - - ORBInitInfo_var &operator= (ORBInitInfo_ptr); - ORBInitInfo_var &operator= (const ORBInitInfo_var &); - ORBInitInfo_ptr operator-> (void) const; - - operator const ORBInitInfo_ptr &() const; - operator ORBInitInfo_ptr &(); - // in, inout, out, _retn - ORBInitInfo_ptr in (void) const; - ORBInitInfo_ptr &inout (void); - ORBInitInfo_ptr &out (void); - ORBInitInfo_ptr _retn (void); - ORBInitInfo_ptr ptr (void) const; - - // Hooks used by template sequence and object manager classes - // for non-defined forward declared interfaces. static ORBInitInfo_ptr tao_duplicate (ORBInitInfo_ptr); static void tao_release (ORBInitInfo_ptr); static ORBInitInfo_ptr tao_nil (void); - static ORBInitInfo_ptr tao_narrow ( - CORBA::Object * - ACE_ENV_ARG_DECL_NOT_USED + static CORBA::Boolean tao_marshal ( + ORBInitInfo_ptr, + TAO_OutputCDR & ); - static CORBA::Object * tao_upcast (void *); - - private: - ORBInitInfo_ptr ptr_; - // Unimplemented - prevents widening assignment. - ORBInitInfo_var (const TAO_Base_var &rhs); - ORBInitInfo_var &operator= (const TAO_Base_var &rhs); }; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO___OUT_CH_) -#define _PORTABLEINTERCEPTOR_ORBINITINFO___OUT_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946 - class TAO_Export ORBInitInfo_out + struct tao_ORBInitInfo_cast { - public: - ORBInitInfo_out (ORBInitInfo_ptr &); - ORBInitInfo_out (ORBInitInfo_var &); - ORBInitInfo_out (const ORBInitInfo_out &); - ORBInitInfo_out &operator= (const ORBInitInfo_out &); - ORBInitInfo_out &operator= (const ORBInitInfo_var &); - ORBInitInfo_out &operator= (ORBInitInfo_ptr); - operator ORBInitInfo_ptr &(); - ORBInitInfo_ptr &ptr (void); - ORBInitInfo_ptr operator-> (void); - - private: - ORBInitInfo_ptr &ptr_; + static ORBInitInfo_ptr tao_narrow ( + CORBA::Object_ptr + ACE_ENV_ARG_DECL + ); + static CORBA::Object_ptr tao_upcast (void *); }; #endif /* end #if !defined */ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_CH_) #define _PORTABLEINTERCEPTOR_ORBINITINFO_CH_ @@ -2433,7 +1892,7 @@ TAO_NAMESPACE PortableInterceptor static void _tao_any_destructor (void *); // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:368 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:367 typedef char * ObjectId; typedef CORBA::String_var ObjectId_var; @@ -2662,7 +2121,7 @@ TAO_NAMESPACE PortableInterceptor )) = 0; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -2672,7 +2131,7 @@ TAO_NAMESPACE PortableInterceptor protected: ORBInitInfo (void); virtual ~ORBInitInfo (void); - + private: ORBInitInfo (const ORBInitInfo &); void operator= (const ORBInitInfo &); @@ -2686,98 +2145,41 @@ TAO_NAMESPACE PortableInterceptor TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ORBInitInfo; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567 -#if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER___PTR_CH_) -#define _PORTABLEINTERCEPTOR_ORBINITIALIZER___PTR_CH_ +#if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER__ODDS_N_ENDS_CH_) +#define _PORTABLEINTERCEPTOR_ORBINITIALIZER__ODDS_N_ENDS_CH_ class ORBInitializer; typedef ORBInitializer *ORBInitializer_ptr; - - /// Hand-crafted addition. - /// Register an ORBInitializer with the global ORBInitializer - /// table. - TAO_NAMESPACE_STORAGE_CLASS void register_orb_initializer ( - ORBInitializer_ptr init - TAO_ENV_ARG_DECL_WITH_DEFAULTS - ); - -#endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER___VAR_CH_) -#define _PORTABLEINTERCEPTOR_ORBINITIALIZER___VAR_CH_ + struct tao_ORBInitializer_life; + typedef TAO_Objref_Var_T<ORBInitializer, tao_ORBInitializer_life> ORBInitializer_var; + typedef TAO_Objref_Out_T<ORBInitializer, tao_ORBInitializer_life> ORBInitializer_out; - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571 - - class TAO_Export ORBInitializer_var : public TAO_Base_var + struct tao_ORBInitializer_life { - public: - ORBInitializer_var (void); // default constructor - ORBInitializer_var (ORBInitializer_ptr p) : ptr_ (p) {} - ORBInitializer_var (const ORBInitializer_var &); // copy constructor - ~ORBInitializer_var (void); // destructor - - ORBInitializer_var &operator= (ORBInitializer_ptr); - ORBInitializer_var &operator= (const ORBInitializer_var &); - ORBInitializer_ptr operator-> (void) const; - - operator const ORBInitializer_ptr &() const; - operator ORBInitializer_ptr &(); - // in, inout, out, _retn - ORBInitializer_ptr in (void) const; - ORBInitializer_ptr &inout (void); - ORBInitializer_ptr &out (void); - ORBInitializer_ptr _retn (void); - ORBInitializer_ptr ptr (void) const; - - // Hooks used by template sequence and object manager classes - // for non-defined forward declared interfaces. static ORBInitializer_ptr tao_duplicate (ORBInitializer_ptr); static void tao_release (ORBInitializer_ptr); static ORBInitializer_ptr tao_nil (void); - static ORBInitializer_ptr tao_narrow ( - CORBA::Object * - ACE_ENV_ARG_DECL_NOT_USED + static CORBA::Boolean tao_marshal ( + ORBInitializer_ptr, + TAO_OutputCDR & ); - static CORBA::Object * tao_upcast (void *); - - private: - ORBInitializer_ptr ptr_; - // Unimplemented - prevents widening assignment. - ORBInitializer_var (const TAO_Base_var &rhs); - ORBInitializer_var &operator= (const TAO_Base_var &rhs); }; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER___OUT_CH_) -#define _PORTABLEINTERCEPTOR_ORBINITIALIZER___OUT_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946 - class TAO_Export ORBInitializer_out + struct tao_ORBInitializer_cast { - public: - ORBInitializer_out (ORBInitializer_ptr &); - ORBInitializer_out (ORBInitializer_var &); - ORBInitializer_out (const ORBInitializer_out &); - ORBInitializer_out &operator= (const ORBInitializer_out &); - ORBInitializer_out &operator= (const ORBInitializer_var &); - ORBInitializer_out &operator= (ORBInitializer_ptr); - operator ORBInitializer_ptr &(); - ORBInitializer_ptr &ptr (void); - ORBInitializer_ptr operator-> (void); - - private: - ORBInitializer_ptr &ptr_; + static ORBInitializer_ptr tao_narrow ( + CORBA::Object_ptr + ACE_ENV_ARG_DECL + ); + static CORBA::Object_ptr tao_upcast (void *); }; #endif /* end #if !defined */ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER_CH_) #define _PORTABLEINTERCEPTOR_ORBINITIALIZER_CH_ @@ -2833,7 +2235,7 @@ TAO_NAMESPACE PortableInterceptor )) = 0; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -2843,7 +2245,7 @@ TAO_NAMESPACE PortableInterceptor protected: ORBInitializer (void); virtual ~ORBInitializer (void); - + private: ORBInitializer (const ORBInitializer &); void operator= (const ORBInitializer &); @@ -2851,6 +2253,14 @@ TAO_NAMESPACE PortableInterceptor #endif /* end #if !defined */ + /// Hand-crafted addition. + /// Register an ORBInitializer with the global ORBInitializer + /// table. + TAO_NAMESPACE_STORAGE_CLASS void register_orb_initializer ( + ORBInitializer_ptr init + TAO_ENV_ARG_DECL_WITH_DEFAULTS + ); + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 @@ -3001,7 +2411,7 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::Inval #endif /* __ACE_INLINE__ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018 #if defined (__ACE_INLINE__) #include "PortableInterceptorC.i" diff --git a/TAO/tao/PortableInterceptorC.i b/TAO/tao/PortableInterceptorC.i index b1528e1d8f8..a7ae310e5d0 100644 --- a/TAO/tao/PortableInterceptorC.i +++ b/TAO/tao/PortableInterceptorC.i @@ -26,13 +26,6 @@ #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR___CI_) #define _PORTABLEINTERCEPTOR_INTERCEPTOR___CI_ -ACE_INLINE -CORBA::Boolean -PortableInterceptor::Interceptor::marshal (TAO_OutputCDR &) -{ - return 0; -} - #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -41,13 +34,6 @@ PortableInterceptor::Interceptor::marshal (TAO_OutputCDR &) #if !defined (_PORTABLEINTERCEPTOR_CURRENT___CI_) #define _PORTABLEINTERCEPTOR_CURRENT___CI_ -ACE_INLINE -CORBA::Boolean -PortableInterceptor::Current::marshal (TAO_OutputCDR &) -{ - return 0; -} - #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -56,13 +42,6 @@ PortableInterceptor::Current::marshal (TAO_OutputCDR &) #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO___CI_) #define _PORTABLEINTERCEPTOR_REQUESTINFO___CI_ -ACE_INLINE -CORBA::Boolean -PortableInterceptor::RequestInfo::marshal (TAO_OutputCDR &) -{ - return 0; -} - #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -71,13 +50,6 @@ PortableInterceptor::RequestInfo::marshal (TAO_OutputCDR &) #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___CI_) #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___CI_ -ACE_INLINE -CORBA::Boolean -PortableInterceptor::ClientRequestInfo::marshal (TAO_OutputCDR &) -{ - return 0; -} - #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -86,13 +58,6 @@ PortableInterceptor::ClientRequestInfo::marshal (TAO_OutputCDR &) #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO___CI_) #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO___CI_ -ACE_INLINE -CORBA::Boolean -PortableInterceptor::ServerRequestInfo::marshal (TAO_OutputCDR &) -{ - return 0; -} - #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -101,13 +66,6 @@ PortableInterceptor::ServerRequestInfo::marshal (TAO_OutputCDR &) #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___CI_) #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___CI_ -ACE_INLINE -CORBA::Boolean -PortableInterceptor::ClientRequestInterceptor::marshal (TAO_OutputCDR &) -{ - return 0; -} - #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -116,13 +74,6 @@ PortableInterceptor::ClientRequestInterceptor::marshal (TAO_OutputCDR &) #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___CI_) #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___CI_ -ACE_INLINE -CORBA::Boolean -PortableInterceptor::ServerRequestInterceptor::marshal (TAO_OutputCDR &) -{ - return 0; -} - #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -131,13 +82,6 @@ PortableInterceptor::ServerRequestInterceptor::marshal (TAO_OutputCDR &) #if !defined (_PORTABLEINTERCEPTOR_IORINFO___CI_) #define _PORTABLEINTERCEPTOR_IORINFO___CI_ -ACE_INLINE -CORBA::Boolean -PortableInterceptor::IORInfo::marshal (TAO_OutputCDR &) -{ - return 0; -} - #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -146,13 +90,6 @@ PortableInterceptor::IORInfo::marshal (TAO_OutputCDR &) #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR___CI_) #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR___CI_ -ACE_INLINE -CORBA::Boolean -PortableInterceptor::IORInterceptor::marshal (TAO_OutputCDR &) -{ - return 0; -} - #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -161,13 +98,6 @@ PortableInterceptor::IORInterceptor::marshal (TAO_OutputCDR &) #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY___CI_) #define _PORTABLEINTERCEPTOR_POLICYFACTORY___CI_ -ACE_INLINE -CORBA::Boolean -PortableInterceptor::PolicyFactory::marshal (TAO_OutputCDR &) -{ - return 0; -} - #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -176,13 +106,6 @@ PortableInterceptor::PolicyFactory::marshal (TAO_OutputCDR &) #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO___CI_) #define _PORTABLEINTERCEPTOR_ORBINITINFO___CI_ -ACE_INLINE -CORBA::Boolean -PortableInterceptor::ORBInitInfo::marshal (TAO_OutputCDR &) -{ - return 0; -} - #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -191,17 +114,10 @@ PortableInterceptor::ORBInitInfo::marshal (TAO_OutputCDR &) #if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER___CI_) #define _PORTABLEINTERCEPTOR_ORBINITIALIZER___CI_ -ACE_INLINE -CORBA::Boolean -PortableInterceptor::ORBInitializer::marshal (TAO_OutputCDR &) -{ - return 0; -} - #endif /* end #if !defined */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:71 ACE_INLINE CORBA::Boolean operator<< ( @@ -252,7 +168,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:71 ACE_INLINE CORBA::Boolean operator<< ( diff --git a/TAO/tao/Seq_VarOut_T.cpp b/TAO/tao/Seq_VarOut_T.cpp index e94be3f774e..412b12aa0a3 100644 --- a/TAO/tao/Seq_VarOut_T.cpp +++ b/TAO/tao/Seq_VarOut_T.cpp @@ -29,10 +29,12 @@ TAO_Seq_Var_Base_T<T,T_elem>::TAO_Seq_Var_Base_T ( } } +// **************************************************************************** + template<typename T, typename T_elem> -TAO_Seq_Var_Base_T<T,T_elem> & -TAO_Seq_Var_Base_T<T,T_elem>::operator= ( - const TAO_Seq_Var_Base_T<T,T_elem> & p +TAO_FixedSeq_Var_T<T,T_elem> & +TAO_FixedSeq_Var_T<T,T_elem>::operator= ( + const TAO_FixedSeq_Var_T<T,T_elem> & p ) { if (this != &p) @@ -64,8 +66,6 @@ TAO_Seq_Var_Base_T<T,T_elem>::operator= ( return *this; } -// **************************************************************************** - // Fixed-size types only. template<typename T, typename T_elem> TAO_FixedSeq_Var_T<T,T_elem> & @@ -82,4 +82,78 @@ TAO_FixedSeq_Var_T<T,T_elem>::operator= (const T & p) return *this; } +// **************************************************************************** + +template<typename T, typename T_elem> +TAO_VarSeq_Var_T<T,T_elem> & +TAO_VarSeq_Var_T<T,T_elem>::operator= ( + const TAO_VarSeq_Var_T<T,T_elem> & p + ) +{ + if (this != &p) + { + if (p.ptr_ == 0) + { + delete this->ptr_; + this->ptr_ = 0; + } + else + { + T * deep_copy = 0; + ACE_NEW_RETURN ( + deep_copy, + T (*p.ptr_), + *this + ); + + if (deep_copy != 0) + { + T * tmp = deep_copy; + deep_copy = this->ptr_; + this->ptr_ = tmp; + delete deep_copy; + } + } + } + + return *this; +} + +// **************************************************************************** + +template<typename T, typename T_elem> +TAO_MngSeq_Var_T<T,T_elem> & +TAO_MngSeq_Var_T<T,T_elem>::operator= ( + const TAO_MngSeq_Var_T<T,T_elem> & p + ) +{ + if (this != &p) + { + if (p.ptr_ == 0) + { + delete this->ptr_; + this->ptr_ = 0; + } + else + { + T * deep_copy = 0; + ACE_NEW_RETURN ( + deep_copy, + T (*p.ptr_), + *this + ); + + if (deep_copy != 0) + { + T * tmp = deep_copy; + deep_copy = this->ptr_; + this->ptr_ = tmp; + delete deep_copy; + } + } + } + + return *this; +} + #endif /* TAO_SEQ_VAROUT_T_C */ diff --git a/TAO/tao/Seq_VarOut_T.h b/TAO/tao/Seq_VarOut_T.h index 773ccd697b6..5150e4c24bf 100644 --- a/TAO/tao/Seq_VarOut_T.h +++ b/TAO/tao/Seq_VarOut_T.h @@ -36,9 +36,6 @@ public: ~TAO_Seq_Var_Base_T (void); - TAO_Seq_Var_Base_T &operator= (T *); - TAO_Seq_Var_Base_T &operator= (const TAO_Seq_Var_Base_T<T,T_elem> &); - T *operator-> (void); const T *operator-> (void) const; @@ -46,9 +43,6 @@ public: operator T &(); operator T &() const; - T_elem & operator[] (CORBA::ULong index); - const T_elem & operator[] (CORBA::ULong index) const; - // in, inout, out, _retn const T & in (void) const; T & inout (void); @@ -80,8 +74,14 @@ public: // Fixed-size base types only. TAO_FixedSeq_Var_T (const T &); + TAO_FixedSeq_Var_T & operator= (T *); + TAO_FixedSeq_Var_T & operator= (const TAO_FixedSeq_Var_T<T,T_elem> &); + + T_elem & operator[] (CORBA::ULong index); + const T_elem & operator[] (CORBA::ULong index) const; + // Fixed-size base types only. - TAO_FixedSeq_Var_T &operator= (const T &); + TAO_FixedSeq_Var_T & operator= (const T &); }; /** @@ -99,8 +99,40 @@ public: TAO_VarSeq_Var_T (T *); TAO_VarSeq_Var_T (const TAO_VarSeq_Var_T<T,T_elem> &); + TAO_VarSeq_Var_T & operator= (T *); + TAO_VarSeq_Var_T & operator= (const TAO_VarSeq_Var_T<T,T_elem> &); + + T_elem & operator[] (CORBA::ULong index); + const T_elem & operator[] (CORBA::ULong index) const; + + // Variable-size base types only. + operator T *& (); +}; + +/** + * @class TAO_MngSeq_Var_T + * + * @brief Parametrized implementation of _var class for sequences + * whose element is of a managed type - string, wstring, valuetype, + * interface, abstract interface and pseudo object. + * + */ +template <typename T, typename T_elem> +class TAO_MngSeq_Var_T : public TAO_Seq_Var_Base_T<T,T_elem> +{ +public: + TAO_MngSeq_Var_T (void); + TAO_MngSeq_Var_T (T *); + TAO_MngSeq_Var_T (const TAO_MngSeq_Var_T<T,T_elem> &); + + TAO_MngSeq_Var_T & operator= (T *); + TAO_MngSeq_Var_T & operator= (const TAO_MngSeq_Var_T<T,T_elem> &); + // Variable-size base types only. operator T *& (); + + // Managed base types only. + T_elem operator[] (CORBA::ULong index); }; /** diff --git a/TAO/tao/Seq_VarOut_T.inl b/TAO/tao/Seq_VarOut_T.inl index a2a606e6af8..09c4455f25a 100644 --- a/TAO/tao/Seq_VarOut_T.inl +++ b/TAO/tao/Seq_VarOut_T.inl @@ -21,16 +21,6 @@ TAO_Seq_Var_Base_T<T,T_elem>::~TAO_Seq_Var_Base_T (void) template<typename T, typename T_elem> ACE_INLINE -TAO_Seq_Var_Base_T<T,T_elem> & -TAO_Seq_Var_Base_T<T,T_elem>::operator= (T * p) -{ - delete this->ptr_; - this->ptr_ = p; - return *this; -} - -template<typename T, typename T_elem> -ACE_INLINE const T * TAO_Seq_Var_Base_T<T,T_elem>::operator-> (void) const { @@ -68,22 +58,6 @@ TAO_Seq_Var_Base_T<T,T_elem>::operator T & () const template<typename T, typename T_elem> ACE_INLINE -T_elem & -TAO_Seq_Var_Base_T<T,T_elem>::operator[] (CORBA::ULong index) -{ - return this->ptr_->operator[] (index); -} - -template<typename T, typename T_elem> -ACE_INLINE -const T_elem & -TAO_Seq_Var_Base_T<T,T_elem>::operator[] (CORBA::ULong index) const -{ - return ACE_const_cast (const T_elem &, this->ptr_->operator[] (index)); -} - -template<typename T, typename T_elem> -ACE_INLINE const T & TAO_Seq_Var_Base_T<T,T_elem>::in (void) const { @@ -156,6 +130,32 @@ TAO_FixedSeq_Var_T<T,T_elem>::TAO_FixedSeq_Var_T (const T & p) T (p)); } +template<typename T, typename T_elem> +ACE_INLINE +TAO_FixedSeq_Var_T<T,T_elem> & +TAO_FixedSeq_Var_T<T,T_elem>::operator= (T * p) +{ + delete this->ptr_; + this->ptr_ = p; + return *this; +} + +template<typename T, typename T_elem> +ACE_INLINE +T_elem & +TAO_FixedSeq_Var_T<T,T_elem>::operator[] (CORBA::ULong index) +{ + return this->ptr_->operator[] (index); +} + +template<typename T, typename T_elem> +ACE_INLINE +const T_elem & +TAO_FixedSeq_Var_T<T,T_elem>::operator[] (CORBA::ULong index) const +{ + return ACE_const_cast (const T_elem &, this->ptr_->operator[] (index)); +} + // *************************************************************** template<typename T, typename T_elem> @@ -176,6 +176,16 @@ TAO_VarSeq_Var_T<T,T_elem>::TAO_VarSeq_Var_T ( : TAO_Seq_Var_Base_T<T,T_elem> (p) {} +template<typename T, typename T_elem> +ACE_INLINE +TAO_VarSeq_Var_T<T,T_elem> & +TAO_VarSeq_Var_T<T,T_elem>::operator= (T * p) +{ + delete this->ptr_; + this->ptr_ = p; + return *this; +} + // Variable-size types only. template<typename T, typename T_elem> ACE_INLINE @@ -184,6 +194,68 @@ TAO_VarSeq_Var_T<T,T_elem>::operator T *& () return this->ptr_; } +template<typename T, typename T_elem> +ACE_INLINE +T_elem & +TAO_VarSeq_Var_T<T,T_elem>::operator[] (CORBA::ULong index) +{ + return this->ptr_->operator[] (index); +} + +template<typename T, typename T_elem> +ACE_INLINE +const T_elem & +TAO_VarSeq_Var_T<T,T_elem>::operator[] (CORBA::ULong index) const +{ + return ACE_const_cast (const T_elem &, this->ptr_->operator[] (index)); +} + +// *************************************************************** + +template<typename T, typename T_elem> +ACE_INLINE +TAO_MngSeq_Var_T<T,T_elem>::TAO_MngSeq_Var_T (void) +{} + +template<typename T, typename T_elem> +ACE_INLINE +TAO_MngSeq_Var_T<T,T_elem>::TAO_MngSeq_Var_T (T * p) + : TAO_Seq_Var_Base_T<T,T_elem> (p) +{} + +template<typename T, typename T_elem> +TAO_MngSeq_Var_T<T,T_elem>::TAO_MngSeq_Var_T ( + const TAO_MngSeq_Var_T<T,T_elem> & p + ) + : TAO_Seq_Var_Base_T<T,T_elem> (p) +{} + +template<typename T, typename T_elem> +ACE_INLINE +TAO_MngSeq_Var_T<T,T_elem> & +TAO_MngSeq_Var_T<T,T_elem>::operator= (T * p) +{ + delete this->ptr_; + this->ptr_ = p; + return *this; +} + +// Variable-size types only. +template<typename T, typename T_elem> +ACE_INLINE +TAO_MngSeq_Var_T<T,T_elem>::operator T *& () +{ + return this->ptr_; +} + +template<typename T, typename T_elem> +ACE_INLINE +T_elem +TAO_MngSeq_Var_T<T,T_elem>::operator[] (CORBA::ULong index) +{ + return this->ptr_->operator[] (index); +} + // **************************************************************** template<typename T, typename T_var, typename T_elem> diff --git a/TAO/tao/Sequence_T.cpp b/TAO/tao/Sequence_T.cpp index 7369859a9b4..04d238b01cc 100644 --- a/TAO/tao/Sequence_T.cpp +++ b/TAO/tao/Sequence_T.cpp @@ -97,18 +97,6 @@ TAO_Unbounded_Sequence<T>::~TAO_Unbounded_Sequence (void) template<typename T> void -TAO_Unbounded_Sequence<T>::_tao_any_destructor ( - void * _tao_void_pointer - ) -{ - TAO_Unbounded_Sequence<T> * tmp = - ACE_static_cast (TAO_Unbounded_Sequence<T> *, - _tao_void_pointer); - delete tmp; -} - -template<typename T> -void TAO_Unbounded_Sequence<T>::_allocate_buffer (CORBA::ULong length) { T * tmp = TAO_Unbounded_Sequence<T>::allocbuf (length); @@ -313,18 +301,6 @@ TAO_Bounded_Sequence<T, MAX>::~TAO_Bounded_Sequence (void) this->_deallocate_buffer (); } -template<typename T, size_t MAX> -void -TAO_Bounded_Sequence<T, MAX>::_tao_any_destructor ( - void * _tao_void_pointer - ) -{ - typedef TAO_Bounded_Sequence<T, MAX> THIS_SEQ_TYPE; - THIS_SEQ_TYPE * tmp = ACE_static_cast (THIS_SEQ_TYPE *, - _tao_void_pointer); - delete tmp; -} - template<typename T, size_t MAX> void TAO_Bounded_Sequence<T, MAX>::_allocate_buffer (CORBA::ULong) @@ -916,18 +892,6 @@ TAO_Unbounded_Object_Sequence<T,T_var,T_life,T_cast>::freebuf (T ** buffer) template<typename T, typename T_var, typename T_life, typename T_cast> void -TAO_Unbounded_Object_Sequence<T,T_var,T_life,T_cast>::_tao_any_destructor ( - void * _tao_void_pointer - ) -{ - typedef TAO_Unbounded_Object_Sequence<T,T_var,T_life,T_cast> THIS_SEQ_TYPE; - THIS_SEQ_TYPE * tmp = ACE_static_cast (THIS_SEQ_TYPE *, - _tao_void_pointer); - delete tmp; -} - -template<typename T, typename T_var, typename T_life, typename T_cast> -void TAO_Unbounded_Object_Sequence<T,T_var,T_life,T_cast>::_allocate_buffer ( CORBA::ULong length ) @@ -1192,22 +1156,6 @@ template<typename T, typename T_cast, size_t MAX> void -TAO_Bounded_Object_Sequence<T,T_var,T_life,T_cast,MAX>::_tao_any_destructor ( - void * _tao_void_pointer - ) -{ - typedef TAO_Bounded_Object_Sequence<T,T_var,T_life,T_cast,MAX> THIS_SEQ_TYPE; - THIS_SEQ_TYPE * tmp = ACE_static_cast (THIS_SEQ_TYPE *, - _tao_void_pointer); - delete tmp; -} - -template<typename T, - typename T_var, - typename T_life, - typename T_cast, - size_t MAX> -void TAO_Bounded_Object_Sequence<T,T_var,T_life,T_cast,MAX>::_allocate_buffer ( CORBA::ULong length ) @@ -1440,18 +1388,6 @@ TAO_Unbounded_Pseudo_Sequence<T,T_var>::freebuf (T ** buffer) delete [] buffer; } -template<typename T, typename T_var> -void -TAO_Unbounded_Pseudo_Sequence<T,T_var>::_tao_any_destructor ( - void * _tao_void_pointer - ) -{ - typedef TAO_Unbounded_Pseudo_Sequence<T,T_var> THIS_SEQ_TYPE; - THIS_SEQ_TYPE * tmp = ACE_static_cast (THIS_SEQ_TYPE *, - _tao_void_pointer); - delete tmp; -} - template <typename T, typename T_var> void TAO_Unbounded_Pseudo_Sequence<T,T_var>::_allocate_buffer (CORBA::ULong length) @@ -1651,18 +1587,6 @@ TAO_Bounded_Pseudo_Sequence<T,T_var,MAX>::freebuf (T ** buffer) delete [] buffer; } -template<typename T, typename T_var, size_t MAX> -void -TAO_Bounded_Pseudo_Sequence<T,T_var,MAX>::_tao_any_destructor ( - void * _tao_void_pointer - ) -{ - typedef TAO_Bounded_Pseudo_Sequence<T,T_var,MAX> THIS_SEQ_TYPE; - THIS_SEQ_TYPE * tmp = ACE_static_cast (THIS_SEQ_TYPE *, - _tao_void_pointer); - delete tmp; -} - template <typename T, typename T_var, size_t MAX> void TAO_Bounded_Pseudo_Sequence<T,T_var,MAX>::_allocate_buffer ( @@ -1860,18 +1784,6 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::freebuf (T ** buffer) delete [] buffer; } -template<typename T, typename T_var, typename T_life> -void -TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::_tao_any_destructor ( - void * _tao_void_pointer - ) -{ - typedef TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life> THIS_SEQ_TYPE; - THIS_SEQ_TYPE * tmp = ACE_static_cast (THIS_SEQ_TYPE *, - _tao_void_pointer); - delete tmp; -} - template <typename T, typename T_var, typename T_life> void TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::_allocate_buffer ( @@ -2084,18 +1996,6 @@ TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::freebuf (T ** buffer) delete [] buffer; } -template<typename T, typename T_var, typename T_life, size_t MAX> -void -TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::_tao_any_destructor ( - void * _tao_void_pointer - ) -{ - typedef TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX> THIS_SEQ_TYPE; - THIS_SEQ_TYPE * tmp = ACE_static_cast (THIS_SEQ_TYPE *, - _tao_void_pointer); - delete tmp; -} - template <typename T, typename T_var, typename T_life, size_t MAX> void TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::_allocate_buffer ( @@ -2295,18 +2195,6 @@ TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::freebuf (T ** buffer) delete [] buffer; } -template <typename T, typename T_var, typename T_life> -void -TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::_tao_any_destructor ( - void * _tao_void_pointer - ) -{ - typedef TAO_Unbounded_Abstract_Sequence<T,T_var,T_life> THIS_SEQ_TYPE; - THIS_SEQ_TYPE * tmp = ACE_static_cast (THIS_SEQ_TYPE *, - _tao_void_pointer); - delete tmp; -} - template <typename T, typename T_var, typename T_life> void TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::_allocate_buffer ( @@ -2517,18 +2405,6 @@ TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::freebuf (T ** buffer) template <typename T, typename T_var, typename T_life, size_t MAX> void -TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::_tao_any_destructor ( - void * _tao_void_pointer - ) -{ - typedef TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX> THIS_SEQ_TYPE; - THIS_SEQ_TYPE * tmp = ACE_static_cast (THIS_SEQ_TYPE *, - _tao_void_pointer); - delete tmp; -} - -template <typename T, typename T_var, typename T_life, size_t MAX> -void TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::_allocate_buffer ( CORBA::ULong length ) @@ -2792,18 +2668,6 @@ TAO_Unbounded_Array_Sequence<T,T_life>::_deallocate_buffer (void) template <typename T, typename T_life> void -TAO_Unbounded_Array_Sequence<T,T_life>::_tao_any_destructor ( - void * _tao_void_pointer - ) -{ - typedef TAO_Unbounded_Array_Sequence<T,T_life> THIS_SEQ_TYPE; - THIS_SEQ_TYPE * tmp = ACE_static_cast (THIS_SEQ_TYPE *, - _tao_void_pointer); - delete tmp; -} - -template <typename T, typename T_life> -void TAO_Unbounded_Array_Sequence<T,T_life>::replace (CORBA::ULong max, CORBA::ULong length, T * data, @@ -3009,18 +2873,6 @@ TAO_Bounded_Array_Sequence<T,T_life,MAX>::freebuf (T * buffer) template <typename T, typename T_life, size_t MAX> void -TAO_Bounded_Array_Sequence<T,T_life,MAX>::_tao_any_destructor ( - void * _tao_void_pointer - ) -{ - typedef TTAO_Bounded_Array_Sequence<T,T_life,MAX> THIS_SEQ_TYPE; - THIS_SEQ_TYPE * tmp = ACE_static_cast (THIS_SEQ_TYPE *, - _tao_void_pointer); - delete tmp; -} - -template <typename T, typename T_life, size_t MAX> -void TAO_Bounded_Array_Sequence<T,T_life,MAX>::replace (CORBA::ULong max, CORBA::ULong length, T * data, @@ -3183,18 +3035,6 @@ TAO_Bounded_String_Sequence<MAX>::freebuf (char ** buffer) template<size_t MAX> void -TAO_Bounded_String_Sequence<MAX>::_tao_any_destructor ( - void * _tao_void_pointer - ) -{ - TAO_Bounded_String_Sequence<MAX> * tmp = - ACE_static_cast (TAO_Bounded_String_Sequence<MAX> *, - _tao_void_pointer); - delete tmp; -} - -template<size_t MAX> -void TAO_Bounded_String_Sequence<MAX>::_allocate_buffer (CORBA::ULong /* length */) { // For this class memory is never reallocated so the implementation @@ -3393,18 +3233,6 @@ TAO_Bounded_WString_Sequence<MAX>::freebuf (CORBA::WChar* *buffer) template<size_t MAX> void -TAO_Bounded_WString_Sequence<MAX>::_tao_any_destructor ( - void * _tao_void_pointer - ) -{ - TAO_Bounded_WString_Sequence<MAX> * tmp = - ACE_static_cast (TAO_Bounded_WString_Sequence<MAX> *, - _tao_void_pointer); - delete tmp; -} - -template<size_t MAX> -void TAO_Bounded_WString_Sequence<MAX>::_allocate_buffer ( CORBA::ULong /* length */ ) diff --git a/TAO/tao/Sequence_T.h b/TAO/tao/Sequence_T.h index f338f4df313..ba883060b51 100644 --- a/TAO/tao/Sequence_T.h +++ b/TAO/tao/Sequence_T.h @@ -770,9 +770,6 @@ public: */ static void freebuf (T **); - static void _tao_any_destructor (void *); - typedef T_var _var_type; - // The Base_Sequence functions, please see "tao/Sequence.h" /// No default to workaround egcs problem with templates and /// namespaces @@ -844,9 +841,6 @@ public: /// it. static void freebuf (T ** buffer); - static void _tao_any_destructor (void *); - typedef T_var _var_type; - // The Base_Sequence functions, please see "tao/sequence.h" /// No default to workaround egcs problem with templates and /// namespaces @@ -920,9 +914,6 @@ public: /// Release all the elements. static void freebuf (T **); - static void _tao_any_destructor (void *); - typedef T_var _var_type; - // The Base_Sequence functions, please see "tao/Sequence.h" virtual void _allocate_buffer (CORBA::ULong length); virtual void _deallocate_buffer (void); @@ -976,9 +967,6 @@ public: /// it. static void freebuf (T ** buffer); - static void _tao_any_destructor (void *); - typedef T_var _var_type; - // The Base_Sequence functions, please see "tao/sequence.h" virtual void _allocate_buffer (CORBA::ULong length); virtual void _deallocate_buffer (void); @@ -1041,9 +1029,6 @@ public: /// Release all the elements. static void freebuf (T **); - static void _tao_any_destructor (void *); - typedef T_var _var_type; - // The Base_Sequence functions, please see "tao/Sequence.h" /// No default to workaround egcs problem with templates and /// namespaces @@ -1099,9 +1084,6 @@ public: /// it. static void freebuf (T ** buffer); - static void _tao_any_destructor (void *); - typedef T_var _var_type; - // The Base_Sequence functions, please see "tao/sequence.h" /// No default to workaround egcs problem with templates and /// namespaces @@ -1166,9 +1148,6 @@ public: /// Release all the elements. static void freebuf (T **); - static void _tao_any_destructor (void *); - typedef T_var _var_type; - // The Base_Sequence functions, please see "tao/Sequence.h" /// No default to workaround egcs problem with templates and /// namespaces @@ -1224,9 +1203,6 @@ public: /// it. static void freebuf (T ** buffer); - static void _tao_any_destructor (void *); - typedef T_var _var_type; - // The Base_Sequence functions, please see "tao/sequence.h" /// No default to workaround egcs problem with templates and /// namespaces diff --git a/TAO/tao/ServicesC.cpp b/TAO/tao/ServicesC.cpp index 412cd5fe5a5..a2146b28d32 100644 --- a/TAO/tao/ServicesC.cpp +++ b/TAO/tao/ServicesC.cpp @@ -263,7 +263,7 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 void CORBA::ServiceDetail::_tao_any_destructor (void *_tao_void_pointer) { @@ -272,6 +272,37 @@ void CORBA::ServiceDetail::_tao_any_destructor (void *_tao_void_pointer) } // TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274 + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + +template class + TAO_Var_Var_T< + ServiceDetail + >; + +template class + TAO_Out_T< + ServiceDetail, + ServiceDetail_var + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# pragma instantiate \ + TAO_Var_Var_T< \ + ServiceDetail \ + > + +# pragma instantiate \ + TAO_Out_T< \ + ServiceDetail, \ + ServiceDetail_var \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_CORBA_ServiceInformation[] = @@ -435,7 +466,7 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 void CORBA::ServiceInformation::_tao_any_destructor (void *_tao_void_pointer) { @@ -444,116 +475,38 @@ void CORBA::ServiceInformation::_tao_any_destructor (void *_tao_void_pointer) } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CS_) -#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CS_ - -void -CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_allocate_buffer (CORBA::ULong length) -{ - CORBA::ULong* tmp = 0; - tmp = _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (length); - - if (this->buffer_ != 0) - { - CORBA::ULong *old = - ACE_reinterpret_cast (CORBA::ULong *, this->buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - tmp[i] = old[i]; - } - - if (this->release_) - { - _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::freebuf (old); - } - } - - this->buffer_ = tmp; -} - -void -CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_deallocate_buffer (void) -{ - if (this->buffer_ == 0 || this->release_ == 0) - { - return; - } - - CORBA::ULong *tmp = - ACE_reinterpret_cast (CORBA::ULong *, this->buffer_); - _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::freebuf (tmp); - this->buffer_ = 0; -} - -CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::~_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (void) -{ - this->_deallocate_buffer (); -} - -#endif /* end #if !defined */ - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CS_) -#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CS_ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250 - -// ************************************************************* -// CORBA::ServiceInformation::_tao_seq_ServiceOption -// ************************************************************* +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50 CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_seq_ServiceOption (void) {} CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_seq_ServiceOption (CORBA::ULong max) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<CORBA::ULong> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max) + : TAO_Unbounded_Sequence< + CORBA::ServiceOption + > + (max) {} CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_seq_ServiceOption ( CORBA::ULong max, CORBA::ULong length, - CORBA::ULong *buffer, + CORBA::ULong* buffer, CORBA::Boolean release ) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<CORBA::ULong> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max, length, buffer, release) + : TAO_Unbounded_Sequence< + CORBA::ServiceOption + > + (max, length, buffer, release) {} CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_seq_ServiceOption (const _tao_seq_ServiceOption &seq) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<CORBA::ULong> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (seq) + : TAO_Unbounded_Sequence< + CORBA::ServiceOption + > + (seq) {} -CORBA::ServiceInformation::_tao_seq_ServiceOption::~_tao_seq_ServiceOption (void) // dtor +CORBA::ServiceInformation::_tao_seq_ServiceOption::~_tao_seq_ServiceOption (void) {} void CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_any_destructor (void *_tao_void_pointer) @@ -562,119 +515,39 @@ void CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_any_destructor (voi delete tmp; } -#endif /* end #if !defined */ - // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_cs.cpp:101 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CS_) -#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CS_ - -void -CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_allocate_buffer (CORBA::ULong length) -{ - CORBA::ServiceDetail* tmp = 0; - tmp = _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (length); - - if (this->buffer_ != 0) - { - CORBA::ServiceDetail *old = - ACE_reinterpret_cast (CORBA::ServiceDetail *, this->buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - tmp[i] = old[i]; - } - - if (this->release_) - { - _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::freebuf (old); - } - } - - this->buffer_ = tmp; -} - -void -CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_deallocate_buffer (void) -{ - if (this->buffer_ == 0 || this->release_ == 0) - { - return; - } - - CORBA::ServiceDetail *tmp = - ACE_reinterpret_cast (CORBA::ServiceDetail *, this->buffer_); - _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::freebuf (tmp); - this->buffer_ = 0; -} - -CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::~_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (void) -{ - this->_deallocate_buffer (); -} - -#endif /* end #if !defined */ - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CS_) -#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CS_ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250 - -// ************************************************************* -// CORBA::ServiceInformation::_tao_seq_ServiceDetail -// ************************************************************* +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50 CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_seq_ServiceDetail (void) {} CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_seq_ServiceDetail (CORBA::ULong max) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<CORBA::ServiceDetail> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max) + : TAO_Unbounded_Sequence< + CORBA::ServiceDetail + > + (max) {} CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_seq_ServiceDetail ( CORBA::ULong max, CORBA::ULong length, - CORBA::ServiceDetail *buffer, + CORBA::ServiceDetail* buffer, CORBA::Boolean release ) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<CORBA::ServiceDetail> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max, length, buffer, release) + : TAO_Unbounded_Sequence< + CORBA::ServiceDetail + > + (max, length, buffer, release) {} CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_seq_ServiceDetail (const _tao_seq_ServiceDetail &seq) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_Sequence<CORBA::ServiceDetail> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (seq) + : TAO_Unbounded_Sequence< + CORBA::ServiceDetail + > + (seq) {} -CORBA::ServiceInformation::_tao_seq_ServiceDetail::~_tao_seq_ServiceDetail (void) // dtor +CORBA::ServiceInformation::_tao_seq_ServiceDetail::~_tao_seq_ServiceDetail (void) {} void CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_any_destructor (void *_tao_void_pointer) @@ -683,7 +556,36 @@ void CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_any_destructor (voi delete tmp; } -#endif /* end #if !defined */ +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274 + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + +template class + TAO_Var_Var_T< + ServiceInformation + >; + +template class + TAO_Out_T< + ServiceInformation, + ServiceInformation_var + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# pragma instantiate \ + TAO_Var_Var_T< \ + ServiceInformation \ + > + +# pragma instantiate \ + TAO_Out_T< \ + ServiceInformation, \ + ServiceInformation_var \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54 @@ -816,7 +718,7 @@ CORBA::Boolean operator>>= ( #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93 #if !defined _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceOption_CPP_ #define _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceOption_CPP_ @@ -873,7 +775,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceOption_CPP_ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93 #if !defined _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceDetail_CPP_ #define _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceDetail_CPP_ diff --git a/TAO/tao/ServicesC.h b/TAO/tao/ServicesC.h index d4dfeceb05a..6fd6cba64ce 100644 --- a/TAO/tao/ServicesC.h +++ b/TAO/tao/ServicesC.h @@ -27,12 +27,13 @@ #include "ace/pre.h" #include "tao/OctetSeqC.h" +#include "tao/CDR.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/CDR.h" +#include "tao/VarOut_T.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -64,7 +65,7 @@ TAO_NAMESPACE CORBA { // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333 typedef CORBA::UShort ServiceType; typedef CORBA::UShort_out ServiceType_out; @@ -75,7 +76,7 @@ TAO_NAMESPACE CORBA TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceType; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333 typedef CORBA::ULong ServiceOption; typedef CORBA::ULong_out ServiceOption_out; @@ -86,7 +87,7 @@ TAO_NAMESPACE CORBA TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceOption; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333 typedef CORBA::ULong ServiceDetailType; typedef CORBA::ULong_out ServiceDetailType_out; @@ -102,9 +103,25 @@ TAO_NAMESPACE CORBA const CORBA::ServiceType Security = 1U; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231 + + struct ServiceDetail; - class ServiceDetail_var; + typedef + TAO_Var_Var_T< + ServiceDetail + > + ServiceDetail_var; + + typedef + TAO_Out_T< + ServiceDetail, + ServiceDetail_var + > + ServiceDetail_out; + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52 struct TAO_Export ServiceDetail { @@ -116,69 +133,30 @@ TAO_NAMESPACE CORBA }; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71 - - class TAO_Export ServiceDetail_var - { - public: - ServiceDetail_var (void); - ServiceDetail_var (ServiceDetail *); - ServiceDetail_var (const ServiceDetail_var &); - ~ServiceDetail_var (void); - - ServiceDetail_var &operator= (ServiceDetail *); - ServiceDetail_var &operator= (const ServiceDetail_var &); - ServiceDetail *operator-> (void); - const ServiceDetail *operator-> (void) const; - - operator const ServiceDetail &() const; - operator ServiceDetail &(); - operator ServiceDetail &() const; - - // Variable-size types only. - operator ServiceDetail *&(); - - // in, inout, out, _retn - const ServiceDetail &in (void) const; - ServiceDetail &inout (void); - ServiceDetail *&out (void); - ServiceDetail *_retn (void); - ServiceDetail *ptr (void) const; + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - private: - ServiceDetail *ptr_; - }; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceDetail; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231 - class TAO_Export ServiceDetail_out - { - public: - ServiceDetail_out (ServiceDetail *&); - ServiceDetail_out (ServiceDetail_var &); - ServiceDetail_out (const ServiceDetail_out &); - ServiceDetail_out &operator= (const ServiceDetail_out &); - ServiceDetail_out &operator= (ServiceDetail *); - operator ServiceDetail *&(); - ServiceDetail *&ptr (void); - ServiceDetail *operator-> (void); - - private: - ServiceDetail *&ptr_; - // Assignment from T_var not allowed. - void operator= (const ServiceDetail_var &); - }; + struct ServiceInformation; - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 + typedef + TAO_Var_Var_T< + ServiceInformation + > + ServiceInformation_var; - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceDetail; + typedef + TAO_Out_T< + ServiceInformation, + ServiceInformation_var + > + ServiceInformation_out; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49 - - class ServiceInformation_var; + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52 struct TAO_Export ServiceInformation { @@ -187,101 +165,31 @@ TAO_NAMESPACE CORBA static void _tao_any_destructor (void *); - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CH_) -#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CH_ - - class TAO_Export _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption - : public TAO_Unbounded_Base_Sequence - { - public: - _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (void); - _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (CORBA::ULong maximum); - _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption ( - CORBA::ULong maximum, - CORBA::ULong length, - CORBA::ULong *data, - CORBA::Boolean release = 0 - ); - _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption ( - const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &rhs - ); - _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &operator= ( - const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &rhs - ); - virtual ~_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (void); - - // = Accessors. - CORBA::ULong &operator[] (CORBA::ULong i); - const CORBA::ULong &operator[] (CORBA::ULong i) const; - - // = Static operations. - static CORBA::ULong *allocbuf (CORBA::ULong size); - static void freebuf (CORBA::ULong *buffer); - - // Implement the TAO_Base_Sequence methods (see Sequence.h) - virtual void _allocate_buffer (CORBA::ULong length); - virtual void _deallocate_buffer (void); - CORBA::ULong *get_buffer (CORBA::Boolean orphan = 0); - const CORBA::ULong *get_buffer (void) const; - void replace ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::ULong *data, - CORBA::Boolean release - ); - }; - -#endif /* end #if !defined */ - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CH_) -#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CH_ - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371 - - class _tao_seq_ServiceOption; - - // ************************************************************* - // CORBA::ServiceInformation::_tao_seq_ServiceOption - // ************************************************************* + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75 - class TAO_Export _tao_seq_ServiceOption : public - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption -#else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<CORBA::ULong> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + class TAO_Export _tao_seq_ServiceOption + : public + TAO_Unbounded_Sequence< + CORBA::ServiceOption + > { public: _tao_seq_ServiceOption (void); _tao_seq_ServiceOption (CORBA::ULong max); _tao_seq_ServiceOption ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::ULong *buffer, + CORBA::ULong max, + CORBA::ULong length, + CORBA::ULong* buffer, CORBA::Boolean release = 0 ); _tao_seq_ServiceOption (const _tao_seq_ServiceOption &); ~_tao_seq_ServiceOption (void); - static void _tao_any_destructor (void*); + static void _tao_any_destructor (void *); }; - -#endif /* end #if !defined */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_field/field_ch.cpp:447 @@ -290,101 +198,31 @@ TAO_NAMESPACE CORBA _tao_seq_ServiceOption service_options; - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ch.cpp:65 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CH_) -#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CH_ - - class TAO_Export _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail - : public TAO_Unbounded_Base_Sequence - { - public: - _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (void); - _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (CORBA::ULong maximum); - _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail ( - CORBA::ULong maximum, - CORBA::ULong length, - ACE_NESTED_CLASS (CORBA, ServiceDetail) *data, - CORBA::Boolean release = 0 - ); - _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail ( - const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail &rhs - ); - _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail &operator= ( - const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail &rhs - ); - virtual ~_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (void); - - // = Accessors. - ACE_NESTED_CLASS (CORBA, ServiceDetail) &operator[] (CORBA::ULong i); - const ACE_NESTED_CLASS (CORBA, ServiceDetail) &operator[] (CORBA::ULong i) const; - - // = Static operations. - static ACE_NESTED_CLASS (CORBA, ServiceDetail) *allocbuf (CORBA::ULong size); - static void freebuf (ACE_NESTED_CLASS (CORBA, ServiceDetail) *buffer); - - // Implement the TAO_Base_Sequence methods (see Sequence.h) - virtual void _allocate_buffer (CORBA::ULong length); - virtual void _deallocate_buffer (void); - ACE_NESTED_CLASS (CORBA, ServiceDetail) *get_buffer (CORBA::Boolean orphan = 0); - const ACE_NESTED_CLASS (CORBA, ServiceDetail) *get_buffer (void) const; - void replace ( - CORBA::ULong max, - CORBA::ULong length, - ACE_NESTED_CLASS (CORBA, ServiceDetail) *data, - CORBA::Boolean release - ); - }; - -#endif /* end #if !defined */ - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CH_) -#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CH_ - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:371 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75 - class _tao_seq_ServiceDetail; - - // ************************************************************* - // CORBA::ServiceInformation::_tao_seq_ServiceDetail - // ************************************************************* - - class TAO_Export _tao_seq_ServiceDetail : public - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:51 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail -#else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<ACE_NESTED_CLASS (CORBA, ServiceDetail)> - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + class TAO_Export _tao_seq_ServiceDetail + : public + TAO_Unbounded_Sequence< + CORBA::ServiceDetail + > { public: _tao_seq_ServiceDetail (void); _tao_seq_ServiceDetail (CORBA::ULong max); _tao_seq_ServiceDetail ( - CORBA::ULong max, - CORBA::ULong length, - ACE_NESTED_CLASS (CORBA, ServiceDetail) *buffer, + CORBA::ULong max, + CORBA::ULong length, + ACE_NESTED_CLASS (CORBA, ServiceDetail)* buffer, CORBA::Boolean release = 0 ); _tao_seq_ServiceDetail (const _tao_seq_ServiceDetail &); ~_tao_seq_ServiceDetail (void); - static void _tao_any_destructor (void*); + static void _tao_any_destructor (void *); }; - -#endif /* end #if !defined */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_field/field_ch.cpp:447 @@ -394,61 +232,6 @@ TAO_NAMESPACE CORBA }; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71 - - class TAO_Export ServiceInformation_var - { - public: - ServiceInformation_var (void); - ServiceInformation_var (ServiceInformation *); - ServiceInformation_var (const ServiceInformation_var &); - ~ServiceInformation_var (void); - - ServiceInformation_var &operator= (ServiceInformation *); - ServiceInformation_var &operator= (const ServiceInformation_var &); - ServiceInformation *operator-> (void); - const ServiceInformation *operator-> (void) const; - - operator const ServiceInformation &() const; - operator ServiceInformation &(); - operator ServiceInformation &() const; - - // Variable-size types only. - operator ServiceInformation *&(); - - // in, inout, out, _retn - const ServiceInformation &in (void) const; - ServiceInformation &inout (void); - ServiceInformation *&out (void); - ServiceInformation *_retn (void); - ServiceInformation *ptr (void) const; - - private: - ServiceInformation *ptr_; - }; - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:445 - - class TAO_Export ServiceInformation_out - { - public: - ServiceInformation_out (ServiceInformation *&); - ServiceInformation_out (ServiceInformation_var &); - ServiceInformation_out (const ServiceInformation_out &); - ServiceInformation_out &operator= (const ServiceInformation_out &); - ServiceInformation_out &operator= (ServiceInformation *); - operator ServiceInformation *&(); - ServiceInformation *&ptr (void); - ServiceInformation *operator-> (void); - - private: - ServiceInformation *&ptr_; - // Assignment from T_var not allowed. - void operator= (const ServiceInformation_var &); - }; - - // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceInformation; @@ -532,7 +315,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* __ACE_INLINE__ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018 #if defined (__ACE_INLINE__) #include "ServicesC.i" diff --git a/TAO/tao/ServicesC.i b/TAO/tao/ServicesC.i index c4fb452b840..05f20d51f81 100644 --- a/TAO/tao/ServicesC.i +++ b/TAO/tao/ServicesC.i @@ -21,855 +21,7 @@ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194 - -// ************************************************************* -// Inline operations for class CORBA::ServiceDetail_var -// ************************************************************* - -ACE_INLINE -CORBA::ServiceDetail_var::ServiceDetail_var (void) - : ptr_ (0) -{} - -ACE_INLINE -CORBA::ServiceDetail_var::ServiceDetail_var (ServiceDetail *p) - : ptr_ (p) -{} - -ACE_INLINE -CORBA::ServiceDetail_var::ServiceDetail_var (const ::CORBA::ServiceDetail_var &p) -{ - if (p.ptr_) - { - ACE_NEW (this->ptr_, ::CORBA::ServiceDetail (*p.ptr_)); - } - else - { - this->ptr_ = 0; - } -} - -ACE_INLINE -CORBA::ServiceDetail_var::~ServiceDetail_var (void) -{ - delete this->ptr_; -} - -ACE_INLINE -CORBA::ServiceDetail_var & -CORBA::ServiceDetail_var::operator= (ServiceDetail *_tao_struct_var) -{ - delete this->ptr_; - this->ptr_ = _tao_struct_var; - return *this; -} - -ACE_INLINE -::CORBA::ServiceDetail_var & -CORBA::ServiceDetail_var::operator= (const ::CORBA::ServiceDetail_var &_tao_struct_var) -{ - if (this != &_tao_struct_var) - { - if (_tao_struct_var.ptr_ == 0) - { - delete this->ptr_; - this->ptr_ = 0; - } - else - { - ServiceDetail *deep_copy = 0; - ACE_NEW_RETURN ( - deep_copy, - ServiceDetail (*_tao_struct_var.ptr_), - *this - ); - - if (deep_copy != 0) - { - ServiceDetail *tmp = deep_copy; - deep_copy = this->ptr_; - this->ptr_ = tmp; - delete deep_copy; - } - } - } - - return *this; -} - -ACE_INLINE const ::CORBA::ServiceDetail * -CORBA::ServiceDetail_var::operator-> (void) const -{ - return this->ptr_; -} - -ACE_INLINE ::CORBA::ServiceDetail * -CORBA::ServiceDetail_var::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -CORBA::ServiceDetail_var::operator const ::CORBA::ServiceDetail &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE -CORBA::ServiceDetail_var::operator ::CORBA::ServiceDetail &() // cast -{ - return *this->ptr_; -} - -ACE_INLINE -CORBA::ServiceDetail_var::operator ::CORBA::ServiceDetail &() const // cast -{ - return *this->ptr_; -} - -// Variable-size types only. -ACE_INLINE -CORBA::ServiceDetail_var::operator ::CORBA::ServiceDetail *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE const ::CORBA::ServiceDetail & -CORBA::ServiceDetail_var::in (void) const -{ - return *this->ptr_; -} - -ACE_INLINE ::CORBA::ServiceDetail & -CORBA::ServiceDetail_var::inout (void) -{ - return *this->ptr_; -} - -// Mapping for variable size. -ACE_INLINE ::CORBA::ServiceDetail *& -CORBA::ServiceDetail_var::out (void) -{ - delete this->ptr_; - this->ptr_ = 0; - return this->ptr_; -} - -ACE_INLINE ::CORBA::ServiceDetail * -CORBA::ServiceDetail_var::_retn (void) -{ - ::CORBA::ServiceDetail *tmp = this->ptr_; - this->ptr_ = 0; - return tmp; -} - -ACE_INLINE ::CORBA::ServiceDetail * -CORBA::ServiceDetail_var::ptr (void) const -{ - return this->ptr_; -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523 - -// ************************************************************* -// Inline operations for class CORBA::ServiceDetail_out -// ************************************************************* - -ACE_INLINE -CORBA::ServiceDetail_out::ServiceDetail_out (::CORBA::ServiceDetail *&p) - : ptr_ (p) -{ - this->ptr_ = 0; -} - -ACE_INLINE -CORBA::ServiceDetail_out::ServiceDetail_out (ServiceDetail_var &p) - : ptr_ (p.out ()) -{ - delete this->ptr_; - this->ptr_ = 0; -} - -ACE_INLINE -CORBA::ServiceDetail_out::ServiceDetail_out (const ::CORBA::ServiceDetail_out &p) - : ptr_ (ACE_const_cast (ServiceDetail_out&, p).ptr_) -{} - -ACE_INLINE -CORBA::ServiceDetail_out & -CORBA::ServiceDetail_out::operator= (const ::CORBA::ServiceDetail_out &p) -{ - this->ptr_ = ACE_const_cast (ServiceDetail_out&, p).ptr_; - return *this; -} - -ACE_INLINE -CORBA::ServiceDetail_out & -CORBA::ServiceDetail_out::operator= (ServiceDetail *_tao_struct_out) -{ - this->ptr_ = _tao_struct_out; - return *this; -} - -ACE_INLINE -CORBA::ServiceDetail_out::operator ::CORBA::ServiceDetail *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE ::CORBA::ServiceDetail *& -CORBA::ServiceDetail_out::ptr (void) // ptr -{ - return this->ptr_; -} - -ACE_INLINE ::CORBA::ServiceDetail * -CORBA::ServiceDetail_out::operator-> (void) -{ - return this->ptr_; -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194 - -// ************************************************************* -// Inline operations for class CORBA::ServiceInformation_var -// ************************************************************* - -ACE_INLINE -CORBA::ServiceInformation_var::ServiceInformation_var (void) - : ptr_ (0) -{} - -ACE_INLINE -CORBA::ServiceInformation_var::ServiceInformation_var (ServiceInformation *p) - : ptr_ (p) -{} - -ACE_INLINE -CORBA::ServiceInformation_var::ServiceInformation_var (const ::CORBA::ServiceInformation_var &p) -{ - if (p.ptr_) - { - ACE_NEW (this->ptr_, ::CORBA::ServiceInformation (*p.ptr_)); - } - else - { - this->ptr_ = 0; - } -} - -ACE_INLINE -CORBA::ServiceInformation_var::~ServiceInformation_var (void) -{ - delete this->ptr_; -} - -ACE_INLINE -CORBA::ServiceInformation_var & -CORBA::ServiceInformation_var::operator= (ServiceInformation *_tao_struct_var) -{ - delete this->ptr_; - this->ptr_ = _tao_struct_var; - return *this; -} - -ACE_INLINE -::CORBA::ServiceInformation_var & -CORBA::ServiceInformation_var::operator= (const ::CORBA::ServiceInformation_var &_tao_struct_var) -{ - if (this != &_tao_struct_var) - { - if (_tao_struct_var.ptr_ == 0) - { - delete this->ptr_; - this->ptr_ = 0; - } - else - { - ServiceInformation *deep_copy = 0; - ACE_NEW_RETURN ( - deep_copy, - ServiceInformation (*_tao_struct_var.ptr_), - *this - ); - - if (deep_copy != 0) - { - ServiceInformation *tmp = deep_copy; - deep_copy = this->ptr_; - this->ptr_ = tmp; - delete deep_copy; - } - } - } - - return *this; -} - -ACE_INLINE const ::CORBA::ServiceInformation * -CORBA::ServiceInformation_var::operator-> (void) const -{ - return this->ptr_; -} - -ACE_INLINE ::CORBA::ServiceInformation * -CORBA::ServiceInformation_var::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -CORBA::ServiceInformation_var::operator const ::CORBA::ServiceInformation &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE -CORBA::ServiceInformation_var::operator ::CORBA::ServiceInformation &() // cast -{ - return *this->ptr_; -} - -ACE_INLINE -CORBA::ServiceInformation_var::operator ::CORBA::ServiceInformation &() const // cast -{ - return *this->ptr_; -} - -// Variable-size types only. -ACE_INLINE -CORBA::ServiceInformation_var::operator ::CORBA::ServiceInformation *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE const ::CORBA::ServiceInformation & -CORBA::ServiceInformation_var::in (void) const -{ - return *this->ptr_; -} - -ACE_INLINE ::CORBA::ServiceInformation & -CORBA::ServiceInformation_var::inout (void) -{ - return *this->ptr_; -} - -// Mapping for variable size. -ACE_INLINE ::CORBA::ServiceInformation *& -CORBA::ServiceInformation_var::out (void) -{ - delete this->ptr_; - this->ptr_ = 0; - return this->ptr_; -} - -ACE_INLINE ::CORBA::ServiceInformation * -CORBA::ServiceInformation_var::_retn (void) -{ - ::CORBA::ServiceInformation *tmp = this->ptr_; - this->ptr_ = 0; - return tmp; -} - -ACE_INLINE ::CORBA::ServiceInformation * -CORBA::ServiceInformation_var::ptr (void) const -{ - return this->ptr_; -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:523 - -// ************************************************************* -// Inline operations for class CORBA::ServiceInformation_out -// ************************************************************* - -ACE_INLINE -CORBA::ServiceInformation_out::ServiceInformation_out (::CORBA::ServiceInformation *&p) - : ptr_ (p) -{ - this->ptr_ = 0; -} - -ACE_INLINE -CORBA::ServiceInformation_out::ServiceInformation_out (ServiceInformation_var &p) - : ptr_ (p.out ()) -{ - delete this->ptr_; - this->ptr_ = 0; -} - -ACE_INLINE -CORBA::ServiceInformation_out::ServiceInformation_out (const ::CORBA::ServiceInformation_out &p) - : ptr_ (ACE_const_cast (ServiceInformation_out&, p).ptr_) -{} - -ACE_INLINE -CORBA::ServiceInformation_out & -CORBA::ServiceInformation_out::operator= (const ::CORBA::ServiceInformation_out &p) -{ - this->ptr_ = ACE_const_cast (ServiceInformation_out&, p).ptr_; - return *this; -} - -ACE_INLINE -CORBA::ServiceInformation_out & -CORBA::ServiceInformation_out::operator= (ServiceInformation *_tao_struct_out) -{ - this->ptr_ = _tao_struct_out; - return *this; -} - -ACE_INLINE -CORBA::ServiceInformation_out::operator ::CORBA::ServiceInformation *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE ::CORBA::ServiceInformation *& -CORBA::ServiceInformation_out::ptr (void) // ptr -{ - return this->ptr_; -} - -ACE_INLINE ::CORBA::ServiceInformation * -CORBA::ServiceInformation_out::operator-> (void) -{ - return this->ptr_; -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CI_) -#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CI_ - -ACE_INLINE -CORBA::ULong * -CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (CORBA::ULong size) -{ - CORBA::ULong *retval = 0; - ACE_NEW_RETURN (retval, CORBA::ULong[size], 0); - return retval; -} - -ACE_INLINE -void CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::freebuf (CORBA::ULong *buffer) -{ - delete [] buffer; -} - -ACE_INLINE -CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (void) -{ -} - -ACE_INLINE -CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (CORBA::ULong maximum) - : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (maximum)) -{ -} - -ACE_INLINE -CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption ( - CORBA::ULong maximum, - CORBA::ULong length, - CORBA::ULong *data, - CORBA::Boolean release - ) - : TAO_Unbounded_Base_Sequence (maximum, length, data, release) -{ -} - -ACE_INLINE -CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption ( - const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &rhs - ) - : TAO_Unbounded_Base_Sequence (rhs) -{ - if (rhs.buffer_ != 0) - { - CORBA::ULong *tmp1 = - _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (this->maximum_); - CORBA::ULong * const tmp2 = - ACE_reinterpret_cast (CORBA::ULong * ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - tmp1[i] = tmp2[i]; - } - - this->buffer_ = tmp1; - } - else - { - this->buffer_ = 0; - } -} - -ACE_INLINE -CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption & -CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::operator= ( - const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &rhs - ) -{ - if (this == &rhs) - { - return *this; - } - - if (this->release_) - { - if (this->maximum_ < rhs.maximum_) - { - // Free the old buffer. - CORBA::ULong *tmp = - ACE_reinterpret_cast (CORBA::ULong *, this->buffer_); - - _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::freebuf (tmp); - - this->buffer_ = - _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (rhs.maximum_); - } - } - else - { - this->buffer_ = - _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (rhs.maximum_); - } - - TAO_Unbounded_Base_Sequence::operator= (rhs); - - CORBA::ULong *tmp1 = - ACE_reinterpret_cast (CORBA::ULong *, this->buffer_); - CORBA::ULong * const tmp2 = - ACE_reinterpret_cast (CORBA::ULong * ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - tmp1[i] = tmp2[i]; - } - - return *this; -} - -// = Accessors. -ACE_INLINE -CORBA::ULong & -CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::operator[] (CORBA::ULong i) -{ - ACE_ASSERT (i < this->maximum_); - CORBA::ULong* tmp = - ACE_reinterpret_cast (CORBA::ULong*, this->buffer_); - return tmp[i]; -} - -ACE_INLINE -const CORBA::ULong & -CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::operator[] (CORBA::ULong i) const -{ - ACE_ASSERT (i < this->maximum_); - CORBA::ULong * const tmp = - ACE_reinterpret_cast (CORBA::ULong* ACE_CAST_CONST, this->buffer_); - return tmp[i]; -} - -// Implement the TAO_Base_Sequence methods (see Sequence.h) - -ACE_INLINE -CORBA::ULong * -CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::get_buffer (CORBA::Boolean orphan) -{ - CORBA::ULong *result = 0; - - if (orphan == 0) - { - // We retain ownership. - if (this->buffer_ == 0) - { - result = - _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (this->length_); - this->buffer_ = result; - this->release_ = 1; - } - else - { - result = - ACE_reinterpret_cast (CORBA::ULong*, this->buffer_); - } - } - else // if (orphan == 1) - { - if (this->release_ != 0) - { - // We set the state back to default and relinquish ownership. - result = - ACE_reinterpret_cast(CORBA::ULong*,this->buffer_); - this->maximum_ = 0; - this->length_ = 0; - this->buffer_ = 0; - this->release_ = 0; - } - } - - return result; -} - -ACE_INLINE -const CORBA::ULong * -CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::get_buffer (void) const -{ - return ACE_reinterpret_cast (const CORBA::ULong * ACE_CAST_CONST, this->buffer_); -} - -ACE_INLINE -void -CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::replace ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::ULong *data, - CORBA::Boolean release - ) -{ - this->maximum_ = max; - this->length_ = length; - - if (this->buffer_ && this->release_ == 1) - { - CORBA::ULong *tmp = - ACE_reinterpret_cast (CORBA::ULong*, this->buffer_); - _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::freebuf (tmp); - } - - this->buffer_ = data; - this->release_ = release; -} - -#endif /* end #if !defined */ - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_sequence_ci.cpp:99 - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - -#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CI_) -#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CI_ - -ACE_INLINE -CORBA::ServiceDetail * -CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (CORBA::ULong size) -{ - CORBA::ServiceDetail *retval = 0; - ACE_NEW_RETURN (retval, CORBA::ServiceDetail[size], 0); - return retval; -} - -ACE_INLINE -void CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::freebuf (CORBA::ServiceDetail *buffer) -{ - delete [] buffer; -} - -ACE_INLINE -CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (void) -{ -} - -ACE_INLINE -CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (CORBA::ULong maximum) - : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (maximum)) -{ -} - -ACE_INLINE -CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail ( - CORBA::ULong maximum, - CORBA::ULong length, - CORBA::ServiceDetail *data, - CORBA::Boolean release - ) - : TAO_Unbounded_Base_Sequence (maximum, length, data, release) -{ -} - -ACE_INLINE -CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail ( - const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail &rhs - ) - : TAO_Unbounded_Base_Sequence (rhs) -{ - if (rhs.buffer_ != 0) - { - CORBA::ServiceDetail *tmp1 = - _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (this->maximum_); - CORBA::ServiceDetail * const tmp2 = - ACE_reinterpret_cast (CORBA::ServiceDetail * ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - tmp1[i] = tmp2[i]; - } - - this->buffer_ = tmp1; - } - else - { - this->buffer_ = 0; - } -} - -ACE_INLINE -CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail & -CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::operator= ( - const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail &rhs - ) -{ - if (this == &rhs) - { - return *this; - } - - if (this->release_) - { - if (this->maximum_ < rhs.maximum_) - { - // Free the old buffer. - CORBA::ServiceDetail *tmp = - ACE_reinterpret_cast (CORBA::ServiceDetail *, this->buffer_); - - _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::freebuf (tmp); - - this->buffer_ = - _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (rhs.maximum_); - } - } - else - { - this->buffer_ = - _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (rhs.maximum_); - } - - TAO_Unbounded_Base_Sequence::operator= (rhs); - - CORBA::ServiceDetail *tmp1 = - ACE_reinterpret_cast (CORBA::ServiceDetail *, this->buffer_); - CORBA::ServiceDetail * const tmp2 = - ACE_reinterpret_cast (CORBA::ServiceDetail * ACE_CAST_CONST, rhs.buffer_); - - for (CORBA::ULong i = 0; i < this->length_; ++i) - { - tmp1[i] = tmp2[i]; - } - - return *this; -} - -// = Accessors. -ACE_INLINE -CORBA::ServiceDetail & -CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::operator[] (CORBA::ULong i) -{ - ACE_ASSERT (i < this->maximum_); - CORBA::ServiceDetail* tmp = - ACE_reinterpret_cast (CORBA::ServiceDetail*, this->buffer_); - return tmp[i]; -} - -ACE_INLINE -const CORBA::ServiceDetail & -CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::operator[] (CORBA::ULong i) const -{ - ACE_ASSERT (i < this->maximum_); - CORBA::ServiceDetail * const tmp = - ACE_reinterpret_cast (CORBA::ServiceDetail* ACE_CAST_CONST, this->buffer_); - return tmp[i]; -} - -// Implement the TAO_Base_Sequence methods (see Sequence.h) - -ACE_INLINE -CORBA::ServiceDetail * -CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::get_buffer (CORBA::Boolean orphan) -{ - CORBA::ServiceDetail *result = 0; - - if (orphan == 0) - { - // We retain ownership. - if (this->buffer_ == 0) - { - result = - _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (this->length_); - this->buffer_ = result; - this->release_ = 1; - } - else - { - result = - ACE_reinterpret_cast (CORBA::ServiceDetail*, this->buffer_); - } - } - else // if (orphan == 1) - { - if (this->release_ != 0) - { - // We set the state back to default and relinquish ownership. - result = - ACE_reinterpret_cast(CORBA::ServiceDetail*,this->buffer_); - this->maximum_ = 0; - this->length_ = 0; - this->buffer_ = 0; - this->release_ = 0; - } - } - - return result; -} - -ACE_INLINE -const CORBA::ServiceDetail * -CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::get_buffer (void) const -{ - return ACE_reinterpret_cast (const CORBA::ServiceDetail * ACE_CAST_CONST, this->buffer_); -} - -ACE_INLINE -void -CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::replace ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::ServiceDetail *data, - CORBA::Boolean release - ) -{ - this->maximum_ = max; - this->length_ = length; - - if (this->buffer_ && this->release_ == 1) - { - CORBA::ServiceDetail *tmp = - ACE_reinterpret_cast (CORBA::ServiceDetail*, this->buffer_); - _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::freebuf (tmp); - } - - this->buffer_ = data; - this->release_ = release; -} - -#endif /* end #if !defined */ - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71 ACE_INLINE CORBA::Boolean operator<< ( @@ -946,7 +98,7 @@ CORBA::Boolean TAO_Export operator>> ( #endif /* _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceDetail_I_ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71 ACE_INLINE CORBA::Boolean operator<< ( diff --git a/TAO/tao/StringSeqC.cpp b/TAO/tao/StringSeqC.cpp index 80cfaca1bed..e6badf5ea50 100644 --- a/TAO/tao/StringSeqC.cpp +++ b/TAO/tao/StringSeqC.cpp @@ -24,72 +24,44 @@ #include "StringSeqC.h" +#include "Any_T.h" +#include "CDR.h" #if defined (__BORLANDC__) -#pragma option -w-rvl -w-rch -w-ccc -w-aus +#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) #include "StringSeqC.i" #endif /* !defined INLINE */ -#include "Any_T.h" - -#if !defined (_CORBA_STRINGSEQ_CS_) -#define _CORBA_STRINGSEQ_CS_ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250 - -// ************************************************************* -// CORBA::StringSeq -// ************************************************************* +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50 CORBA::StringSeq::StringSeq (void) {} CORBA::StringSeq::StringSeq (CORBA::ULong max) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -TAO_Unbounded_String_Sequence -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_String_Sequence - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max) + : TAO_Unbounded_String_Sequence + (max) {} CORBA::StringSeq::StringSeq ( CORBA::ULong max, CORBA::ULong length, - char * *buffer, + char ** buffer, CORBA::Boolean release ) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -TAO_Unbounded_String_Sequence -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_String_Sequence - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max, length, buffer, release) + : TAO_Unbounded_String_Sequence + (max, length, buffer, release) {} CORBA::StringSeq::StringSeq (const StringSeq &seq) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -TAO_Unbounded_String_Sequence -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_String_Sequence - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (seq) + : TAO_Unbounded_String_Sequence + (seq) {} -CORBA::StringSeq::~StringSeq (void) // dtor +CORBA::StringSeq::~StringSeq (void) {} void CORBA::StringSeq::_tao_any_destructor (void *_tao_void_pointer) @@ -98,7 +70,37 @@ void CORBA::StringSeq::_tao_any_destructor (void *_tao_void_pointer) delete tmp; } -#endif /* end #if !defined */ +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + +template class + TAO_MngSeq_Var_T< + CORBA::StringSeq, + TAO_SeqElem_String_Manager + >; + +template class + TAO_Seq_Out_T< + CORBA::StringSeq, + CORBA::StringSeq_var, + TAO_SeqElem_String_Manager + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# pragma instantiate \ + TAO_MngSeq_Var_T< \ + CORBA::StringSeq, \ + TAO_SeqElem_String_Manager \ + > + +# pragma instantiate \ + TAO_Seq_Out_T< \ + CORBA::StringSeq, \ + CORBA::StringSeq_var, \ + TAO_SeqElem_String_Manager \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -145,61 +147,33 @@ TAO_NAMESPACE_DEFINE ( ) TAO_NAMESPACE_END -#if !defined (_CORBA_WSTRINGSEQ_CS_) -#define _CORBA_WSTRINGSEQ_CS_ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:250 - -// ************************************************************* -// CORBA::WStringSeq -// ************************************************************* +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50 CORBA::WStringSeq::WStringSeq (void) {} CORBA::WStringSeq::WStringSeq (CORBA::ULong max) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -TAO_Unbounded_WString_Sequence -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_WString_Sequence - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max) + : TAO_Unbounded_WString_Sequence + (max) {} CORBA::WStringSeq::WStringSeq ( CORBA::ULong max, CORBA::ULong length, - CORBA::WChar * *buffer, + CORBA::WChar ** buffer, CORBA::Boolean release ) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -TAO_Unbounded_WString_Sequence -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_WString_Sequence - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max, length, buffer, release) + : TAO_Unbounded_WString_Sequence + (max, length, buffer, release) {} CORBA::WStringSeq::WStringSeq (const WStringSeq &seq) - : - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -TAO_Unbounded_WString_Sequence -#else /* TAO_USE_SEQUENCE_TEMPLATES */ -TAO_Unbounded_WString_Sequence - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (seq) + : TAO_Unbounded_WString_Sequence + (seq) {} -CORBA::WStringSeq::~WStringSeq (void) // dtor +CORBA::WStringSeq::~WStringSeq (void) {} void CORBA::WStringSeq::_tao_any_destructor (void *_tao_void_pointer) @@ -208,7 +182,37 @@ void CORBA::WStringSeq::_tao_any_destructor (void *_tao_void_pointer) delete tmp; } -#endif /* end #if !defined */ +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + +template class + TAO_MngSeq_Var_T< + CORBA::WStringSeq, + TAO_SeqElem_WString_Manager + >; + +template class + TAO_Seq_Out_T< + CORBA::WStringSeq, + CORBA::WStringSeq_var, + TAO_SeqElem_WString_Manager + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# pragma instantiate \ + TAO_MngSeq_Var_T< \ + CORBA::WStringSeq, \ + TAO_SeqElem_WString_Manager \ + > + +# pragma instantiate \ + TAO_Seq_Out_T< \ + CORBA::WStringSeq, \ + CORBA::WStringSeq_var, \ + TAO_SeqElem_WString_Manager \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -314,6 +318,13 @@ CORBA::Boolean operator>>= ( ); } +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ + defined (ACE_HAS_GNU_REPO) + template class TAO::Any_Dual_Impl_T<CORBA::StringSeq>; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::StringSeq> +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54 @@ -372,8 +383,15 @@ CORBA::Boolean operator>>= ( ); } +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ + defined (ACE_HAS_GNU_REPO) + template class TAO::Any_Dual_Impl_T<CORBA::WStringSeq>; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::WStringSeq> +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93 CORBA::Boolean operator<< ( TAO_OutputCDR &strm, @@ -439,7 +457,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93 CORBA::Boolean operator<< ( TAO_OutputCDR &strm, diff --git a/TAO/tao/StringSeqC.h b/TAO/tao/StringSeqC.h index 019234a71cb..ce6a9db6c18 100644 --- a/TAO/tao/StringSeqC.h +++ b/TAO/tao/StringSeqC.h @@ -27,13 +27,13 @@ #include "ace/pre.h" -#include "corbafwd.h" +#include "Sequence.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Sequence.h" +#include "Seq_VarOut_T.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -58,233 +58,129 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -namespace CORBA -{ - -#if !defined (_CORBA_STRINGSEQ_CH_) -#define _CORBA_STRINGSEQ_CH_ +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48 +TAO_NAMESPACE CORBA +{ + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75 + class StringSeq; - class StringSeq_var; - // ************************************************************* - // CORBA::StringSeq - // ************************************************************* + typedef + TAO_MngSeq_Var_T< + StringSeq, + TAO_SeqElem_String_Manager + > + StringSeq_var; - class TAO_Export StringSeq : public - -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - TAO_Unbounded_String_Sequence -#else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_String_Sequence - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + typedef + TAO_Seq_Out_T< + StringSeq, + StringSeq_var, + TAO_SeqElem_String_Manager + > + StringSeq_out; + + class TAO_Export StringSeq + : public + TAO_Unbounded_String_Sequence { public: - StringSeq (void); // default ctor - StringSeq (CORBA::ULong max); // uses max size + StringSeq (void); + StringSeq (CORBA::ULong max); StringSeq ( - CORBA::ULong max, - CORBA::ULong length, - char * *buffer, - CORBA::Boolean release = 0 - ); - StringSeq (const StringSeq &); // copy ctor + CORBA::ULong max, + CORBA::ULong length, + char ** buffer, + CORBA::Boolean release = 0 + ); + StringSeq (const StringSeq &); ~StringSeq (void); - static void _tao_any_destructor (void*); + + static void _tao_any_destructor (void *); typedef StringSeq_var _var_type; }; - -#endif /* end #if !defined */ - -#if !defined (_CORBA_STRINGSEQ___VAR_CH_) -#define _CORBA_STRINGSEQ___VAR_CH_ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549 - - // ************************************************************* - // class CORBA::StringSeq_var - // ************************************************************* - - class TAO_Export StringSeq_var - { - public: - StringSeq_var (void); // default constructor - StringSeq_var (StringSeq *); - StringSeq_var (const StringSeq_var &); // copy constructor - ~StringSeq_var (void); // destructor - - StringSeq_var &operator= (StringSeq *); - StringSeq_var &operator= (const StringSeq_var &); - StringSeq *operator-> (void); - const StringSeq *operator-> (void) const; - - operator const StringSeq &() const; - operator StringSeq &(); - operator StringSeq &() const; - operator StringSeq *&(); // variable-size base types only - - TAO_SeqElem_String_Manager operator[] (CORBA::ULong index); - - // in, inout, out, _retn - const StringSeq &in (void) const; - StringSeq &inout (void); - StringSeq *&out (void); - StringSeq *_retn (void); - StringSeq *ptr (void) const; - - private: - StringSeq *ptr_; - }; - -#endif /* end #if !defined */ - -#if !defined (_CORBA_STRINGSEQ___OUT_CH_) -#define _CORBA_STRINGSEQ___OUT_CH_ - - class TAO_Export StringSeq_out - { - public: - StringSeq_out (StringSeq *&); - StringSeq_out (StringSeq_var &); - StringSeq_out (const StringSeq_out &); - StringSeq_out &operator= (const StringSeq_out &); - StringSeq_out &operator= (StringSeq *); - operator StringSeq *&(); - StringSeq *&ptr (void); - StringSeq *operator-> (void); - TAO_SeqElem_String_Manager operator[] (CORBA::ULong index); + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - private: - StringSeq *&ptr_; - // assignment from T_var not allowed - void operator= (const StringSeq_var &); - }; - -#endif /* end #if !defined */ + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StringSeq; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StringSeq; - -#if !defined (_CORBA_WSTRINGSEQ_CH_) -#define _CORBA_WSTRINGSEQ_CH_ - class WStringSeq; - class WStringSeq_var; - // ************************************************************* - // CORBA::WStringSeq - // ************************************************************* + typedef + TAO_MngSeq_Var_T< + WStringSeq, + TAO_SeqElem_WString_Manager + > + WStringSeq_var; - class TAO_Export WStringSeq : public -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - TAO_Unbounded_WString_Sequence -#else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_WString_Sequence - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + typedef + TAO_Seq_Out_T< + WStringSeq, + WStringSeq_var, + TAO_SeqElem_WString_Manager + > + WStringSeq_out; + + class TAO_Export WStringSeq + : public + TAO_Unbounded_WString_Sequence { public: - WStringSeq (void); // default ctor - WStringSeq (CORBA::ULong max); // uses max size + WStringSeq (void); + WStringSeq (CORBA::ULong max); WStringSeq ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::WChar * *buffer, - CORBA::Boolean release = 0 - ); - WStringSeq (const WStringSeq &); // copy ctor + CORBA::ULong max, + CORBA::ULong length, + CORBA::WChar ** buffer, + CORBA::Boolean release = 0 + ); + WStringSeq (const WStringSeq &); ~WStringSeq (void); - static void _tao_any_destructor (void*); + + static void _tao_any_destructor (void *); typedef WStringSeq_var _var_type; }; - -#endif /* end #if !defined */ - -#if !defined (_CORBA_WSTRINGSEQ___VAR_CH_) -#define _CORBA_WSTRINGSEQ___VAR_CH_ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:549 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - // ************************************************************* - // class WStringSeq_var - // ************************************************************* - - class TAO_Export WStringSeq_var - { - public: - WStringSeq_var (void); // default constructor - WStringSeq_var (WStringSeq *); - WStringSeq_var (const WStringSeq_var &); // copy constructor - ~WStringSeq_var (void); // destructor - - WStringSeq_var &operator= (WStringSeq *); - WStringSeq_var &operator= (const WStringSeq_var &); - WStringSeq *operator-> (void); - const WStringSeq *operator-> (void) const; - - operator const WStringSeq &() const; - operator WStringSeq &(); - operator WStringSeq &() const; - operator WStringSeq *&(); // variable-size base types only - - TAO_SeqElem_WString_Manager operator[] (CORBA::ULong index); - - // in, inout, out, _retn - const WStringSeq &in (void) const; - WStringSeq &inout (void); - WStringSeq *&out (void); - WStringSeq *_retn (void); - WStringSeq *ptr (void) const; - - private: - WStringSeq *ptr_; - }; - -#endif /* end #if !defined */ - -#if !defined (_CORBA_WSTRINGSEQ___OUT_CH_) -#define _CORBA_WSTRINGSEQ___OUT_CH_ + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_WStringSeq; - class TAO_Export WStringSeq_out - { - public: - WStringSeq_out (WStringSeq *&); - WStringSeq_out (WStringSeq_var &); - WStringSeq_out (const WStringSeq_out &); - WStringSeq_out &operator= (const WStringSeq_out &); - WStringSeq_out &operator= (WStringSeq *); - operator WStringSeq *&(); - WStringSeq *&ptr (void); - WStringSeq *operator-> (void); - TAO_SeqElem_WString_Manager operator[] (CORBA::ULong index); - - private: - WStringSeq *&ptr_; - // assignment from T_var not allowed - void operator= (const WStringSeq_var &); - }; +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67 -#endif /* end #if !defined */ - -} // End namespace CORBA +} +TAO_NAMESPACE_CLOSE // module CORBA +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52 TAO_Export void operator<<= (CORBA::Any &, const CORBA::StringSeq &); // copying version TAO_Export void operator<<= (CORBA::Any &, CORBA::StringSeq*); // noncopying version TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::StringSeq *&); // deprecated TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::StringSeq *&); + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52 + TAO_Export void operator<<= (CORBA::Any &, const CORBA::WStringSeq &); // copying version TAO_Export void operator<<= (CORBA::Any &, CORBA::WStringSeq*); // noncopying version TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::WStringSeq *&); // deprecated TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::WStringSeq *&); +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48 + #ifndef __ACE_INLINE__ // TAO_IDL - Generated from @@ -327,7 +223,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* __ACE_INLINE__ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018 #if defined (__ACE_INLINE__) #include "StringSeqC.i" diff --git a/TAO/tao/StringSeqC.i b/TAO/tao/StringSeqC.i index 66a4b0ae58d..6e55aadacaa 100644 --- a/TAO/tao/StringSeqC.i +++ b/TAO/tao/StringSeqC.i @@ -20,482 +20,6 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html -#if !defined (_CORBA_STRINGSEQ_CI_) -#define _CORBA_STRINGSEQ_CI_ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226 - -// ************************************************************* -// Inline operations for class CORBA::StringSeq_var -// ************************************************************* - -ACE_INLINE -CORBA::StringSeq_var::StringSeq_var (void) - : ptr_ (0) -{} - -ACE_INLINE -CORBA::StringSeq_var::StringSeq_var (StringSeq *p) - : ptr_ (p) -{} - -ACE_INLINE -CORBA::StringSeq_var::StringSeq_var (const ::CORBA::StringSeq_var &p) -{ - if (p.ptr_) - { - ACE_NEW (this->ptr_, ::CORBA::StringSeq (*p.ptr_)); - } - else - { - this->ptr_ = 0; - } -} - -ACE_INLINE -CORBA::StringSeq_var::~StringSeq_var (void) -{ - delete this->ptr_; -} - -ACE_INLINE -CORBA::StringSeq_var & -CORBA::StringSeq_var::operator= (StringSeq *p) -{ - delete this->ptr_; - this->ptr_ = p; - return *this; -} - -ACE_INLINE -::CORBA::StringSeq_var & -CORBA::StringSeq_var::operator= (const ::CORBA::StringSeq_var &p) -{ - if (this != &p) - { - if (p.ptr_ == 0) - { - delete this->ptr_; - this->ptr_ = 0; - } - else - { - StringSeq *deep_copy = 0; - ACE_NEW_RETURN ( - deep_copy, - StringSeq (*p.ptr_), - *this - ); - - if (deep_copy != 0) - { - StringSeq *tmp = deep_copy; - deep_copy = this->ptr_; - this->ptr_ = tmp; - delete deep_copy; - } - } - } - - return *this; -} - -ACE_INLINE -const ::CORBA::StringSeq * -CORBA::StringSeq_var::operator-> (void) const -{ - return this->ptr_; -} - -ACE_INLINE -::CORBA::StringSeq * -CORBA::StringSeq_var::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -CORBA::StringSeq_var::operator const ::CORBA::StringSeq &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE -CORBA::StringSeq_var::operator ::CORBA::StringSeq &() // cast -{ - return *this->ptr_; -} - -ACE_INLINE -CORBA::StringSeq_var::operator ::CORBA::StringSeq &() const // cast -{ - return *this->ptr_; -} - -// Variable-size types only. -ACE_INLINE -CORBA::StringSeq_var::operator ::CORBA::StringSeq *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE -TAO_SeqElem_String_Manager -CORBA::StringSeq_var::operator[] (CORBA::ULong index) -{ - return this->ptr_->operator[] (index); -} - -ACE_INLINE -const ::CORBA::StringSeq & -CORBA::StringSeq_var::in (void) const -{ - return *this->ptr_; -} - -ACE_INLINE -::CORBA::StringSeq & -CORBA::StringSeq_var::inout (void) -{ - return *this->ptr_; -} - -ACE_INLINE -::CORBA::StringSeq *& -CORBA::StringSeq_var::out (void) -{ - delete this->ptr_; - this->ptr_ = 0; - return this->ptr_; -} - -ACE_INLINE -::CORBA::StringSeq * -CORBA::StringSeq_var::_retn (void) -{ - ::CORBA::StringSeq *tmp = this->ptr_; - this->ptr_ = 0; - return tmp; -} - -ACE_INLINE -::CORBA::StringSeq * -CORBA::StringSeq_var::ptr (void) const -{ - return this->ptr_; -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567 - -// ************************************************************* -// Inline operations for class CORBA::StringSeq_out -// ************************************************************* - -ACE_INLINE -CORBA::StringSeq_out::StringSeq_out (StringSeq *&p) - : ptr_ (p) -{ - this->ptr_ = 0; -} - -ACE_INLINE -CORBA::StringSeq_out::StringSeq_out (StringSeq_var &p) - : ptr_ (p.out ()) -{ - delete this->ptr_; - this->ptr_ = 0; -} - -ACE_INLINE -CORBA::StringSeq_out::StringSeq_out (const ::CORBA::StringSeq_out &p) - : ptr_ (ACE_const_cast (StringSeq_out&, p).ptr_) -{} - -ACE_INLINE -::CORBA::StringSeq_out & -CORBA::StringSeq_out::operator= (const ::CORBA::StringSeq_out &p) -{ - this->ptr_ = ACE_const_cast (StringSeq_out&, p).ptr_; - return *this; -} - -ACE_INLINE -::CORBA::StringSeq_out & -CORBA::StringSeq_out::operator= (StringSeq *p) -{ - this->ptr_ = p; - return *this; -} - -ACE_INLINE -CORBA::StringSeq_out::operator ::CORBA::StringSeq *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE -::CORBA::StringSeq *& -CORBA::StringSeq_out::ptr (void) // ptr -{ - return this->ptr_; -} - -ACE_INLINE -::CORBA::StringSeq * -CORBA::StringSeq_out::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -TAO_SeqElem_String_Manager -CORBA::StringSeq_out::operator[] (CORBA::ULong index) -{ - return this->ptr_->operator[] (index); -} - -#endif /* end #if !defined */ - -#if !defined (_CORBA_WSTRINGSEQ_CI_) -#define _CORBA_WSTRINGSEQ_CI_ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:226 - -// ************************************************************* -// Inline operations for class CORBA::WStringSeq_var -// ************************************************************* - -ACE_INLINE -CORBA::WStringSeq_var::WStringSeq_var (void) - : ptr_ (0) -{} - -ACE_INLINE -CORBA::WStringSeq_var::WStringSeq_var (WStringSeq *p) - : ptr_ (p) -{} - -ACE_INLINE -CORBA::WStringSeq_var::WStringSeq_var (const ::CORBA::WStringSeq_var &p) -{ - if (p.ptr_) - { - ACE_NEW (this->ptr_, ::CORBA::WStringSeq (*p.ptr_)); - } - else - { - this->ptr_ = 0; - } -} - -ACE_INLINE -CORBA::WStringSeq_var::~WStringSeq_var (void) -{ - delete this->ptr_; -} - -ACE_INLINE -CORBA::WStringSeq_var & -CORBA::WStringSeq_var::operator= (WStringSeq *p) -{ - delete this->ptr_; - this->ptr_ = p; - return *this; -} - -ACE_INLINE -::CORBA::WStringSeq_var & -CORBA::WStringSeq_var::operator= (const ::CORBA::WStringSeq_var &p) -{ - if (this != &p) - { - if (p.ptr_ == 0) - { - delete this->ptr_; - this->ptr_ = 0; - } - else - { - WStringSeq *deep_copy = 0; - ACE_NEW_RETURN ( - deep_copy, - WStringSeq (*p.ptr_), - *this - ); - - if (deep_copy != 0) - { - WStringSeq *tmp = deep_copy; - deep_copy = this->ptr_; - this->ptr_ = tmp; - delete deep_copy; - } - } - } - - return *this; -} - -ACE_INLINE -const ::CORBA::WStringSeq * -CORBA::WStringSeq_var::operator-> (void) const -{ - return this->ptr_; -} - -ACE_INLINE -::CORBA::WStringSeq * -CORBA::WStringSeq_var::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -CORBA::WStringSeq_var::operator const ::CORBA::WStringSeq &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE -CORBA::WStringSeq_var::operator ::CORBA::WStringSeq &() // cast -{ - return *this->ptr_; -} - -ACE_INLINE -CORBA::WStringSeq_var::operator ::CORBA::WStringSeq &() const // cast -{ - return *this->ptr_; -} - -// Variable-size types only. -ACE_INLINE -CORBA::WStringSeq_var::operator ::CORBA::WStringSeq *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE -TAO_SeqElem_WString_Manager -CORBA::WStringSeq_var::operator[] (CORBA::ULong index) -{ - return this->ptr_->operator[] (index); -} - -ACE_INLINE -const ::CORBA::WStringSeq & -CORBA::WStringSeq_var::in (void) const -{ - return *this->ptr_; -} - -ACE_INLINE -::CORBA::WStringSeq & -CORBA::WStringSeq_var::inout (void) -{ - return *this->ptr_; -} - -ACE_INLINE -::CORBA::WStringSeq *& -CORBA::WStringSeq_var::out (void) -{ - delete this->ptr_; - this->ptr_ = 0; - return this->ptr_; -} - -ACE_INLINE -::CORBA::WStringSeq * -CORBA::WStringSeq_var::_retn (void) -{ - ::CORBA::WStringSeq *tmp = this->ptr_; - this->ptr_ = 0; - return tmp; -} - -ACE_INLINE -::CORBA::WStringSeq * -CORBA::WStringSeq_var::ptr (void) const -{ - return this->ptr_; -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ci.cpp:567 - -// ************************************************************* -// Inline operations for class CORBA::WStringSeq_out -// ************************************************************* - -ACE_INLINE -CORBA::WStringSeq_out::WStringSeq_out (WStringSeq *&p) - : ptr_ (p) -{ - this->ptr_ = 0; -} - -ACE_INLINE -CORBA::WStringSeq_out::WStringSeq_out (WStringSeq_var &p) - : ptr_ (p.out ()) -{ - delete this->ptr_; - this->ptr_ = 0; -} - -ACE_INLINE -CORBA::WStringSeq_out::WStringSeq_out (const ::CORBA::WStringSeq_out &p) - : ptr_ (ACE_const_cast (WStringSeq_out&, p).ptr_) -{} - -ACE_INLINE -::CORBA::WStringSeq_out & -CORBA::WStringSeq_out::operator= (const ::CORBA::WStringSeq_out &p) -{ - this->ptr_ = ACE_const_cast (WStringSeq_out&, p).ptr_; - return *this; -} - -ACE_INLINE -::CORBA::WStringSeq_out & -CORBA::WStringSeq_out::operator= (WStringSeq *p) -{ - this->ptr_ = p; - return *this; -} - -ACE_INLINE -CORBA::WStringSeq_out::operator ::CORBA::WStringSeq *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE -::CORBA::WStringSeq *& -CORBA::WStringSeq_out::ptr (void) // ptr -{ - return this->ptr_; -} - -ACE_INLINE -::CORBA::WStringSeq * -CORBA::WStringSeq_out::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -TAO_SeqElem_WString_Manager -CORBA::WStringSeq_out::operator[] (CORBA::ULong index) -{ - return this->ptr_->operator[] (index); -} - -#endif /* end #if !defined */ - // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84 diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp index 9f0573e1c1e..eb599fa4f5c 100644 --- a/TAO/tao/TAOC.cpp +++ b/TAO/tao/TAOC.cpp @@ -29,10 +29,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) - -#include "tao/Any_T.h" - #if !defined (__ACE_INLINE__) #include "TAOC.i" #endif /* !defined INLINE */ @@ -187,7 +183,7 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 void TAO::BufferingConstraint::_tao_any_destructor (void *_tao_void_pointer) { @@ -196,12 +192,31 @@ void TAO::BufferingConstraint::_tao_any_destructor (void *_tao_void_pointer) } // TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274 + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + +template class + TAO_Fixed_Var_T< + BufferingConstraint + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# pragma instantiate \ + TAO_Fixed_Var_T< \ + BufferingConstraint \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61 int TAO::BufferingConstraintPolicy::_tao_class_id = 0; TAO::BufferingConstraintPolicy_ptr -tao_TAO_BufferingConstraintPolicy_duplicate ( +TAO::tao_BufferingConstraintPolicy_life::tao_duplicate ( TAO::BufferingConstraintPolicy_ptr p ) { @@ -209,7 +224,7 @@ tao_TAO_BufferingConstraintPolicy_duplicate ( } void -tao_TAO_BufferingConstraintPolicy_release ( +TAO::tao_BufferingConstraintPolicy_life::tao_release ( TAO::BufferingConstraintPolicy_ptr p ) { @@ -217,231 +232,67 @@ tao_TAO_BufferingConstraintPolicy_release ( } TAO::BufferingConstraintPolicy_ptr -tao_TAO_BufferingConstraintPolicy_nil ( +TAO::tao_BufferingConstraintPolicy_life::tao_nil ( void ) { return TAO::BufferingConstraintPolicy::_nil (); } -TAO::BufferingConstraintPolicy_ptr -tao_TAO_BufferingConstraintPolicy_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return TAO::BufferingConstraintPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object * -tao_TAO_BufferingConstraintPolicy_upcast ( - void *src - ) -{ - TAO::BufferingConstraintPolicy **tmp = - ACE_static_cast (TAO::BufferingConstraintPolicy **, src); - return *tmp; -} - CORBA::Boolean -tao_TAO_BufferingConstraintPolicy_marshal ( +TAO::tao_BufferingConstraintPolicy_life::tao_marshal ( TAO::BufferingConstraintPolicy_ptr p, - TAO_OutputCDR &strm + TAO_OutputCDR &cdr ) { - return p->marshal (strm); -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:721 - -// ************************************************************* -// TAO::BufferingConstraintPolicy_var -// ************************************************************* - -TAO::BufferingConstraintPolicy_var::BufferingConstraintPolicy_var (void) - : ptr_ (BufferingConstraintPolicy::_nil ()) -{} - -::TAO::BufferingConstraintPolicy_ptr -TAO::BufferingConstraintPolicy_var::ptr (void) const -{ - return this->ptr_; -} - -TAO::BufferingConstraintPolicy_var::BufferingConstraintPolicy_var (const ::TAO::BufferingConstraintPolicy_var &p) - : TAO_Base_var (), - ptr_ (BufferingConstraintPolicy::_duplicate (p.ptr ())) -{} - -TAO::BufferingConstraintPolicy_var::~BufferingConstraintPolicy_var (void) -{ - CORBA::release (this->ptr_); -} - -TAO::BufferingConstraintPolicy_var & -TAO::BufferingConstraintPolicy_var::operator= (BufferingConstraintPolicy_ptr p) -{ - CORBA::release (this->ptr_); - this->ptr_ = p; - return *this; -} - -TAO::BufferingConstraintPolicy_var & -TAO::BufferingConstraintPolicy_var::operator= (const ::TAO::BufferingConstraintPolicy_var &p) -{ - if (this != &p) - { - CORBA::release (this->ptr_); - this->ptr_ = ::TAO::BufferingConstraintPolicy::_duplicate (p.ptr ()); - } - return *this; -} - -TAO::BufferingConstraintPolicy_var::operator const ::TAO::BufferingConstraintPolicy_ptr &() const // cast -{ - return this->ptr_; -} - -TAO::BufferingConstraintPolicy_var::operator ::TAO::BufferingConstraintPolicy_ptr &() // cast -{ - return this->ptr_; -} - -::TAO::BufferingConstraintPolicy_ptr -TAO::BufferingConstraintPolicy_var::operator-> (void) const -{ - return this->ptr_; -} - -::TAO::BufferingConstraintPolicy_ptr -TAO::BufferingConstraintPolicy_var::in (void) const -{ - return this->ptr_; -} - -::TAO::BufferingConstraintPolicy_ptr & -TAO::BufferingConstraintPolicy_var::inout (void) -{ - return this->ptr_; + return p->marshal (cdr); } -::TAO::BufferingConstraintPolicy_ptr & -TAO::BufferingConstraintPolicy_var::out (void) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::TAO::BufferingConstraintPolicy::_nil (); - return this->ptr_; -} - -::TAO::BufferingConstraintPolicy_ptr -TAO::BufferingConstraintPolicy_var::_retn (void) -{ - // yield ownership of managed obj reference - ::TAO::BufferingConstraintPolicy_ptr val = this->ptr_; - this->ptr_ = ::TAO::BufferingConstraintPolicy::_nil (); - return val; -} - -::TAO::BufferingConstraintPolicy_ptr -TAO::BufferingConstraintPolicy_var::tao_duplicate (BufferingConstraintPolicy_ptr p) -{ - return ::TAO::BufferingConstraintPolicy::_duplicate (p); -} - -void -TAO::BufferingConstraintPolicy_var::tao_release (BufferingConstraintPolicy_ptr p) -{ - CORBA::release (p); -} - -::TAO::BufferingConstraintPolicy_ptr -TAO::BufferingConstraintPolicy_var::tao_nil (void) -{ - return ::TAO::BufferingConstraintPolicy::_nil (); -} - -::TAO::BufferingConstraintPolicy_ptr -TAO::BufferingConstraintPolicy_var::tao_narrow ( +TAO::BufferingConstraintPolicy_ptr +TAO::tao_BufferingConstraintPolicy_cast::tao_narrow ( CORBA::Object *p ACE_ENV_ARG_DECL ) { - return ::TAO::BufferingConstraintPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); + return TAO::BufferingConstraintPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * -TAO::BufferingConstraintPolicy_var::tao_upcast (void *src) +TAO::tao_BufferingConstraintPolicy_cast::tao_upcast ( + void *src + ) { - BufferingConstraintPolicy **tmp = - ACE_static_cast (BufferingConstraintPolicy **, src); + TAO::BufferingConstraintPolicy **tmp = + ACE_static_cast (TAO::BufferingConstraintPolicy **, src); return *tmp; } -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1030 - -// ************************************************************* -// TAO::BufferingConstraintPolicy_out -// ************************************************************* - -TAO::BufferingConstraintPolicy_out::BufferingConstraintPolicy_out (BufferingConstraintPolicy_ptr &p) - : ptr_ (p) -{ - this->ptr_ = ::TAO::BufferingConstraintPolicy::_nil (); -} - -TAO::BufferingConstraintPolicy_out::BufferingConstraintPolicy_out (BufferingConstraintPolicy_var &p) - : ptr_ (p.out ()) -{ - CORBA::release (this->ptr_); - this->ptr_ = ::TAO::BufferingConstraintPolicy::_nil (); -} - -TAO::BufferingConstraintPolicy_out::BufferingConstraintPolicy_out (const ::TAO::BufferingConstraintPolicy_out &p) - : ptr_ (ACE_const_cast (BufferingConstraintPolicy_out &, p).ptr_) -{} - -::TAO::BufferingConstraintPolicy_out & -TAO::BufferingConstraintPolicy_out::operator= (const ::TAO::BufferingConstraintPolicy_out &p) -{ - this->ptr_ = ACE_const_cast (BufferingConstraintPolicy_out&, p).ptr_; - return *this; -} - -TAO::BufferingConstraintPolicy_out & -TAO::BufferingConstraintPolicy_out::operator= (const ::TAO::BufferingConstraintPolicy_var &p) -{ - this->ptr_ = ::TAO::BufferingConstraintPolicy::_duplicate (p.ptr ()); - return *this; -} - -TAO::BufferingConstraintPolicy_out & -TAO::BufferingConstraintPolicy_out::operator= (BufferingConstraintPolicy_ptr p) -{ - this->ptr_ = p; - return *this; -} - -TAO::BufferingConstraintPolicy_out::operator ::TAO::BufferingConstraintPolicy_ptr &() // cast -{ - return this->ptr_; -} - -::TAO::BufferingConstraintPolicy_ptr & -TAO::BufferingConstraintPolicy_out::ptr (void) -{ - return this->ptr_; -} - -::TAO::BufferingConstraintPolicy_ptr -TAO::BufferingConstraintPolicy_out::operator-> (void) -{ - return this->ptr_; -} +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + template class + TAO_Objref_Var_T< + TAO::BufferingConstraintPolicy, + TAO::tao_BufferingConstraintPolicy_life + >; + template class + TAO_Objref_Out_T< + TAO::BufferingConstraintPolicy, + TAO::tao_BufferingConstraintPolicy_life + >; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +# pragma instantiate \ + TAO_Objref_Var_T< \ + TAO::BufferingConstraintPolicy, \ + TAO::tao_BufferingConstraintPolicy_life \ + > +# pragma instantiate \ + TAO_Objref_Out_T< \ + TAO::BufferingConstraintPolicy, \ + TAO::tao_BufferingConstraintPolicy_life \ + > +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 TAO::BufferingConstraintPolicy::BufferingConstraintPolicy (void) {} @@ -549,6 +400,12 @@ const char* TAO::BufferingConstraintPolicy::_interface_repository_id (void) cons return "IDL:tao/TAO/BufferingConstraintPolicy:1.0"; } +CORBA::Boolean +TAO::BufferingConstraintPolicy::marshal (TAO_OutputCDR &) +{ + return 0; +} + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -704,6 +561,7 @@ operator>>= ( ); } +template<> CORBA::Boolean TAO::Any_Impl_T<TAO::BufferingConstraintPolicy>::to_object ( CORBA::Object_ptr &_tao_elem @@ -732,10 +590,7 @@ TAO::Any_Impl_T<TAO::BufferingConstraintPolicy>::demarshal_value (TAO_InputCDR & template class TAO_Object_Manager<TAO::BufferingConstraintPolicy,TAO::BufferingConstraintPolicy_var>; template class TAO::Any_Impl_T<TAO::BufferingConstraintPolicy>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<TAO::BufferingConstraintPolicy,TAO::BufferingConstraintPolicy_var> +# pragma instantiate TAO_Object_Manager<TAO::BufferingConstraintPolicy, TAO::BufferingConstraintPolicy_var> # pragma instantiate TAO::Any_Impl_T<TAO::BufferingConstraintPolicy> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ - - diff --git a/TAO/tao/TAOC.h b/TAO/tao/TAOC.h index e65c81b3a69..3c0517d7252 100644 --- a/TAO/tao/TAOC.h +++ b/TAO/tao/TAOC.h @@ -27,14 +27,15 @@ #include "ace/pre.h" -#include "tao/corbafwd.h" +#include "PolicyC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "PolicyC.h" +#include "Messaging_SyncScopeC.h" #include "TimeBaseC.h" +#include "VarOut_T.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -64,10 +65,9 @@ TAO_NAMESPACE TAO { -#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333 typedef CORBA::UShort BufferingConstraintMode; typedef CORBA::UShort_out BufferingConstraintMode_out; @@ -80,27 +80,40 @@ TAO_NAMESPACE TAO // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::UShort BUFFER_FLUSH = 0U; + const TAO::BufferingConstraintMode BUFFER_FLUSH = 0U; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::UShort BUFFER_TIMEOUT = 1U; + const TAO::BufferingConstraintMode BUFFER_TIMEOUT = 1U; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::UShort BUFFER_MESSAGE_COUNT = 2U; + const TAO::BufferingConstraintMode BUFFER_MESSAGE_COUNT = 2U; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::UShort BUFFER_MESSAGE_BYTES = 4U; + const TAO::BufferingConstraintMode BUFFER_MESSAGE_BYTES = 4U; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231 + + struct BufferingConstraint; - class BufferingConstraint_var; + typedef + TAO_Fixed_Var_T< + BufferingConstraint + > + BufferingConstraint_var; + + typedef + BufferingConstraint & + BufferingConstraint_out; + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52 struct TAO_Export BufferingConstraint { @@ -114,48 +127,6 @@ TAO_NAMESPACE TAO }; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71 - - class TAO_Export BufferingConstraint_var - { - public: - BufferingConstraint_var (void); - BufferingConstraint_var (BufferingConstraint *); - BufferingConstraint_var (const BufferingConstraint_var &); - // Fixed-size types only. - BufferingConstraint_var (const BufferingConstraint &); - ~BufferingConstraint_var (void); - - BufferingConstraint_var &operator= (BufferingConstraint *); - BufferingConstraint_var &operator= (const BufferingConstraint_var &); - - // Fixed-size types only. - BufferingConstraint_var &operator= (const BufferingConstraint &); - - BufferingConstraint *operator-> (void); - const BufferingConstraint *operator-> (void) const; - - operator const BufferingConstraint &() const; - operator BufferingConstraint &(); - operator BufferingConstraint &() const; - - // in, inout, out, _retn - const BufferingConstraint &in (void) const; - BufferingConstraint &inout (void); - BufferingConstraint &out (void); - BufferingConstraint _retn (void); - BufferingConstraint *ptr (void) const; - - private: - BufferingConstraint *ptr_; - }; - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:105 - - typedef BufferingConstraint &BufferingConstraint_out; - - // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BufferingConstraint; @@ -163,93 +134,44 @@ TAO_NAMESPACE TAO // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::ULong BUFFERING_CONSTRAINT_POLICY_TYPE = 1413545985U; + const CORBA::PolicyType BUFFERING_CONSTRAINT_POLICY_TYPE = 1413545985U; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:52 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567 -#if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY___PTR_CH_) -#define _TAO_BUFFERINGCONSTRAINTPOLICY___PTR_CH_ +#if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY__ODDS_N_ENDS_CH_) +#define _TAO_BUFFERINGCONSTRAINTPOLICY__ODDS_N_ENDS_CH_ class BufferingConstraintPolicy; typedef BufferingConstraintPolicy *BufferingConstraintPolicy_ptr; - -#endif /* end #if !defined */ - -#if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY___VAR_CH_) -#define _TAO_BUFFERINGCONSTRAINTPOLICY___VAR_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:571 + struct tao_BufferingConstraintPolicy_life; + typedef TAO_Objref_Var_T<BufferingConstraintPolicy, tao_BufferingConstraintPolicy_life> BufferingConstraintPolicy_var; + typedef TAO_Objref_Out_T<BufferingConstraintPolicy, tao_BufferingConstraintPolicy_life> BufferingConstraintPolicy_out; - class TAO_Export BufferingConstraintPolicy_var : public TAO_Base_var + struct tao_BufferingConstraintPolicy_life { - public: - BufferingConstraintPolicy_var (void); // default constructor - BufferingConstraintPolicy_var (BufferingConstraintPolicy_ptr p) : ptr_ (p) {} - BufferingConstraintPolicy_var (const BufferingConstraintPolicy_var &); // copy constructor - ~BufferingConstraintPolicy_var (void); // destructor - - BufferingConstraintPolicy_var &operator= (BufferingConstraintPolicy_ptr); - BufferingConstraintPolicy_var &operator= (const BufferingConstraintPolicy_var &); - BufferingConstraintPolicy_ptr operator-> (void) const; - - operator const BufferingConstraintPolicy_ptr &() const; - operator BufferingConstraintPolicy_ptr &(); - // in, inout, out, _retn - BufferingConstraintPolicy_ptr in (void) const; - BufferingConstraintPolicy_ptr &inout (void); - BufferingConstraintPolicy_ptr &out (void); - BufferingConstraintPolicy_ptr _retn (void); - BufferingConstraintPolicy_ptr ptr (void) const; - - // Hooks used by template sequence and object manager classes - // for non-defined forward declared interfaces. static BufferingConstraintPolicy_ptr tao_duplicate (BufferingConstraintPolicy_ptr); static void tao_release (BufferingConstraintPolicy_ptr); static BufferingConstraintPolicy_ptr tao_nil (void); - static BufferingConstraintPolicy_ptr tao_narrow ( - CORBA::Object * - ACE_ENV_ARG_DECL_NOT_USED + static CORBA::Boolean tao_marshal ( + BufferingConstraintPolicy_ptr, + TAO_OutputCDR & ); - static CORBA::Object * tao_upcast (void *); - - private: - BufferingConstraintPolicy_ptr ptr_; - // Unimplemented - prevents widening assignment. - BufferingConstraintPolicy_var (const TAO_Base_var &rhs); - BufferingConstraintPolicy_var &operator= (const TAO_Base_var &rhs); }; - -#endif /* end #if !defined */ - -#if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY___OUT_CH_) -#define _TAO_BUFFERINGCONSTRAINTPOLICY___OUT_CH_ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:946 - class TAO_Export BufferingConstraintPolicy_out + struct tao_BufferingConstraintPolicy_cast { - public: - BufferingConstraintPolicy_out (BufferingConstraintPolicy_ptr &); - BufferingConstraintPolicy_out (BufferingConstraintPolicy_var &); - BufferingConstraintPolicy_out (const BufferingConstraintPolicy_out &); - BufferingConstraintPolicy_out &operator= (const BufferingConstraintPolicy_out &); - BufferingConstraintPolicy_out &operator= (const BufferingConstraintPolicy_var &); - BufferingConstraintPolicy_out &operator= (BufferingConstraintPolicy_ptr); - operator BufferingConstraintPolicy_ptr &(); - BufferingConstraintPolicy_ptr &ptr (void); - BufferingConstraintPolicy_ptr operator-> (void); - - private: - BufferingConstraintPolicy_ptr &ptr_; + static BufferingConstraintPolicy_ptr tao_narrow ( + CORBA::Object_ptr + ACE_ENV_ARG_DECL + ); + static CORBA::Object_ptr tao_upcast (void *); }; #endif /* end #if !defined */ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:110 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY_CH_) #define _TAO_BUFFERINGCONSTRAINTPOLICY_CH_ @@ -293,7 +215,7 @@ TAO_NAMESPACE TAO )) = 0; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -303,10 +225,6 @@ TAO_NAMESPACE TAO protected: BufferingConstraintPolicy (void); virtual ~BufferingConstraintPolicy (void); - - friend class _TAO_BufferingConstraintPolicy_Remote_Proxy_Impl; - friend class _TAO_BufferingConstraintPolicy_ThruPOA_Proxy_Impl; - friend class _TAO_BufferingConstraintPolicy_Direct_Proxy_Impl; private: BufferingConstraintPolicy (const BufferingConstraintPolicy &); @@ -320,17 +238,15 @@ TAO_NAMESPACE TAO TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BufferingConstraintPolicy; -#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ - // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::Short SYNC_EAGER_BUFFERING = 0; + const Messaging::SyncScope SYNC_EAGER_BUFFERING = 0; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - const CORBA::Short SYNC_DELAYED_BUFFERING = -2; + const Messaging::SyncScope SYNC_DELAYED_BUFFERING = -2; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67 @@ -338,8 +254,6 @@ TAO_NAMESPACE TAO } TAO_NAMESPACE_CLOSE // module TAO -#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) - // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52 @@ -372,14 +286,12 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO::BufferingConstraint & #endif /* __ACE_INLINE__ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018 #if defined (__ACE_INLINE__) #include "TAOC.i" #endif /* defined INLINE */ -#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ - #if defined(_MSC_VER) && (_MSC_VER >= 1200) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/TAOC.i b/TAO/tao/TAOC.i index a3c1ff1311c..a0902c77e4e 100644 --- a/TAO/tao/TAOC.i +++ b/TAO/tao/TAOC.i @@ -21,185 +21,15 @@ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194 - -// ************************************************************* -// Inline operations for class TAO::BufferingConstraint_var -// ************************************************************* - -ACE_INLINE -TAO::BufferingConstraint_var::BufferingConstraint_var (void) - : ptr_ (0) -{} - -ACE_INLINE -TAO::BufferingConstraint_var::BufferingConstraint_var (BufferingConstraint *p) - : ptr_ (p) -{} - -ACE_INLINE -TAO::BufferingConstraint_var::BufferingConstraint_var (const ::TAO::BufferingConstraint_var &p) -{ - if (p.ptr_) - { - ACE_NEW (this->ptr_, ::TAO::BufferingConstraint (*p.ptr_)); - } - else - { - this->ptr_ = 0; - } -} - -// Fixed-size types only. -ACE_INLINE -TAO::BufferingConstraint_var::BufferingConstraint_var (const ::TAO::BufferingConstraint &p) -{ - ACE_NEW (this->ptr_, ::TAO::BufferingConstraint (p)); -} - -ACE_INLINE -TAO::BufferingConstraint_var::~BufferingConstraint_var (void) -{ - delete this->ptr_; -} - -ACE_INLINE -TAO::BufferingConstraint_var & -TAO::BufferingConstraint_var::operator= (BufferingConstraint *_tao_struct_var) -{ - delete this->ptr_; - this->ptr_ = _tao_struct_var; - return *this; -} - -ACE_INLINE -::TAO::BufferingConstraint_var & -TAO::BufferingConstraint_var::operator= (const ::TAO::BufferingConstraint_var &_tao_struct_var) -{ - if (this != &_tao_struct_var) - { - if (_tao_struct_var.ptr_ == 0) - { - delete this->ptr_; - this->ptr_ = 0; - } - else - { - BufferingConstraint *deep_copy = 0; - ACE_NEW_RETURN ( - deep_copy, - BufferingConstraint (*_tao_struct_var.ptr_), - *this - ); - - if (deep_copy != 0) - { - BufferingConstraint *tmp = deep_copy; - deep_copy = this->ptr_; - this->ptr_ = tmp; - delete deep_copy; - } - } - } - - return *this; -} - -// fixed-size types only -ACE_INLINE TAO::BufferingConstraint_var & -TAO::BufferingConstraint_var::operator= (const ::TAO::BufferingConstraint &p) -{ - if (this->ptr_ != &p) - { - delete this->ptr_; - ACE_NEW_RETURN ( - this->ptr_, - ::TAO::BufferingConstraint (p), - *this - ); - } - - return *this; -} - -ACE_INLINE const ::TAO::BufferingConstraint * -TAO::BufferingConstraint_var::operator-> (void) const -{ - return this->ptr_; -} - -ACE_INLINE ::TAO::BufferingConstraint * -TAO::BufferingConstraint_var::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -TAO::BufferingConstraint_var::operator const ::TAO::BufferingConstraint &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE -TAO::BufferingConstraint_var::operator ::TAO::BufferingConstraint &() // cast -{ - return *this->ptr_; -} - -ACE_INLINE -TAO::BufferingConstraint_var::operator ::TAO::BufferingConstraint &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE const ::TAO::BufferingConstraint & -TAO::BufferingConstraint_var::in (void) const -{ - return *this->ptr_; -} - -ACE_INLINE ::TAO::BufferingConstraint & -TAO::BufferingConstraint_var::inout (void) -{ - return *this->ptr_; -} - -// mapping for fixed size -ACE_INLINE ::TAO::BufferingConstraint & -TAO::BufferingConstraint_var::out (void) -{ - return *this->ptr_; -} - -ACE_INLINE ::TAO::BufferingConstraint -TAO::BufferingConstraint_var::_retn (void) -{ - return *this->ptr_; -} - -ACE_INLINE ::TAO::BufferingConstraint * -TAO::BufferingConstraint_var::ptr (void) const -{ - return this->ptr_; -} - -// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68 #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY___CI_) #define _TAO_BUFFERINGCONSTRAINTPOLICY___CI_ -ACE_INLINE -CORBA::Boolean -TAO::BufferingConstraintPolicy::marshal (TAO_OutputCDR &) -{ - return 0; -} - #endif /* end #if !defined */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71 ACE_INLINE CORBA::Boolean operator<< ( diff --git a/TAO/tao/TimeBaseC.cpp b/TAO/tao/TimeBaseC.cpp index fff9ea8f003..335360ceab2 100644 --- a/TAO/tao/TimeBaseC.cpp +++ b/TAO/tao/TimeBaseC.cpp @@ -19,8 +19,11 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "TimeBaseC.h" +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314 + +#include "tao/TimeBaseC.h" #include "tao/Stub.h" #include "tao/Invocation.h" @@ -262,7 +265,7 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 void TimeBase::UtcT::_tao_any_destructor (void *_tao_void_pointer) { @@ -271,6 +274,25 @@ void TimeBase::UtcT::_tao_any_destructor (void *_tao_void_pointer) } // TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274 + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + +template class + TAO_Fixed_Var_T< + UtcT + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# pragma instantiate \ + TAO_Fixed_Var_T< \ + UtcT \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_TimeBase_IntervalT[] = @@ -339,7 +361,7 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:67 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 void TimeBase::IntervalT::_tao_any_destructor (void *_tao_void_pointer) { @@ -347,6 +369,25 @@ void TimeBase::IntervalT::_tao_any_destructor (void *_tao_void_pointer) delete tmp; } +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274 + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + +template class + TAO_Fixed_Var_T< + IntervalT + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# pragma instantiate \ + TAO_Fixed_Var_T< \ + IntervalT \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54 diff --git a/TAO/tao/TimeBaseC.h b/TAO/tao/TimeBaseC.h index 04632051f26..e30bb4552d2 100644 --- a/TAO/tao/TimeBaseC.h +++ b/TAO/tao/TimeBaseC.h @@ -26,15 +26,13 @@ #define _TAO_IDL_ORIG_TIMEBASEC_H_ #include "ace/pre.h" -#include "tao/corbafwd.h" #include "tao/Any_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "TAO_Export.h" -#include "tao/SmartProxies/Smart_Proxies.h" +#include "tao/VarOut_T.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -66,7 +64,7 @@ TAO_NAMESPACE TimeBase { // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333 typedef CORBA::ULongLong TimeT; typedef CORBA::ULongLong_out TimeT_out; @@ -77,7 +75,7 @@ TAO_NAMESPACE TimeBase TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TimeT; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333 typedef TimeT InaccuracyT; typedef TimeT_out InaccuracyT_out; @@ -88,7 +86,7 @@ TAO_NAMESPACE TimeBase TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InaccuracyT; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:334 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333 typedef CORBA::Short TdfT; typedef CORBA::Short_out TdfT_out; @@ -99,9 +97,22 @@ TAO_NAMESPACE TimeBase TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TdfT; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231 - class UtcT_var; + struct UtcT; + + typedef + TAO_Fixed_Var_T< + UtcT + > + UtcT_var; + + typedef + UtcT & + UtcT_out; + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52 struct TAO_Export UtcT { @@ -115,56 +126,27 @@ TAO_NAMESPACE TimeBase }; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71 - - class TAO_Export UtcT_var - { - public: - UtcT_var (void); - UtcT_var (UtcT *); - UtcT_var (const UtcT_var &); - // Fixed-size types only. - UtcT_var (const UtcT &); - ~UtcT_var (void); - - UtcT_var &operator= (UtcT *); - UtcT_var &operator= (const UtcT_var &); - - // Fixed-size types only. - UtcT_var &operator= (const UtcT &); - - UtcT *operator-> (void); - const UtcT *operator-> (void) const; - - operator const UtcT &() const; - operator UtcT &(); - operator UtcT &() const; - - // in, inout, out, _retn - const UtcT &in (void) const; - UtcT &inout (void); - UtcT &out (void); - UtcT _retn (void); - UtcT *ptr (void) const; + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - private: - UtcT *ptr_; - }; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UtcT; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:105 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231 - typedef UtcT &UtcT_out; + struct IntervalT; - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 + typedef + TAO_Fixed_Var_T< + IntervalT + > + IntervalT_var; - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UtcT; + typedef + IntervalT & + IntervalT_out; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:49 - - class IntervalT_var; + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52 struct TAO_Export IntervalT { @@ -176,48 +158,6 @@ TAO_NAMESPACE TimeBase }; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:71 - - class TAO_Export IntervalT_var - { - public: - IntervalT_var (void); - IntervalT_var (IntervalT *); - IntervalT_var (const IntervalT_var &); - // Fixed-size types only. - IntervalT_var (const IntervalT &); - ~IntervalT_var (void); - - IntervalT_var &operator= (IntervalT *); - IntervalT_var &operator= (const IntervalT_var &); - - // Fixed-size types only. - IntervalT_var &operator= (const IntervalT &); - - IntervalT *operator-> (void); - const IntervalT *operator-> (void) const; - - operator const IntervalT &() const; - operator IntervalT &(); - operator IntervalT &() const; - - // in, inout, out, _retn - const IntervalT &in (void) const; - IntervalT &inout (void); - IntervalT &out (void); - IntervalT _retn (void); - IntervalT *ptr (void) const; - - private: - IntervalT *ptr_; - }; - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:105 - - typedef IntervalT &IntervalT_out; - - // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IntervalT; @@ -267,7 +207,7 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TimeBase::IntervalT &); #endif /* __ACE_INLINE__ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018 #if defined (__ACE_INLINE__) #include "TimeBaseC.i" diff --git a/TAO/tao/TimeBaseC.i b/TAO/tao/TimeBaseC.i index 3db4462317f..02bd740e22c 100644 --- a/TAO/tao/TimeBaseC.i +++ b/TAO/tao/TimeBaseC.i @@ -21,333 +21,7 @@ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194 - -// ************************************************************* -// Inline operations for class TimeBase::UtcT_var -// ************************************************************* - -ACE_INLINE -TimeBase::UtcT_var::UtcT_var (void) - : ptr_ (0) -{} - -ACE_INLINE -TimeBase::UtcT_var::UtcT_var (UtcT *p) - : ptr_ (p) -{} - -ACE_INLINE -TimeBase::UtcT_var::UtcT_var (const ::TimeBase::UtcT_var &p) -{ - if (p.ptr_) - { - ACE_NEW (this->ptr_, ::TimeBase::UtcT (*p.ptr_)); - } - else - { - this->ptr_ = 0; - } -} - -// Fixed-size types only. -ACE_INLINE -TimeBase::UtcT_var::UtcT_var (const ::TimeBase::UtcT &p) -{ - ACE_NEW (this->ptr_, ::TimeBase::UtcT (p)); -} - -ACE_INLINE -TimeBase::UtcT_var::~UtcT_var (void) -{ - delete this->ptr_; -} - -ACE_INLINE -TimeBase::UtcT_var & -TimeBase::UtcT_var::operator= (UtcT *_tao_struct_var) -{ - delete this->ptr_; - this->ptr_ = _tao_struct_var; - return *this; -} - -ACE_INLINE -::TimeBase::UtcT_var & -TimeBase::UtcT_var::operator= (const ::TimeBase::UtcT_var &_tao_struct_var) -{ - if (this != &_tao_struct_var) - { - if (_tao_struct_var.ptr_ == 0) - { - delete this->ptr_; - this->ptr_ = 0; - } - else - { - UtcT *deep_copy = 0; - ACE_NEW_RETURN ( - deep_copy, - UtcT (*_tao_struct_var.ptr_), - *this - ); - - if (deep_copy != 0) - { - UtcT *tmp = deep_copy; - deep_copy = this->ptr_; - this->ptr_ = tmp; - delete deep_copy; - } - } - } - - return *this; -} - -// fixed-size types only -ACE_INLINE TimeBase::UtcT_var & -TimeBase::UtcT_var::operator= (const ::TimeBase::UtcT &p) -{ - if (this->ptr_ != &p) - { - delete this->ptr_; - ACE_NEW_RETURN ( - this->ptr_, - ::TimeBase::UtcT (p), - *this - ); - } - - return *this; -} - -ACE_INLINE const ::TimeBase::UtcT * -TimeBase::UtcT_var::operator-> (void) const -{ - return this->ptr_; -} - -ACE_INLINE ::TimeBase::UtcT * -TimeBase::UtcT_var::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -TimeBase::UtcT_var::operator const ::TimeBase::UtcT &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE -TimeBase::UtcT_var::operator ::TimeBase::UtcT &() // cast -{ - return *this->ptr_; -} - -ACE_INLINE -TimeBase::UtcT_var::operator ::TimeBase::UtcT &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE const ::TimeBase::UtcT & -TimeBase::UtcT_var::in (void) const -{ - return *this->ptr_; -} - -ACE_INLINE ::TimeBase::UtcT & -TimeBase::UtcT_var::inout (void) -{ - return *this->ptr_; -} - -// mapping for fixed size -ACE_INLINE ::TimeBase::UtcT & -TimeBase::UtcT_var::out (void) -{ - return *this->ptr_; -} - -ACE_INLINE ::TimeBase::UtcT -TimeBase::UtcT_var::_retn (void) -{ - return *this->ptr_; -} - -ACE_INLINE ::TimeBase::UtcT * -TimeBase::UtcT_var::ptr (void) const -{ - return this->ptr_; -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_structure.cpp:194 - -// ************************************************************* -// Inline operations for class TimeBase::IntervalT_var -// ************************************************************* - -ACE_INLINE -TimeBase::IntervalT_var::IntervalT_var (void) - : ptr_ (0) -{} - -ACE_INLINE -TimeBase::IntervalT_var::IntervalT_var (IntervalT *p) - : ptr_ (p) -{} - -ACE_INLINE -TimeBase::IntervalT_var::IntervalT_var (const ::TimeBase::IntervalT_var &p) -{ - if (p.ptr_) - { - ACE_NEW (this->ptr_, ::TimeBase::IntervalT (*p.ptr_)); - } - else - { - this->ptr_ = 0; - } -} - -// Fixed-size types only. -ACE_INLINE -TimeBase::IntervalT_var::IntervalT_var (const ::TimeBase::IntervalT &p) -{ - ACE_NEW (this->ptr_, ::TimeBase::IntervalT (p)); -} - -ACE_INLINE -TimeBase::IntervalT_var::~IntervalT_var (void) -{ - delete this->ptr_; -} - -ACE_INLINE -TimeBase::IntervalT_var & -TimeBase::IntervalT_var::operator= (IntervalT *_tao_struct_var) -{ - delete this->ptr_; - this->ptr_ = _tao_struct_var; - return *this; -} - -ACE_INLINE -::TimeBase::IntervalT_var & -TimeBase::IntervalT_var::operator= (const ::TimeBase::IntervalT_var &_tao_struct_var) -{ - if (this != &_tao_struct_var) - { - if (_tao_struct_var.ptr_ == 0) - { - delete this->ptr_; - this->ptr_ = 0; - } - else - { - IntervalT *deep_copy = 0; - ACE_NEW_RETURN ( - deep_copy, - IntervalT (*_tao_struct_var.ptr_), - *this - ); - - if (deep_copy != 0) - { - IntervalT *tmp = deep_copy; - deep_copy = this->ptr_; - this->ptr_ = tmp; - delete deep_copy; - } - } - } - - return *this; -} - -// fixed-size types only -ACE_INLINE TimeBase::IntervalT_var & -TimeBase::IntervalT_var::operator= (const ::TimeBase::IntervalT &p) -{ - if (this->ptr_ != &p) - { - delete this->ptr_; - ACE_NEW_RETURN ( - this->ptr_, - ::TimeBase::IntervalT (p), - *this - ); - } - - return *this; -} - -ACE_INLINE const ::TimeBase::IntervalT * -TimeBase::IntervalT_var::operator-> (void) const -{ - return this->ptr_; -} - -ACE_INLINE ::TimeBase::IntervalT * -TimeBase::IntervalT_var::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -TimeBase::IntervalT_var::operator const ::TimeBase::IntervalT &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE -TimeBase::IntervalT_var::operator ::TimeBase::IntervalT &() // cast -{ - return *this->ptr_; -} - -ACE_INLINE -TimeBase::IntervalT_var::operator ::TimeBase::IntervalT &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE const ::TimeBase::IntervalT & -TimeBase::IntervalT_var::in (void) const -{ - return *this->ptr_; -} - -ACE_INLINE ::TimeBase::IntervalT & -TimeBase::IntervalT_var::inout (void) -{ - return *this->ptr_; -} - -// mapping for fixed size -ACE_INLINE ::TimeBase::IntervalT & -TimeBase::IntervalT_var::out (void) -{ - return *this->ptr_; -} - -ACE_INLINE ::TimeBase::IntervalT -TimeBase::IntervalT_var::_retn (void) -{ - return *this->ptr_; -} - -ACE_INLINE ::TimeBase::IntervalT * -TimeBase::IntervalT_var::ptr (void) const -{ - return this->ptr_; -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71 ACE_INLINE CORBA::Boolean operator<< ( @@ -392,7 +66,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:103 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71 ACE_INLINE CORBA::Boolean operator<< ( diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h index db07c4c48b5..e2f6fc12199 100644 --- a/TAO/tao/corbafwd.h +++ b/TAO/tao/corbafwd.h @@ -180,18 +180,12 @@ namespace CORBA class WString_out; class StringSeq; - class StringSeq_var; - class StringSeq_out; extern TAO_Export TypeCode_ptr _tc_StringSeq; class WStringSeq; - class WStringSeq_var; - class WStringSeq_out; extern TAO_Export TypeCode_ptr _tc_WStringSeq; class OctetSeq; - class OctetSeq_var; - class OctetSeq_out; extern TAO_Export TypeCode_ptr _tc_OctetSeq; class Any; @@ -561,14 +555,10 @@ namespace CORBA extern TAO_Export CORBA::TypeCode_ptr _tc_ServiceDetailType; struct ServiceDetail; - class ServiceDetail_var; - class ServiceDetail_out; typedef ServiceDetail * ServiceDetail_ptr; extern TAO_Export CORBA::TypeCode_ptr _tc_ServiceDetail; struct ServiceInformation; - class ServiceInformation_var; - class ServiceInformation_out; typedef ServiceInformation * ServiceInformation_ptr; extern TAO_Export CORBA::TypeCode_ptr _tc_ServiceInformation; |