diff options
Diffstat (limited to 'TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp')
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp index 3f87f4430db..37d859136ef 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp @@ -85,7 +85,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node) -1); // Generate the scope::operation name. - *os << parent->fullname () + *os << parent->full_name () << "::" << "sendc_" << node->local_name ()->get_string (); @@ -376,7 +376,7 @@ be_interpretive_visitor_operation_ami_cs::gen_pre_stub_info (be_operation *node, else *os << "_get_"; } - *os << node->flatname () << + *os << node->flat_name () << "_paramdata [] = " << be_nl; *os << "{\n"; os->incr_indent (); @@ -397,7 +397,7 @@ be_interpretive_visitor_operation_ami_cs::gen_pre_stub_info (be_operation *node, } *os << "\n"; os->decr_indent (); - *os << "}; // " << node->flatname () << "_paramdata\n\n"; + *os << "}; // " << node->flat_name () << "_paramdata\n\n"; // Check if this operation raises any exceptions. In that case, we must // generate a list of exception typecodes. This is not valid for @@ -430,7 +430,7 @@ be_interpretive_visitor_operation_ami_cs::gen_pre_stub_info (be_operation *node, else *os << "_get_"; } - *os << node->flatname () + *os << node->flat_name () << "_calldata = " << be_nl << "{" << "\""; @@ -468,7 +468,7 @@ be_interpretive_visitor_operation_ami_cs::gen_pre_stub_info (be_operation *node, else *os << "_get_"; } - *os << node->flatname () << "_paramdata, "; + *os << node->flat_name () << "_paramdata, "; // insert exception list (if any) - node for attributes if (this->ctx_->attribute ()) @@ -478,7 +478,7 @@ be_interpretive_visitor_operation_ami_cs::gen_pre_stub_info (be_operation *node, if (node->exceptions ()) { *os << node->exceptions ()->length () - << ", _tao_" << node->flatname () << "_exceptiondata};\n\n"; + << ", _tao_" << node->flat_name () << "_exceptiondata};\n\n"; } else *os << "0, 0};\n\n"; @@ -544,7 +544,7 @@ be_interpretive_visitor_operation_ami_cs::gen_marshal_and_invoke (be_operation else *os << "_get_"; } - *os << node->flatname () << "_calldata," << be_nl + *os << node->flat_name () << "_calldata," << be_nl << "_tao_arguments" << be_uidt_nl << ");\n"; @@ -674,9 +674,21 @@ be_compiled_visitor_operation_ami_cs::gen_marshal_and_invoke (be_operation *node // Get the interface. be_decl *interface = be_interface::narrow_from_scope (node->defined_in ())->decl (); - *os << "&AMI_" << interface->fullname () << "_Handler" << "::" - << node->local_name () << "_skel," << be_nl; - + { + char *full_name = 0; + + interface->compute_full_name ("AMI_", + "_Handler", + full_name); + + *os << "&" << full_name << "::" + << node->local_name () << "_skel," << be_nl; + + delete full_name; + } + + + // Next argument is the ami handler passed in for this method. *os << "_tao_ami_handler" << be_uidt_nl @@ -735,7 +747,7 @@ be_compiled_visitor_operation_ami_cs::gen_marshal_and_invoke (be_operation *node << "int _invoke_status =" << be_idt_nl; if (node->exceptions ()) { - *os << "_tao_call.invoke (_tao_" << node->flatname () + *os << "_tao_call.invoke (_tao_" << node->flat_name () << "_exceptiondata, " << node->exceptions ()->length () << ", ACE_TRY_ENV);"; |