diff options
Diffstat (limited to 'TAO/TAO_IDL/be/be_visitor_interface')
21 files changed, 94 insertions, 94 deletions
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 fce022ee17f..a9b511b3cbf 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp @@ -114,7 +114,7 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node) << be_nl << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl << "const char* logical_type_id" << be_nl - << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");\n" << be_uidt_nl; *os << "virtual void* _downcast (" << be_idt << be_idt_nl @@ -126,7 +126,7 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node) << "TAO_ServerRequest &req," << be_nl << "void *obj," << be_nl << "void *servant_upcall" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ");\n" << be_uidt_nl; // Add a skeleton for our _non_existent method. @@ -134,7 +134,7 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node) << "TAO_ServerRequest &req," << be_nl << "void *obj," << be_nl << "void *servant_upcall" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ");\n" << be_uidt_nl; // Add a skeleton for our _interface method. @@ -142,14 +142,14 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node) << "TAO_ServerRequest &req," << be_nl << "void *obj," << be_nl << "void *servant_upcall" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ");\n" << be_uidt_nl; // Add the dispatch method. *os << "virtual void _dispatch (" << be_idt << be_idt_nl << "TAO_ServerRequest &req," << be_nl << "void *_servant_upcall" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ");\n" << be_uidt_nl; this->this_method (node); @@ -355,6 +355,6 @@ be_visitor_amh_interface_sh::this_method (be_interface *node) // 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_nl - << "TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_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_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp index 94bf1737db1..a8a079ffe3e 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp @@ -70,9 +70,9 @@ be_visitor_amh_interface_ss::this_method (be_interface *node) *os << non_amh_name.c_str() << "*" << be_nl << full_skel_name - << "::_this (TAO_ENV_SINGLE_ARG_DECL)" << be_nl + << "::_this (ACE_ENV_SINGLE_ARG_DECL)" << be_nl << "{" << be_idt_nl // idt = 1 - << "TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);" + << "TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_nl << "ACE_CHECK_RETURN (0);" << be_nl << be_nl; @@ -109,14 +109,14 @@ be_visitor_amh_interface_ss::dispatch_method (be_interface *node) << full_skel_name << "::_dispatch (" << be_idt << be_idt_nl << "TAO_ServerRequest &req," << be_nl << "void *context" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_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" << be_nl - << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl + << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "}" << be_nl; } 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 5b8e64e50c2..0791620c497 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 @@ -82,7 +82,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node) << "_tao_elem = " << node->full_name () << "::_nil ();" << be_nl << "CORBA::TypeCode_var type = _tao_any.type ();" << be_nl << be_nl << "CORBA::Boolean result = type->equivalent (" << node->tc_name () - << " TAO_ENV_ARG_PARAMETER);" << be_nl + << " ACE_ENV_ARG_PARAMETER);" << be_nl << "ACE_TRY_CHECK;" << be_nl << be_nl << "if (!result)" << be_idt_nl << "return 0; // not equivalent" << be_uidt_nl << be_nl 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 441b3330a6f..67068688a0d 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 @@ -48,7 +48,7 @@ be_visitor_interface_base_proxy_broker_ch::visit_interface (be_interface *node) << be_idt << be_idt_nl; *os << node->local_name () << " *object" << be_nl - << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_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_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp index f8fc999e4a2..f3c743a6dfa 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 @@ -91,7 +91,7 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node) << node->full_name () << "::_unchecked_narrow (" << be_idt << be_idt_nl << "obj.in ()" << be_nl - << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl + << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl << ");" << be_uidt << be_uidt_nl; *os << "ACE_TRY_CHECK;" << be_nl; *os << "return 1;" << be_uidt_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_sh.cpp index d16bf1fd7ed..fa2aebe35da 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_sh.cpp @@ -100,7 +100,7 @@ int be_visitor_interface_direct_collocated_sh::visit_interface (be_interface *no *os << "virtual CORBA::Boolean _is_a" << be_idt << "(" << be_idt_nl << "const CORBA::Char *logical_type_id" << be_nl - << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt_nl << be_nl; *os << "virtual void *_tao_QueryInterface (ptr_arith_t type);\n" @@ -118,7 +118,7 @@ int be_visitor_interface_direct_collocated_sh::visit_interface (be_interface *no *os << "virtual CORBA::Boolean _non_existent" << be_idt << "(" << be_idt_nl - << "TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt_nl << be_nl; if (this->visit_scope (node) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_ss.cpp index 0d87db8e818..1d9bb2bb34f 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_ss.cpp @@ -105,10 +105,10 @@ int be_visitor_interface_direct_collocated_ss::visit_interface (be_interface *no << "_is_a" << be_idt << "(" << be_idt_nl << "const CORBA::Char *logical_type_id" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl << be_nl; *os << "{" << be_idt_nl - << "return this->servant_->_is_a (logical_type_id TAO_ENV_ARG_PARAMETER);" + << "return this->servant_->_is_a (logical_type_id ACE_ENV_ARG_PARAMETER);" << be_uidt_nl << "}\n\n" << be_uidt_nl; @@ -155,10 +155,10 @@ int be_visitor_interface_direct_collocated_ss::visit_interface (be_interface *no *os << "CORBA::Boolean " << node->full_coll_name (be_interface::DIRECT) << "::" << "_non_existent" << be_idt << "(" << be_idt_nl - << "TAO_ENV_SINGLE_ARG_DECL" << be_uidt_nl + << "ACE_ENV_SINGLE_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl << be_nl; *os << "{" << be_idt_nl - << "return this->servant_->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);" + << "return this->servant_->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl << "}\n\n" << be_uidt_nl; 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 aa9d82b1551..1bc260d140d 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp @@ -176,7 +176,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node) << "static " << node->local_name () << "_ptr " << "_narrow (" << be_idt << be_idt_nl << "CORBA::Object_ptr obj" << be_nl - << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt_nl << be_nl; // There's no need for an _unchecked_narrow for locality @@ -184,7 +184,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node) *os << "static " << node->local_name () << "_ptr " << "_unchecked_narrow (" << be_idt << be_idt_nl << "CORBA::Object_ptr obj" << be_nl - << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt_nl << be_nl; // This method is defined in the header file to workaround old @@ -218,7 +218,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node) { *os << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl << "const CORBA::Char *type_id" << be_nl - << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt_nl << be_nl; } 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 bb569badd4f..57786ac89e7 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp @@ -101,11 +101,11 @@ be_visitor_interface_cs::visit_interface (be_interface *node) << "tao_" << node->flat_name () << "_narrow (" << be_idt << be_idt_nl << "CORBA::Object *p" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl << "return " << node->full_name () - << "::_narrow (p TAO_ENV_ARG_PARAMETER);" + << "::_narrow (p ACE_ENV_ARG_PARAMETER);" << be_uidt_nl << "}" << be_nl << be_nl; @@ -127,7 +127,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_interface_cs::" "visit_interface - " - "codegen for _var failed\n"), + "codegen for _var failed\n"), -1); } @@ -137,7 +137,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_interface_cs::" "visit_interface - " - "codegen for _out failed\n"), + "codegen for _out failed\n"), -1); } @@ -301,7 +301,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) *os << node->full_name () << "_ptr " << node->full_name () << "::_narrow (" << be_idt << be_idt_nl << "CORBA::Object_ptr obj" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl; @@ -316,7 +316,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) *os << "if (! obj->_is_local ())" << be_idt_nl << "{" << be_idt_nl << "CORBA::Boolean is_a = obj->_is_a (\"" - << node->repoID () << "\" TAO_ENV_ARG_PARAMETER);" << be_nl + << node->repoID () << "\" ACE_ENV_ARG_PARAMETER);" << be_nl << "ACE_CHECK_RETURN (" << bt->nested_type_name (this->ctx_->scope ()) << "::_nil ());" << be_nl << "if (is_a == 0)" << be_idt_nl @@ -326,7 +326,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) } *os << "return " << bt->nested_type_name (this->ctx_->scope ()) - << "::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);" << be_uidt_nl + << "::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);" << be_uidt_nl << "}" << be_nl << be_nl; // The _unchecked_narrow method @@ -335,7 +335,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) << node->full_name () << "::_unchecked_narrow (" << be_idt << be_idt_nl << "CORBA::Object_ptr obj" << be_nl - << "TAO_ENV_ARG_DECL_NOT_USED" << be_uidt_nl + << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl << "if (CORBA::is_nil (obj))" << be_idt_nl @@ -452,7 +452,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) os->indent (); *os << "CORBA::Boolean " << node->full_name () << "::_is_a (" - << "const CORBA::Char *value TAO_ENV_ARG_DECL)" + << "const CORBA::Char *value ACE_ENV_ARG_DECL)" << be_nl << "{\n"; @@ -475,7 +475,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) *os << " return 1; // success using local knowledge\n"; os->decr_indent (); *os << "else" << be_nl; - *os << " return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);\n"; + *os << " return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);\n"; os->decr_indent (); *os << "}\n\n"; } @@ -493,7 +493,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_interface_cs::" "visit_interface - " - "_tao_QueryInterface method codegen failed\n"), + "_tao_QueryInterface method codegen failed\n"), -1); } @@ -522,7 +522,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_interface_cs::" "visit_interface - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } 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 b0062f701ee..bbb32209225 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp @@ -146,7 +146,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node) << be_nl << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl << "const char* logical_type_id" << be_nl - << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");\n" << be_uidt_nl; *os << "virtual void* _downcast (" << be_idt << be_idt_nl @@ -158,7 +158,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node) << "TAO_ServerRequest &req," << be_nl << "void *obj," << be_nl << "void *servant_upcall" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ");\n" << be_uidt_nl; // Add a skeleton for our _non_existent method. @@ -166,7 +166,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node) << "TAO_ServerRequest &req," << be_nl << "void *obj," << be_nl << "void *servant_upcall" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ");\n" << be_uidt_nl; // Add a skeleton for our _interface method. @@ -174,14 +174,14 @@ be_visitor_interface_sh::visit_interface (be_interface *node) << "TAO_ServerRequest &req," << be_nl << "void *obj," << be_nl << "void *servant_upcall" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ");\n" << be_uidt_nl; // Add the dispatch method. *os << "virtual void _dispatch (" << be_idt << be_idt_nl << "TAO_ServerRequest &req," << be_nl << "void *_servant_upcall" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ");\n" << be_uidt_nl; this->this_method (node); @@ -313,7 +313,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 - << "TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");\n" << be_uidt; } 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 b6f3684674c..8686a4bf0ac 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp @@ -137,7 +137,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node) " copy ctor generation failed\n"), -1); } - + *os << " TAO_ServantBase (rhs)" << be_uidt_nl @@ -166,7 +166,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node) << "TAO_ServerRequest &_tao_server_request, " << be_nl << "void * _tao_object_reference," << be_nl << "void * /* Servant_Upcall */" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl; *os << "{" << be_idt_nl; *os << "TAO_InputCDR &_tao_in = _tao_server_request.incoming ();" << be_nl; @@ -185,7 +185,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node) *os << "ACE_THROW (CORBA::MARSHAL ());" << be_uidt_nl << be_nl; } - *os << "_tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);" + *os << "_tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);" << be_nl; *os << "ACE_CHECK;" << be_nl << be_nl; *os << "_tao_server_request.init_reply ();" << be_nl; @@ -212,13 +212,13 @@ be_visitor_interface_ss::visit_interface (be_interface *node) << "TAO_ServerRequest &_tao_server_request, " << be_nl << "void * _tao_object_reference," << be_nl << "void * /* Servant_Upcall */" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl; *os << "{" << be_idt_nl; *os << full_skel_name << " *_tao_impl = (" << full_skel_name << " *) _tao_object_reference;" << be_nl; *os << "CORBA::Boolean _tao_retval =" << be_idt_nl - << "_tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);" + << "_tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl; *os << "ACE_CHECK;" << be_nl << be_nl; *os << "_tao_server_request.init_reply ();" << be_nl; @@ -239,7 +239,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node) << "TAO_ServerRequest &_tao_server_request, " << be_nl << "void * _tao_object_reference," << be_nl << "void * /* Servant_Upcall */" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl; *os << "{" << be_idt_nl; *os << full_skel_name << " *_tao_impl = (" @@ -258,7 +258,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node) *os << "ACE_TRY" << be_idt_nl << "{" << be_idt_nl << "_tao_retval = " << be_idt_nl - << "_tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);" + << "_tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl << "ACE_TRY_CHECK;" << be_nl << be_nl << "_tao_server_request.init_reply ();" << be_nl << be_nl @@ -286,7 +286,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node) *os << "CORBA::Boolean " << full_skel_name << "::_is_a (" << be_idt << be_idt_nl << "const char* value" << be_nl - << "TAO_ENV_ARG_DECL_NOT_USED" << be_uidt_nl + << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl << "const char *base_id = \"IDL:org.omg/CORBA/Object:1.0\";" << be_nl @@ -360,9 +360,9 @@ be_visitor_interface_ss::this_method (be_interface *node) // the _this () operation *os << node->full_name () << "*" << be_nl << node->full_skel_name () - << "::_this (TAO_ENV_SINGLE_ARG_DECL)" << be_nl + << "::_this (ACE_ENV_SINGLE_ARG_DECL)" << be_nl << "{" << be_idt_nl // idt = 1 - << "TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);" + << "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 << be_nl; @@ -398,13 +398,13 @@ be_visitor_interface_ss::dispatch_method (be_interface *node) << "::_dispatch (" << be_idt << be_idt_nl << "TAO_ServerRequest &req," << be_nl << "void *servant_upcall" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_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 - << " TAO_ENV_ARG_PARAMETER);" + << " ACE_ENV_ARG_PARAMETER);" << be_uidt_nl; *os << "}" << be_nl << be_nl; } 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 61e98a47572..273530debd1 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 @@ -52,7 +52,7 @@ be_visitor_interface_remote_proxy_broker_ch::visit_interface (be_interface *node << be_idt << be_idt_nl; *os << node->local_name () << " *object" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ");" << be_uidt_nl << be_uidt_nl; *os << "private:" << be_idt_nl 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 717fb8d85e5..93fa5e34089 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 @@ -77,7 +77,7 @@ be_visitor_interface_remote_proxy_broker_cs::visit_interface (be_interface *node <<node->full_remote_proxy_broker_name () << "::" << "select_proxy (" << be_idt_nl << "::" << node->full_name () << " *" << be_nl - << "TAO_ENV_ARG_DECL_NOT_USED" << be_uidt_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 << "}" << be_nl << be_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 f94b49ace25..fd4fd4987e8 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 @@ -80,7 +80,7 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node) << "_ptr create_proxy (" << be_idt << be_idt_nl << node->local_name () << "_ptr proxy" << be_nl - << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "};\n\n"; @@ -94,15 +94,15 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node) << "int register_proxy_factory (" << be_idt << be_idt_nl << "TAO_" << node->flat_name () << "_Default_Proxy_Factory *df,"<< be_nl << "int one_shot_factory = 1" << be_nl - << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt_nl << be_nl << "int unregister_proxy_factory (" << be_idt << be_idt_nl - << "TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_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" << be_nl - << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_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 () 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 6fefb52088a..aed69607090 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 @@ -101,7 +101,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) << "_Default_Proxy_Factory::create_proxy (" << be_idt << be_idt_nl << "::" << node->full_name () << "_ptr proxy" << be_nl - << "TAO_ENV_ARG_DECL_NOT_USED" << be_uidt_nl + << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl << ")" << be_uidt << be_uidt_nl << "{" << be_idt_nl << "return proxy;" << be_uidt << be_uidt_nl @@ -151,14 +151,14 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) << "TAO_" << node->flat_name () << "_Default_Proxy_Factory *df," << be_idt_nl << " int one_shot_factory" << be_nl - << " TAO_ENV_ARG_DECL" << be_idt_nl + << " ACE_ENV_ARG_DECL" << be_idt_nl << ")" << be_uidt << be_uidt << be_uidt_nl << "{" << be_idt_nl << "ACE_MT (ACE_GUARD_RETURN (" << "TAO_SYNCH_RECURSIVE_MUTEX, ace_mon," << be_idt_nl << "this->lock_, 0));" <<be_uidt_nl << "// Remove any existing <proxy_factory_> and replace with the new one."<<be_nl - << "this->unregister_proxy_factory (TAO_ENV_SINGLE_ARG_PARAMETER);" << be_nl + << "this->unregister_proxy_factory (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_nl << "ACE_CHECK_RETURN (-1);" << be_nl << "this->proxy_factory_ = df;"<< be_nl << "this->one_shot_factory_ = one_shot_factory;" << be_uidt << be_uidt_nl @@ -175,7 +175,7 @@ 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_nl - << "TAO_ENV_SINGLE_ARG_DECL_NOT_USED" << be_idt_nl + << "ACE_ENV_SINGLE_ARG_DECL_NOT_USED" << be_idt_nl << ")" << be_uidt << be_uidt_nl << "{" << be_idt_nl << "ACE_MT (ACE_GUARD_RETURN (" @@ -205,7 +205,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) << "_Proxy_Factory_Adapter::create_proxy (" << be_idt << be_idt_nl << "::" << node->full_name () << "_ptr proxy" << be_nl - << "TAO_ENV_ARG_DECL_NOT_USED" << be_uidt_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 6a861bcbacc..2b78387f443 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 @@ -48,7 +48,7 @@ be_visitor_interface_strategized_proxy_broker_sh::visit_interface (be_interface *os << "virtual " << "::" << node->full_base_proxy_impl_name () << " &" << "select_proxy (" << be_idt_nl; *os << "::" << node->full_name () << " *object" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ");" << be_uidt_nl << be_nl; @@ -56,7 +56,7 @@ be_visitor_interface_strategized_proxy_broker_sh::visit_interface (be_interface << "// Helper methods that takes care to create the proxy" << be_nl << "// as soon as their use is necessary." << be_nl << "void create_proxy (" << be_idt_nl << "int collocation_strategy" - << be_nl << "TAO_ENV_ARG_DECL" + << be_nl << "ACE_ENV_ARG_DECL" << be_uidt_nl << ");" << be_nl << be_nl << "// Caches the proxy implementations. The proxy implementation" << be_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 e16ab575100..f67d173214d 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 @@ -70,7 +70,7 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (be_interface << "select_proxy (" << be_idt << be_idt_nl // idt = 2 << "::" << node->full_name () << " *object" << be_nl - << "TAO_ENV_ARG_DECL" + << "ACE_ENV_ARG_DECL" << be_uidt_nl // idt = 1 << ")" << be_uidt_nl // idt = 0 @@ -78,7 +78,7 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (be_interface << be_idt_nl // idt = 1 << "int strategy =" << be_idt_nl // idt = 2 - << "TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);" + << "TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);" << be_nl << "ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);" << be_uidt_nl << be_nl // idt = 1 @@ -86,7 +86,7 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (be_interface << be_idt_nl // idt = 2 << "return *this->proxy_cache_[strategy];" << be_uidt_nl << be_nl // idt = 1 - << "this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);" + << "this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);" << be_nl << "ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);" << be_nl << be_nl @@ -101,7 +101,7 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (be_interface << be_idt << be_idt_nl // idt = 2 << "int strategy" << be_nl - << "TAO_ENV_ARG_DECL" + << "ACE_ENV_ARG_DECL" << be_uidt_nl // idt = 1 << ")" << be_uidt_nl // idt = 0 diff --git a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_sh.cpp index e600e2e83a4..7193ad36241 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_sh.cpp @@ -89,12 +89,12 @@ int be_visitor_interface_thru_poa_collocated_sh::visit_interface (be_interface * *os << "virtual CORBA::Boolean _is_a" << be_idt << "(" << be_idt_nl << "const CORBA::Char *logical_type_id" << be_nl - << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt_nl << be_nl; *os << "virtual CORBA::Boolean _non_existent" << be_idt << "(" << be_idt_nl - << "TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt_nl << be_nl; if (this->visit_scope (node) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_ss.cpp index 277a6ec76e8..4a4c59bc34e 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_ss.cpp @@ -79,7 +79,7 @@ int be_visitor_interface_thru_poa_collocated_ss::visit_interface (be_interface * << "_is_a" << be_idt << "(" << be_idt_nl << "const CORBA::Char *logical_type_id" << be_nl - << "TAO_ENV_ARG_DECL" << be_uidt_nl + << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl << be_nl << "{" << be_idt_nl; *os <<"TAO_Object_Adapter::Servant_Upcall servant_upcall (" @@ -93,7 +93,7 @@ int be_visitor_interface_thru_poa_collocated_ss::visit_interface (be_interface * << "this->_object_key ()," << be_nl << "\"" << "_is_a" << "\"," << be_nl << "forward_to.out ()" << be_nl - << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl + << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl << ");" << be_uidt_nl << "ACE_CHECK_RETURN (0);" << be_nl; *os << "return ACE_reinterpret_cast (" << be_idt << be_idt_nl @@ -101,14 +101,14 @@ int be_visitor_interface_thru_poa_collocated_ss::visit_interface (be_interface * << "servant_upcall.servant ()->_downcast (" << be_idt << be_idt_nl << "\"" << node->repoID () << "\"" << be_uidt_nl << ")" << be_uidt << be_uidt_nl - << ")->_is_a (logical_type_id TAO_ENV_ARG_PARAMETER);" << be_uidt << be_uidt_nl + << ")->_is_a (logical_type_id ACE_ENV_ARG_PARAMETER);" << be_uidt << be_uidt_nl << "}" << be_uidt_nl << be_nl << be_nl; // Generate _non_existent implementation. *os << "CORBA::Boolean " << node->full_coll_name (be_interface::THRU_POA) << "::" << "_non_existent" << be_idt << "(" << be_idt_nl - << "TAO_ENV_SINGLE_ARG_DECL" << be_uidt_nl + << "ACE_ENV_SINGLE_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl << be_nl << "{" << be_idt_nl; *os <<"TAO_Object_Adapter::Servant_Upcall servant_upcall (" @@ -122,7 +122,7 @@ int be_visitor_interface_thru_poa_collocated_ss::visit_interface (be_interface * << "this->_object_key ()," << be_nl << "\"" << "_non_existent" << "\"," << be_nl << "forward_to.out ()" << be_nl - << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl + << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl << ");" << be_uidt_nl << "ACE_CHECK_RETURN (0);" << be_nl; *os << "return ACE_reinterpret_cast (" << be_idt << be_idt_nl @@ -130,7 +130,7 @@ int be_visitor_interface_thru_poa_collocated_ss::visit_interface (be_interface * << "servant_upcall.servant ()->_downcast (" << be_idt << be_idt_nl << "\"" << node->repoID () << "\"" << be_uidt_nl << ")" << be_uidt << be_uidt_nl - << ")->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);" << be_uidt << be_uidt_nl + << ")->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_uidt << be_uidt_nl << "}" << be_uidt_nl << be_nl << be_nl; if (this->visit_scope (node) == -1) 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 38fe9b00cf7..d8ecbb5d5a6 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp @@ -19,9 +19,9 @@ // // ============================================================================ -#include "idl.h" -#include "idl_extern.h" -#include "be.h" +#include "idl.h" +#include "idl_extern.h" +#include "be.h" #include "be_visitor_interface.h" @@ -118,7 +118,7 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node) << "// set the ownership" << be_nl << be_nl << "// overridden ServantBase operations" << be_nl << "PortableServer::POA_ptr _default_POA (" << be_idt << be_idt_nl - << "TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl + << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt << "\n"; if (node->traverse_inheritance_graph ( @@ -148,8 +148,8 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node) int be_visitor_interface_tie_sh::method_helper (be_interface *, - be_interface *node, - TAO_OutStream *os) + be_interface *node, + TAO_OutStream *os) { be_visitor_context ctx; ctx.state (TAO_CodeGen::TAO_INTERFACE_TIE_SH); @@ -161,8 +161,8 @@ be_visitor_interface_tie_sh::method_helper (be_interface *, { delete visitor; ACE_ERROR_RETURN ((LM_ERROR, - "be_visitor_interface_tie_sh::" - "method_helper\n"), -1); + "be_visitor_interface_tie_sh::" + "method_helper\n"), -1); } delete visitor; 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 b3256a1274c..7a42da46f21 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp @@ -19,9 +19,9 @@ // // ============================================================================ -#include "idl.h" -#include "idl_extern.h" -#include "be.h" +#include "idl.h" +#include "idl_extern.h" +#include "be.h" #include "be_visitor_interface.h" @@ -161,13 +161,13 @@ 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 (TAO_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 << "return PortableServer::POA::_duplicate (this->poa_.in ());\n" << be_uidt_nl << "return this->" << localskelname - << "::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl + << "::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl << "}\n\n"; if (node->traverse_inheritance_graph (be_visitor_interface_tie_si::method_helper, os) == -1) @@ -189,8 +189,8 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node) int be_visitor_interface_tie_si::method_helper (be_interface *derived, - be_interface *node, - TAO_OutStream *os) + be_interface *node, + TAO_OutStream *os) { be_visitor_context ctx; ctx.state (TAO_CodeGen::TAO_INTERFACE_TIE_SI); @@ -202,8 +202,8 @@ be_visitor_interface_tie_si::method_helper (be_interface *derived, { delete visitor; ACE_ERROR_RETURN ((LM_ERROR, - "be_visitor_interface_tie_sh::" - "method_helper\n"), -1); + "be_visitor_interface_tie_sh::" + "method_helper\n"), -1); } delete visitor; return 0; |