diff options
Diffstat (limited to 'TAO/TAO_IDL/be/be_visitor_interface')
24 files changed, 250 insertions, 250 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_ch.cpp index 560bb8e72ef..94b5bb12b7d 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_ch.cpp @@ -98,6 +98,6 @@ be_visitor_amh_interface_ch::visit_interface (be_interface *node) "codegen for scope failed\n"), -1); } - node->cli_hdr_gen (true); + node->cli_hdr_gen (I_TRUE); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp index 19e7340f37c..f62b5150a47 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp @@ -121,7 +121,8 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node) << "virtual ~" << class_name.c_str () << " (void);\n\n" << be_nl << "virtual ::CORBA::Boolean _is_a (" << be_idt << be_idt_nl - << "const char* logical_type_id" << env_dflts << be_uidt_nl + << "const char* logical_type_id" << be_nl + << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt_nl << be_nl; // *os << "virtual void* _downcast (" << be_idt << be_idt_nl @@ -132,41 +133,47 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node) *os << "static void _is_a_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest &req," << be_nl << "void *obj," << be_nl - << "void *servant_upcall" << env_decl << be_uidt_nl + << "void *servant_upcall" << be_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ");" << be_uidt_nl << be_nl; // Add a skeleton for our _non_existent method. *os << "static void _non_existent_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest &req," << be_nl << "void *obj," << be_nl - << "void *servant_upcall" << env_decl << be_uidt_nl + << "void *servant_upcall" << be_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ");" << be_uidt_nl << be_nl; // Add a skeleton for our _interface method. *os << "static void _interface_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest &req," << be_nl << "void *obj," << be_nl - << "void *servant_upcall" << env_decl << be_uidt_nl + << "void *servant_upcall" << be_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ");" << be_uidt_nl << be_nl; // Add a skeleton for our _component method. *os << "static void _component_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest &req," << be_nl << "void *obj," << be_nl - << "void *servant_upcall" << env_decl << be_uidt_nl + << "void *servant_upcall" << be_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ");" << be_uidt_nl << be_nl; // Add a skeleton for our _repository_id method. *os << "static void _repository_id_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest &req," << be_nl << "void *obj," << be_nl - << "void *servant_upcall" << env_decl << be_uidt_nl + << "void *servant_upcall" << be_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ");" << be_uidt_nl << be_nl; // Add the dispatch method. *os << "virtual void _dispatch (" << be_idt << be_idt_nl << "TAO_ServerRequest &req," << be_nl - << "void *_servant_upcall" << env_decl << be_uidt_nl + << "void *_servant_upcall" << be_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ");" << be_uidt_nl << be_nl; this->this_method (node); @@ -377,10 +384,7 @@ be_visitor_amh_interface_sh::add_amh_operation (be_operation *node, // After having generated the operation we insert it into the // AMH node interface. - if (0 == amh_node->be_add_operation (operation)) - { - return -1; - } + amh_node->be_add_operation (operation); return 0; } @@ -427,7 +431,7 @@ be_visitor_amh_interface_sh::this_method (be_interface *node) // interfaces is "special", because the returned type is not exactly // the type of the class, but the original class that "implied" the // AMH one. - *os << non_amh_name.c_str () << " *_this (" << be_idt << be_idt - << env_dflts << be_uidt_nl + *os << non_amh_name.c_str () << " *_this (" << be_idt << be_idt_nl + << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");\n" << be_uidt; } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp index 10118851bcf..5bbea728b19 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp @@ -135,7 +135,8 @@ be_visitor_amh_interface_si::gen_skel_helper (be_interface *derived, << "_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest & req," << be_nl << "void * context," << be_nl - << "void * obj" << env_decl << be_uidt_nl + << "void * obj" << be_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl; *os << ancestor_amh_name @@ -147,7 +148,8 @@ be_visitor_amh_interface_si::gen_skel_helper (be_interface *derived, << "_skel (" << be_idt << be_idt_nl << "req," << be_nl << "context," << be_nl - << "impl" << env_arg << be_uidt_nl + << "impl" << be_nl + << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "}"; } @@ -171,7 +173,8 @@ be_visitor_amh_interface_si::gen_skel_helper (be_interface *derived, << "_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest & req," << be_nl << "void * context," << be_nl - << "void * obj" << env_decl << be_uidt_nl + << "void * obj" << be_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl; @@ -185,7 +188,8 @@ be_visitor_amh_interface_si::gen_skel_helper (be_interface *derived, << "_skel (" << be_idt << be_idt_nl << "req," << be_nl << "context," << be_nl - << "impl" << env_arg << be_uidt_nl + << "impl" << be_nl + << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "}"; @@ -203,7 +207,8 @@ be_visitor_amh_interface_si::gen_skel_helper (be_interface *derived, << "_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest & req," << be_nl << "void * context," << be_nl - << "void * obj" << env_decl << be_uidt_nl + << "void * obj" << be_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl; @@ -217,7 +222,8 @@ be_visitor_amh_interface_si::gen_skel_helper (be_interface *derived, << "_skel (" << be_idt << be_idt_nl << "req," << be_nl << "context," << be_nl - << "impl" << env_arg << be_uidt_nl + << "impl" << be_nl + << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "}"; } 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 05fee0ef3d6..d7b6ef96b1d 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp @@ -71,13 +71,11 @@ be_visitor_amh_interface_ss::this_method (be_interface *node) *os << non_amh_name.c_str () << "*" << be_nl << full_skel_name - << "::_this (" - << (be_global->use_raw_throw () ? "void" : "ACE_ENV_SINGLE_ARG_DECL") - << ")" << be_nl + << "::_this (ACE_ENV_SINGLE_ARG_DECL)" << be_nl << "{" << be_idt_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; + << "TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);" + << be_nl + << "ACE_CHECK_RETURN (0);" << be_nl << be_nl; *os << "TAO_Stub_Auto_Ptr safe_stub (stub);" << be_nl << "::CORBA::Object_ptr tmp = CORBA::Object::_nil ();" << be_nl @@ -130,13 +128,15 @@ 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" << env_decl << be_uidt_nl + << "void * context" << be_nl + << "ACE_ENV_ARG_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" << env_arg << be_uidt_nl + << "this" << be_nl + << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "}"; } @@ -148,6 +148,7 @@ 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 *) { diff --git a/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp index e87982b4447..21681f94492 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp @@ -92,8 +92,6 @@ be_visitor_interface_any_op_ch::visit_interface (be_interface *node) *os << "#else\n\n"; } - *os << be_global->core_versioning_begin () << be_nl; - *os << macro << " void operator<<= (::CORBA::Any &, " << node->name () << "_ptr); // copying" << be_nl; *os << macro << " void operator<<= (::CORBA::Any &, " << node->name () @@ -101,8 +99,6 @@ be_visitor_interface_any_op_ch::visit_interface (be_interface *node) *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, " << node->name () << "_ptr &);"; - *os << be_global->core_versioning_end () << be_nl; - if (module != 0) { *os << "\n\n#endif"; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp index 87e0899c0b2..9bcbcba0496 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp @@ -53,8 +53,6 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node) // All template specializations must be generated before the instantiations // in the operators. - *os << be_global->core_versioning_begin () << be_nl; - if (! node->is_abstract ()) { *os << be_nl << be_nl @@ -123,7 +121,6 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node) << "}"; } - *os << be_global->core_versioning_end () << be_nl; be_module *module = 0; @@ -199,8 +196,6 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node) *os << "#else\n"; } - *os << be_global->core_versioning_begin () << be_nl; - *os << be_nl << be_nl << "// Copying insertion." << be_nl << "void" << be_nl @@ -246,8 +241,6 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node) << ");" << be_uidt << be_uidt << be_uidt_nl << "}"; - *os << be_global->core_versioning_end () << be_nl; - if (module != 0) { *os << "\n\n#endif"; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp index 916f4cb041d..f006fb845da 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp @@ -1,7 +1,7 @@ //$Id$ -ACE_RCSID (be_visitor_interface, - base_proxy_broker_ch, +ACE_RCSID (be_visitor_interface, + base_proxy_broker_ch, "$Id$") be_visitor_interface_base_proxy_broker_ch:: @@ -26,7 +26,7 @@ be_visitor_interface_base_proxy_broker_ch::visit_interface ( TAO_OutStream *os = this->ctx_->stream (); *os << be_nl - << "///////////////////////////////////////////////////////////////////////" + << "///////////////////////////////////////////////////////////////////////" << be_nl << "// Base Proxy Broker Declaration " << be_nl << "//" << be_nl << be_nl; @@ -50,7 +50,8 @@ be_visitor_interface_base_proxy_broker_ch::visit_interface ( << "select_proxy (" << be_idt << be_idt_nl; - *os << node->local_name () << " *object" << env_dflts << be_uidt_nl + *os << node->local_name () << " *object" << be_nl + << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ") = 0;" << be_uidt_nl // idt = 1 << be_uidt_nl; // idt = 0 diff --git a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp index c09ed666805..845866a7568 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp @@ -54,8 +54,6 @@ be_visitor_interface_cdr_op_ch::visit_interface (be_interface *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; - *os << be_global->core_versioning_begin () << be_nl; - // Generate the CDR << and >> operator declarations. *os << be_global->stub_export_macro () << " ::CORBA::Boolean " << "operator<< (TAO_OutputCDR &, const " << node->full_name () @@ -64,8 +62,6 @@ be_visitor_interface_cdr_op_ch::visit_interface (be_interface *node) << "operator>> (TAO_InputCDR &, " << node->full_name () << "_ptr &);"; - *os << be_global->core_versioning_end () << be_nl; - // Set the substate as generating code for the types defined in our scope. this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_SCOPE); diff --git a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp index 369273c817e..d115c4671c6 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp @@ -62,8 +62,6 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; - *os << be_global->core_versioning_begin () << be_nl; - // Set the sub state as generating code for the output operator. this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_OUTPUT); @@ -142,8 +140,6 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node) *os << "return 1;" << be_uidt_nl << "}"; - *os << be_global->core_versioning_end () << be_nl; - node->cli_stub_cdr_op_gen (1); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp index eb7c5cda9d4..b5cb1aa8d6b 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp @@ -40,7 +40,7 @@ be_visitor_interface_direct_proxy_impl_sh::visit_interface ( *os << "class " << be_global->skel_export_macro () << " " << node->direct_proxy_impl_name (); - bool first_concrete = true; + idl_bool first_concrete = I_TRUE; if (node->n_inherits () > 0) { @@ -60,17 +60,17 @@ be_visitor_interface_direct_proxy_impl_sh::visit_interface ( if (first_concrete) { - *os << be_nl + *os << be_nl << " : " << be_idt << be_idt; } else { - *os << "," << be_nl; + *os << "," << be_nl; } - first_concrete = false; + first_concrete = I_FALSE; - *os << "public virtual ::" + *os << "public virtual ::" << inherited->full_direct_proxy_impl_name (); } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp index dc72c8a0ead..b1148857606 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp @@ -110,7 +110,7 @@ be_visitor_interface::visit_scope (be_scope *node) int status = intf->traverse_inheritance_graph (helper, this->ctx_->stream (), - false); + I_FALSE); if (status == -1) { diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp index 6c26766524a..959a01e914c 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp @@ -213,15 +213,15 @@ be_visitor_interface_ch::visit_interface (be_interface *node) { *os << "// These two are inherited from SessionComponent." << be_nl << be_nl - << "virtual void ciao_preactivate (" << be_idt << be_idt - << env_sngl_dflts << be_uidt_nl + << "virtual void ciao_preactivate (" << be_idt << be_idt_nl + << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ")" << be_nl << "ACE_THROW_SPEC ((" << be_idt_nl << "::CORBA::SystemException," << be_nl << "::Components::CCMException" << be_uidt_nl << "));" << be_uidt_nl << be_nl - << "virtual void ciao_postactivate (" << be_idt << be_idt - << env_sngl_dflts << be_uidt_nl + << "virtual void ciao_postactivate (" << be_idt << be_idt_nl + << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ")" << be_nl << "ACE_THROW_SPEC ((" << be_idt_nl << "::CORBA::SystemException," << be_nl @@ -238,7 +238,8 @@ be_visitor_interface_ch::visit_interface (be_interface *node) // The _is_a method *os << "virtual ::CORBA::Boolean _is_a (" << be_idt << be_idt_nl - << "const char *type_id" << env_dflts << be_uidt_nl + << "const char *type_id" << be_nl + << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt_nl << be_nl; // The _interface_repository_id method. @@ -385,7 +386,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node) } } - node->cli_hdr_gen (true); + node->cli_hdr_gen (I_TRUE); return 0; } @@ -451,14 +452,14 @@ be_visitor_interface_ch::gen_xxx_narrow (const char *nar, if (node->is_abstract ()) { - *os << "::CORBA::AbstractBase_ptr obj"; + *os << "::CORBA::AbstractBase_ptr obj" << be_nl; } else { - *os << "::CORBA::Object_ptr obj"; + *os << "::CORBA::Object_ptr obj" << be_nl; } - *os << env_dflts << be_uidt_nl + *os << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt_nl << be_nl; return true; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp index e78a52a7528..4f95cccade4 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp @@ -54,7 +54,7 @@ be_visitor_interface_ci::visit_interface (be_interface *node) // Nothing to generate for a local interface except from it scope. if (node->is_local ()) { - node->cli_inline_gen (true); + node->cli_inline_gen (I_TRUE); return 0; } @@ -107,6 +107,6 @@ be_visitor_interface_ci::visit_interface (be_interface *node) } os->gen_endif (); - node->cli_inline_gen (true); + node->cli_inline_gen (I_TRUE); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp index 49eed2b20ce..1609e409b05 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp @@ -96,7 +96,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) << "::CORBA::Boolean" << be_nl << "TAO::Objref_Traits<" << node->name () << ">::marshal (" << be_idt << be_idt_nl - << "const " << node->name () << "_ptr p," << be_nl + << node->name () << "_ptr p," << be_nl << "TAO_OutputCDR & cdr" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl @@ -339,8 +339,8 @@ be_visitor_interface_cs::visit_interface (be_interface *node) << be_nl << be_nl << "void" << be_nl << node->full_name () << "::ciao_preactivate (" - << be_idt << be_idt - << env_sngl_not << be_uidt_nl + << be_idt << be_idt_nl + << "ACE_ENV_SINGLE_ARG_DECL_NOT_USED" << be_uidt_nl << ")" << be_uidt_nl << "ACE_THROW_SPEC (( ::CORBA::SystemException," << be_nl << " ::Components::CCMException))" << be_uidt_nl @@ -348,8 +348,8 @@ be_visitor_interface_cs::visit_interface (be_interface *node) << "}" << be_nl << be_nl << "void" << be_nl << node->full_name () << "::ciao_postactivate (" - << be_idt << be_idt - << env_sngl_not << be_uidt_nl + << be_idt << be_idt_nl + << "ACE_ENV_SINGLE_ARG_DECL_NOT_USED" << be_uidt_nl << ")" << be_uidt_nl << "ACE_THROW_SPEC (( ::CORBA::SystemException," << be_nl << " ::Components::CCMException))" << be_uidt_nl @@ -359,16 +359,12 @@ be_visitor_interface_cs::visit_interface (be_interface *node) *os << "::CORBA::Boolean" << be_nl << node->full_name () << "::_is_a (" << be_idt << be_idt_nl - << "const char *value"; + << "const char *value" << be_nl; if (node->is_local () || node->is_abstract ()) - { - *os << env_not; - } + *os << "ACE_ENV_ARG_DECL_NOT_USED"; else - { - *os << env_decl; - } + *os << "ACE_ENV_ARG_DECL"; *os << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl @@ -434,7 +430,8 @@ be_visitor_interface_cs::visit_interface (be_interface *node) { *os << "return this->ACE_NESTED_CLASS ( ::CORBA, Object)::_is_a (" << be_idt << be_idt_nl - << "value" << env_arg << be_uidt_nl + << "value" << be_nl + << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl << ");" << be_uidt << be_uidt_nl; } @@ -527,8 +524,9 @@ be_visitor_interface_cs::gen_xxx_narrow (const char *pre, *os << "::CORBA::Object_ptr"; } - *os << " _tao_objref" - << (node->is_local () ? env_not : env_decl) + *os << " _tao_objref" << be_nl + << "ACE_ENV_ARG_DECL" + << (node->is_local () ? "_NOT_USED" : "") << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl; @@ -556,7 +554,8 @@ be_visitor_interface_cs::gen_xxx_narrow (const char *pre, << "\"" << node->repoID () << "\"," << be_nl << node->flat_client_enclosing_scope () << node->base_proxy_broker_name () - << "_Factory_function_pointer" << env_arg << be_uidt_nl + << "_Factory_function_pointer" << be_nl + << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl << ");" << be_uidt << be_nl << "return TAO_" << node->flat_name () << "_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (proxy);" @@ -583,7 +582,8 @@ be_visitor_interface_cs::gen_xxx_narrow (const char *pre, << "\"" << node->repoID () << "\"," << be_nl << node->flat_client_enclosing_scope () << node->base_proxy_broker_name () - << "_Factory_function_pointer" << env_arg << be_uidt_nl + << "_Factory_function_pointer" << be_nl + << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl << ");" << be_uidt << be_uidt << be_uidt_nl << "}" << be_nl << be_nl; } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp index 1e5817b65ce..8af48e1e422 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp @@ -84,27 +84,31 @@ be_visitor_interface_sh::visit_interface (be_interface *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__; + << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; // Generate the skeleton class name. - *os << be_nl << be_nl - << "class " << class_name.c_str () << ";" << be_nl; + *os << "class " << class_name.c_str () << ";" << be_nl; // Generate the _ptr declaration. *os << "typedef " << class_name.c_str () << " *" << class_name.c_str () - << "_ptr;"; + << "_ptr;" << be_nl << be_nl; if (be_global->gen_direct_collocation ()) { - *os << be_nl << be_nl - << "class " << node->direct_proxy_impl_name () << ";" << be_nl - << "class " << node->strategized_proxy_broker_name () << ";"; + *os << "class " << node->direct_proxy_impl_name () << ";" << be_nl; } + if (be_global->gen_direct_collocation ()) + { + *os << "class " << node->strategized_proxy_broker_name () + << ";" << be_nl; + } + + *os << be_nl; + // Now generate the class definition. - *os << be_nl << be_nl - << "class " << be_global->skel_export_macro () + *os << "class " << be_global->skel_export_macro () << " " << class_name.c_str () << be_idt_nl << ": " << be_idt; long n_parents = node->n_inherits (); @@ -165,7 +169,8 @@ be_visitor_interface_sh::visit_interface (be_interface *node) << be_nl << "virtual ::CORBA::Boolean ciao_is_substitutable (" << be_idt << be_idt_nl - << "const char *event_repo_id" << env_dflts << be_uidt_nl + << "const char *event_repo_id" << be_nl + << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ")" << be_nl << "ACE_THROW_SPEC (( ::CORBA::SystemException));" << be_uidt_nl << be_nl; @@ -173,49 +178,56 @@ be_visitor_interface_sh::visit_interface (be_interface *node) // _is_a *os << "virtual ::CORBA::Boolean _is_a (" << be_idt << be_idt_nl - << "const char* logical_type_id" << env_dflts << be_uidt_nl + << "const char* logical_type_id" << be_nl + << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt_nl << be_nl; // Add a skeleton for our _is_a method. *os << "static void _is_a_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest & req," << be_nl << "void * servant_upcall," << be_nl - << "void * servant" << env_decl << be_uidt_nl + << "void * servant" << be_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ");" << be_uidt_nl << be_nl; // Add a skeleton for our _non_existent method. *os << "static void _non_existent_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest & req," << be_nl << "void * servant_upcall," << be_nl - << "void * servant" << env_decl << be_uidt_nl + << "void * servant" << be_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ");" << be_uidt_nl << be_nl; // Add a skeleton for our _interface method. *os << "static void _interface_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest & req," << be_nl << "void * servant_upcall," << be_nl - << "void * servant" << env_decl << be_uidt_nl + << "void * servant" << be_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ");" << be_uidt_nl << be_nl; // Add a skeleton for our _component method. *os << "static void _component_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest & req," << be_nl << "void * servant_upcall," << be_nl - << "void * servant" << env_decl << be_uidt_nl + << "void * servant" << be_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ");" << be_uidt_nl << be_nl; // Add a skeleton for our _repository_id method. *os << "static void _repository_id_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest & req," << be_nl << "void * servant_upcall," << be_nl - << "void * servant" << env_decl << be_uidt_nl + << "void * servant" << be_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ");" << be_uidt_nl << be_nl; // Add the dispatch method. *os << "virtual void _dispatch (" << be_idt << be_idt_nl << "TAO_ServerRequest & req," << be_nl - << "void * servant_upcall" << env_decl << be_uidt_nl + << "void * servant_upcall" << be_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ");" << be_uidt_nl << be_nl; this->this_method (node); @@ -380,7 +392,7 @@ be_visitor_interface_sh::this_method (be_interface *node) // Print out the _this() method. *os << "::" << node->full_name () << " *_this (" << be_idt << be_idt_nl - << env_dflts << be_uidt_nl + << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt << be_nl; } @@ -388,7 +400,7 @@ int be_visitor_interface_sh::generate_amh_classes (be_interface *node) { // We have to check for any abstract ancestor until AMH is integrated - // with abstract interfaces. If the node itself is abstract, this + // with abstract interfaces. If the node itself is abstract, this // visitor would not be created. if (be_global->gen_amh_classes () && !node->has_mixed_parentage ()) { diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp index 1a4cecb0056..8c9c767d55c 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp @@ -204,14 +204,14 @@ be_visitor_interface_ss::visit_interface (be_interface *node) full_skel_name, is_a_upcall_command_name.c_str ()); - *os << be_nl << be_nl - << "void " << full_skel_name + *os << "void " << full_skel_name << "::_is_a_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest & server_request, " << be_nl << "void * TAO_INTERCEPTOR (servant_upcall)," << be_nl - << "void * servant" << env_decl << be_uidt_nl + << "void * servant" << be_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl; - *os << "{" << be_idt; + *os << "{" << be_idt_nl; // Generate exception list. be_visitor_operation_exceptlist_ss exception_list (this->ctx_); @@ -276,14 +276,13 @@ be_visitor_interface_ss::visit_interface (be_interface *node) << " , exceptions" << be_nl << " , nexceptions" << "\n#endif /* TAO_HAS_INTERCEPTORS == 1 */" << be_nl - << " " - << (be_global->use_raw_throw () ? "" : "ACE_ENV_ARG_PARAMETER") - << ");" << TAO_ACE_CHECK (); + << " ACE_ENV_ARG_PARAMETER);" << be_nl + << "ACE_CHECK;" << be_nl; this->generate_send_reply (os); *os << be_uidt_nl - << "}"; + << "}" << be_nl << be_nl; } // Generate code for the _non_existent skeleton. @@ -309,14 +308,14 @@ be_visitor_interface_ss::visit_interface (be_interface *node) full_skel_name, non_exist_upcall_command_name.c_str ()); - *os << be_nl << be_nl - << "void " << full_skel_name + *os << "void " << full_skel_name << "::_non_existent_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest & server_request, " << be_nl << "void * TAO_INTERCEPTOR (servant_upcall)," << be_nl - << "void * servant" << env_decl << be_uidt_nl + << "void * servant" << be_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl; - *os << "{" << be_idt; + *os << "{" << be_idt_nl; // Generate exception list. be_visitor_operation_exceptlist_ss exception_list (this->ctx_); @@ -380,14 +379,14 @@ be_visitor_interface_ss::visit_interface (be_interface *node) << " , exceptions" << be_nl << " , nexceptions" << "\n#endif /* TAO_HAS_INTERCEPTORS == 1 */" << be_nl - << " " - << (be_global->use_raw_throw () ? "" : "ACE_ENV_ARG_PARAMETER") - << ");" << TAO_ACE_CHECK (); + << " ACE_ENV_ARG_PARAMETER);" << be_nl + << "ACE_CHECK;" << be_nl; this->generate_send_reply (os); *os << be_uidt_nl - << "}"; + << "}" << be_nl << be_nl; + } // Generate code for the _repository_id skeleton. @@ -417,14 +416,14 @@ be_visitor_interface_ss::visit_interface (be_interface *node) full_skel_name, repository_id_upcall_command_name.c_str ()); - *os << be_nl << be_nl - << "void " << full_skel_name + *os << "void " << full_skel_name << "::_repository_id_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest & server_request, " << be_nl << "void * TAO_INTERCEPTOR (servant_upcall)," << be_nl - << "void * servant" << env_decl << be_uidt_nl + << "void * servant" << be_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl; - *os << "{" << be_idt; + *os << "{" << be_idt_nl; // Generate exception list. be_visitor_operation_exceptlist_ss exception_list (this->ctx_); @@ -488,25 +487,26 @@ be_visitor_interface_ss::visit_interface (be_interface *node) << " , exceptions" << be_nl << " , nexceptions" << "\n#endif /* TAO_HAS_INTERCEPTORS == 1 */" << be_nl - << " " - << (be_global->use_raw_throw () ? "" : "ACE_ENV_ARG_PARAMETER") - << ");" << TAO_ACE_CHECK (); + << " ACE_ENV_ARG_PARAMETER);" << be_nl + << "ACE_CHECK;" << be_nl; this->generate_send_reply (os); *os << be_uidt_nl - << "}"; + << "}" << be_nl << be_nl; + } *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl - << "// " << __FILE__ << ":" << __LINE__; + << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; *os << be_nl << be_nl << "void " << full_skel_name << "::_interface_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest & server_request, " << be_nl << "void * /* servant_upcall */," << be_nl - << "void * servant" << env_decl << be_uidt_nl + << "void * servant" << be_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl; *os << "{" << be_idt_nl; *os << "TAO_IFR_Client_Adapter *_tao_adapter =" << be_idt_nl @@ -516,10 +516,8 @@ be_visitor_interface_ss::visit_interface (be_interface *node) << ");" << be_uidt_nl << be_uidt_nl; *os << "if (_tao_adapter == 0)" << be_idt_nl << "{" << be_idt_nl - << "ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1," - << be_nl - << " ::CORBA::COMPLETED_NO));" - << be_uidt_nl + << "ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1," << be_nl + << " ::CORBA::COMPLETED_NO));" << be_uidt_nl << "}" << be_uidt_nl << be_nl; // Get the right object implementation. @@ -529,12 +527,9 @@ be_visitor_interface_ss::visit_interface (be_interface *node) << be_uidt_nl; *os << "::CORBA::InterfaceDef_ptr _tao_retval = " << be_idt_nl - << "impl->_get_interface (" - << (be_global->use_raw_throw () - ? "" - : "ACE_ENV_SINGLE_ARG_PARAMETER") - << ");" << be_uidt - << TAO_ACE_CHECK () << be_nl << be_nl + << "impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);" + << be_uidt_nl + << "ACE_CHECK;" << be_nl << be_nl << "server_request.init_reply ();" << be_nl << "TAO_OutputCDR &_tao_out = *server_request.outgoing ();" << be_nl << be_nl @@ -553,7 +548,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node) this->generate_send_reply (os); *os << be_uidt_nl - << "}"; + << "}" << be_nl << be_nl; // Generate code for the _component skeleton. @@ -581,14 +576,15 @@ be_visitor_interface_ss::visit_interface (be_interface *node) full_skel_name, get_component_upcall_command_name.c_str()); - *os << be_nl << be_nl - << "void " << full_skel_name + *os << "void " << full_skel_name << "::_component_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest & server_request, " << be_nl << "void * TAO_INTERCEPTOR (servant_upcall)," << be_nl - << "void * servant" << env_decl << be_uidt_nl + << "void * servant" << be_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl; - *os << "{" << be_idt; + *os << "{" << be_idt_nl; + // Generate exception list. be_visitor_operation_exceptlist_ss exception_list (this->ctx_); @@ -651,18 +647,19 @@ be_visitor_interface_ss::visit_interface (be_interface *node) << " , exceptions" << be_nl << " , nexceptions" << "\n#endif /* TAO_HAS_INTERCEPTORS == 1 */" << be_nl - << " " - << (be_global->use_raw_throw () ? "" : "ACE_ENV_ARG_PARAMETER") - << ");" << TAO_ACE_CHECK () << be_uidt_nl - << "}"; + << " ACE_ENV_ARG_PARAMETER);" << be_nl + << "ACE_CHECK;" << be_nl; + + *os << be_uidt_nl + << "}" << be_nl << be_nl; } // Generate code for the _is_a override. - *os << be_nl << be_nl - << "::CORBA::Boolean " << full_skel_name + *os << "::CORBA::Boolean " << full_skel_name << "::_is_a (" << be_idt << be_idt_nl - << "const char* value" << env_not << be_uidt_nl + << "const char* value" << be_nl + << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl << "return" << be_idt_nl @@ -707,7 +704,8 @@ be_visitor_interface_ss::visit_interface (be_interface *node) *os << be_nl << be_nl << "::CORBA::Boolean " << full_skel_name << "::ciao_is_substitutable (" << be_idt << be_idt_nl - << "const char * /* event_repo_id */" << env_not << be_uidt_nl + << "const char * /* event_repo_id */" << be_nl + << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl << ")" << be_nl << "ACE_THROW_SPEC (( ::CORBA::SystemException))" << be_uidt_nl << "{" << be_idt_nl @@ -817,14 +815,11 @@ be_visitor_interface_ss::this_method (be_interface *node) // the _this () operation. *os << node->full_name () << " *" << be_nl << node->full_skel_name () - << "::_this (" - << (be_global->use_raw_throw () ? "void" : "ACE_ENV_SINGLE_ARG_DECL") - << ")" << be_nl + << "::_this (ACE_ENV_SINGLE_ARG_DECL)" << be_nl << "{" << be_idt_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 + << "TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);" + << be_nl + << "ACE_CHECK_RETURN (0);" << be_nl << be_nl << "TAO_Stub_Auto_Ptr safe_stub (stub);" << be_nl; *os << "::CORBA::Object_ptr tmp = CORBA::Object::_nil ();" @@ -869,15 +864,14 @@ be_visitor_interface_ss::dispatch_method (be_interface *node) *os << "void " << node->full_skel_name () << "::_dispatch (" << be_idt << be_idt_nl << "TAO_ServerRequest & req," << be_nl - << "void * servant_upcall" << env_decl << be_uidt_nl + << "void * servant_upcall" << be_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl; *os << "{" << be_idt_nl; *os << "this->synchronous_upcall_dispatch (req," << be_nl << " servant_upcall," << be_nl << " this" << be_nl - << " " - << (be_global->use_raw_throw () ? "" : "ACE_ENV_ARG_PARAMETER") - << ");" + << " ACE_ENV_ARG_PARAMETER);" << be_uidt_nl; *os << "}"; } @@ -886,7 +880,7 @@ int be_visitor_interface_ss::generate_amh_classes (be_interface *node) { // We have to check for any abstract ancestor until AMH is integrated - // with abstract interfaces. If the node itself is abstract, this + // with abstract interfaces. If the node itself is abstract, this // visitor would not be created. if (be_global->gen_amh_classes () && !node->has_mixed_parentage ()) { @@ -994,7 +988,7 @@ be_visitor_interface_ss::generate_proxy_classes (be_interface *node) << node->flat_client_enclosing_scope () << node->base_proxy_broker_name () << "_Factory_Initializer)" << be_uidt_nl - << ");" << be_uidt << be_uidt; + << ");" << be_uidt << be_uidt_nl << be_nl; } if (be_global->gen_direct_collocation ()) diff --git a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp index 12c8f672665..f0f00ab4c50 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp @@ -31,7 +31,7 @@ be_visitor_interface_remote_proxy_broker_ch::visit_interface ( os->indent (); *os << be_nl - << "///////////////////////////////////////////////////////////////////////" + << "///////////////////////////////////////////////////////////////////////" << be_nl << "// Remote Proxy Broker Declaration " << be_nl << "//" << be_nl << be_nl; @@ -54,11 +54,12 @@ be_visitor_interface_remote_proxy_broker_ch::visit_interface ( << be_nl << be_nl; // Accessor Method - *os << "virtual " << node->base_proxy_impl_name () << " &" + *os << "virtual " << node->base_proxy_impl_name () << " &" << "select_proxy (" << be_idt << be_idt_nl; - *os << node->local_name () << " *object" << env_decl << be_uidt_nl + *os << node->local_name () << " *object" << be_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ");" << be_uidt_nl << be_uidt_nl; *os << "private:" << be_idt_nl @@ -70,7 +71,7 @@ be_visitor_interface_remote_proxy_broker_ch::visit_interface ( // Factory Member Function declaration. *os << "// This member function is used to get an handle to the " << "unique instance" << be_nl - << "// of the Remote Proxy Broker that is available for a given" + << "// of the Remote Proxy Broker that is available for a given" << be_nl << "// interface." << be_nl << "static " << node->remote_proxy_broker_name () diff --git a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp index 30d5a00dd13..4399b3509d1 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp @@ -2,8 +2,8 @@ // $Id$ // -ACE_RCSID (be_visitor_interface, - remote_proxy_broker_cs, +ACE_RCSID (be_visitor_interface, + remote_proxy_broker_cs, "$Id$") be_visitor_interface_remote_proxy_broker_cs:: @@ -34,7 +34,7 @@ be_visitor_interface_remote_proxy_broker_cs::visit_interface ( os->indent (); *os << be_nl - << "///////////////////////////////////////////////////////////////////////" + << "///////////////////////////////////////////////////////////////////////" << be_nl << "// Remote & Base Proxy Broker Implementation" << be_nl << "//" << be_nl << be_nl; @@ -84,9 +84,9 @@ be_visitor_interface_remote_proxy_broker_cs::visit_interface ( *os << node->full_base_proxy_impl_name () << "&" << be_nl <<node->full_remote_proxy_broker_name () << "::" << "select_proxy (" << be_idt << be_idt_nl - << "::" << node->full_name () << " *" << env_not << be_uidt_nl - << ")" << be_uidt_nl - << "{" << be_idt_nl // idt = 1 + << "::" << node->full_name () << " *" << be_nl + << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl << ")" + << be_uidt_nl << "{" << be_idt_nl // idt = 1 << "return this->remote_proxy_impl_;" << be_uidt_nl << "}"; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp index c55d08b839e..8d4031086ae 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp @@ -18,8 +18,8 @@ // // ============================================================================ -ACE_RCSID (be_visitor_interface, - smart_proxy_ch, +ACE_RCSID (be_visitor_interface, + smart_proxy_ch, "$Id$") @@ -75,7 +75,8 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node) << "virtual "<< node->local_name () << "_ptr create_proxy (" << be_idt << be_idt_nl << node->local_name () - << "_ptr proxy" << env_dflts << be_uidt_nl + << "_ptr proxy" << be_nl + << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "};\n\n"; @@ -88,14 +89,16 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node) << "_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX>;" << be_nl << be_nl << "void register_proxy_factory (" << be_idt << be_idt_nl << "TAO_" << node->flat_name () << "_Default_Proxy_Factory *df,"<< be_nl - << "int one_shot_factory = 1" << env_dflts << be_uidt_nl + << "int one_shot_factory = 1" << be_nl + << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt_nl << be_nl - << "void unregister_proxy_factory (" << be_idt << be_idt - << env_dflts << be_uidt_nl + << "void unregister_proxy_factory (" << be_idt << be_idt_nl + << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt_nl << be_nl << node->local_name () << "_ptr create_proxy (" << be_idt << be_idt_nl - << node->local_name () << "_ptr proxy" << env_dflts << be_uidt_nl + << node->local_name () << "_ptr proxy" << be_nl + << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt << be_uidt_nl << be_nl << "protected:" << be_idt_nl << "TAO_" << node->flat_name () @@ -157,11 +160,11 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node) *os << "{" << be_nl << "public:" << be_idt_nl - << "TAO_"<< node->flat_name () << "_Smart_Proxy_Base (void);" + << "TAO_"<< node->flat_name () << "_Smart_Proxy_Base (void);" << be_nl // Just to keep Old g++ complier (version: 2.7.2.3) happy it's // necesssary to declare and define the destructor explicitly. - << "~TAO_"<< node->flat_name () << "_Smart_Proxy_Base (void);" + << "~TAO_"<< node->flat_name () << "_Smart_Proxy_Base (void);" << be_nl // This method will delegate this method to the <base_proxy_> // member of the smart proxy and so the smart proxy's (nil) @@ -182,7 +185,7 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_interface_ch::" "visit_interface - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp index 4c4c41b8013..f2b65b7f3d3 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp @@ -97,7 +97,8 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) *os << "TAO_" << node->flat_name () << "_Default_Proxy_Factory::create_proxy (" << be_idt << be_idt_nl << "::" << node->full_name () - << "_ptr proxy" << env_not << be_uidt_nl + << "_ptr proxy" << be_nl + << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl << ")" << be_uidt << be_uidt_nl << "{" << be_idt_nl << "return proxy;" << be_uidt_nl @@ -157,7 +158,8 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) << "_Proxy_Factory_Adapter::register_proxy_factory (" << be_idt << be_idt_nl << "TAO_" << node->flat_name () << "_Default_Proxy_Factory *df," << be_nl - << "int one_shot_factory" << env_decl << be_uidt_nl + << "int one_shot_factory" << be_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt << be_uidt_nl << "{" << be_idt_nl << "ACE_MT (" << be_idt << be_idt_nl @@ -167,13 +169,9 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) << "this->lock_" << be_uidt_nl << ")" << be_uidt << be_uidt_nl << ");" <<be_uidt_nl << be_nl - << "// Remove any existing <proxy_factory_> and " - << "replace with the new one." << be_nl - << "this->unregister_proxy_factory (" - << (be_global->use_raw_throw () - ? "" - : "ACE_ENV_SINGLE_ARG_PARAMETER") - << ");" << TAO_ACE_CHECK () << be_nl + << "// Remove any existing <proxy_factory_> and replace with the new one." << be_nl + << "this->unregister_proxy_factory (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_nl + << "ACE_CHECK;" << be_nl << "this->proxy_factory_ = df;" << be_nl << "this->one_shot_factory_ = one_shot_factory;" << be_uidt_nl << "}\n\n"; @@ -188,8 +186,8 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) *os << "TAO_"<< node->flat_name () << "_Proxy_Factory_Adapter::unregister_proxy_factory (" - << be_idt << be_idt - << env_sngl_not << be_uidt_nl + << be_idt << be_idt_nl + << "ACE_ENV_SINGLE_ARG_DECL_NOT_USED" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl << "ACE_MT (" << be_idt << be_idt_nl @@ -224,7 +222,8 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) *os << "TAO_"<< node->flat_name () << "_Proxy_Factory_Adapter::create_proxy (" << be_idt << be_idt_nl << "::" << node->full_name () - << "_ptr proxy" << env_not << be_uidt_nl + << "_ptr proxy" << be_nl + << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl << ")" << be_uidt << be_uidt_nl << "{" << be_idt_nl << "ACE_MT (ACE_GUARD_RETURN (" diff --git a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp index baf3709e1b7..8a446d8eda1 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp @@ -53,7 +53,8 @@ be_visitor_interface_strategized_proxy_broker_sh::visit_interface ( *os << be_nl << be_nl << "TAO::Collocation_Strategy" << be_nl << "get_strategy (" << be_idt << be_idt_nl - << "::CORBA::Object_ptr obj" << env_decl << be_uidt_nl + << "::CORBA::Object_ptr obj" << be_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_nl << "ACE_THROW_SPEC (( ::CORBA::SystemException));" << be_uidt; @@ -66,12 +67,13 @@ be_visitor_interface_strategized_proxy_broker_sh::visit_interface ( << "int num_args," << be_nl << "const char * op," << be_nl << "size_t op_len," << be_nl - << "TAO::Collocation_Strategy strategy" << env_decl << be_uidt_nl + << "TAO::Collocation_Strategy strategy" << be_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_nl << "ACE_THROW_SPEC (( ::CORBA::Exception));"; *os << be_uidt_nl << be_nl - << "static " << node->strategized_proxy_broker_name () + << "static " << node->strategized_proxy_broker_name () << " *" << be_nl << "the" << node->strategized_proxy_broker_name () << " (void);" << be_uidt_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp index 80ce04b3f3f..4a2479fa48d 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp @@ -65,18 +65,17 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface ( // get_strategy() impementation. *os << "TAO::Collocation_Strategy" << be_nl - << node->full_strategized_proxy_broker_name () << "::" + <<node->full_strategized_proxy_broker_name () << "::" << "get_strategy (" << be_idt << be_idt_nl - << "::CORBA::Object_ptr obj" << env_decl << be_uidt_nl + << "::CORBA::Object_ptr obj" << be_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_nl << "ACE_THROW_SPEC (( ::CORBA::SystemException))" << be_uidt_nl << "{" << be_idt_nl << "TAO::Collocation_Strategy strategy =" << be_idt_nl - << "TAO_ORB_Core::collocation_strategy (obj" - << (be_global->use_raw_throw () ? "" : " ACE_ENV_ARG_PARAMETER") - << ");" << be_uidt - << TAO_ACE_CHECK ("TAO::TAO_CS_REMOTE_STRATEGY") - << be_nl << be_nl + << "TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);" + << be_uidt_nl + << "ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);" << be_nl << be_nl << "return strategy;" << be_uidt_nl << "}" << be_nl << be_nl; @@ -90,20 +89,21 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface ( << "int num_args," << be_nl << "const char * op," << be_nl << "size_t op_len," << be_nl - << "TAO::Collocation_Strategy strategy" << env_decl << be_uidt_nl + << "TAO::Collocation_Strategy strategy" << be_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_nl << "ACE_THROW_SPEC (( ::CORBA::Exception))" << be_uidt_nl << "{" << be_idt_nl << "TAO::Direct_Collocation_Upcall_Wrapper collocation_upcall_wrapper;" << be_nl << "collocation_upcall_wrapper.upcall (" << be_idt_nl - << "obj," << be_nl - << "forward_obj," << be_nl - << "args," << be_nl - << "num_args," << be_nl - << "op," << be_nl - << "op_len," << be_nl - << "strategy" << env_arg - << ");" << be_uidt << be_uidt_nl + << "obj, " << be_nl + << "forward_obj, " << be_nl + << "args, " << be_nl + << "num_args, " << be_nl + << "op, " << be_nl + << "op_len, " << be_nl + << "strategy " << be_nl + << "ACE_ENV_ARG_PARAMETER);" << be_uidt << be_uidt_nl << "}"; *os << be_nl << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp index d6ce5c3e516..aecd1107492 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp @@ -19,8 +19,8 @@ // // ============================================================================ -ACE_RCSID (be_visitor_interface, - tie_sh, +ACE_RCSID (be_visitor_interface, + tie_sh, "$Id$") // ************************************************************ @@ -117,11 +117,11 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node) << "void _is_owner ( ::CORBA::Boolean b);" << be_nl << "// set the ownership" << be_nl << be_nl << "// overridden ServantBase operations" << be_nl - << "PortableServer::POA_ptr _default_POA (" << be_idt << be_idt - << env_sngl_dflts << be_uidt_nl + << "PortableServer::POA_ptr _default_POA (" << be_idt << be_idt_nl + << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt; - int status = + int status = node->traverse_inheritance_graph ( be_visitor_interface_tie_sh::method_helper, os @@ -161,7 +161,7 @@ be_visitor_interface_tie_sh::method_helper (be_interface *, TAO_OutStream *os) { // Any methods from abstract parents have already been - // "added" to the derived interface scope by the overridden + // "added" to the derived interface scope by the overridden // visit_scope() method in be_visitor_interface, so we can skip // this base interface, if it is abstract. if (node->is_abstract ()) @@ -178,7 +178,7 @@ be_visitor_interface_tie_sh::method_helper (be_interface *, { ACE_ERROR_RETURN ((LM_ERROR, "be_visitor_interface_tie_sh::" - "method_helper\n"), + "method_helper\n"), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp index 0bbf5bb2d1e..46e93a19938 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp @@ -19,8 +19,8 @@ // // ============================================================================ -ACE_RCSID (be_visitor_interface, - tie_si, +ACE_RCSID (be_visitor_interface, + tie_si, "$Id$") @@ -42,8 +42,8 @@ be_visitor_interface_tie_si::~be_visitor_interface_tie_si (void) int be_visitor_interface_tie_si::visit_interface (be_interface *node) { - if (node->srv_inline_gen () - || node->imported () + if (node->srv_inline_gen () + || node->imported () || node->is_abstract ()) { return 0; @@ -53,13 +53,13 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node) static char localtiename [NAMEBUFSIZE]; static char localskelname [NAMEBUFSIZE]; - ACE_OS::memset (fulltiename, - '\0', + ACE_OS::memset (fulltiename, + '\0', NAMEBUFSIZE); - ACE_OS::memset (localtiename, - '\0', + ACE_OS::memset (localtiename, + '\0', NAMEBUFSIZE); - ACE_OS::memset (localskelname, + ACE_OS::memset (localskelname, '\0', NAMEBUFSIZE); @@ -67,25 +67,25 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node) // class name. // We are outermost. - ACE_OS::sprintf (fulltiename, - "%s_tie", + ACE_OS::sprintf (fulltiename, + "%s_tie", node->full_skel_name ()); if (!node->is_nested ()) { - ACE_OS::sprintf (localskelname, + ACE_OS::sprintf (localskelname, "POA_%s", node->local_name ()); - ACE_OS::sprintf (localtiename, + ACE_OS::sprintf (localtiename, "POA_%s_tie", node->local_name ()); } else { - ACE_OS::sprintf (localskelname, + ACE_OS::sprintf (localskelname, "%s", node->local_name ()); - ACE_OS::sprintf (localtiename, + ACE_OS::sprintf (localtiename, "%s_tie", node->local_name ()); } @@ -180,24 +180,19 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node) *os << "template <class T> ACE_INLINE " << "PortableServer::POA_ptr" << be_nl << fulltiename - << "<T>::_default_POA (" - << (be_global->use_raw_throw () ? "" : "ACE_ENV_SINGLE_ARG_DECL") - << ")" << be_nl + << "<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)" << be_nl << "{" << be_idt_nl << "if (! CORBA::is_nil (this->poa_.in ()))" << be_idt_nl << "{" << be_idt_nl - << "return PortableServer::POA::_duplicate (this->poa_.in ());" - << be_uidt_nl + << "return PortableServer::POA::_duplicate (this->poa_.in ());" << be_uidt_nl << "}" << be_uidt_nl << be_nl << "return this->" << localskelname - << "::_default_POA (" - << (be_global->use_raw_throw () ? "" : "ACE_ENV_SINGLE_ARG_PARAMETER") - << ");" << be_uidt_nl + << "::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl << "}"; int status = node->traverse_inheritance_graph ( - be_visitor_interface_tie_si::method_helper, + be_visitor_interface_tie_si::method_helper, os ); @@ -225,7 +220,7 @@ be_visitor_interface_tie_si::method_helper (be_interface *derived, TAO_OutStream *os) { // Any methods from abstract parents have already been - // "added" to the derived interface scope by the overridden + // "added" to the derived interface scope by the overridden // visit_scope() method in be_visitor_interface, so we can skip // this base interface, if it is abstract. if (node->is_abstract ()) @@ -244,7 +239,7 @@ be_visitor_interface_tie_si::method_helper (be_interface *derived, { ACE_ERROR_RETURN ((LM_ERROR, "be_visitor_interface_tie_si::" - "method_helper\n"), + "method_helper\n"), -1); } |