diff options
Diffstat (limited to 'TAO/TAO_IDL/be/be_visitor_interface')
18 files changed, 113 insertions, 182 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 99699d86b47..94b5bb12b7d 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_ch.cpp @@ -72,7 +72,7 @@ be_visitor_amh_interface_ch::visit_interface (be_interface *node) { // We do not inherit from anybody, hence we do so from the base // CORBA::Object class. - *os << "public virtual CORBA::Object" << be_uidt_nl; + *os << "public virtual ::CORBA::Object" << be_uidt_nl; } // Generate the body. 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 d19c33e49f0..f62b5150a47 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp @@ -120,7 +120,7 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node) << "& rhs);" << be_nl << "virtual ~" << class_name.c_str () << " (void);\n\n" << be_nl - << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl + << "virtual ::CORBA::Boolean _is_a (" << be_idt << be_idt_nl << "const char* logical_type_id" << be_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/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp index 9ffdb575d4e..d7b6ef96b1d 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp @@ -78,18 +78,18 @@ be_visitor_amh_interface_ss::this_method (be_interface *node) << "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 + << "::CORBA::Object_ptr tmp = CORBA::Object::_nil ();" << be_nl << be_nl - << "CORBA::Boolean _tao_opt_colloc =" << be_idt_nl + << "::CORBA::Boolean _tao_opt_colloc =" << be_idt_nl << "stub->servant_orb_var ()->orb_core ()->" << "optimize_collocation_objects ();" << be_uidt_nl << be_nl << "ACE_NEW_RETURN (" << be_idt << be_idt_nl << "tmp," << be_nl - << "CORBA::Object (stub, _tao_opt_colloc, this)," << be_nl + << "::CORBA::Object (stub, _tao_opt_colloc, this)," << be_nl << "0" << be_uidt_nl << ");" << be_uidt_nl << be_nl; - *os << "CORBA::Object_var obj = tmp;" << be_nl + *os << "::CORBA::Object_var obj = tmp;" << be_nl << "(void) safe_stub.release ();" << be_nl << be_nl; *os << "typedef ::" << node->name () << " STUB_SCOPED_NAME;" << be_nl 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 0f8344a4477..04ba19f3ee5 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 @@ -75,13 +75,13 @@ be_visitor_interface_any_op_ch::visit_interface (be_interface *node) // emit nested variation of any operators *os << be_global->stub_export_macro () << " void" - << " operator<<= (CORBA::Any &, " << node->local_name () + << " operator<<= ( ::CORBA::Any &, " << node->local_name () << "_ptr); // copying" << be_nl; *os << be_global->stub_export_macro () << " void" - << " operator<<= (CORBA::Any &, " << node->local_name () + << " operator<<= ( ::CORBA::Any &, " << node->local_name () << "_ptr *); // non-copying" << be_nl; - *os << be_global->stub_export_macro () << " CORBA::Boolean" - << " operator>>= (const CORBA::Any &, " + *os << be_global->stub_export_macro () << " ::CORBA::Boolean" + << " operator>>= (const ::CORBA::Any &, " << node->local_name () << "_ptr &);"; be_util::gen_nested_namespace_end (os, module); @@ -91,13 +91,13 @@ be_visitor_interface_any_op_ch::visit_interface (be_interface *node) } *os << be_global->stub_export_macro () << " void" - << " operator<<= (CORBA::Any &, " << node->name () + << " operator<<= ( ::CORBA::Any &, " << node->name () << "_ptr); // copying" << be_nl; *os << be_global->stub_export_macro () << " void" - << " operator<<= (CORBA::Any &, " << node->name () + << " operator<<= ( ::CORBA::Any &, " << node->name () << "_ptr *); // non-copying" << be_nl; - *os << be_global->stub_export_macro () << " CORBA::Boolean" - << " operator>>= (const CORBA::Any &, " + *os << be_global->stub_export_macro () << " ::CORBA::Boolean" + << " operator>>= (const ::CORBA::Any &, " << node->name () << "_ptr &);"; if (module != 0) 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 f69b345fa01..0dc68a07648 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 @@ -58,13 +58,13 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node) << "namespace TAO" << be_nl << "{" << be_idt_nl << "template<>" << be_nl - << "CORBA::Boolean" << be_nl + << "::CORBA::Boolean" << be_nl << "Any_Impl_T<" << node->name () << ">::to_object (" << be_idt << be_idt_nl - << "CORBA::Object_ptr &_tao_elem" << be_uidt_nl + << "::CORBA::Object_ptr &_tao_elem" << be_uidt_nl << ") const" << be_uidt_nl << "{" << be_idt_nl - << "_tao_elem = CORBA::Object::_duplicate (this->value_);" << be_nl + << "_tao_elem = ::CORBA::Object::_duplicate (this->value_);" << be_nl << "return true;" << be_uidt_nl << "}" << be_uidt_nl << "}"; @@ -76,14 +76,14 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node) << "namespace TAO" << be_nl << "{" << be_idt_nl << "template<>" << be_nl - << "CORBA::Boolean" << be_nl + << "::CORBA::Boolean" << be_nl << "Any_Impl_T<" << node->name () << ">::to_abstract_base (" << be_idt << be_idt_nl - << "CORBA::AbstractBase_ptr &_tao_elem" << be_uidt_nl + << "::CORBA::AbstractBase_ptr &_tao_elem" << be_uidt_nl << ") const" << be_uidt_nl << "{" << be_idt_nl - << "_tao_elem = CORBA::AbstractBase::_duplicate (this->value_);" + << "_tao_elem = ::CORBA::AbstractBase::_duplicate (this->value_);" << be_nl << "return true;" << be_uidt_nl << "}" << be_uidt_nl @@ -102,7 +102,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node) << "namespace TAO" << be_nl << "{" << be_idt_nl << "template<>" << be_nl - << "CORBA::Boolean" << be_nl + << "::CORBA::Boolean" << be_nl << "Any_Impl_T<" << node->name () << ">::marshal_value (TAO_OutputCDR &)" << be_nl << "{" << be_idt_nl @@ -111,7 +111,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node) *os << be_nl << be_nl << "template<>" << be_nl - << "CORBA::Boolean" << be_nl + << "::CORBA::Boolean" << be_nl << "Any_Impl_T<" << node->name () << ">::demarshal_value (TAO_InputCDR &)" << be_nl << "{" << be_idt_nl @@ -148,7 +148,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node) << "// Copying insertion." << be_nl << "void" << be_nl << "operator<<= (" << be_idt << be_idt_nl - << "CORBA::Any &_tao_any," << be_nl + << "::CORBA::Any &_tao_any," << be_nl << node->local_name () << "_ptr _tao_elem" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl @@ -160,7 +160,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node) *os << "// Non-copying insertion." << be_nl << "void" << be_nl << "operator<<= (" << be_idt << be_idt_nl - << "CORBA::Any &_tao_any," << be_nl + << "::CORBA::Any &_tao_any," << be_nl << node->local_name () << "_ptr *_tao_elem" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl @@ -173,9 +173,9 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node) << ");" << be_uidt << be_uidt_nl << "}" << be_nl << be_nl; - *os << "CORBA::Boolean" << be_nl + *os << "::CORBA::Boolean" << be_nl << "operator>>= (" << be_idt << be_idt_nl - << "const CORBA::Any &_tao_any," << be_nl + << "const ::CORBA::Any &_tao_any," << be_nl << node->local_name () << "_ptr &_tao_elem" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl @@ -199,7 +199,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node) << "// Copying insertion." << be_nl << "void" << be_nl << "operator<<= (" << be_idt << be_idt_nl - << "CORBA::Any &_tao_any," << be_nl + << "::CORBA::Any &_tao_any," << be_nl << node->full_name () << "_ptr _tao_elem" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl @@ -211,7 +211,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node) *os << "// Non-copying insertion." << be_nl << "void" << be_nl << "operator<<= (" << be_idt << be_idt_nl - << "CORBA::Any &_tao_any," << be_nl + << "::CORBA::Any &_tao_any," << be_nl << node->full_name () << "_ptr *_tao_elem" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl @@ -224,9 +224,9 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node) << ");" << be_uidt << be_uidt_nl << "}" << be_nl << be_nl; - *os << "CORBA::Boolean" << be_nl + *os << "::CORBA::Boolean" << be_nl << "operator>>= (" << be_idt << be_idt_nl - << "const CORBA::Any &_tao_any," << be_nl + << "const ::CORBA::Any &_tao_any," << be_nl << node->full_name () << "_ptr &_tao_elem" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl 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 1ede6cefe3b..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 @@ -55,10 +55,10 @@ be_visitor_interface_cdr_op_ch::visit_interface (be_interface *node) << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; // Generate the CDR << and >> operator declarations. - *os << be_global->stub_export_macro () << " CORBA::Boolean " + *os << be_global->stub_export_macro () << " ::CORBA::Boolean " << "operator<< (TAO_OutputCDR &, const " << node->full_name () << "_ptr );" << be_nl; - *os << be_global->stub_export_macro () << " CORBA::Boolean " + *os << be_global->stub_export_macro () << " ::CORBA::Boolean " << "operator>> (TAO_InputCDR &, " << node->full_name () << "_ptr &);"; 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 026a7276195..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 @@ -65,7 +65,7 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node) // Set the sub state as generating code for the output operator. this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_OUTPUT); - *os << "CORBA::Boolean operator<< (" << be_idt << be_idt_nl + *os << "::CORBA::Boolean operator<< (" << be_idt << be_idt_nl << "TAO_OutputCDR &strm," << be_nl << "const " << node->full_name () << "_ptr _tao_objref" << be_uidt_nl << ")" << be_uidt_nl @@ -73,7 +73,7 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node) if (node->is_abstract ()) { - *os << "CORBA::AbstractBase_ptr"; + *os << "::CORBA::AbstractBase_ptr"; } else if (node->node_type () == AST_Decl::NT_component) { @@ -81,7 +81,7 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node) } else { - *os << "CORBA::Object_ptr"; + *os << "::CORBA::Object_ptr"; } *os << " _tao_corba_obj = _tao_objref;" << be_nl; @@ -91,7 +91,7 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node) // Set the substate as generating code for the input operator. this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_INPUT); - *os << "CORBA::Boolean operator>> (" << be_idt << be_idt_nl + *os << "::CORBA::Boolean operator>> (" << be_idt << be_idt_nl << "TAO_InputCDR &strm," << be_nl << node->full_name () << "_ptr &_tao_objref" << be_uidt_nl << ")" << be_uidt_nl @@ -99,7 +99,7 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node) if (node->is_abstract ()) { - *os << "CORBA::AbstractBase_var obj;"; + *os << "::CORBA::AbstractBase_var obj;"; } else if (node->node_type () == AST_Decl::NT_component) { @@ -107,7 +107,7 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node) } else { - *os << "CORBA::Object_var obj;"; + *os << "::CORBA::Object_var obj;"; } *os << be_nl << be_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 1a410049325..bdfc0b4129f 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp @@ -99,12 +99,12 @@ be_visitor_interface_ch::visit_interface (be_interface *node) if (node->is_abstract () && nparents == 0) { - *os << "public virtual CORBA::AbstractBase" << be_uidt_nl; + *os << "public virtual ::CORBA::AbstractBase" << be_uidt_nl; } if (has_concrete_parent == 0 && ! node->is_abstract ()) { - *os << "public virtual CORBA::Object"; + *os << "public virtual ::CORBA::Object"; if (nparents > 0) { @@ -217,37 +217,18 @@ be_visitor_interface_ch::visit_interface (be_interface *node) << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ")" << be_nl << "ACE_THROW_SPEC ((" << be_idt_nl - << "CORBA::SystemException," << be_nl + << "::CORBA::SystemException," << be_nl << "::Components::CCMException" << be_uidt_nl << "));" << be_uidt_nl << be_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 + << "::CORBA::SystemException," << be_nl << "::Components::CCMException" << be_uidt_nl << "));" << be_uidt_nl << be_nl; } -/* - if (node->n_inherits () > 0) - { - const char *id = node->inherits ()[0]->repoID (); - const char *ecb_id = "IDL:omg.org/Components/EventConsumerBase:1.0"; - - if (ACE_OS::strcmp (id, ecb_id) == 0) - { - *os << "// Check that enables substitution of base class events." - << be_nl - << "virtual CORBA::Boolean tao_is_substitutable (" - << be_idt << be_idt_nl - << "const char *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; - } - } -*/ + if (! node->is_abstract ()) { node->analyze_parentage (); @@ -261,7 +242,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node) } // The _is_a method - *os << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl + *os << "virtual ::CORBA::Boolean _is_a (" << be_idt << be_idt_nl << "const char *type_id" << be_nl << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt_nl << be_nl; @@ -270,7 +251,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node) *os << "virtual const char* _interface_repository_id (void) const;"; // The virtual marshal method, to prevent marshal of local iterfaces. - *os << be_nl << "virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);"; + *os << be_nl << "virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr);"; if (! node->is_local ()) { @@ -336,7 +317,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node) *os << "// Non-local interface only." << be_nl << node->local_name () << " (" << be_idt << be_idt_nl << "TAO_Stub *objref," << be_nl - << "CORBA::Boolean _tao_collocated = 0," << be_nl + << "::CORBA::Boolean _tao_collocated = 0," << be_nl << "TAO_Abstract_ServantBase *servant = 0," << be_nl << "TAO_ORB_Core *orb_core = 0" << be_uidt_nl << ");" << be_uidt_nl << be_nl; @@ -476,11 +457,11 @@ be_visitor_interface_ch::gen_xxx_narrow (const char *nar, if (node->is_abstract ()) { - *os << "CORBA::AbstractBase_ptr obj" << be_nl; + *os << "::CORBA::AbstractBase_ptr obj" << be_nl; } else { - *os << "CORBA::Object_ptr obj" << be_nl; + *os << "::CORBA::Object_ptr obj" << be_nl; } *os << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl 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 aaf21611898..4f95cccade4 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp @@ -82,7 +82,7 @@ be_visitor_interface_ci::visit_interface (be_interface *node) *os << "ACE_INLINE" << be_nl << node->name () << "::" << node->local_name () << " (const " << node->local_name () << " &rhs)" << be_idt_nl - << ": ACE_NESTED_CLASS (CORBA, AbstractBase) (rhs)" << be_uidt_nl + << ": ACE_NESTED_CLASS ( ::CORBA, AbstractBase) (rhs)" << be_uidt_nl << "{}"; } @@ -99,7 +99,7 @@ be_visitor_interface_ci::visit_interface (be_interface *node) << "IOP::IOR *ior," << be_nl << "TAO_ORB_Core *oc" << be_uidt_nl << ")" << be_nl; - *os << ": ACE_NESTED_CLASS (CORBA, Object) (ior, oc)," << be_idt_nl + *os << ": ACE_NESTED_CLASS ( ::CORBA, Object) (ior, oc)," << be_idt_nl << "the"<< node->base_proxy_broker_name () << "_ (0)" << be_uidt << 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 3b1f8bde312..f922eb8df16 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp @@ -65,7 +65,6 @@ be_visitor_interface_cs::visit_interface (be_interface *node) << "// Traits specializations for " << node->name () << "."; *os << be_nl << be_nl -// << "ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION" << be_nl << node->name () << "_ptr" << be_nl << "TAO::Objref_Traits<" << node->name () << ">::duplicate (" << be_idt << be_idt_nl @@ -76,18 +75,16 @@ be_visitor_interface_cs::visit_interface (be_interface *node) << "}"; *os << be_nl << be_nl -// << "ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION" << be_nl << "void" << be_nl << "TAO::Objref_Traits<" << node->name () << ">::release (" << be_idt << be_idt_nl << node->name () << "_ptr p" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl - << "CORBA::release (p);" << be_uidt_nl + << "::CORBA::release (p);" << be_uidt_nl << "}"; *os << be_nl << be_nl -// << "ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION" << be_nl << node->name () << "_ptr" << be_nl << "TAO::Objref_Traits<" << node->name () << ">::nil (void)" << be_nl @@ -96,8 +93,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) << "}"; *os << be_nl << be_nl -// << "ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION" << be_nl - << "CORBA::Boolean" << be_nl + << "::CORBA::Boolean" << be_nl << "TAO::Objref_Traits<" << node->name () << ">::marshal (" << be_idt << be_idt_nl << node->name () << "_ptr p," << be_nl @@ -112,7 +108,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) } else { - *os << "CORBA::Object::marshal (p, cdr);"; + *os << "::CORBA::Object::marshal (p, cdr);"; } *os << be_uidt_nl @@ -123,22 +119,22 @@ be_visitor_interface_cs::visit_interface (be_interface *node) { *os << be_nl << be_nl << "void" << be_nl - << "CORBA::release (" + << "::CORBA::release (" << node->name () << "_ptr p)" << be_nl << "{" << be_idt_nl - << "CORBA::AbstractBase_ptr abs = p;" << be_nl - << "CORBA::release (abs);" << be_uidt_nl + << "::CORBA::AbstractBase_ptr abs = p;" << be_nl + << "::CORBA::release (abs);" << be_uidt_nl << "}"; *os << be_nl << be_nl - << "CORBA::Boolean" << be_nl - << "CORBA::is_nil (" + << "::CORBA::Boolean" << be_nl + << "::CORBA::is_nil (" << node->name () << "_ptr p)" << be_nl << "{" << be_idt_nl - << "CORBA::Object_ptr obj = p;" << be_nl - << "return CORBA::is_nil (obj);" << be_uidt_nl + << "::CORBA::Object_ptr obj = p;" << be_nl + << "return ::CORBA::is_nil (obj);" << be_uidt_nl << "}"; } @@ -153,7 +149,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) << node->base_proxy_broker_name () << "_Factory_function_pointer) (" << be_idt << be_idt_nl - << "CORBA::Object_ptr obj" << be_uidt_nl + << "::CORBA::Object_ptr obj" << be_uidt_nl << ") = 0;" << be_uidt; } @@ -275,7 +271,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) << node->local_name () << " *_tao_tmp_pointer =" << be_idt_nl << "static_cast<" << node->local_name () << " *> (_tao_void_pointer);" << be_uidt_nl - << "CORBA::release (_tao_tmp_pointer);" << be_uidt_nl + << "::CORBA::release (_tao_tmp_pointer);" << be_uidt_nl << "}" << be_nl << be_nl; } @@ -284,7 +280,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) *os << "void" << be_nl << node->name () << "::_add_ref (void)" << be_nl << "{" << be_idt_nl - << "this->ACE_NESTED_CLASS (CORBA, Object)::_add_ref ();" + << "this->ACE_NESTED_CLASS ( ::CORBA, Object)::_add_ref ();" << be_uidt_nl << "}" << be_nl << be_nl; } @@ -319,7 +315,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) << bt->local_name () << "_ptr obj)" << be_nl << "{" << be_idt_nl - << "if (! CORBA::is_nil (obj))" << be_idt_nl + << "if (! ::CORBA::is_nil (obj))" << be_idt_nl << "{" << be_idt_nl << "obj->_add_ref ();" << be_uidt_nl << "}" << be_uidt_nl << be_nl @@ -332,7 +328,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) << bt->local_name () << "_ptr obj)" << be_nl << "{" << be_idt_nl - << "CORBA::release (obj);" << be_uidt_nl + << "::CORBA::release (obj);" << be_uidt_nl << "}" << be_nl << be_nl; @@ -346,7 +342,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) << 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 + << "ACE_THROW_SPEC (( ::CORBA::SystemException," << be_nl << " ::Components::CCMException))" << be_uidt_nl << "{" << be_nl << "}" << be_nl << be_nl @@ -355,59 +351,13 @@ be_visitor_interface_cs::visit_interface (be_interface *node) << 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 + << "ACE_THROW_SPEC (( ::CORBA::SystemException," << be_nl << " ::Components::CCMException))" << be_uidt_nl << "{" << be_nl << "}" << be_nl << be_nl; } -/* - if (node->n_inherits () > 0) - { - const char *id = node->inherits ()[0]->repoID (); - const char *ecb_id = "IDL:omg.org/Components/EventConsumerBase:1.0"; - - if (ACE_OS::strcmp (id, ecb_id) == 0) - { - *os << "// Check that enables substitution of base class events." - << be_nl - << "CORBA::Boolean" << be_nl - << node->full_name () << "::tao_is_substitutable (" - << be_idt << be_idt_nl - << "const char *repo_id" << be_nl - << "ACE_ENV_ARG_DECL" << be_uidt_nl - << ")" << be_nl - << "ACE_THROW_SPEC ((CORBA::SystemException))" << be_uidt_nl - << "{" << be_idt_nl - << "if (repo_id == 0)" << be_idt_nl - << "{" << be_idt_nl - << "ACE_THROW_RETURN (CORBA::BAD_PARAM (), FALSE);" - << be_uidt_nl - << "}" << be_uidt_nl << be_nl - << "CORBA::ValueFactory_var f =" << be_idt_nl - << "this->_stubobj ()->servant_orb_var ()->lookup_value_factory (" - << be_idt << be_idt_nl - << "repo_id" << be_nl - << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl - << ");" << be_uidt << be_uidt_nl - << "ACE_CHECK_RETURN (FALSE);" << be_nl << be_nl - << "if (f.ptr () == 0)" << be_idt_nl - << "{" << be_idt_nl - << "return FALSE;" << be_uidt_nl - << "}" << be_uidt_nl << be_nl - << "CORBA::ValueBase_var v = f->create_for_unmarshal ();" - << be_nl; - - // To get the event name, chop "Consumer" from node name. - size_t len = ACE_OS::strlen (node->full_name ()); - ACE_CString event_name (node->full_name (), len - 8); - - *os << "return dynamic_cast<" << event_name.c_str () - << " const*> (v.in ()) != 0;" << be_uidt_nl - << "}" << be_nl << be_nl; - } - } -*/ - *os << "CORBA::Boolean" << be_nl + + *os << "::CORBA::Boolean" << be_nl << node->full_name () << "::_is_a (" << be_idt << be_idt_nl << "const char *value" << be_nl; @@ -478,7 +428,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) } else { - *os << "return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (" + *os << "return this->ACE_NESTED_CLASS ( ::CORBA, Object)::_is_a (" << be_idt << be_idt_nl << "value" << be_nl << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl @@ -497,7 +447,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) << "}"; *os << be_nl << be_nl - << "CORBA::Boolean" << be_nl; + << "::CORBA::Boolean" << be_nl; if (node->is_local ()) { @@ -567,11 +517,11 @@ be_visitor_interface_cs::gen_xxx_narrow (const char *pre, if (node->is_abstract ()) { - *os << "CORBA::AbstractBase_ptr"; + *os << "::CORBA::AbstractBase_ptr"; } else { - *os << "CORBA::Object_ptr"; + *os << "::CORBA::Object_ptr"; } *os << " _tao_objref" << 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 54d2c0482dd..69e5b12c1d4 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp @@ -167,17 +167,17 @@ be_visitor_interface_sh::visit_interface (be_interface *node) *os << "// Default implementation of CIAO-specific operation," << be_nl << "// overridden in derived class generated by the CIDL compiler." << be_nl - << "virtual CORBA::Boolean ciao_is_substitutable (" + << "virtual ::CORBA::Boolean ciao_is_substitutable (" << be_idt << be_idt_nl << "const char *event_repo_id" << be_nl << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ")" << be_nl - << "ACE_THROW_SPEC ((CORBA::SystemException));" + << "ACE_THROW_SPEC (( ::CORBA::SystemException));" << be_uidt_nl << be_nl; } // _is_a - *os << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl + *os << "virtual ::CORBA::Boolean _is_a (" << be_idt << be_idt_nl << "const char* logical_type_id" << be_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_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp index e4aa54eb7a8..0f9ed94b411 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp @@ -516,8 +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. @@ -526,14 +526,14 @@ be_visitor_interface_ss::visit_interface (be_interface *node) << full_skel_name << " *> (servant);" << be_uidt_nl; - *os << "CORBA::InterfaceDef_ptr _tao_retval = " << be_idt_nl + *os << "::CORBA::InterfaceDef_ptr _tao_retval = " << be_idt_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 - << "CORBA::Boolean const _tao_result =" << be_idt_nl + << "::CORBA::Boolean const _tao_result =" << be_idt_nl << "_tao_adapter->interfacedef_cdr_insert (" << be_idt << be_idt_nl << "_tao_out," << be_nl << "_tao_retval" << be_uidt_nl @@ -542,7 +542,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node) *os << "if (_tao_result == 0)" << be_idt_nl << "{" << be_idt_nl - << "ACE_THROW (CORBA::MARSHAL ());" << be_uidt_nl + << "ACE_THROW ( ::CORBA::MARSHAL ());" << be_uidt_nl << "}" << be_uidt; this->generate_send_reply (os); @@ -656,7 +656,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node) // Generate code for the _is_a override. - *os << "CORBA::Boolean " << full_skel_name + *os << "::CORBA::Boolean " << full_skel_name << "::_is_a (" << be_idt << be_idt_nl << "const char* value" << be_nl << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl @@ -702,12 +702,12 @@ be_visitor_interface_ss::visit_interface (be_interface *node) if (node->is_event_consumer ()) { *os << be_nl << be_nl - << "CORBA::Boolean " << full_skel_name + << "::CORBA::Boolean " << full_skel_name << "::ciao_is_substitutable (" << be_idt << be_idt_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 + << "ACE_THROW_SPEC (( ::CORBA::SystemException))" << be_uidt_nl << "{" << be_idt_nl << "return true;" << be_uidt_nl << "}"; @@ -822,18 +822,18 @@ be_visitor_interface_ss::this_method (be_interface *node) << "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 ();" + *os << "::CORBA::Object_ptr tmp = CORBA::Object::_nil ();" << be_nl << be_nl - << "CORBA::Boolean _tao_opt_colloc =" << be_idt_nl + << "::CORBA::Boolean _tao_opt_colloc =" << be_idt_nl << "stub->servant_orb_var ()->orb_core ()->" << "optimize_collocation_objects ();" << be_uidt_nl << be_nl << "ACE_NEW_RETURN (" << be_idt << be_idt_nl << "tmp," << be_nl - << "CORBA::Object (stub, _tao_opt_colloc, this)," << be_nl + << "::CORBA::Object (stub, _tao_opt_colloc, this)," << be_nl << "0" << be_uidt_nl << ");" << be_uidt_nl << be_nl; - *os << "CORBA::Object_var obj = tmp;" << be_nl + *os << "::CORBA::Object_var obj = tmp;" << be_nl << "(void) safe_stub.release ();" << be_nl << be_nl << "typedef ::" << node->name () << " STUB_SCOPED_NAME;" << be_nl << "return" << be_idt_nl @@ -925,7 +925,7 @@ be_visitor_interface_ss::generate_proxy_classes (be_interface *node) << "TAO::Collocation_Proxy_Broker *" << be_nl << node->flat_client_enclosing_scope () << node->base_proxy_broker_name () - << "_Factory_function (CORBA::Object_ptr)" << be_nl + << "_Factory_function ( ::CORBA::Object_ptr)" << be_nl << "{" << be_idt_nl << "return"; 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 9f168671ad0..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 @@ -55,7 +55,7 @@ be_visitor_interface_remote_proxy_broker_cs::visit_interface ( << node->base_proxy_broker_name () << "_Factory_function_pointer) (" << be_idt << be_idt_nl - << "CORBA::Object_ptr obj" << be_uidt_nl + << "::CORBA::Object_ptr obj" << be_uidt_nl << ") = 0;" << be_uidt_nl << be_nl; *os << "// Factory Member function Implementation." << be_nl 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 f2b65b7f3d3..f52f0b7cf71 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 @@ -329,7 +329,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) *os << "{" << be_idt_nl << "// Obtain the real proxy stored in <base_proxy_>" << be_nl - << "if (CORBA::is_nil (this->proxy_.in ()))" << be_idt_nl + << "if ( ::CORBA::is_nil (this->proxy_.in ()))" << be_idt_nl << "{" << be_idt_nl << " // Verify whether factory is one-shot, if so disable"<<be_nl << " // factory temporarily or not else remove."<<be_nl 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 eecac020fa6..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,16 +53,16 @@ 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" << be_nl + << "::CORBA::Object_ptr obj" << be_nl << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_nl - << "ACE_THROW_SPEC ((CORBA::SystemException));" << be_uidt; + << "ACE_THROW_SPEC (( ::CORBA::SystemException));" << be_uidt; *os << be_nl << be_nl << "void" << be_nl << "dispatch (" << be_idt << be_idt_nl - << "CORBA::Object_ptr obj," << be_nl - << "CORBA::Object_out forward_obj," << be_nl + << "::CORBA::Object_ptr obj," << be_nl + << "::CORBA::Object_out forward_obj," << be_nl << "TAO::Argument ** args," << be_nl << "int num_args," << be_nl << "const char * op," << be_nl @@ -70,7 +70,7 @@ be_visitor_interface_strategized_proxy_broker_sh::visit_interface ( << "TAO::Collocation_Strategy strategy" << be_nl << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_nl - << "ACE_THROW_SPEC ((CORBA::Exception));"; + << "ACE_THROW_SPEC (( ::CORBA::Exception));"; *os << be_uidt_nl << be_nl << "static " << node->strategized_proxy_broker_name () 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 687dc913620..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 @@ -67,10 +67,10 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface ( *os << "TAO::Collocation_Strategy" << be_nl <<node->full_strategized_proxy_broker_name () << "::" << "get_strategy (" << be_idt << be_idt_nl - << "CORBA::Object_ptr obj" << be_nl + << "::CORBA::Object_ptr obj" << be_nl << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_nl - << "ACE_THROW_SPEC ((CORBA::SystemException))" << be_uidt_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 ACE_ENV_ARG_PARAMETER);" @@ -83,8 +83,8 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface ( *os << "void" << be_nl << node->full_strategized_proxy_broker_name () << "::" << "dispatch (" << be_idt << be_idt_nl - << "CORBA::Object_ptr obj," << be_nl - << "CORBA::Object_out forward_obj," << be_nl + << "::CORBA::Object_ptr obj," << be_nl + << "::CORBA::Object_out forward_obj," << be_nl << "TAO::Argument ** args," << be_nl << "int num_args," << be_nl << "const char * op," << be_nl @@ -92,7 +92,7 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface ( << "TAO::Collocation_Strategy strategy" << be_nl << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_nl - << "ACE_THROW_SPEC ((CORBA::Exception))" << be_uidt_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 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 37f1edcab84..aecd1107492 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp @@ -95,12 +95,12 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node) << "// the T& ctor" << be_nl << tiename << " (T &t, PortableServer::POA_ptr poa);" << be_nl << "// ctor taking a POA" << be_nl - << tiename << " (T *tp, CORBA::Boolean release = 1);" << be_nl + << tiename << " (T *tp, ::CORBA::Boolean release = 1);" << be_nl << "// ctor taking pointer and an ownership flag" << be_nl << tiename << " (" << be_idt << be_idt_nl << "T *tp," << be_nl << "PortableServer::POA_ptr poa," << be_nl - << "CORBA::Boolean release = 1" << be_uidt_nl + << "::CORBA::Boolean release = 1" << be_uidt_nl << ");" << be_uidt_nl << "// ctor with T*, ownership flag and a POA" << be_nl << "~" << tiename << " (void);" << be_nl @@ -110,11 +110,11 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node) << "// return the underlying object" << be_nl << "void _tied_object (T &obj);" << be_nl << "// set the underlying object" << be_nl - << "void _tied_object (T *obj, CORBA::Boolean release = 1);" << be_nl + << "void _tied_object (T *obj, ::CORBA::Boolean release = 1);" << be_nl << "// set the underlying object and the ownership flag" << be_nl - << "CORBA::Boolean _is_owner (void);" << be_nl + << "::CORBA::Boolean _is_owner (void);" << be_nl << "// do we own it" << be_nl - << "void _is_owner (CORBA::Boolean b);" << be_nl + << "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_nl @@ -140,7 +140,7 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node) << "private:" << be_idt_nl << "T *ptr_;" << be_nl << "PortableServer::POA_var poa_;" << be_nl - << "CORBA::Boolean rel_;" << be_nl << be_nl + << "::CORBA::Boolean rel_;" << be_nl << be_nl << "// copy and assignment are not allowed" << be_nl << tiename << " (const " << tiename << " &);" << be_nl << "void operator= (const " << tiename << " &);" << be_uidt_nl 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 319ba991a4d..f3d07cabb93 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp @@ -112,7 +112,7 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node) *os << "template <class T> ACE_INLINE" << be_nl << fulltiename << "<T>::" << localtiename - << " (T *tp, CORBA::Boolean release)" << be_nl + << " (T *tp, ::CORBA::Boolean release)" << be_nl << "\t: ptr_ (tp)," << be_nl << "\t poa_ (PortableServer::POA::_nil ())," << be_nl << "\t rel_ (release)" << be_nl @@ -120,7 +120,7 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node) *os << "template <class T> ACE_INLINE" << be_nl << fulltiename << "<T>::" << localtiename - << " (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)" + << " (T *tp, PortableServer::POA_ptr poa, ::CORBA::Boolean release)" << be_nl << "\t: ptr_ (tp)," << be_nl << "\t poa_ (PortableServer::POA::_duplicate (poa))," << be_nl @@ -155,7 +155,7 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node) *os << "template <class T> ACE_INLINE void" << be_nl << fulltiename << "<T>::_tied_object (T *obj, " - << "CORBA::Boolean release)" << be_nl + << "::CORBA::Boolean release)" << be_nl << "{" << be_idt_nl << "if (this->rel_)" << be_idt_nl << "{" << be_idt_nl @@ -165,14 +165,14 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node) << "this->rel_ = release;" << be_uidt_nl << "}" << be_nl << be_nl; - *os << "template <class T> ACE_INLINE CORBA::Boolean" << be_nl + *os << "template <class T> ACE_INLINE ::CORBA::Boolean" << be_nl << fulltiename << "<T>::_is_owner (void)" << be_nl << "{" << be_idt_nl << "return this->rel_;" << be_uidt_nl << "}" << be_nl << be_nl; *os << "template <class T> ACE_INLINE void" << be_nl - << fulltiename << "<T>::_is_owner (CORBA::Boolean b)" << be_nl + << fulltiename << "<T>::_is_owner ( ::CORBA::Boolean b)" << be_nl << "{" << be_idt_nl << "this->rel_ = b;" << be_uidt_nl << "}" << be_nl << be_nl; @@ -182,7 +182,7 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node) << fulltiename << "<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)" << be_nl << "{" << be_idt_nl - << "if (!CORBA::is_nil (this->poa_.in ()))" << 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 << "}" << be_uidt_nl << be_nl |