diff options
Diffstat (limited to 'TAO/TAO_IDL/be/be_visitor_exception')
8 files changed, 59 insertions, 59 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp index 6da03378b3e..6b3127aa13d 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp @@ -53,16 +53,16 @@ be_visitor_exception_any_op_ch::visit_exception (be_exception *node) *os << be_nl << be_nl << be_global->stub_export_macro () << " void" - << " operator<<= (CORBA::Any &, const " << node->name () + << " operator<<= ( ::CORBA::Any &, const " << node->name () << " &); // copying version" << be_nl; *os << be_global->stub_export_macro () << " void" - << " operator<<= (CORBA::Any &, " << node->name () + << " operator<<= ( ::CORBA::Any &, " << node->name () << "*); // noncopying version" << 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 () << " *&); // deprecated\n"; - *os << be_global->stub_export_macro () << " CORBA::Boolean" - << " operator>>= (const CORBA::Any &, const " + *os << be_global->stub_export_macro () << " ::CORBA::Boolean" + << " operator>>= (const ::CORBA::Any &, const " << node->name () << " *&);"; diff --git a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp index 36045cdb0d1..9dbed0d7913 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp @@ -55,13 +55,13 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node) << "namespace TAO" << be_nl << "{" << be_idt_nl << "template<>" << be_nl - << "CORBA::Boolean" << be_nl + << "::CORBA::Boolean" << be_nl << "Any_Dual_Impl_T<" << node->name () << ">::demarshal_value (" << be_idt << be_idt_nl << "TAO_InputCDR & cdr" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl - << "CORBA::String_var id;" << be_nl << be_nl + << "::CORBA::String_var id;" << be_nl << be_nl << "if (!(cdr >> id.out ()))" << be_idt_nl << "{" << be_idt_nl << "return false;" << be_uidt_nl @@ -92,7 +92,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node) << "namespace TAO" << be_nl << "{" << be_idt_nl << "template<>" << be_nl - << "CORBA::Boolean" << be_nl + << "::CORBA::Boolean" << be_nl << "Any_Dual_Impl_T<" << node->name () << ">::marshal_value (TAO_OutputCDR &)" << be_nl << "{" << be_idt_nl @@ -101,7 +101,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node) *os << be_nl << be_nl << "template<>" << be_nl - << "CORBA::Boolean" << be_nl + << "::CORBA::Boolean" << be_nl << "Any_Dual_Impl_T<" << node->name () << ">::demarshal_value (TAO_InputCDR &)" << be_nl << "{" << be_idt_nl @@ -115,7 +115,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node) *os << be_nl << be_nl << "// Copying insertion." << be_nl << "void operator<<= (" << be_idt << be_idt_nl - << "CORBA::Any &_tao_any," << be_nl + << "::CORBA::Any &_tao_any," << be_nl << "const " << node->name () << " &_tao_elem" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl @@ -131,7 +131,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node) // Non-copying insertion operator." *os << "// Non-copying insertion." << be_nl << "void operator<<= (" << be_idt << be_idt_nl - << "CORBA::Any &_tao_any," << be_nl + << "::CORBA::Any &_tao_any," << be_nl << node->name () << " *_tao_elem" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl @@ -146,8 +146,8 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node) // Extraction to non-const pointer operator. *os << "// Extraction to non-const pointer (deprecated)." << be_nl - << "CORBA::Boolean operator>>= (" << be_idt << be_idt_nl - << "const CORBA::Any &_tao_any," << be_nl + << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl + << "const ::CORBA::Any &_tao_any," << be_nl << node->name () << " *&_tao_elem" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl @@ -159,8 +159,8 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node) // Extraction to const pointer operator. *os << "// Extraction to const pointer." << be_nl - << "CORBA::Boolean operator>>= (" << be_idt << be_idt_nl - << "const CORBA::Any &_tao_any," << be_nl + << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl + << "const ::CORBA::Any &_tao_any," << be_nl << "const " << node->name () << " *&_tao_elem" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp index ece5f6de4bc..bea4c76931f 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp @@ -52,10 +52,10 @@ be_visitor_exception_cdr_op_ch::visit_exception (be_exception *node) << "// " << __FILE__ << ":" << __LINE__; *os << be_nl << be_nl - << be_global->stub_export_macro () << " CORBA::Boolean" + << be_global->stub_export_macro () << " ::CORBA::Boolean" << " operator<< (TAO_OutputCDR &, const " << node->name () << " &);" << be_nl; - *os << be_global->stub_export_macro () << " CORBA::Boolean" + *os << be_global->stub_export_macro () << " ::CORBA::Boolean" << " operator>> (TAO_InputCDR &, " << node->name () << " &);"; diff --git a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp index f46219433cb..66756dd7705 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp @@ -63,7 +63,7 @@ be_visitor_exception_cdr_op_cs::visit_exception (be_exception *node) this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_OUTPUT); *os << be_nl << be_nl - << "CORBA::Boolean operator<< (" << be_idt << be_idt_nl + << "::CORBA::Boolean operator<< (" << be_idt << be_idt_nl << "TAO_OutputCDR &strm," << be_nl << "const " << node->name () << " &_tao_aggregate" << be_uidt_nl << ")" << be_uidt_nl @@ -111,7 +111,7 @@ be_visitor_exception_cdr_op_cs::visit_exception (be_exception *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 &"; if (node->nmembers () > 0) diff --git a/TAO/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp b/TAO/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp index 0ba66636700..ea3c3fbdda0 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp @@ -301,13 +301,13 @@ int be_visitor_exception_ctor_assign::visit_string (be_string *node) if (node->width () == (long) sizeof (char)) { *os << "this->" << bd->local_name () - << " = CORBA::string_dup (_tao_" + << " = ::CORBA::string_dup (_tao_" << bd->local_name () << ");"; } else { *os << "this->" << bd->local_name () - << " = CORBA::wstring_dup (_tao_" + << " = ::CORBA::wstring_dup (_tao_" << bd->local_name () << ");"; } } @@ -316,13 +316,13 @@ int be_visitor_exception_ctor_assign::visit_string (be_string *node) if (node->width () == (long) sizeof (char)) { *os << "this->" << bd->local_name () - << " = CORBA::string_dup (_tao_excp." + << " = ::CORBA::string_dup (_tao_excp." << bd->local_name () << ".in ());"; } else { *os << "this->" << bd->local_name () - << " = CORBA::wstring_dup (_tao_excp." + << " = ::CORBA::wstring_dup (_tao_excp." << bd->local_name () << ".in ());"; } } @@ -399,7 +399,7 @@ be_visitor_exception_ctor_assign::emit_valuetype_common (be_type *node) if (this->ctx_->exception ()) // Special constructor. { - *os << "CORBA::add_ref (" << be_idt << be_idt_nl + *os << "::CORBA::add_ref (" << be_idt << be_idt_nl << "const_cast<" << be_idt << be_idt_nl << node->name () << " *> (" << be_nl << "_tao_" << bd->local_name () << be_uidt_nl @@ -410,7 +410,7 @@ be_visitor_exception_ctor_assign::emit_valuetype_common (be_type *node) } else { - *os << "CORBA::add_ref (" << be_idt << be_idt_nl + *os << "::CORBA::add_ref (" << be_idt << be_idt_nl << "const_cast<" << be_idt << be_idt_nl << node->name () << " *> (" << be_nl << "_tao_excp." << bd->local_name () << ".in ()" << be_uidt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp index 93d4da131b4..247654bcf40 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp @@ -56,7 +56,7 @@ int be_visitor_exception_ch::visit_exception (be_exception *node) *os << be_nl << be_nl << "class " << be_global->stub_export_macro () << " " << node->local_name () - << " : public CORBA::UserException" << be_nl; + << " : public ::CORBA::UserException" << be_nl; *os << "{" << be_nl << "public:" << be_idt_nl; @@ -89,13 +89,13 @@ int be_visitor_exception_ch::visit_exception (be_exception *node) *os << "static " << node->local_name () - << " *_downcast (CORBA::Exception *);" << be_nl + << " *_downcast ( ::CORBA::Exception *);" << be_nl << "static const " << node->local_name () - << " *_downcast (CORBA::Exception const *);" << be_nl << be_nl; + << " *_downcast ( ::CORBA::Exception const *);" << be_nl << be_nl; - *os << "static CORBA::Exception *_alloc (void);" << be_nl << be_nl; + *os << "static ::CORBA::Exception *_alloc (void);" << be_nl << be_nl; - *os << "virtual CORBA::Exception *" + *os << "virtual ::CORBA::Exception *" << "_tao_duplicate (void) const;\n" << be_nl << "virtual void _raise (void) const;\n" << be_nl << "virtual void _tao_encode (" << be_idt << be_idt_nl @@ -133,7 +133,7 @@ int be_visitor_exception_ch::visit_exception (be_exception *node) // exception. We have already output a warning message when // launching the stub header typecode visitor. *os << be_nl << be_nl - << "virtual CORBA::TypeCode_ptr _tao_type (void) const;"; + << "virtual ::CORBA::TypeCode_ptr _tao_type (void) const;"; *os << be_uidt_nl << "};"; diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp index 89d6604b061..78350dc88ce 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp @@ -65,7 +65,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) // Default constructor. *os << node->name () << "::" << node->local_name () << " (void)" << be_idt_nl; - *os << ": CORBA::UserException (" << be_idt << be_idt << be_idt_nl + *os << ": ::CORBA::UserException (" << be_idt << be_idt << be_idt_nl << "\"" << node->repoID () << "\"," << be_nl << "\"" << node->local_name () << "\"" << be_uidt_nl << ")" << be_uidt << be_uidt << be_uidt_nl; @@ -81,7 +81,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) // Copy constructor. *os << node->name () << "::" << node->local_name () << " (const ::" << node->name () << " &_tao_excp)" << be_idt_nl; - *os << ": CORBA::UserException (" << be_idt << be_idt << be_idt_nl + *os << ": ::CORBA::UserException (" << be_idt << be_idt << be_idt_nl << "_tao_excp._rep_id ()," << be_nl << "_tao_excp._name ()" << be_uidt_nl << ")" << be_uidt << be_uidt << be_uidt_nl; @@ -114,7 +114,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) *os << node->name () << "::operator= (const ::" << node->name () << " &_tao_excp)" << be_nl << "{" << be_idt_nl - << "this->ACE_NESTED_CLASS (CORBA, UserException)::operator= " + << "this->ACE_NESTED_CLASS ( ::CORBA, UserException)::operator= " << "(_tao_excp);"; // Assign each individual member. @@ -149,7 +149,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) // Non-const downcast method. *os << node->name () << " *" << be_nl; - *os << node->name () << "::_downcast (CORBA::Exception *_tao_excp)" << be_nl; + *os << node->name () << "::_downcast ( ::CORBA::Exception *_tao_excp)" << be_nl; *os << "{" << be_idt_nl; *os << "return dynamic_cast<" << node->local_name () << " *> (_tao_excp);" << be_uidt_nl; @@ -157,7 +157,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) // Const downcast method. *os << "const " << node->name () << " *" << be_nl; - *os << node->name () << "::_downcast (CORBA::Exception const *_tao_excp)" + *os << node->name () << "::_downcast ( ::CORBA::Exception const *_tao_excp)" << be_nl; *os << "{" << be_idt_nl; *os << "return dynamic_cast<const " << node->local_name () @@ -165,19 +165,19 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) *os << "}" << be_nl << be_nl; // Generate the _alloc method. - *os << "CORBA::Exception *" << node->name () + *os << "::CORBA::Exception *" << node->name () << "::_alloc (void)" << be_nl; *os << "{" << be_idt_nl; - *os << "CORBA::Exception *retval = 0;" << be_nl + *os << "::CORBA::Exception *retval = 0;" << be_nl << "ACE_NEW_RETURN (retval, ::" << node->name () << ", 0);" << be_nl << "return retval;" << be_uidt_nl; *os << "}" << be_nl << be_nl; - *os << "CORBA::Exception *" << be_nl + *os << "::CORBA::Exception *" << be_nl << node->name () << "::_tao_duplicate (void) const" << be_nl << "{" << be_idt_nl - << "CORBA::Exception *result = 0;" << be_nl + << "::CORBA::Exception *result = 0;" << be_nl << "ACE_NEW_RETURN (" << be_idt << be_idt_nl << "result," << be_nl << "::" << node->name () << " (*this)," << be_nl @@ -207,11 +207,11 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) if (be_global->use_raw_throw ()) { - *os << "throw CORBA::MARSHAL ();" << be_uidt_nl; + *os << "throw ::CORBA::MARSHAL ();" << be_uidt_nl; } else { - *os << "ACE_THROW (CORBA::MARSHAL ());" << be_uidt_nl; + *os << "ACE_THROW ( ::CORBA::MARSHAL ());" << be_uidt_nl; } *os << "}" << be_nl << be_nl; @@ -225,11 +225,11 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) if (be_global->use_raw_throw ()) { - *os << "throw CORBA::MARSHAL ();" << be_uidt_nl; + *os << "throw ::CORBA::MARSHAL ();" << be_uidt_nl; } else { - *os << "ACE_THROW (CORBA::MARSHAL ());" << be_uidt_nl; + *os << "ACE_THROW ( ::CORBA::MARSHAL ());" << be_uidt_nl; } *os << "}" << be_nl << be_nl; @@ -251,11 +251,11 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) if (be_global->use_raw_throw ()) { - *os << "throw CORBA::MARSHAL ();" << be_uidt_nl; + *os << "throw ::CORBA::MARSHAL ();" << be_uidt_nl; } else { - *os << "ACE_THROW (CORBA::MARSHAL ());" << be_uidt_nl; + *os << "ACE_THROW ( ::CORBA::MARSHAL ());" << be_uidt_nl; } *os << "}" << be_nl << be_nl; @@ -269,11 +269,11 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) if (be_global->use_raw_throw ()) { - *os << "throw CORBA::MARSHAL ();" << be_uidt_nl; + *os << "throw ::CORBA::MARSHAL ();" << be_uidt_nl; } else { - *os << "ACE_THROW (CORBA::MARSHAL ());" << be_uidt_nl; + *os << "ACE_THROW ( ::CORBA::MARSHAL ());" << be_uidt_nl; } *os << "}" << be_nl << be_nl; @@ -298,7 +298,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) } *os << be_idt_nl - << ": CORBA::UserException (" + << ": ::CORBA::UserException (" << be_idt << be_idt << be_idt_nl << "\"" << node->repoID () << "\"," << be_nl << "\"" << node->local_name () << "\"" << be_uidt_nl @@ -330,7 +330,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) // exception. We have already output a warning message when // launching the stub header typecode visitor. *os << "// TAO extension - the virtual _type method." << be_nl; - *os << "CORBA::TypeCode_ptr " << node->name () + *os << "::CORBA::TypeCode_ptr " << node->name () << "::_tao_type (void) const" << be_nl; *os << "{" << be_idt_nl; *os << "return ::" << node->tc_name () << ";" << be_uidt_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp index a1f3a3d894c..b2dbc13542d 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp @@ -276,11 +276,11 @@ int be_visitor_exception_ctor::visit_predefined_type (be_predefined_type *node) { if (this->ctx_->state () == TAO_CodeGen::TAO_EXCEPTION_CTOR_CH) { - *os << "const " << bt->nested_type_name (this->ctx_->scope ()); + *os << "const ::" << bt->nested_type_name (this->ctx_->scope ()); } else { - *os << "const " << bt->name (); + *os << "const ::" << bt->name (); } *os << " &"; @@ -292,23 +292,23 @@ int be_visitor_exception_ctor::visit_predefined_type (be_predefined_type *node) { if (this->ctx_->state () == TAO_CodeGen::TAO_EXCEPTION_CTOR_CH) { - *os << "const " << bt->nested_type_name (this->ctx_->scope (), - "_ptr "); + *os << "const ::" << bt->nested_type_name (this->ctx_->scope (), + "_ptr "); } else { - *os << "const " << bt->name () << "_ptr "; + *os << "const ::" << bt->name () << "_ptr "; } } else { if (this->ctx_->state () == TAO_CodeGen::TAO_EXCEPTION_CTOR_CH) { - *os << bt->nested_type_name (this->ctx_->scope ()); + *os << "::" << bt->nested_type_name (this->ctx_->scope ()); } else { - *os << bt->name (); + *os << "::" << bt->name (); } } @@ -353,7 +353,7 @@ int be_visitor_exception_ctor::visit_string (be_string *node) } else { - *os << "const CORBA::WChar *"; + *os << "const ::CORBA::WChar *"; } return 0; |