diff options
Diffstat (limited to 'TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp')
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp index ff4ba91daa7..083cd8b4e8c 100644 --- a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp @@ -323,25 +323,21 @@ be_visitor_field_ch::visit_predefined_type (be_predefined_type *node) bt = node; } - if (node->pt () == AST_PredefinedType::PT_pseudo) + if (node->pt () == AST_PredefinedType::PT_object) { - // Check if we are dealing with a CORBA::Object, - if (!ACE_OS::strcmp (node->local_name ()->get_string (), "Object")) + *os << bt->name () << "_var"; + } + else if (node->pt () == AST_PredefinedType::PT_pseudo) + { + // ACE_NESTED_CLASS macro generated by nested_type_name + // is not necessary in all cases. + if (bt->defined_in ()->scope_node_type () == AST_Decl::NT_interface) { - *os << bt->name () << "_var"; + *os << bt->nested_type_name (this->ctx_->scope (), "_var"); } else { - // ACE_NESTED_CLASS macro generated by nested_type_name - // is not necessary in all cases. - if (bt->defined_in ()->scope_node_type () == AST_Decl::NT_interface) - { - *os << bt->nested_type_name (this->ctx_->scope (), "_var"); - } - else - { - *os << bt->name () << "_var"; - } + *os << bt->name () << "_var"; } } else |