diff options
Diffstat (limited to 'TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp')
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp index d7b6ef96b1d..3760418d94b 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp @@ -71,11 +71,13 @@ be_visitor_amh_interface_ss::this_method (be_interface *node) *os << non_amh_name.c_str () << "*" << be_nl << full_skel_name - << "::_this (ACE_ENV_SINGLE_ARG_DECL)" << be_nl + << "::_this (" + << (be_global->use_raw_throw () ? "void" : "ACE_ENV_SINGLE_ARG_DECL") + << ")" << be_nl << "{" << be_idt_nl - << "TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);" - << be_nl - << "ACE_CHECK_RETURN (0);" << be_nl << be_nl; + << "TAO_Stub *stub = this->_create_stub (" + << (be_global->use_raw_throw () ? "" : "ACE_ENV_SINGLE_ARG_PARAMETER") + << ");" << TAO_ACE_CHECK ("0") << be_nl << be_nl; *os << "TAO_Stub_Auto_Ptr safe_stub (stub);" << be_nl << "::CORBA::Object_ptr tmp = CORBA::Object::_nil ();" << be_nl @@ -128,15 +130,13 @@ be_visitor_amh_interface_ss::dispatch_method (be_interface *node) *os << "void" << be_nl << full_skel_name << "::_dispatch (" << be_idt << be_idt_nl << "TAO_ServerRequest & req," << be_nl - << "void * context" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl + << "void * context" << env_decl << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl << "this->asynchronous_upcall_dispatch (" << be_idt << be_idt_nl << "req," << be_nl << "context," << be_nl - << "this" << be_nl - << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl + << "this" << env_arg << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "}"; } @@ -148,7 +148,6 @@ be_visitor_amh_interface_ss::generate_send_reply (TAO_OutStream * os) << "server_request.tao_send_reply ();"; } - int be_visitor_amh_interface_ss::generate_amh_classes (be_interface *) { @@ -244,8 +243,8 @@ emit (be_interface *derived, be_decl *scope; scope = be_scope::narrow_from_scope (base->defined_in ())->decl (); - *os << "ACE_NESTED_CLASS (POA_" << scope->name () << ", AMH_" - << base->local_name () << ") (rhs)"; + *os << "POA_" << scope->name () << "::AMH_" + << base->local_name () << " (rhs)"; } else { |