diff options
Diffstat (limited to 'TAO/TAO_IDL/be/be_visitor_arg_traits.cpp')
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_arg_traits.cpp | 42 |
1 files changed, 3 insertions, 39 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp index 0eea91ba50e..3548c50705a 100644 --- a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp +++ b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp @@ -107,8 +107,6 @@ be_visitor_arg_traits::visit_interface (be_interface *node) if (node->seen_in_operation ()) { TAO_OutStream *os = this->ctx_->stream (); - idl_bool stub = (this->ctx_->state () == TAO_CodeGen::TAO_ROOT_CS); - BE_GlobalData *b = be_global; // This should be generated even for imported nodes. The ifdef guard prevents // multiple declarations. @@ -116,9 +114,8 @@ be_visitor_arg_traits::visit_interface (be_interface *node) *os << be_nl << be_nl << "ACE_TEMPLATE_SPECIALIZATION" << be_nl - << "class " - << (stub ? b->stub_export_macro () : b->skel_export_macro ()) - << " " << this->S_ << "Arg_Traits<" + << "class " << be_global->stub_export_macro () << " " + << this->S_ << "Arg_Traits<" << node->name () << ">" << be_idt_nl << ": public" << be_idt << be_idt_nl << "Object_" << this->S_ << "Arg_Traits_T<" << be_idt << be_idt_nl @@ -486,40 +483,7 @@ be_visitor_arg_traits::visit_array (be_array *node) // This should be generated even for imported nodes. The ifdef guard prevents // multiple declarations. -// os->gen_ifdef_macro (node->flat_name (), "arg_traits"); - - // Generate the array traits specialization definitions, - // guarded by #ifdef on unaliased array element type and length. - - ACE_CString unique; - be_type *bt = be_type::narrow_from_decl (node->base_type ()); - AST_Decl::NodeType nt = bt->node_type (); - - if (nt == AST_Decl::NT_typedef) - { - be_typedef *td = be_typedef::narrow_from_decl (bt); - unique = td->primitive_base_type ()->flat_name (); - } - else - { - unique = bt->flat_name (); - } - - char buf[NAMEBUFSIZE]; - - for (unsigned long i = 0; i < node->n_dims (); ++i) - { - ACE_OS::memset (buf, - '\0', - NAMEBUFSIZE); - ACE_OS::sprintf (buf, - "_%ld", - node->dims ()[i]->ev ()->u.ulval); - unique += buf; - } - - unique += "_traits"; - os->gen_ifdef_macro (unique.fast_rep ()); + os->gen_ifdef_macro (node->flat_name (), "arg_traits"); *os << be_nl << be_nl << "ACE_TEMPLATE_SPECIALIZATION" << be_nl |