diff options
142 files changed, 1096 insertions, 1006 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 3e7a51ffadf..22131733f45 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,154 @@ +Fri Aug 12 22:13:15 UTC 2005 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/be/be_interface.cpp: + * TAO_IDL/be/be_predefined_type.cpp: + * TAO_IDL/be/be_valuetype.cpp: + * TAO_IDL/be/be_visitor_traits.cpp: + * TAO_IDL/be/be_visitor_argument/arglist.cpp: + * TAO_IDL/be/be_visitor_argument/invoke_cs.cpp: + * TAO_IDL/be/be_visitor_argument/marshal_ss.cpp: + * TAO_IDL/be/be_visitor_argument/paramlist.cpp: + * TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp: + * TAO_IDL/be/be_visitor_array/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_array/any_op_cs.cpp: + * TAO_IDL/be/be_visitor_array/array.cpp: + * TAO_IDL/be/be_visitor_array/array_cs.cpp: + * TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_array/serializer_op_ch.cpp: + * TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp: + * TAO_IDL/be/be_visitor_component/component_ch.cpp: + * TAO_IDL/be/be_visitor_component/component_ci.cpp: + * TAO_IDL/be/be_visitor_component/component_cs.cpp: + * TAO_IDL/be/be_visitor_component/component_sh.cpp: + * TAO_IDL/be/be_visitor_enum/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_enum/any_op_cs.cpp: + * TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_enum/serializer_op_ch.cpp: + * TAO_IDL/be/be_visitor_enum/serializer_op_cs.cpp: + * TAO_IDL/be/be_visitor_exception/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_exception/any_op_cs.cpp: + * TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_exception/ctor_assign.cpp: + * TAO_IDL/be/be_visitor_exception/exception_ch.cpp: + * TAO_IDL/be/be_visitor_exception/exception_cs.cpp: + * TAO_IDL/be/be_visitor_exception/exception_ctor.cpp: + * TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_field/field_ch.cpp: + * TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp: + * TAO_IDL/be/be_visitor_interface/amh_ch.cpp: + * TAO_IDL/be/be_visitor_interface/amh_sh.cpp: + * TAO_IDL/be/be_visitor_interface/amh_ss.cpp: + * TAO_IDL/be/be_visitor_interface/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_interface/any_op_cs.cpp: + * TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_interface/interface_ch.cpp: + * TAO_IDL/be/be_visitor_interface/interface_ci.cpp: + * TAO_IDL/be/be_visitor_interface/interface_cs.cpp: + * TAO_IDL/be/be_visitor_interface/interface_sh.cpp: + * TAO_IDL/be/be_visitor_interface/interface_ss.cpp: + * TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp: + * TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp: + * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp: + * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp: + * TAO_IDL/be/be_visitor_interface/tie_sh.cpp: + * TAO_IDL/be/be_visitor_interface/tie_si.cpp: + * TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp: + * TAO_IDL/be/be_visitor_operation/amh_sh.cpp: + * TAO_IDL/be/be_visitor_operation/amh_ss.cpp: + * TAO_IDL/be/be_visitor_operation/ami_cs.cpp: + * TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp: + * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.c + * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.c + * TAO_IDL/be/be_visitor_operation/arglist.cpp: + * TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp: + * TAO_IDL/be/be_visitor_operation/operation.cpp: + * TAO_IDL/be/be_visitor_operation/operation_ss.cpp: + * TAO_IDL/be/be_visitor_operation/rettype.cpp: + * TAO_IDL/be/be_visitor_root/root.cpp: + * TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp: + * TAO_IDL/be/be_visitor_sequence/buffer_type.cpp: + * TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_sequence/sequence_base.cpp: + * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp: + * TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp: + * TAO_IDL/be/be_visitor_sequence/serializer_op_ch.cpp: + * TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp: + * TAO_IDL/be/be_visitor_structure/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_structure/any_op_cs.cpp: + * TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_structure/serializer_op_ch.cpp: + * TAO_IDL/be/be_visitor_structure/serializer_op_cs.cpp: + * TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp: + * TAO_IDL/be/be_visitor_typecode/objref_typecode.cpp: + * TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp: + * TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp: + * TAO_IDL/be/be_visitor_typecode/union_typecode.cpp: + * TAO_IDL/be/be_visitor_typecode/value_typecode.cpp: + * TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp: + * TAO_IDL/be/be_visitor_union/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_union/any_op_cs.cpp: + * TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_union/discriminant_ch.cpp: + * TAO_IDL/be/be_visitor_union/discriminant_ci.cpp: + * TAO_IDL/be/be_visitor_union/serializer_op_ch.cpp: + * TAO_IDL/be/be_visitor_union/serializer_op_cs.cpp: + * TAO_IDL/be/be_visitor_union/union_ch.cpp: + * TAO_IDL/be/be_visitor_union/union_cs.cpp: + * TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_union_branch/private_ch.cpp: + * TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp: + * TAO_IDL/be/be_visitor_union_branch/public_ch.cpp: + * TAO_IDL/be/be_visitor_union_branch/public_ci.cpp: + * TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp: + * TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp: + * TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp: + * TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_valuebox/field_ch.cpp: + * TAO_IDL/be/be_visitor_valuebox/field_ci.cpp: + * TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp: + * TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp: + * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp: + * TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/field_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/field_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ci.cpp: + + Made sure the leading '::' appears before the 'CORBA' + scope of all generated basic type names. If application + IDL has a nested module named 'CORBA' there will be + confusion otherwise. Thanks to Nikolay Metchev + <n.metchev@teamphone.com> for sending in the example + IDL file that uncovered the bug. + Fri Aug 12 14:17:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/tests/Miop/McastHello/McastHello.h: diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp index 8d091f81de7..79bbd7f5e48 100644 --- a/TAO/TAO_IDL/be/be_interface.cpp +++ b/TAO/TAO_IDL/be/be_interface.cpp @@ -511,7 +511,7 @@ be_interface::gen_stub_ctor (TAO_OutStream *os) << this->local_name () << " (" << be_idt << be_idt_nl << "TAO_Stub *objref," << be_nl - << "CORBA::Boolean _tao_collocated," << be_nl + << "::CORBA::Boolean _tao_collocated," << be_nl << "TAO_Abstract_ServantBase *servant," << be_nl << "TAO_ORB_Core *oc" << be_uidt_nl << ")" << be_nl @@ -519,7 +519,7 @@ be_interface::gen_stub_ctor (TAO_OutStream *os) if (this->has_mixed_parentage_) { - *os << "ACE_NESTED_CLASS (CORBA, AbstractBase) (" + *os << "ACE_NESTED_CLASS (::CORBA, AbstractBase) (" << be_idt << be_idt << be_idt_nl << "objref," << be_nl << "_tao_collocated," << be_nl @@ -813,7 +813,7 @@ be_interface::gen_operation_table (const char *flat_name, this->skel_count_++; *os << "};" << be_nl << be_nl; - *os << "static const CORBA::Long _tao_" << flat_name + *os << "static const ::CORBA::Long _tao_" << flat_name << "_optable_size = sizeof (ACE_Hash_Map_Entry<const char *," << " TAO::Operation_Skeletons>) * (" << (3 * this->skel_count_) << ");" << be_nl; @@ -2331,7 +2331,7 @@ be_interface::gen_throw_spec (UTL_ExceptList *list, } *os << be_nl << throw_spec_open; - *os << be_idt_nl << "CORBA::SystemException"; + *os << be_idt_nl << "::CORBA::SystemException"; // Initialize an iterator to iterate thru the exception list. for (UTL_ExceptlistActiveIterator ei (list); diff --git a/TAO/TAO_IDL/be/be_predefined_type.cpp b/TAO/TAO_IDL/be/be_predefined_type.cpp index 67e730a49ce..657e90f8c03 100644 --- a/TAO/TAO_IDL/be/be_predefined_type.cpp +++ b/TAO/TAO_IDL/be/be_predefined_type.cpp @@ -71,11 +71,11 @@ be_predefined_type::be_predefined_type (AST_PredefinedType::PredefinedType t, if (t == AST_PredefinedType::PT_object) { - this->fwd_helper_name_ = "CORBA::tao_Object"; + this->fwd_helper_name_ = "::CORBA::tao_Object"; } else if (t == AST_PredefinedType::PT_value) { - this->fwd_helper_name_ = "CORBA::tao_ValueBase"; + this->fwd_helper_name_ = "::CORBA::tao_ValueBase"; } switch (t) diff --git a/TAO/TAO_IDL/be/be_valuetype.cpp b/TAO/TAO_IDL/be/be_valuetype.cpp index 9fb566a5fdf..57eee838fc4 100644 --- a/TAO/TAO_IDL/be/be_valuetype.cpp +++ b/TAO/TAO_IDL/be/be_valuetype.cpp @@ -487,7 +487,7 @@ be_valuetype::gen_helper_stubs (char* , << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; *os << "void" << be_nl - << "CORBA::add_ref (" << this->full_name () << " * vt)" << be_nl + << "::CORBA::add_ref (" << this->full_name () << " * vt)" << be_nl << "{" << be_idt_nl << "if (vt != 0)" << be_idt_nl << "{" << be_idt_nl @@ -496,7 +496,7 @@ be_valuetype::gen_helper_stubs (char* , << "}" << be_nl << be_nl; *os << "void" << be_nl - << "CORBA::remove_ref (" << this->full_name () << " * vt)" << be_nl + << "::CORBA::remove_ref (" << this->full_name () << " * vt)" << be_nl << "{" << be_idt_nl << "if (vt != 0)" << be_idt_nl << "{" << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp index a41595c1b4a..edac236eaa3 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp @@ -220,7 +220,7 @@ int be_visitor_args_arglist::visit_predefined_type (be_predefined_type *node) // The only PT_pseudo that doesn't take a _ptr suffix. idl_bool is_tckind = (ACE_OS::strcmp (node->local_name ()->get_string (), "TCKind") == 0); - + switch (this->direction ()) { case AST_Argument::dir_IN: @@ -304,7 +304,7 @@ int be_visitor_args_arglist::visit_string (be_string *node) *os << "char *&"; break; case AST_Argument::dir_OUT: - *os << "CORBA::String_out"; + *os << "::CORBA::String_out"; break; } } @@ -313,13 +313,13 @@ int be_visitor_args_arglist::visit_string (be_string *node) switch (this->direction ()) { case AST_Argument::dir_IN: - *os << "const CORBA::WChar *"; + *os << "const ::CORBA::WChar *"; break; case AST_Argument::dir_INOUT: - *os << "CORBA::WChar *&"; + *os << "::CORBA::WChar *&"; break; case AST_Argument::dir_OUT: - *os << "CORBA::WString_out"; + *os << "::CORBA::WString_out"; break; } } diff --git a/TAO/TAO_IDL/be/be_visitor_argument/invoke_cs.cpp b/TAO/TAO_IDL/be/be_visitor_argument/invoke_cs.cpp index b9ab1795ccd..b9a474a744b 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument/invoke_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument/invoke_cs.cpp @@ -276,16 +276,16 @@ int be_visitor_args_invoke_cs::visit_predefined_type (be_predefined_type *node) *os << arg->local_name (); break; case AST_PredefinedType::PT_char: - *os << "CORBA::Any::from_char (" << arg->local_name () << ")"; + *os << "::CORBA::Any::from_char (" << arg->local_name () << ")"; break; case AST_PredefinedType::PT_wchar: - *os << "CORBA::Any::from_wchar (" << arg->local_name () << ")"; + *os << "::CORBA::Any::from_wchar (" << arg->local_name () << ")"; break; case AST_PredefinedType::PT_boolean: - *os << "CORBA::Any::from_boolean (" << arg->local_name () << ")"; + *os << "::CORBA::Any::from_boolean (" << arg->local_name () << ")"; break; case AST_PredefinedType::PT_octet: - *os << "CORBA::Any::from_octet (" << arg->local_name () << ")"; + *os << "::CORBA::Any::from_octet (" << arg->local_name () << ")"; break; default: ACE_ERROR_RETURN ((LM_ERROR, @@ -323,16 +323,16 @@ int be_visitor_args_invoke_cs::visit_predefined_type (be_predefined_type *node) *os << arg->local_name (); break; case AST_PredefinedType::PT_char: - *os << "CORBA::Any::to_char (" << arg->local_name () << ")"; + *os << "::CORBA::Any::to_char (" << arg->local_name () << ")"; break; case AST_PredefinedType::PT_wchar: - *os << "CORBA::Any::to_wchar (" << arg->local_name () << ")"; + *os << "::CORBA::Any::to_wchar (" << arg->local_name () << ")"; break; case AST_PredefinedType::PT_boolean: - *os << "CORBA::Any::to_boolean (" << arg->local_name () << ")"; + *os << "::CORBA::Any::to_boolean (" << arg->local_name () << ")"; break; case AST_PredefinedType::PT_octet: - *os << "CORBA::Any::to_octet (" << arg->local_name () << ")"; + *os << "::CORBA::Any::to_octet (" << arg->local_name () << ")"; break; default: ACE_ERROR_RETURN ((LM_ERROR, @@ -364,16 +364,16 @@ int be_visitor_args_invoke_cs::visit_predefined_type (be_predefined_type *node) *os << arg->local_name (); break; case AST_PredefinedType::PT_char: - *os << "CORBA::Any::to_char (" << arg->local_name () << ")"; + *os << "::CORBA::Any::to_char (" << arg->local_name () << ")"; break; case AST_PredefinedType::PT_wchar: - *os << "CORBA::Any::to_wchar (" << arg->local_name () << ")"; + *os << "::CORBA::Any::to_wchar (" << arg->local_name () << ")"; break; case AST_PredefinedType::PT_boolean: - *os << "CORBA::Any::to_boolean (" << arg->local_name () << ")"; + *os << "::CORBA::Any::to_boolean (" << arg->local_name () << ")"; break; case AST_PredefinedType::PT_octet: - *os << "CORBA::Any::to_octet (" << arg->local_name () << ")"; + *os << "::CORBA::Any::to_octet (" << arg->local_name () << ")"; break; default: ACE_ERROR_RETURN ((LM_ERROR, @@ -485,11 +485,11 @@ int be_visitor_args_invoke_cs::visit_string (be_string *node) case AST_Argument::dir_INOUT: if (node->width () == (long) sizeof (char)) { - *os << "CORBA::Any::to_string ("; + *os << "::CORBA::Any::to_string ("; } else { - *os << "CORBA::Any::to_wstring ("; + *os << "::CORBA::Any::to_wstring ("; } *os << arg->local_name () << ", " @@ -498,11 +498,11 @@ int be_visitor_args_invoke_cs::visit_string (be_string *node) case AST_Argument::dir_OUT: if (node->width () == (long) sizeof (char)) { - *os << "CORBA::Any::to_string ("; + *os << "::CORBA::Any::to_string ("; } else { - *os << "CORBA::Any::to_wstring ("; + *os << "::CORBA::Any::to_wstring ("; } *os << arg->local_name () << ".ptr (), " diff --git a/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp index 3a9d2345f6c..46b141d852b 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp @@ -280,16 +280,16 @@ int be_visitor_args_marshal_ss::visit_predefined_type ( *os << arg->local_name (); break; case AST_PredefinedType::PT_char: - *os << "CORBA::Any::to_char (" << arg->local_name () << ")"; + *os << "::CORBA::Any::to_char (" << arg->local_name () << ")"; break; case AST_PredefinedType::PT_wchar: - *os << "CORBA::Any::to_wchar (" << arg->local_name () << ")"; + *os << "::CORBA::Any::to_wchar (" << arg->local_name () << ")"; break; case AST_PredefinedType::PT_boolean: - *os << "CORBA::Any::to_boolean (" << arg->local_name () << ")"; + *os << "::CORBA::Any::to_boolean (" << arg->local_name () << ")"; break; case AST_PredefinedType::PT_octet: - *os << "CORBA::Any::to_octet (" << arg->local_name () << ")"; + *os << "::CORBA::Any::to_octet (" << arg->local_name () << ")"; break; default: ACE_ERROR_RETURN ((LM_ERROR, @@ -331,16 +331,16 @@ int be_visitor_args_marshal_ss::visit_predefined_type ( *os << arg->local_name (); break; case AST_PredefinedType::PT_char: - *os << "CORBA::Any::from_char (" << arg->local_name () << ")"; + *os << "::CORBA::Any::from_char (" << arg->local_name () << ")"; break; case AST_PredefinedType::PT_wchar: - *os << "CORBA::Any::from_wchar (" << arg->local_name () << ")"; + *os << "::CORBA::Any::from_wchar (" << arg->local_name () << ")"; break; case AST_PredefinedType::PT_boolean: - *os << "CORBA::Any::from_boolean (" << arg->local_name () << ")"; + *os << "::CORBA::Any::from_boolean (" << arg->local_name () << ")"; break; case AST_PredefinedType::PT_octet: - *os << "CORBA::Any::from_octet (" << arg->local_name () << ")"; + *os << "::CORBA::Any::from_octet (" << arg->local_name () << ")"; break; default: ACE_ERROR_RETURN ((LM_ERROR, @@ -372,16 +372,16 @@ int be_visitor_args_marshal_ss::visit_predefined_type ( *os << arg->local_name (); break; case AST_PredefinedType::PT_char: - *os << "CORBA::Any::from_char (" << arg->local_name () << ")"; + *os << "::CORBA::Any::from_char (" << arg->local_name () << ")"; break; case AST_PredefinedType::PT_wchar: - *os << "CORBA::Any::from_wchar (" << arg->local_name () << ")"; + *os << "::CORBA::Any::from_wchar (" << arg->local_name () << ")"; break; case AST_PredefinedType::PT_boolean: - *os << "CORBA::Any::from_boolean (" << arg->local_name () << ")"; + *os << "::CORBA::Any::from_boolean (" << arg->local_name () << ")"; break; case AST_PredefinedType::PT_octet: - *os << "CORBA::Any::from_octet (" << arg->local_name () << ")"; + *os << "::CORBA::Any::from_octet (" << arg->local_name () << ")"; break; default: ACE_ERROR_RETURN (( @@ -471,11 +471,11 @@ int be_visitor_args_marshal_ss::visit_string (be_string *node) { if (node->width () == (long) sizeof (char)) { - *os << "CORBA::Any::to_string ("; + *os << "::CORBA::Any::to_string ("; } else { - *os << "CORBA::Any::to_wstring ("; + *os << "::CORBA::Any::to_wstring ("; } *os << arg->local_name () << ".out (), " @@ -514,11 +514,11 @@ int be_visitor_args_marshal_ss::visit_string (be_string *node) case AST_Argument::dir_OUT: if (node->width () == (long) sizeof (char)) { - *os << "CORBA::Any::from_string ((char *)"; + *os << "::CORBA::Any::from_string ((char *)"; } else { - *os << "CORBA::Any::from_wstring ((CORBA::WChar *)"; + *os << "::CORBA::Any::from_wstring ((CORBA::WChar *)"; } *os << arg->local_name () << ".in (), " diff --git a/TAO/TAO_IDL/be/be_visitor_argument/paramlist.cpp b/TAO/TAO_IDL/be/be_visitor_argument/paramlist.cpp index fbb5e7613cd..e6fbca5ca9e 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument/paramlist.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument/paramlist.cpp @@ -145,13 +145,13 @@ int be_visitor_args_paramlist::visit_argument (be_argument *node) switch (node->direction ()) { case AST_Argument::dir_IN: - *os << "(*parameter_list)[len].mode = CORBA::PARAM_IN;" << be_nl; + *os << "(*parameter_list)[len].mode = ::CORBA::PARAM_IN;" << be_nl; break; case AST_Argument::dir_INOUT: - *os << "(*parameter_list)[len].mode = CORBA::PARAM_INOUT;" << be_nl; + *os << "(*parameter_list)[len].mode = ::CORBA::PARAM_INOUT;" << be_nl; break; case AST_Argument::dir_OUT: - *os << "(*parameter_list)[len].mode = CORBA::PARAM_OUT;" << be_nl; + *os << "(*parameter_list)[len].mode = ::CORBA::PARAM_OUT;" << be_nl; break; default: ACE_ERROR_RETURN ((LM_ERROR, @@ -182,11 +182,11 @@ be_visitor_args_paramlist::visit_string (be_string *node) // Bounded strings. if (node->width () == (long) sizeof (char)) { - *os << "CORBA::Any::from_string ((char *)"; + *os << "::CORBA::Any::from_string ((char *)"; } else { - *os << "CORBA::Any::from_wstring ((CORBA::WChar *)"; + *os << "::CORBA::Any::from_wstring ((CORBA::WChar *)"; } *os << arg->local_name () << "_, " @@ -213,19 +213,19 @@ be_visitor_args_paramlist::visit_predefined_type (be_predefined_type *node) switch (node->pt ()) { case AST_PredefinedType::PT_boolean: - *os << "CORBA::Any::from_boolean (this->"; + *os << "::CORBA::Any::from_boolean (this->"; *os << arg->local_name () << "_);"; break; case AST_PredefinedType::PT_char: - *os << "CORBA::Any::from_char (this->"; + *os << "::CORBA::Any::from_char (this->"; *os << arg->local_name () << "_);"; break; case AST_PredefinedType::PT_wchar: - *os << "CORBA::Any::from_wchar (this->"; + *os << "::CORBA::Any::from_wchar (this->"; *os << arg->local_name () << "_);"; break; case AST_PredefinedType::PT_octet: - *os << "CORBA::Any::from_octet (this->"; + *os << "::CORBA::Any::from_octet (this->"; *os << arg->local_name () << "_);"; break; default: diff --git a/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp index 639d624c5a6..2736db1b783 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp @@ -55,8 +55,7 @@ int be_visitor_args_vardecl_ss::visit_argument (be_argument *node) TAO_OutStream *os = this->ctx_->stream (); - *os << be_nl - << "::"; + *os << be_nl; // Different types have different mappings when used as in/out or // inout parameters. Let this visitor deal with the type @@ -91,8 +90,8 @@ int be_visitor_args_vardecl_ss::visit_array (be_array *node) { case AST_Argument::dir_IN: case AST_Argument::dir_INOUT: - *os << bt->name () << " " << arg->local_name () << ";" << be_nl - << bt->name () << "_forany _tao_forany_" + *os << "::" << bt->name () << " " << arg->local_name () << ";" << be_nl + << "::" << bt->name () << "_forany _tao_forany_" << arg->local_name () << " (" << be_idt << be_idt_nl << arg->local_name () << be_uidt_nl << ");" << be_uidt; @@ -101,7 +100,7 @@ int be_visitor_args_vardecl_ss::visit_array (be_array *node) case AST_Argument::dir_OUT: if (node->size_type () == be_type::VARIABLE) { - *os << bt->name () << "_var " << arg->local_name () + *os << "::" << bt->name () << "_var " << arg->local_name () << ";"; } else @@ -136,7 +135,7 @@ int be_visitor_args_vardecl_ss::visit_enum (be_enum *node) case AST_Argument::dir_IN: case AST_Argument::dir_INOUT: case AST_Argument::dir_OUT: - *os << bt->name () << " " << arg->local_name () << ";"; + *os << "::" << bt->name () << " " << arg->local_name () << ";"; break; } @@ -187,10 +186,10 @@ int be_visitor_args_vardecl_ss::visit_predefined_type (be_predefined_type *node) AST_PredefinedType::PredefinedType pt = node->pt (); + *os << "::" << bt->name (); + if (pt == AST_PredefinedType::PT_any) { - *os << bt->name (); - switch (this->direction ()) { case AST_Argument::dir_IN: @@ -207,11 +206,11 @@ int be_visitor_args_vardecl_ss::visit_predefined_type (be_predefined_type *node) else if (pt == AST_PredefinedType::PT_pseudo || pt == AST_PredefinedType::PT_object) { - *os << bt->name () << "_var " << arg->local_name () << ";"; + *os << "_var " << arg->local_name () << ";"; } else { - *os << bt->name () << " " << arg->local_name (); + *os << " " << arg->local_name (); switch (this->direction ()) { @@ -274,11 +273,11 @@ int be_visitor_args_vardecl_ss::visit_sequence (be_sequence *node) { case AST_Argument::dir_IN: case AST_Argument::dir_INOUT: - *os << bt->name () << " " << arg->local_name () << ";"; + *os << "::" << bt->name () << " " << arg->local_name () << ";"; break; case AST_Argument::dir_OUT: - *os << bt->name () << "_var " + *os << "::" << bt->name () << "_var " << arg->local_name () << ";" << be_nl; break; @@ -298,22 +297,22 @@ int be_visitor_args_vardecl_ss::visit_string (be_string *node) case AST_Argument::dir_INOUT: if (node->width () == (long) sizeof (char)) { - *os << "CORBA::String_var " << arg->local_name () << ";"; + *os << "::CORBA::String_var " << arg->local_name () << ";"; } else { - *os << "CORBA::WString_var " << arg->local_name () << ";"; + *os << "::CORBA::WString_var " << arg->local_name () << ";"; } break; case AST_Argument::dir_OUT: if (node->width () == (long )sizeof (char)) { - *os << "CORBA::String_var " << arg->local_name () << ";"; + *os << "::CORBA::String_var " << arg->local_name () << ";"; } else { - *os << "CORBA::WString_var " << arg->local_name () << ";"; + *os << "::CORBA::WString_var " << arg->local_name () << ";"; } break; @@ -402,11 +401,11 @@ be_visitor_args_vardecl_ss::emit_common (be_type *node) { case AST_Argument::dir_IN: case AST_Argument::dir_INOUT: - *os << bt->name () << "_var " << arg->local_name () << ";"; + *os << "::" << bt->name () << "_var " << arg->local_name () << ";"; break; case AST_Argument::dir_OUT: - *os << bt->name () << "_var " + *os << "::" << bt->name () << "_var " << arg->local_name () << ";"; break; @@ -437,18 +436,18 @@ be_visitor_args_vardecl_ss::emit_common2 (be_type *node) { case AST_Argument::dir_IN: case AST_Argument::dir_INOUT: - *os << bt->name () << " " << arg->local_name () << ";"; + *os << "::" << bt->name () << " " << arg->local_name () << ";"; break; case AST_Argument::dir_OUT: if (node->size_type () == be_type::VARIABLE) { - *os << bt->name () << "_var " + *os << "::" << bt->name () << "_var " << arg->local_name () << ";"; } else { - *os << bt->name () << " " << arg->local_name () << ";"; + *os << "::" << bt->name () << " " << arg->local_name () << ";"; } break; diff --git a/TAO/TAO_IDL/be/be_visitor_array/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_array/any_op_ch.cpp index 3d5eade88a6..1dc5255322d 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/any_op_ch.cpp @@ -52,10 +52,10 @@ be_visitor_array_any_op_ch::visit_array (be_array *node) << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; *os << be_global->stub_export_macro () << " void" - << " operator<<= (CORBA::Any &, const " << node->name () + << " operator<<= ( ::CORBA::Any &, const " << node->name () << "_forany &);" << 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 () << "_forany &);"; node->cli_hdr_any_op_gen (1); diff --git a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp index 3e5bd9218c6..06073cb6f91 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp @@ -66,7 +66,7 @@ be_visitor_array_any_op_cs::visit_array (be_array *node) << "namespace TAO" << be_nl << "{" << be_idt_nl << "template<>" << be_nl - << "CORBA::Boolean" << be_nl + << "::CORBA::Boolean" << be_nl << "Any_Array_Impl_T<" << be_idt << be_idt_nl << node->name () << "_slice," << be_nl << node->name () << "_forany" << be_uidt_nl @@ -77,7 +77,7 @@ be_visitor_array_any_op_cs::visit_array (be_array *node) *os << be_nl << be_nl << "template<>" << be_nl - << "CORBA::Boolean" << be_nl + << "::CORBA::Boolean" << be_nl << "Any_Array_Impl_T<" << be_idt << be_idt_nl << node->name () << "_slice," << be_nl << node->name () << "_forany" << be_uidt_nl @@ -89,7 +89,7 @@ be_visitor_array_any_op_cs::visit_array (be_array *node) } *os << "void operator<<= (" << be_idt << be_idt_nl - << "CORBA::Any &_tao_any," << be_nl + << "::CORBA::Any &_tao_any," << be_nl << "const " << node->name () << "_forany &_tao_elem" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl @@ -108,8 +108,8 @@ be_visitor_array_any_op_cs::visit_array (be_array *node) << ");" << be_uidt << be_uidt << be_uidt_nl << "}" << be_nl << be_nl; - *os << "CORBA::Boolean operator>>= (" << be_idt << be_idt_nl - << "const CORBA::Any &_tao_any," << be_nl + *os << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl + << "const ::CORBA::Any &_tao_any," << be_nl << node->name () << "_forany &_tao_elem" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_array/array.cpp b/TAO/TAO_IDL/be/be_visitor_array/array.cpp index 5334f051af4..c03f8a00798 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/array.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/array.cpp @@ -83,6 +83,8 @@ be_visitor_array::visit_predefined_type (be_predefined_type *node) { TAO_OutStream *os = this->ctx_->stream (); AST_PredefinedType::PredefinedType pt = node->pt (); + + *os << "::"; if (pt == AST_PredefinedType::PT_pseudo || pt == AST_PredefinedType::PT_object) diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp index 8afb42d1c75..d99afdcc692 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp @@ -191,7 +191,7 @@ int be_visitor_array_cs::visit_array (be_array *node) if (expr->ev ()->et == AST_Expression::EV_ulong) { // Generate a loop for each dimension. - *os << "for (CORBA::ULong i" << i << " = 0; i" << i << " < " + *os << "for ( ::CORBA::ULong i" << i << " = 0; i" << i << " < " << expr->ev ()->u.ulval << "; ++i" << i << ")" << be_idt_nl << "{" << be_idt_nl; } diff --git a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp index 64ae7118735..00d3ecc3ff0 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp @@ -133,7 +133,7 @@ be_visitor_array_cdr_op_ch::visit_array (be_array *node) *os << node->name () << "_forany &);" << be_nl; } - *os << be_global->stub_export_macro () << " CORBA::Boolean" + *os << be_global->stub_export_macro () << " ::CORBA::Boolean" << " operator>> (TAO_InputCDR &, "; if (!this->ctx_->tdef ()) diff --git a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp index cc336d252ca..a3725dc31d4 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp @@ -178,7 +178,7 @@ be_visitor_array_cdr_op_cs::visit_array (be_array *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 " << fname << "_forany &_tao_array" << be_uidt_nl << ")" << be_uidt_nl @@ -196,7 +196,7 @@ be_visitor_array_cdr_op_cs::visit_array (be_array *node) *os << "}" << be_nl << be_nl; 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 << fname << "_forany &_tao_array" << be_uidt_nl << ")" << be_uidt_nl @@ -593,7 +593,7 @@ be_visitor_array_cdr_op_cs::visit_node (be_type *bt) if (expr->ev ()->et == AST_Expression::EV_ulong) { // Generate a loop for each dimension. - *os << be_nl << "for (CORBA::ULong i" << i + *os << be_nl << "for ( ::CORBA::ULong i" << i << " = 0; i" << i << " < " << expr->ev ()->u.ulval << " && _tao_marshal_flag; i" << i << "++)" << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_array/serializer_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_array/serializer_op_ch.cpp index a2a0ecd5e63..b08bb5db5bf 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/serializer_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/serializer_op_ch.cpp @@ -143,7 +143,7 @@ be_visitor_array_serializer_op_ch::visit_array (be_array *node) this->gen_arg_ref(node); *os << be_global->stub_export_macro () - << " CORBA::Boolean _tao_is_bounded_size (" + << " ::CORBA::Boolean _tao_is_bounded_size (" << "const "; this->gen_arg_ref(node); @@ -153,11 +153,11 @@ be_visitor_array_serializer_op_ch::visit_array (be_array *node) this->gen_arg_ref(node); // Generate the Serializer << and >> operator declarations. - *os << be_global->stub_export_macro () << " CORBA::Boolean" + *os << be_global->stub_export_macro () << " ::CORBA::Boolean" << " operator<< (TAO::DCPS::Serializer &, const "; this->gen_arg_ref(node); - *os << be_global->stub_export_macro () << " CORBA::Boolean" + *os << be_global->stub_export_macro () << " ::CORBA::Boolean" << " operator>> (TAO::DCPS::Serializer &, "; this->gen_arg_ref(node); diff --git a/TAO/TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp index 0a7d7fb2d3e..15ca782da82 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp @@ -197,7 +197,7 @@ be_visitor_array_serializer_op_cs::visit_array (be_array *node) // Set the sub state as generating code for the size method this->ctx_->sub_state (TAO_CodeGen::TAO_IS_BOUNDED_SIZE); - *os << "CORBA::Boolean _tao_is_bounded_size (" << be_idt << be_idt_nl + *os << "::CORBA::Boolean _tao_is_bounded_size (" << be_idt << be_idt_nl << "const " << fname << "_forany &_tao_array" << be_uidt_nl <<")" << be_uidt_nl << "{" << be_idt_nl; @@ -234,7 +234,7 @@ be_visitor_array_serializer_op_cs::visit_array (be_array *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::DCPS::Serializer &strm," << be_nl << "const " << fname << "_forany &_tao_array" << be_uidt_nl << ")" << be_uidt_nl @@ -252,7 +252,7 @@ be_visitor_array_serializer_op_cs::visit_array (be_array *node) *os << "}" << be_nl << be_nl; 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::DCPS::Serializer &strm," << be_nl << fname << "_forany &_tao_array" << be_uidt_nl << ")" << be_uidt_nl @@ -299,14 +299,14 @@ be_visitor_array_serializer_op_cs::visit_enum (be_enum *node) switch (this->ctx_->sub_state ()) { case TAO_CodeGen::TAO_IS_BOUNDED_SIZE: - *os << "ACE_UNUSED_ARG(_tao_array);" << be_nl + *os << "ACE_UNUSED_ARG (_tao_array);" << be_nl << "return true; // array of enum" << be_uidt_nl; break; case TAO_CodeGen::TAO_FIND_SIZE: case TAO_CodeGen::TAO_MAX_MARSHALED_SIZE: { - *os << "ACE_UNUSED_ARG(_tao_array);" << be_nl; - *os << "// array of enum = sizeof(CORBA::ULong) * array size" << be_nl + *os << "ACE_UNUSED_ARG (_tao_array);" << be_nl; + *os << "// array of enum = sizeof ( ::CORBA::ULong) * array size" << be_nl << "return _dcps_max_marshaled_size_ulong () * "; unsigned long ndims = array->n_dims (); @@ -383,7 +383,9 @@ be_visitor_array_serializer_op_cs::visit_valuetype_fwd (be_valuetype_fwd *node) } int -be_visitor_array_serializer_op_cs::visit_predefined_type (be_predefined_type *node) +be_visitor_array_serializer_op_cs::visit_predefined_type ( + be_predefined_type *node + ) { TAO_OutStream *os = this->ctx_->stream (); @@ -794,7 +796,7 @@ be_visitor_array_serializer_op_cs::visit_node (be_type *bt) break; case AST_Decl::NT_array: *os << "// use ULong instead of literal to avoid overload ambiguity" - << be_nl << "CORBA::ULong first = 0;" << be_nl + << be_nl << "::CORBA::ULong first = 0;" << be_nl << "// must use forany instead of a slice to avoid overload ambiguity" << be_nl << bt->name () << "_var tmp_var (" @@ -841,7 +843,7 @@ be_visitor_array_serializer_op_cs::visit_node (be_type *bt) break; case AST_Decl::NT_array: *os << "// use ULong instead of literal to avoid overload ambiguity" - << be_nl << "CORBA::ULong first = 0;" << be_nl + << be_nl << "::CORBA::ULong first = 0;" << be_nl << "// must use forany instead of a slice to avoid overload ambiguity" << be_nl << bt->name () << "_var tmp_var (" @@ -918,7 +920,7 @@ be_visitor_array_serializer_op_cs::visit_node (be_type *bt) else { // Initialize a boolean variable. - *os << "CORBA::Boolean _tao_marshal_flag = 1;" << be_nl; + *os << "::CORBA::Boolean _tao_marshal_flag = 1;" << be_nl; } unsigned long ndims = node->n_dims (); @@ -945,7 +947,7 @@ be_visitor_array_serializer_op_cs::visit_node (be_type *bt) if (expr->ev ()->et == AST_Expression::EV_ulong) { // Generate a loop for each dimension. - *os << be_nl << "for (CORBA::ULong i" << i + *os << be_nl << "for ( ::CORBA::ULong i" << i << " = 0; i" << i << " < " << expr->ev ()->u.ulval; diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp index 063c9ce7c57..d73a9054403 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp @@ -116,7 +116,7 @@ be_visitor_component_ch::visit_component (be_component *node) << node->local_name () << "_ptr obj);" << be_nl << be_nl << "static " << node->local_name () << "_ptr " << "_narrow (" << be_idt << be_idt_nl - << "CORBA::Object_ptr obj" << be_nl + << "::CORBA::Object_ptr obj" << be_nl << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt_nl << be_nl; @@ -165,7 +165,7 @@ be_visitor_component_ch::visit_component (be_component *node) } *os << be_nl << be_nl - << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl + << "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; @@ -175,7 +175,7 @@ be_visitor_component_ch::visit_component (be_component *node) << "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);"; // Add the Proxy Broker member variable. *os << be_uidt_nl << be_nl @@ -210,7 +210,7 @@ be_visitor_component_ch::visit_component (be_component *node) *os << be_nl << 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 *oc = 0" << be_uidt_nl << ");" << be_uidt; diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_ci.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_ci.cpp index 32ca2484400..4458f9f847a 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_ci.cpp @@ -61,7 +61,7 @@ be_visitor_component_ci::visit_component (be_component *node) << "IOP::IOR *ior," << be_nl << "TAO_ORB_Core *oc" << be_uidt_nl << ")" << be_uidt_nl - << ": ACE_NESTED_CLASS (CORBA, Object) (ior, oc)" << be_uidt_nl + << ": ACE_NESTED_CLASS ( ::CORBA, Object) (ior, oc)" << be_uidt_nl << "{" << be_nl << "}" ; diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp index 07ae1ff1718..6f01b89e037 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp @@ -82,7 +82,7 @@ be_visitor_component_cs::visit_component (be_component *node) << 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 @@ -94,7 +94,7 @@ be_visitor_component_cs::visit_component (be_component *node) << "}"; *os << be_nl << 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 @@ -109,22 +109,22 @@ be_visitor_component_cs::visit_component (be_component *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 << "}"; } @@ -137,7 +137,7 @@ be_visitor_component_cs::visit_component (be_component *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; // Generate the destructor and default constructor. @@ -187,7 +187,7 @@ be_visitor_component_cs::visit_component (be_component *node) << "{" << be_idt_nl << node->local_name () << " *_tao_tmp_pointer = static_cast<" << node->local_name () << " *> (_tao_void_pointer);" << be_nl - << "CORBA::release (_tao_tmp_pointer);" << be_uidt_nl + << "::CORBA::release (_tao_tmp_pointer);" << be_uidt_nl << "}" << be_nl << be_nl; } @@ -196,7 +196,7 @@ be_visitor_component_cs::visit_component (be_component *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; } @@ -204,7 +204,7 @@ be_visitor_component_cs::visit_component (be_component *node) // The _narrow method. *os << node->full_name () << "_ptr" << be_nl << node->full_name () << "::_narrow (" << be_idt << be_idt_nl - << "CORBA::Object_ptr" + << "::CORBA::Object_ptr" << " _tao_objref" << be_nl << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl @@ -230,7 +230,7 @@ be_visitor_component_cs::visit_component (be_component *node) << bt->nested_type_name (this->ctx_->scope ()) << "_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 @@ -238,7 +238,7 @@ be_visitor_component_cs::visit_component (be_component *node) << "}" << be_nl << be_nl; // The is_a method. - *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 << "ACE_ENV_ARG_DECL" << be_uidt_nl @@ -268,7 +268,7 @@ be_visitor_component_cs::visit_component (be_component *node) << "}" << be_uidt_nl << "else" << be_idt_nl << "{" << be_idt_nl - << "return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (" + << "return this->ACE_NESTED_CLASS ( ::CORBA, Object)::_is_a (" << be_idt << be_idt_nl << "value" << be_nl << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl @@ -286,7 +286,7 @@ be_visitor_component_cs::visit_component (be_component *node) << "}"; *os << be_nl << be_nl - << "CORBA::Boolean" << be_nl + << "::CORBA::Boolean" << be_nl << node->name () << "::marshal (TAO_OutputCDR &cdr)" << be_nl << "{" << be_idt_nl << "return (cdr << this);" << be_uidt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_sh.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_sh.cpp index ae3e62931aa..5a26b0e29f5 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_sh.cpp @@ -160,16 +160,11 @@ be_visitor_component_sh::visit_component (be_component *node) << "virtual ~" << class_name.c_str () << " (void);" << be_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; - // _downcast -// *os << "virtual void* _downcast (" << be_idt << be_idt_nl -// << "const char* logical_type_id" << 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 diff --git a/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp index 42f22c4611c..e507c1ecbc0 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp @@ -53,10 +53,10 @@ be_visitor_enum_any_op_ch::visit_enum (be_enum *node) // Generate the Any <<= and >>= operators. *os << be_nl << be_nl << be_global->stub_export_macro () << " void" - << " operator<<= (CORBA::Any &, " << node->name () + << " operator<<= ( ::CORBA::Any &, " << node->name () << ");" << 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 () << " &);"; node->cli_hdr_any_op_gen (1); diff --git a/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp index ba7d8c8f560..f35cc47839a 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp @@ -62,7 +62,7 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node) *os << "namespace TAO" << be_nl << "{" << be_idt_nl << "template<>" << be_nl - << "CORBA::Boolean" << be_nl + << "::CORBA::Boolean" << be_nl << "Any_Basic_Impl_T<" << node->name () << ">::marshal_value (TAO_OutputCDR &)" << be_nl << "{" << be_idt_nl @@ -71,7 +71,7 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node) *os << be_nl << be_nl << "template<>" << be_nl - << "CORBA::Boolean" << be_nl + << "::CORBA::Boolean" << be_nl << "Any_Basic_Impl_T<" << node->name () << ">::demarshal_value (TAO_InputCDR &)" << be_nl << "{" << be_idt_nl @@ -83,7 +83,7 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node) // Generate the Any <<= and >>= operator declarations // Any <<= and >>= operators. *os << "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 @@ -95,8 +95,8 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node) << ");" << be_uidt << be_uidt_nl << "}" << be_nl << be_nl; - *os << "CORBA::Boolean operator>>= (" << be_idt << be_idt_nl - << "const CORBA::Any &_tao_any," << be_nl + *os << "::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 diff --git a/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp index 1321507ad7c..0315d8d709b 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp @@ -50,9 +50,9 @@ be_visitor_enum_cdr_op_ch::visit_enum (be_enum *node) << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; // generate the CDR << and >> operators - *os << be_global->stub_export_macro () << " CORBA::Boolean" + *os << be_global->stub_export_macro () << " ::CORBA::Boolean" << " operator<< (TAO_OutputCDR &, " << 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 () << " &);"; node->cli_hdr_cdr_op_gen (1); diff --git a/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp index 744e28ed970..03fe27f85e6 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp @@ -50,18 +50,18 @@ be_visitor_enum_cdr_op_cs::visit_enum (be_enum *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; - *os << "CORBA::Boolean operator<< (TAO_OutputCDR & strm, " + *os << "::CORBA::Boolean operator<< (TAO_OutputCDR & strm, " << node->name () << " _tao_enumerator)" << be_nl << "{" << be_idt_nl - << "return strm << static_cast<CORBA::ULong> (_tao_enumerator);" + << "return strm << static_cast< ::CORBA::ULong> (_tao_enumerator);" << be_uidt_nl << "}" << be_nl << be_nl; - *os << "CORBA::Boolean operator>> (TAO_InputCDR & strm, " + *os << "::CORBA::Boolean operator>> (TAO_InputCDR & strm, " << node->name () << " & _tao_enumerator)" << be_nl << "{" << be_idt_nl - << "CORBA::ULong _tao_temp = 0;" << be_nl - << "CORBA::Boolean const _tao_success = strm >> _tao_temp;" << be_nl + << "::CORBA::ULong _tao_temp = 0;" << be_nl + << "::CORBA::Boolean const _tao_success = strm >> _tao_temp;" << be_nl << be_nl << "if (_tao_success)" << be_idt_nl << "{" << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_enum/serializer_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_enum/serializer_op_ch.cpp index 5211493ca9a..fa543f76d59 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum/serializer_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum/serializer_op_ch.cpp @@ -50,10 +50,10 @@ be_visitor_enum_serializer_op_ch::visit_enum (be_enum *node) << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; // generate the Serializer << and >> operators - *os << be_global->stub_export_macro () << " CORBA::Boolean" + *os << be_global->stub_export_macro () << " ::CORBA::Boolean" << " operator<< (TAO::DCPS::Serializer &, const " << node->name () << " &);" << be_nl; - *os << be_global->stub_export_macro () << " CORBA::Boolean" + *os << be_global->stub_export_macro () << " ::CORBA::Boolean" << " operator>> (TAO::DCPS::Serializer &, " << node->name () << " &);"; diff --git a/TAO/TAO_IDL/be/be_visitor_enum/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/serializer_op_cs.cpp index f4adf2f1777..6410c05b30a 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum/serializer_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum/serializer_op_cs.cpp @@ -51,18 +51,18 @@ be_visitor_enum_serializer_op_cs::visit_enum (be_enum *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; - *os << "CORBA::Boolean operator<< (TAO::DCPS::Serializer &strm, " + *os << "::CORBA::Boolean operator<< (TAO::DCPS::Serializer &strm, " << "const " << node->name () << " &_tao_enumval)" << be_nl << "{" << be_idt_nl - << "CORBA::ULong _tao_temp = _tao_enumval;" << be_nl + << "::CORBA::ULong _tao_temp = _tao_enumval;" << be_nl << "return strm << _tao_temp;" << be_uidt_nl << "}" << be_nl << be_nl; - *os << "CORBA::Boolean operator>> (TAO::DCPS::Serializer &strm, " + *os << "::CORBA::Boolean operator>> (TAO::DCPS::Serializer &strm, " << node->name () << " &_tao_enumval)" << be_nl << "{" << be_idt_nl - << "CORBA::ULong _tao_temp = 0;" << be_nl - << "CORBA::Boolean _tao_result = strm >> _tao_temp;" << be_nl << be_nl + << "::CORBA::ULong _tao_temp = 0;" << be_nl + << "::CORBA::Boolean _tao_result = strm >> _tao_temp;" << be_nl << be_nl << "if (_tao_result == 1)" << be_idt_nl << "{" << be_idt_nl << "_tao_enumval = static_cast<" << node->name () 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; diff --git a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp index effab1b074a..38871eeb801 100644 --- a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp @@ -274,7 +274,7 @@ be_visitor_field_cdr_op_cs::visit_interface (be_interface *node) } else { - *os << "CORBA::Object::marshal (" << be_idt << be_idt_nl + *os << "::CORBA::Object::marshal (" << be_idt << be_idt_nl << "_tao_aggregate." << f->local_name () << ".in ()," << be_nl << "strm" << be_uidt_nl << ")" << be_uidt; @@ -347,7 +347,7 @@ be_visitor_field_cdr_op_cs::visit_interface_fwd (be_interface_fwd *node) } else { - *os << "CORBA::Object::marshal (" << be_idt << be_idt_nl + *os << "::CORBA::Object::marshal (" << be_idt << be_idt_nl << "_tao_aggregate." << f->local_name () << ".in ()," << be_nl << "strm" << be_uidt_nl << ")" << be_uidt; @@ -500,22 +500,22 @@ be_visitor_field_cdr_op_cs::visit_predefined_type (be_predefined_type *node) } else if (pt == AST_PredefinedType::PT_char) { - *os << "(strm >> CORBA::Any::to_char (_tao_aggregate." + *os << "(strm >> ::CORBA::Any::to_char (_tao_aggregate." << f->local_name () << "))"; } else if (pt == AST_PredefinedType::PT_wchar) { - *os << "(strm >> CORBA::Any::to_wchar (_tao_aggregate." + *os << "(strm >> ::CORBA::Any::to_wchar (_tao_aggregate." << f->local_name () << "))"; } else if (pt == AST_PredefinedType::PT_octet) { - *os << "(strm >> CORBA::Any::to_octet (_tao_aggregate." + *os << "(strm >> ::CORBA::Any::to_octet (_tao_aggregate." << f->local_name () << "))"; } else if (pt == AST_PredefinedType::PT_boolean) { - *os << "(strm >> CORBA::Any::to_boolean (_tao_aggregate." + *os << "(strm >> ::CORBA::Any::to_boolean (_tao_aggregate." << f->local_name () << "))"; } else @@ -531,22 +531,22 @@ be_visitor_field_cdr_op_cs::visit_predefined_type (be_predefined_type *node) } else if (pt == AST_PredefinedType::PT_char) { - *os << "(strm << CORBA::Any::from_char (_tao_aggregate." + *os << "(strm << ::CORBA::Any::from_char (_tao_aggregate." << f->local_name () << "))"; } else if (pt == AST_PredefinedType::PT_wchar) { - *os << "(strm << CORBA::Any::from_wchar (_tao_aggregate." + *os << "(strm << ::CORBA::Any::from_wchar (_tao_aggregate." << f->local_name () << "))"; } else if (pt == AST_PredefinedType::PT_octet) { - *os << "(strm << CORBA::Any::from_octet (_tao_aggregate." + *os << "(strm << ::CORBA::Any::from_octet (_tao_aggregate." << f->local_name () << "))"; } else if (pt == AST_PredefinedType::PT_boolean) { - *os << "(strm << CORBA::Any::from_boolean (_tao_aggregate." + *os << "(strm << ::CORBA::Any::from_boolean (_tao_aggregate." << f->local_name () << "))"; } else diff --git a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp index 5a923830956..79bb30bf220 100644 --- a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp @@ -280,6 +280,8 @@ be_visitor_field_ch::visit_predefined_type (be_predefined_type *node) { bt = node; } + + *os << "::"; if (node->pt () == AST_PredefinedType::PT_object) { @@ -324,6 +326,8 @@ be_visitor_field_ch::visit_predefined_type (be_predefined_type *node) } else { + // All the predefined types are in the CORBA namespace, + // so we go ahead and add the global :: qualifier. *os << bt->name (); } } diff --git a/TAO/TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp index a0c929b281a..c55f26aa604 100644 --- a/TAO/TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp @@ -297,7 +297,7 @@ be_visitor_field_serializer_op_cs::visit_interface (be_interface *node) } else { - *os << "CORBA::Object::marshal (" << be_idt << be_idt_nl + *os << "::CORBA::Object::marshal (" << be_idt << be_idt_nl << "_tao_aggregate." << f->local_name () << ".in ()," << be_nl << "strm" << be_uidt_nl << ")" << be_uidt; @@ -370,7 +370,7 @@ be_visitor_field_serializer_op_cs::visit_interface_fwd (be_interface_fwd *node) } else { - *os << "CORBA::Object::marshal (" << be_idt << be_idt_nl + *os << "::CORBA::Object::marshal (" << be_idt << be_idt_nl << "_tao_aggregate." << f->local_name () << ".in ()," << be_nl << "strm" << be_uidt_nl << ")" << be_uidt; @@ -569,22 +569,22 @@ be_visitor_field_serializer_op_cs::visit_predefined_type (be_predefined_type *no } else if (pt == AST_PredefinedType::PT_char) { - *os << "_dcps_max_marshaled_size (CORBA::Any::from_char (_tao_aggregate." + *os << "_dcps_max_marshaled_size ( ::CORBA::Any::from_char (_tao_aggregate." << f->local_name () << "))"; } else if (pt == AST_PredefinedType::PT_wchar) { - *os << "_dcps_max_marshaled_size (CORBA::Any::from_wchar (_tao_aggregate." + *os << "_dcps_max_marshaled_size ( ::CORBA::Any::from_wchar (_tao_aggregate." << f->local_name () << "))"; } else if (pt == AST_PredefinedType::PT_octet) { - *os << "_dcps_max_marshaled_size (CORBA::Any::from_octet (_tao_aggregate." + *os << "_dcps_max_marshaled_size ( ::CORBA::Any::from_octet (_tao_aggregate." << f->local_name () << "))"; } else if (pt == AST_PredefinedType::PT_boolean) { - *os << "_dcps_max_marshaled_size (CORBA::Any::from_boolean (_tao_aggregate." + *os << "_dcps_max_marshaled_size ( ::CORBA::Any::from_boolean (_tao_aggregate." << f->local_name () << "))"; } else @@ -601,22 +601,22 @@ be_visitor_field_serializer_op_cs::visit_predefined_type (be_predefined_type *no } else if (pt == AST_PredefinedType::PT_char) { - *os << "(strm >> CORBA::Any::to_char (_tao_aggregate." + *os << "(strm >> ::CORBA::Any::to_char (_tao_aggregate." << f->local_name () << "))"; } else if (pt == AST_PredefinedType::PT_wchar) { - *os << "(strm >> CORBA::Any::to_wchar (_tao_aggregate." + *os << "(strm >> ::CORBA::Any::to_wchar (_tao_aggregate." << f->local_name () << "))"; } else if (pt == AST_PredefinedType::PT_octet) { - *os << "(strm >> CORBA::Any::to_octet (_tao_aggregate." + *os << "(strm >> ::CORBA::Any::to_octet (_tao_aggregate." << f->local_name () << "))"; } else if (pt == AST_PredefinedType::PT_boolean) { - *os << "(strm >> CORBA::Any::to_boolean (_tao_aggregate." + *os << "(strm >> ::CORBA::Any::to_boolean (_tao_aggregate." << f->local_name () << "))"; } else @@ -632,22 +632,22 @@ be_visitor_field_serializer_op_cs::visit_predefined_type (be_predefined_type *no } else if (pt == AST_PredefinedType::PT_char) { - *os << "(strm << CORBA::Any::from_char (_tao_aggregate." + *os << "(strm << ::CORBA::Any::from_char (_tao_aggregate." << f->local_name () << "))"; } else if (pt == AST_PredefinedType::PT_wchar) { - *os << "(strm << CORBA::Any::from_wchar (_tao_aggregate." + *os << "(strm << ::CORBA::Any::from_wchar (_tao_aggregate." << f->local_name () << "))"; } else if (pt == AST_PredefinedType::PT_octet) { - *os << "(strm << CORBA::Any::from_octet (_tao_aggregate." + *os << "(strm << ::CORBA::Any::from_octet (_tao_aggregate." << f->local_name () << "))"; } else if (pt == AST_PredefinedType::PT_boolean) { - *os << "(strm << CORBA::Any::from_boolean (_tao_aggregate." + *os << "(strm << ::CORBA::Any::from_boolean (_tao_aggregate." << f->local_name () << "))"; } else 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 diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp index 5de4a020bf0..24e9f7ca3fa 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp @@ -87,13 +87,13 @@ be_visitor_interface_fwd_any_op_ch::visit_interface_fwd (be_interface_fwd *node) be_util::gen_nested_namespace_begin (os, module); *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 () << " *&);"; be_util::gen_nested_namespace_end (os, module); @@ -103,13 +103,13 @@ be_visitor_interface_fwd_any_op_ch::visit_interface_fwd (be_interface_fwd *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 () << " *&);"; if (module != 0) diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp index 1d801f131bd..cbf5ebac938 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp @@ -65,10 +65,10 @@ be_visitor_interface_fwd_cdr_op_ch::visit_interface_fwd (be_interface_fwd *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; - *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 &);\n"; diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp index 3875db2d840..1a858a5f1b6 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp @@ -164,7 +164,7 @@ be_visitor_amh_rh_operation_ss::visit_operation (be_operation *node) << " (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_nl << "ACE_TRY_CHECK;" << be_uidt_nl << "}" << be_nl - << "ACE_CATCH (CORBA::Exception, ex)" << be_nl + << "ACE_CATCH ( ::CORBA::Exception, ex)" << be_nl << "{" << be_nl << " this->_tao_rh_send_exception (ex ACE_ENV_ARG_PARAMETER);" << be_nl @@ -227,7 +227,7 @@ be_visitor_amh_rh_operation_ss::marshal_params (be_operation *node) // If marshaling fails, raise exception. if (this->gen_raise_exception (0, - "CORBA::MARSHAL", + "::CORBA::MARSHAL", "") == -1) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp index b19b72f4656..6a01601d05e 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp @@ -96,7 +96,7 @@ be_visitor_amh_operation_sh::visit_operation (be_operation *node) *os << "ACE_THROW_SPEC (("; } - *os << "CORBA::SystemException"; + *os << " ::CORBA::SystemException"; if (be_global->use_raw_throw ()) { @@ -126,7 +126,7 @@ be_visitor_amh_operation_sh::visit_attribute (be_attribute *node) *os << be_uidt_nl << ")" << be_uidt_nl - << "ACE_THROW_SPEC ((CORBA::SystemException)) = 0;" << be_nl; + << "ACE_THROW_SPEC (( ::CORBA::SystemException)) = 0;" << be_nl; if (node->readonly ()) { @@ -154,7 +154,7 @@ be_visitor_amh_operation_sh::visit_attribute (be_attribute *node) } *os << be_uidt_nl << ")" << be_uidt_nl - << "ACE_THROW_SPEC ((CORBA::SystemException)) = 0;" << be_nl; + << "ACE_THROW_SPEC (( ::CORBA::SystemException)) = 0;" << be_nl; return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp index 93507c2261a..373bc2f88a2 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp @@ -126,7 +126,7 @@ be_visitor_amh_operation_ss::visit_operation (be_operation *node) // If marshaling fails, raise exception. if (this->gen_raise_exception (0, - "CORBA::MARSHAL", + "::CORBA::MARSHAL", "") == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -255,7 +255,7 @@ be_visitor_amh_operation_ss::visit_attribute (be_attribute *node) // If marshaling fails, raise exception. if (this->gen_raise_exception (0, - "CORBA::MARSHAL", + "::CORBA::MARSHAL", "") == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -366,18 +366,22 @@ be_visitor_amh_operation_ss::generate_shared_section (be_decl *node, buf = 0; *os << be_nl + << "TAO_ORB_Core *orb_core =" << be_idt_nl + << "_tao_server_request.orb ()->orb_core ();" << be_uidt_nl << be_nl << "TAO_AMH_BUFFER_ALLOCATOR* amh_allocator =" << be_idt_nl - << "_tao_server_request.orb()->orb_core ()->lane_resources().amh_response_handler_allocator();" << be_uidt_nl << be_nl - << "TAO::TAO_Buffer_Allocator<" - << response_handler_implementation_name.c_str () - << ", TAO_AMH_BUFFER_ALLOCATOR> buffer_allocator (amh_allocator);" - << be_nl << be_nl + << "orb_core->lane_resources ().amh_response_handler_allocator ();" + << be_uidt_nl << be_nl + << "TAO::TAO_Buffer_Allocator<" << be_idt << be_idt_nl + << response_handler_implementation_name.c_str () << "," << be_nl + << "TAO_AMH_BUFFER_ALLOCATOR" << be_uidt_nl + << "> buffer_allocator (amh_allocator);" + << be_uidt_nl << be_nl << response_handler_implementation_name.c_str () << "_ptr _tao_rh_ptr = " << be_idt_nl << "buffer_allocator.allocate();" << be_uidt_nl << be_nl - << "if (!_tao_rh_ptr) " << be_idt_nl << "ACE_THROW (CORBA::NO_MEMORY ());" + << "if (!_tao_rh_ptr) " << be_idt_nl << "ACE_THROW ( ::CORBA::NO_MEMORY ());" << be_uidt_nl; // Initialize amh rh diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp index aa8477b0c84..b3abc43ea6c 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp @@ -143,7 +143,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node) 0); int status = this->gen_raise_exception (&bpt, - "CORBA::MARSHAL", + "::CORBA::MARSHAL", ""); if (status == -1) @@ -160,7 +160,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node) *os << be_nl << "if (!this->is_evaluated ())" << be_idt_nl << "{" << be_idt_nl - << "ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);" + << "ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);" << be_uidt_nl << "}" << be_uidt_nl << be_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp index 2f8525957e1..4bb2b636776 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp @@ -180,7 +180,7 @@ be_visitor_operation_ami_exception_holder_operation_cs::visit_operation ( *os << be_uidt_nl << "};\n\n"; os->indent (); - *os << "CORBA::ULong exceptions_count = " + *os << "::CORBA::ULong exceptions_count = " << excep_count << ";\n" << be_nl; exception_data_arg = "exceptions_data"; diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp index ba20ee36122..0b6e0b99818 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp @@ -74,7 +74,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_ch::visit_operation ( *os << "TAO_InputCDR &_tao_reply_cdr," << be_nl << "Messaging::ReplyHandler_ptr _tao_reply_handler," << be_nl - << "CORBA::ULong reply_status"; + << "::CORBA::ULong reply_status"; *os << be_nl << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp index 54bb2b470dd..6fe9ba3a563 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp @@ -129,7 +129,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation ( // Generate the argument list. *os << "TAO_InputCDR &_tao_in, " << be_nl << "Messaging::ReplyHandler_ptr _tao_reply_handler," << be_nl - << "CORBA::ULong reply_status"; + << "::CORBA::ULong reply_status"; *os << be_nl << "ACE_ENV_ARG_DECL"; @@ -243,7 +243,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation ( *os << " ()" << be_uidt_nl << ");" << be_uidt_nl << be_nl; - *os << "CORBA::OctetSeq " + *os << "::CORBA::OctetSeq " << "_tao_marshaled_exception (" << be_idt << be_idt_nl << "cdr->length ()," << be_nl << "cdr->length ()," << be_nl @@ -400,11 +400,11 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::gen_marshal_and_invoke if (be_global->use_raw_throw ()) { - *os << "throw CORBA::MARSHAL ();" << be_uidt_nl << be_nl; + *os << "throw ::CORBA::MARSHAL ();" << be_uidt_nl << be_nl; } else { - *os << "ACE_THROW (CORBA::MARSHAL ());" << be_uidt_nl << be_nl; + *os << "ACE_THROW ( ::CORBA::MARSHAL ());" << be_uidt_nl << be_nl; } } diff --git a/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp index bede4e3c1a0..5988f4c0049 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp @@ -52,7 +52,7 @@ be_visitor_operation_arglist::visit_operation (be_operation *node) { case TAO_CodeGen::TAO_OPERATION_ARGLIST_PROXY_IMPL_XH: case TAO_CodeGen::TAO_OPERATION_ARGLIST_PROXY_IMPL_XS: - *os << "CORBA::Object *_collocated_tao_target_"; + *os << "::CORBA::Object *_collocated_tao_target_"; if (node->argument_count () > 0) { diff --git a/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp index fff24dc6639..3744e47ba62 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp @@ -47,7 +47,7 @@ be_visitor_operation_exceptlist_ss::visit_operation (be_operation * node) // Don't do anything if the exception list is empty. if (node->exceptions ()) { - *os << "static CORBA::TypeCode_ptr const exceptions[] = " << be_idt_nl; + *os << "static ::CORBA::TypeCode_ptr const exceptions[] = " << be_idt_nl; *os << "{" << be_idt_nl; // Initialize an iterator to iterate thru the exception list. @@ -74,7 +74,7 @@ be_visitor_operation_exceptlist_ss::visit_operation (be_operation * node) } else { - *os << "static CORBA::TypeCode_ptr const * const exceptions = 0;" + *os << "static ::CORBA::TypeCode_ptr const * const exceptions = 0;" << be_nl << "static size_t const nexceptions = 0;"; } diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp index 855ed210483..dd53e6dde2a 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp @@ -151,7 +151,7 @@ be_visitor_operation::gen_throw_spec (be_operation *node) if (nt != AST_Decl::NT_valuetype || is_amh_exception_holder) { *os << be_nl << throw_spec_open; - *os << be_idt_nl << "CORBA::SystemException"; + *os << be_idt_nl << "::CORBA::SystemException"; if (node->exceptions ()) { @@ -399,7 +399,7 @@ be_visitor_operation::gen_stub_operation_body ( if (node->has_native ()) // native exists => no stub { if (this->gen_raise_exception (return_type, - "CORBA::MARSHAL", + "::CORBA::MARSHAL", "") == -1) { ACE_ERROR_RETURN (( @@ -423,7 +423,7 @@ be_visitor_operation::gen_stub_operation_body ( // be null. Initialize it now. *os << "if (!this->is_evaluated ())" << be_idt_nl << "{" << be_idt_nl - << "ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);" + << "ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);" << be_uidt_nl << "}" << be_uidt_nl << be_nl << "if (this->the" << intf->base_proxy_broker_name () << "_ == 0)" diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp index 99c2386fbf2..df29bd7302a 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp @@ -106,13 +106,13 @@ be_visitor_operation_ss::visit_argument (be_argument *node) switch (node->direction ()) { case AST_Argument::dir_IN: - *os << "CORBA::ARG_IN, "; + *os << "::CORBA::ARG_IN, "; break; case AST_Argument::dir_INOUT: - *os << "CORBA::ARG_INOUT, "; + *os << "::CORBA::ARG_INOUT, "; break; case AST_Argument::dir_OUT: - *os << "CORBA::ARG_OUT, "; + *os << "::CORBA::ARG_OUT, "; break; } *os << "0}"; diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp index c4d0dd314e0..d638fcb6eea 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp @@ -158,8 +158,15 @@ be_visitor_operation_rettype::visit_predefined_type (be_predefined_type *node) { bt = node; } + + AST_PredefinedType::PredefinedType pt = node->pt (); + + if (pt != AST_PredefinedType::PT_void) + { + *os << "::"; + } - switch (node->pt ()) + switch (pt) { case AST_PredefinedType::PT_pseudo: case AST_PredefinedType::PT_object: @@ -224,7 +231,7 @@ be_visitor_operation_rettype::visit_string (be_string *node) } else { - *os << "CORBA::WChar *"; + *os << "::CORBA::WChar *"; } return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_root/root.cpp b/TAO/TAO_IDL/be/be_visitor_root/root.cpp index b20f98552aa..e6c2ebce2be 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root.cpp @@ -150,7 +150,7 @@ int be_visitor_root::visit_root (be_root *node) << i->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 << ");" << be_uidt; } @@ -212,7 +212,7 @@ int be_visitor_root::visit_root (be_root *node) *os << be_nl << "TAO_NAMESPACE_STORAGE_CLASS void release (" << i->name () << "_ptr);" << be_nl - << "TAO_NAMESPACE_STORAGE_CLASS CORBA::Boolean is_nil (" + << "TAO_NAMESPACE_STORAGE_CLASS ::CORBA::Boolean is_nil (" << i->name () << "_ptr);"; } diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp index b2a7107704f..e3ce91e1e40 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp @@ -54,22 +54,22 @@ be_visitor_sequence_any_op_ch::visit_sequence (be_sequence *node) // Generate the Any <<= and >>= operators. *os << be_global->stub_export_macro (); *os << " void" - << " operator<<= (CORBA::Any &, const "; + << " operator<<= ( ::CORBA::Any &, const "; *os << node->name (); *os << " &); // copying version" << be_nl; *os << be_global->stub_export_macro (); *os << " void" - << " operator<<= (CORBA::Any &, "; + << " operator<<= ( ::CORBA::Any &, "; *os << node->name (); *os << "*); // noncopying version" << be_nl; *os << be_global->stub_export_macro (); - *os << " CORBA::Boolean" - << " operator>>= (const CORBA::Any &, "; + *os << " ::CORBA::Boolean" + << " operator>>= (const ::CORBA::Any &, "; *os << node->name (); *os << " *&); // deprecated" << be_nl; *os << be_global->stub_export_macro (); - *os << " CORBA::Boolean" - << " operator>>= (const CORBA::Any &, const "; + *os << " ::CORBA::Boolean" + << " operator>>= (const ::CORBA::Any &, const "; *os << node->name (); *os << " *&);"; diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp index e54c1ebee72..577ca1ecc3d 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp @@ -64,7 +64,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) *os << "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 @@ -73,7 +73,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *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 @@ -85,7 +85,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) // Copying insertion. *os << 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 @@ -101,7 +101,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) // Non-copying insertion. *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 @@ -116,8 +116,8 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) // Extraction to non-const pointer (deprecated, just calls the other). *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 @@ -129,8 +129,8 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) // Extraction to const pointer. *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_sequence/buffer_type.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp index f1273d74604..7764d7fc244 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp @@ -70,6 +70,8 @@ be_visitor_sequence_buffer_type::visit_predefined_type (be_predefined_type *node { TAO_OutStream *os = this->ctx_->stream (); AST_PredefinedType::PredefinedType pt = node->pt (); + + *os << "::"; if (pt == AST_PredefinedType::PT_pseudo || pt == AST_PredefinedType::PT_object) @@ -214,7 +216,7 @@ be_visitor_sequence_buffer_type::visit_string (be_string *node) } else { - *os << "CORBA::WChar *"; + *os << "::CORBA::WChar *"; } return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp index 6d3e7c3f5fa..6b0e1e24d2b 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp @@ -80,12 +80,12 @@ be_visitor_sequence_cdr_op_ch::visit_sequence (be_sequence *node) } *os << be_nl << be_nl - << be_global->stub_export_macro () << " CORBA::Boolean" + << be_global->stub_export_macro () << " ::CORBA::Boolean" << " operator<< (" << be_idt << be_idt_nl << "TAO_OutputCDR &," << be_nl << "const " << node->name () << " &" << be_uidt_nl << ");" << be_uidt_nl; - *os << be_global->stub_export_macro () << " CORBA::Boolean" + *os << be_global->stub_export_macro () << " ::CORBA::Boolean" << " operator>> (" << be_idt << be_idt_nl << "TAO_InputCDR &," << be_nl << node->name () << " &" << be_uidt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp index 87844c3c482..c39a071c650 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp @@ -103,7 +103,7 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *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->name () << " &_tao_sequence" << be_uidt_nl @@ -111,7 +111,7 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node) << "{" << be_idt_nl; // First encode the sequence length. - *os << "const CORBA::ULong _tao_seq_len = _tao_sequence.length ();" + *os << "const ::CORBA::ULong _tao_seq_len = _tao_sequence.length ();" << be_nl << be_nl; *os << "if (strm << _tao_seq_len)" << be_idt_nl << "{" << be_idt_nl; @@ -143,7 +143,7 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node) // Set the sub state 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 (! bt->is_local ()) @@ -166,7 +166,7 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node) if (! bt->is_local ()) { // First retrieve the length and adjust the sequence length accordingly. - *os << "CORBA::ULong _tao_seq_len;" << be_nl << be_nl; + *os << "::CORBA::ULong _tao_seq_len;" << be_nl << be_nl; *os << "if (strm >> _tao_seq_len)" << be_idt_nl << "{" << be_idt_nl; @@ -392,8 +392,8 @@ be_visitor_sequence_cdr_op_cs::visit_predefined_type ( << "strm.orb_core ()->resource_factory ()->" << be_nl << "input_cdr_allocator_type_locked () == 1)" << be_nl << "{" << be_idt_nl - << "TAO_Unbounded_Sequence<CORBA::Octet> *oseq = " << be_nl - << " static_cast<TAO_Unbounded_Sequence<CORBA::Octet> *> (" + << "TAO_Unbounded_Sequence< ::CORBA::Octet> *oseq = " << be_nl + << " static_cast<TAO_Unbounded_Sequence< ::CORBA::Octet> *> (" << "&_tao_sequence);" << be_nl << "oseq->replace (_tao_seq_len, strm.start ());" << be_nl @@ -410,8 +410,8 @@ be_visitor_sequence_cdr_op_cs::visit_predefined_type ( case TAO_CodeGen::TAO_CDR_OUTPUT: { *os << "{" << be_idt_nl - << "TAO_Unbounded_Sequence<CORBA::Octet> *_tao_octet_seq = " << be_nl - << " static_cast<TAO_Unbounded_Sequence<CORBA::Octet> *> " + << "TAO_Unbounded_Sequence< ::CORBA::Octet> *_tao_octet_seq = " << be_nl + << " static_cast<TAO_Unbounded_Sequence< ::CORBA::Octet> *> " << "(const_cast<" << sequence->name () << " *> (&_tao_sequence));" << be_nl << "if (_tao_octet_seq->mb ())" << be_idt_nl << "return strm.write_octet_array_mb (_tao_octet_seq->mb ());" @@ -597,7 +597,7 @@ be_visitor_sequence_cdr_op_cs::visit_node (be_type *bt) be_visitor_sequence_base visitor (&ctx); // Initialize a boolean variable. - *os << "CORBA::Boolean _tao_marshal_flag = true;" << be_nl << be_nl; + *os << "::CORBA::Boolean _tao_marshal_flag = true;" << be_nl << be_nl; // We get here if the "type" of individual elements of the sequence is not a // primitive type. In this case, we are left with no other alternative but @@ -616,7 +616,7 @@ be_visitor_sequence_cdr_op_cs::visit_node (be_type *bt) if (expr->ev ()->et == AST_Expression::EV_ulong) { - *os << "for (CORBA::ULong i = 0; i < _tao_seq_len" + *os << "for ( ::CORBA::ULong i = 0; i < _tao_seq_len" << " && _tao_marshal_flag; " << "++i)" << be_idt_nl << "{" << be_idt_nl; @@ -719,12 +719,12 @@ be_visitor_sequence_cdr_op_cs::visit_node (be_type *bt) if (str->width () == (long) sizeof (char)) { *os << "_tao_marshal_flag = (strm >> " - << "CORBA::Any::to_string (_tao_sequence[i].out (), "; + << "::CORBA::Any::to_string (_tao_sequence[i].out (), "; } else { *os << "_tao_marshal_flag = (strm >> " - << "CORBA::Any::to_wstring (_tao_sequence[i].out (), "; + << "::CORBA::Any::to_wstring (_tao_sequence[i].out (), "; } *os << str->max_size ()->ev ()->u.ulval << "));" @@ -767,22 +767,22 @@ be_visitor_sequence_cdr_op_cs::visit_node (be_type *bt) break; case AST_PredefinedType::PT_char: *os << "_tao_marshal_flag =" << be_idt_nl - << "(strm >> CORBA::Any::to_char (_tao_sequence[i]));" + << "(strm >> ::CORBA::Any::to_char (_tao_sequence[i]));" << be_uidt; break; case AST_PredefinedType::PT_wchar: *os << "_tao_marshal_flag =" << be_idt_nl - << "(strm >> CORBA::Any::to_wchar (_tao_sequence[i]));" + << "(strm >> ::CORBA::Any::to_wchar (_tao_sequence[i]));" << be_uidt; break; case AST_PredefinedType::PT_boolean: *os << "_tao_marshal_flag =" << be_idt_nl - << "(strm >> CORBA::Any::to_boolean (_tao_sequence[i]));" + << "(strm >> ::CORBA::Any::to_boolean (_tao_sequence[i]));" << be_uidt; break; case AST_PredefinedType::PT_octet: *os << "_tao_marshal_flag =" << be_idt_nl - << "(strm >> CORBA::Any::to_octet (_tao_sequence[i]));" + << "(strm >> ::CORBA::Any::to_octet (_tao_sequence[i]));" << be_uidt; break; default: @@ -884,22 +884,22 @@ be_visitor_sequence_cdr_op_cs::visit_node (be_type *bt) break; case AST_PredefinedType::PT_char: *os << "_tao_marshal_flag =" << be_idt_nl - << "(strm << CORBA::Any::from_char (_tao_sequence[i]));" + << "(strm << ::CORBA::Any::from_char (_tao_sequence[i]));" << be_uidt; break; case AST_PredefinedType::PT_wchar: *os << "_tao_marshal_flag =" << be_idt_nl - << "(strm << CORBA::Any::from_wchar (_tao_sequence[i]));" + << "(strm << ::CORBA::Any::from_wchar (_tao_sequence[i]));" << be_uidt; break; case AST_PredefinedType::PT_boolean: *os << "_tao_marshal_flag =" << be_idt_nl - << "(strm << CORBA::Any::from_boolean (_tao_sequence[i]));" + << "(strm << ::CORBA::Any::from_boolean (_tao_sequence[i]));" << be_uidt; break; case AST_PredefinedType::PT_octet: *os << "_tao_marshal_flag =" << be_idt_nl - << "(strm << CORBA::Any::from_octet (_tao_sequence[i]));" + << "(strm << ::CORBA::Any::from_octet (_tao_sequence[i]));" << be_uidt; break; default: diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_base.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_base.cpp index 868f54e6778..abf654712a0 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_base.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_base.cpp @@ -42,7 +42,7 @@ be_visitor_sequence_base::visit_predefined_type (be_predefined_type *node) { TAO_OutStream *os = this->ctx_->stream (); - *os << node->name (); + *os << "::" << node->name (); return 0; } @@ -283,12 +283,12 @@ be_visitor_sequence_base_template_args::visit_predefined_type ( ) { TAO_OutStream *os = this->ctx_->stream (); - *os << node->name (); + *os << "::" << node->name (); if (beseq_->managed_type () == be_sequence::MNG_PSEUDO || beseq_->managed_type () == be_sequence::MNG_OBJREF) { - *os << "," << node->name () << "_var"; + *os << ", ::" << node->name () << "_var"; } return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp index 71e91b040c0..cc10b86b3bb 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp @@ -140,7 +140,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) if (node->unbounded ()) { *os << be_nl - << node->local_name () << " (CORBA::ULong max);"; + << node->local_name () << " ( ::CORBA::ULong max);"; } *os << be_nl @@ -149,11 +149,11 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) if (node->unbounded ()) { *os << be_nl - << "CORBA::ULong max,"; + << "::CORBA::ULong max,"; } *os << be_nl - << "CORBA::ULong length," << be_nl; + << "::CORBA::ULong length," << be_nl; // Generate the base type for the buffer. be_visitor_context ctx (*this->ctx_); @@ -170,7 +170,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) } *os << "* buffer, " << be_nl - << "CORBA::Boolean release = 0" << be_uidt_nl + << "::CORBA::Boolean release = 0" << be_uidt_nl << ");" << be_uidt_nl; *os << node->local_name () << " (const " << node->local_name () << " &);" << be_nl; @@ -217,10 +217,10 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) { *os << "\n\n#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)" << be_nl << node->local_name () << " (" << be_idt << be_idt_nl - << "CORBA::ULong length," << be_nl + << "::CORBA::ULong length," << be_nl << "const ACE_Message_Block* mb" << be_uidt_nl << ")" << be_uidt_nl - << " : TAO_Unbounded_Sequence<CORBA::Octet>" + << " : TAO_Unbounded_Sequence< ::CORBA::Octet>" << " (length, mb) {}" << "\n" << "#endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */"; } diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp index 0cd0db25ae1..63782abb8d7 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp @@ -77,7 +77,7 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node) *os << be_nl << be_nl << node->name () << "::" << node->local_name () << " (" << be_idt << be_idt_nl - << "CORBA::ULong max" << be_uidt_nl + << "::CORBA::ULong max" << be_uidt_nl << ")" << be_nl << ": " << be_idt; @@ -104,10 +104,10 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node) if (node->unbounded ()) { // Unbounded seq takes this extra parameter. - *os << "CORBA::ULong max," << be_nl; + *os << "::CORBA::ULong max," << be_nl; } - *os << "CORBA::ULong length," << be_nl; + *os << "::CORBA::ULong length," << be_nl; // generate the base type for the buffer be_visitor_context ctx (*this->ctx_); @@ -123,7 +123,7 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node) } *os << " * buffer," << be_nl - << "CORBA::Boolean release" << be_uidt_nl + << "::CORBA::Boolean release" << be_uidt_nl << ")" << be_uidt_nl << " : " << be_idt << be_idt; diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_ch.cpp index 52dd795af45..cc9216fa8fb 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_ch.cpp @@ -82,7 +82,7 @@ be_visitor_sequence_serializer_op_ch::visit_sequence (be_sequence *node) *os << be_nl << be_nl; *os << be_global->stub_export_macro () - << " CORBA::Boolean _tao_is_bounded_size (" << be_idt << be_idt_nl + << " ::CORBA::Boolean _tao_is_bounded_size (" << be_idt << be_idt_nl << "const " << node->name () << " &" << be_uidt_nl << ");" << be_uidt_nl; *os << be_global->stub_export_macro () @@ -95,12 +95,12 @@ be_visitor_sequence_serializer_op_ch::visit_sequence (be_sequence *node) << ");" << be_uidt_nl; *os << be_nl << be_nl - << be_global->stub_export_macro () << " CORBA::Boolean" + << be_global->stub_export_macro () << " ::CORBA::Boolean" << " operator<< (" << be_idt << be_idt_nl << "TAO::DCPS::Serializer &," << be_nl << "const " << node->name () << " &" << be_uidt_nl << ");" << be_uidt_nl; - *os << be_global->stub_export_macro () << " CORBA::Boolean" + *os << be_global->stub_export_macro () << " ::CORBA::Boolean" << " operator>> (" << be_idt << be_idt_nl << "TAO::DCPS::Serializer &," << be_nl << node->name () << " &" << be_uidt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp index 0444ac022d0..9315abf7321 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp @@ -103,7 +103,7 @@ be_visitor_sequence_serializer_op_cs::visit_sequence (be_sequence *node) // --- _tao_is_bounded_size --- this->ctx_->sub_state (TAO_CodeGen::TAO_IS_BOUNDED_SIZE); - *os << "CORBA::Boolean _tao_is_bounded_size (" << be_idt << be_idt_nl + *os << "::CORBA::Boolean _tao_is_bounded_size (" << be_idt << be_idt_nl << "const " << node->name () << " &_tao_sequence" << be_uidt_nl << ")" << be_uidt_nl @@ -191,7 +191,7 @@ be_visitor_sequence_serializer_op_cs::visit_sequence (be_sequence *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::DCPS::Serializer &strm," << be_nl << "const " << node->name () << " &_tao_sequence" << be_uidt_nl @@ -199,7 +199,7 @@ be_visitor_sequence_serializer_op_cs::visit_sequence (be_sequence *node) << "{" << be_idt_nl; // First encode the sequence length. - *os << "const CORBA::ULong _tao_seq_len = _tao_sequence.length ();" + *os << "const ::CORBA::ULong _tao_seq_len = _tao_sequence.length ();" << be_nl << be_nl; *os << "if (strm << _tao_seq_len)" << be_idt_nl << "{" << be_idt_nl; @@ -233,7 +233,7 @@ be_visitor_sequence_serializer_op_cs::visit_sequence (be_sequence *node) // Set the sub state 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::DCPS::Serializer &"; if (! bt->is_local ()) @@ -256,7 +256,7 @@ be_visitor_sequence_serializer_op_cs::visit_sequence (be_sequence *node) if (! bt->is_local ()) { // First retrieve the length and adjust the sequence length accordingly. - *os << "CORBA::ULong _tao_seq_len;" << be_nl << be_nl; + *os << "::CORBA::ULong _tao_seq_len;" << be_nl << be_nl; *os << "if (strm >> _tao_seq_len)" << be_idt_nl << "{" << be_idt_nl; @@ -933,7 +933,7 @@ switch (this->ctx_->sub_state ()) { *os << "//iterate over the sequence to find the current size" << be_nl << "size_t the_length = _dcps_max_marshaled_size_ulong ();" << be_nl - << "for (CORBA::ULong i = 0; i < _tao_sequence.length(); " + << "for ( ::CORBA::ULong i = 0; i < _tao_sequence.length(); " << "++i)" << be_idt_nl << "{" << be_idt_nl; @@ -1011,12 +1011,12 @@ switch (this->ctx_->sub_state ()) case TAO_CodeGen::TAO_CDR_OUTPUT: { // Initialize a boolean variable. - *os << "CORBA::Boolean _tao_marshal_flag = 1;" << be_nl << be_nl; + *os << "::CORBA::Boolean _tao_marshal_flag = 1;" << be_nl << be_nl; if (expr->ev ()->et == AST_Expression::EV_ulong) { - *os << "for (CORBA::ULong i = 0; i < _tao_seq_len" + *os << "for ( ::CORBA::ULong i = 0; i < _tao_seq_len" << " && _tao_marshal_flag; " << "++i)" << be_idt_nl << "{" << be_idt_nl; @@ -1110,12 +1110,12 @@ switch (this->ctx_->sub_state ()) if (str->width () == (long) sizeof (char)) { *os << "_tao_marshal_flag = (strm >> " - << "CORBA::Any::to_string (_tao_sequence[i].out (), "; + << "::CORBA::Any::to_string (_tao_sequence[i].out (), "; } else { *os << "_tao_marshal_flag = (strm >> " - << "CORBA::Any::to_wstring (_tao_sequence[i].out (), "; + << "::CORBA::Any::to_wstring (_tao_sequence[i].out (), "; } *os << str->max_size ()->ev ()->u.ulval << "));" @@ -1157,22 +1157,22 @@ switch (this->ctx_->sub_state ()) break; case AST_PredefinedType::PT_char: *os << "_tao_marshal_flag =" << be_idt_nl - << "(strm >> CORBA::Any::to_char (_tao_sequence[i]));" + << "(strm >> ::CORBA::Any::to_char (_tao_sequence[i]));" << be_uidt; break; case AST_PredefinedType::PT_wchar: *os << "_tao_marshal_flag =" << be_idt_nl - << "(strm >> CORBA::Any::to_wchar (_tao_sequence[i]));" + << "(strm >> ::CORBA::Any::to_wchar (_tao_sequence[i]));" << be_uidt; break; case AST_PredefinedType::PT_boolean: *os << "_tao_marshal_flag =" << be_idt_nl - << "(strm >> CORBA::Any::to_boolean (_tao_sequence[i]));" + << "(strm >> ::CORBA::Any::to_boolean (_tao_sequence[i]));" << be_uidt; break; case AST_PredefinedType::PT_octet: *os << "_tao_marshal_flag =" << be_idt_nl - << "(strm >> CORBA::Any::to_octet (_tao_sequence[i]));" + << "(strm >> ::CORBA::Any::to_octet (_tao_sequence[i]));" << be_uidt; break; default: @@ -1271,22 +1271,22 @@ switch (this->ctx_->sub_state ()) break; case AST_PredefinedType::PT_char: *os << "_tao_marshal_flag =" << be_idt_nl - << "(strm << CORBA::Any::from_char (_tao_sequence[i]));" + << "(strm << ::CORBA::Any::from_char (_tao_sequence[i]));" << be_uidt; break; case AST_PredefinedType::PT_wchar: *os << "_tao_marshal_flag =" << be_idt_nl - << "(strm << CORBA::Any::from_wchar (_tao_sequence[i]));" + << "(strm << ::CORBA::Any::from_wchar (_tao_sequence[i]));" << be_uidt; break; case AST_PredefinedType::PT_boolean: *os << "_tao_marshal_flag =" << be_idt_nl - << "(strm << CORBA::Any::from_boolean (_tao_sequence[i]));" + << "(strm << ::CORBA::Any::from_boolean (_tao_sequence[i]));" << be_uidt; break; case AST_PredefinedType::PT_octet: *os << "_tao_marshal_flag =" << be_idt_nl - << "(strm << CORBA::Any::from_octet (_tao_sequence[i]));" + << "(strm << ::CORBA::Any::from_octet (_tao_sequence[i]));" << be_uidt; break; default: diff --git a/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp index 71fb70136b9..8d1e3462785 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp @@ -52,16 +52,16 @@ be_visitor_structure_any_op_ch::visit_structure (be_structure *node) << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; *os << 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_structure/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp index 86cf886ca09..cf4356a4806 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp @@ -65,7 +65,7 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *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 @@ -74,7 +74,7 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *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 @@ -86,7 +86,7 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node) // Copying insertion. *os << "// 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 @@ -102,7 +102,7 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node) // Non-copying insertion. *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 @@ -117,8 +117,8 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node) // Extraction to non-const pointer (deprecated, just calls the other). *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 @@ -130,8 +130,8 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node) // Extraction to const pointer. *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_structure/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp index 3aca186bbb9..f29f1e5a5fd 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp @@ -53,10 +53,10 @@ be_visitor_structure_cdr_op_ch::visit_structure (be_structure *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; - *os << be_global->stub_export_macro () << " CORBA::Boolean" + *os << 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_structure/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp index dbbdab9dfd6..73841a9b18e 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp @@ -63,7 +63,7 @@ be_visitor_structure_cdr_op_cs::visit_structure (be_structure *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->name () << " &_tao_aggregate" << be_uidt_nl << ")" << be_uidt_nl @@ -90,7 +90,7 @@ be_visitor_structure_cdr_op_cs::visit_structure (be_structure *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->is_local ()) diff --git a/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_ch.cpp index cda64a00df6..7b5b502332b 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_ch.cpp @@ -59,7 +59,7 @@ be_visitor_structure_serializer_op_ch::visit_structure (be_structure *node) if (0 != (info = idl_global->is_dcps_type(node->name()))) { *os << be_global->stub_export_macro () - << " CORBA::Boolean _dcps_has_key(const " + << " ::CORBA::Boolean _dcps_has_key(const " << node->name() << "& val);" << be_nl; *os << "// This structure supports use of std::map with a key" << be_nl @@ -107,17 +107,17 @@ be_visitor_structure_serializer_op_ch::visit_structure (be_structure *node) << node->name() << "& _tao_aggregate);" << be_nl; //- _tao_is_bounded_size(type) method *os << be_global->stub_export_macro () - << " CORBA::Boolean _tao_is_bounded_size (const " + << " ::CORBA::Boolean _tao_is_bounded_size (const " << node->name() << "& _tao_aggregate);" << be_nl; //- _dcps_find_size(type) method *os << be_global->stub_export_macro () << " size_t _dcps_find_size (const " << node->name() << "& _tao_aggregate);" << be_nl; - *os << be_global->stub_export_macro () << " CORBA::Boolean" + *os << be_global->stub_export_macro () << " ::CORBA::Boolean" << " operator<< (TAO::DCPS::Serializer &, const " << node->name () << " &);" << be_nl; - *os << be_global->stub_export_macro () << " CORBA::Boolean" + *os << be_global->stub_export_macro () << " ::CORBA::Boolean" << " operator>> (TAO::DCPS::Serializer &, " << node->name () << " &);"; diff --git a/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_cs.cpp index 2b01e0f2b33..4083ce2c89c 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_cs.cpp @@ -63,7 +63,7 @@ be_visitor_structure_serializer_op_cs::visit_structure (be_structure *node) IDL_GlobalData::DCPS_Data_Type_Info* info; if (0 != (info = idl_global->is_dcps_type(node->name()))) { - *os << "CORBA::Boolean _dcps_has_key(const " + *os << "::CORBA::Boolean _dcps_has_key (const " << node->name() << "& ) { " << be_idt_nl; if (info->key_list_.is_empty()) *os << "return false;"; @@ -75,10 +75,10 @@ be_visitor_structure_serializer_op_cs::visit_structure (be_structure *node) //- _dcps_max_marshaled_size(type) method this->ctx_->sub_state (TAO_CodeGen::TAO_MAX_MARSHALED_SIZE); *os << "size_t " - << "_dcps_max_marshaled_size(const " + << "_dcps_max_marshaled_size (const " << node->name() << "& _tao_aggregate)" << be_nl << "{" << be_idt_nl - << "ACE_UNUSED_ARG(_tao_aggregate);" + << "ACE_UNUSED_ARG (_tao_aggregate);" << " // sometimes not used - avoid warning" << be_nl; { @@ -109,7 +109,7 @@ be_visitor_structure_serializer_op_cs::visit_structure (be_structure *node) //- _tao_is_bounded_size(type) method this->ctx_->sub_state (TAO_CodeGen::TAO_IS_BOUNDED_SIZE); - *os << "CORBA::Boolean _tao_is_bounded_size(const " + *os << "::CORBA::Boolean _tao_is_bounded_size (const " << node->name() << "& _tao_aggregate)" << be_nl << "{" << be_idt_nl; @@ -118,7 +118,7 @@ be_visitor_structure_serializer_op_cs::visit_structure (be_structure *node) be_visitor_serializer_op_field_decl field_decl (&new_ctx); field_decl.visit_scope (node); - *os << "ACE_UNUSED_ARG(_tao_aggregate);" + *os << "ACE_UNUSED_ARG (_tao_aggregate);" << " // often not used - avoid warning" << be_nl << "return" << be_idt_nl; @@ -172,7 +172,7 @@ be_visitor_structure_serializer_op_cs::visit_structure (be_structure *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::DCPS::Serializer &strm," << be_nl << "const " << node->name () << " &_tao_aggregate" << be_uidt_nl << ")" << be_uidt_nl @@ -199,7 +199,7 @@ be_visitor_structure_serializer_op_cs::visit_structure (be_structure *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::DCPS::Serializer &"; if (! node->is_local ()) diff --git a/TAO/TAO_IDL/be/be_visitor_traits.cpp b/TAO/TAO_IDL/be/be_visitor_traits.cpp index e392c50c23d..2b36f4e51b5 100644 --- a/TAO/TAO_IDL/be/be_visitor_traits.cpp +++ b/TAO/TAO_IDL/be/be_visitor_traits.cpp @@ -124,7 +124,7 @@ be_visitor_traits::visit_interface (be_interface *node) << "::" << node->name () << "_ptr" << be_uidt_nl << ");" << be_uidt_nl << "static ::" << node->name () << "_ptr nil (void);" << be_nl - << "static CORBA::Boolean marshal (" << be_idt << be_idt_nl + << "static ::CORBA::Boolean marshal (" << be_idt << be_idt_nl << "::" << node->name () << "_ptr p," << be_nl << "TAO_OutputCDR & cdr" << be_uidt_nl << ");" << be_uidt << be_uidt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp index bc505b8b116..db1c9b60fc7 100644 --- a/TAO/TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp @@ -67,11 +67,11 @@ TAO::be_visitor_alias_typecode::common (be_type * node, // Generate the alias TypeCode instantiation. os << "static TAO::TypeCode::Alias<char const *," << be_nl - << " CORBA::TypeCode_ptr const *," << be_nl + << " ::CORBA::TypeCode_ptr const *," << be_nl << " TAO::Null_RefCount_Policy>" << be_idt_nl << "_tao_tc_" << node->flat_name () << " (" << be_idt_nl - << "CORBA::" << tctype << "," << be_nl + << "::CORBA::" << tctype << "," << be_nl << "\"" << node->repoID () << "\"," << be_nl << "\"" << node->original_local_name () << "\"," << be_nl << "&"; diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/objref_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/objref_typecode.cpp index 8d26f892454..968eb016f21 100644 --- a/TAO/TAO_IDL/be/be_visitor_typecode/objref_typecode.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typecode/objref_typecode.cpp @@ -81,7 +81,7 @@ TAO::be_visitor_objref_typecode::visit_i (char const * kind, << " TAO::Null_RefCount_Policy>" << be_idt_nl << "_tao_tc_" << flat_name << " (" << be_idt_nl - << "CORBA::tk_" << kind << "," << be_nl + << "::CORBA::tk_" << kind << "," << be_nl << "\"" << repository_id << "\"," << be_nl << "\"" << original_local_name << "\");" << be_uidt_nl << be_uidt_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp index 5e5d47656a7..88aed752e98 100644 --- a/TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp @@ -98,7 +98,7 @@ TAO::be_visitor_struct_typecode::visit (AST_Structure * node, + node->flat_name ()); // Generate array containing struct field characteristics. - os << "static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const "; + os << "static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const "; if (node->nfields () == 0) { @@ -119,10 +119,10 @@ TAO::be_visitor_struct_typecode::visit (AST_Structure * node, } static char const StringType[] = "char const *"; - static char const TypeCodeType[] = "CORBA::TypeCode_ptr const *"; + static char const TypeCodeType[] = "::CORBA::TypeCode_ptr const *"; static char const MemberArrayType[] = "TAO::TypeCode::Struct_Field<char const *, " - "CORBA::TypeCode_ptr const *> const *"; + "::CORBA::TypeCode_ptr const *> const *"; // Generate the TypeCode instantiation. os << "static "; @@ -149,7 +149,7 @@ TAO::be_visitor_struct_typecode::visit (AST_Structure * node, os << be_idt_nl << "_tao_tc_" << node->flat_name () << " (" << be_idt_nl - << "CORBA::tk_" << (is_exception ? "except" : "struct") << "," + << "::CORBA::tk_" << (is_exception ? "except" : "struct") << "," << be_nl << "\"" << node->repoID () << "\"," << be_nl << "\"" << node->original_local_name () << "\"," << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp index 667a7dace1d..ca73351bdf9 100644 --- a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp @@ -656,7 +656,7 @@ be_visitor_typecode_defn::visit_array (be_array *node) unsigned long const ndims = node->n_dims (); for (unsigned long i = 0; i < ndims; ++i) { - os << "TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *," << be_nl + os << "TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *," << be_nl << " TAO::Null_RefCount_Policy>" << be_idt_nl << node->flat_name (); @@ -670,7 +670,7 @@ be_visitor_typecode_defn::visit_array (be_array *node) } os << " (" << be_idt_nl - << "CORBA::tk_array," << be_nl + << "::CORBA::tk_array," << be_nl << "&"; if (i == 0) @@ -971,10 +971,9 @@ be_visitor_typecode_defn::visit_sequence (be_sequence * node) << " TAO::Null_RefCount_Policy>" << be_idt_nl << node->flat_name () << "_" << node->max_size()->ev ()->u.ulval -// << node->tc_name () << " (" << be_idt_nl - << "CORBA::tk_sequence," << be_nl + << "::CORBA::tk_sequence," << be_nl << "&"; if (this->gen_base_typecode_name (base) != 0) @@ -1041,7 +1040,7 @@ be_visitor_typecode_defn::visit_string (be_string * node) << "TAO::TypeCode::String<TAO::Null_RefCount_Policy>" << be_idt_nl << node->flat_name () << " (" << be_idt_nl - << "CORBA::tk_" << (node->width () == 1 ? "string" : "wstring") << "," + << "::CORBA::tk_" << (node->width () == 1 ? "string" : "wstring") << "," << be_nl << node->max_size () << ");" << be_uidt_nl << be_uidt_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/union_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/union_typecode.cpp index e88b26e6f8b..c7f8d416fb8 100644 --- a/TAO/TAO_IDL/be/be_visitor_typecode/union_typecode.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typecode/union_typecode.cpp @@ -74,10 +74,10 @@ TAO::be_visitor_union_typecode::visit_union (be_union * node) return -1; static char const StringType[] = "char const *"; - static char const TypeCodeType[] = "CORBA::TypeCode_ptr const *"; + static char const TypeCodeType[] = "::CORBA::TypeCode_ptr const *"; static char const MemberArrayType[] = "TAO::TypeCode::Case<char const *, " - "CORBA::TypeCode_ptr const *> const * const *"; + "::CORBA::TypeCode_ptr const *> const * const *"; // Generate the TypeCode instantiation. os << "static "; @@ -169,7 +169,7 @@ TAO::be_visitor_union_typecode::visit_cases (be_union * node) os << "static TAO::TypeCode::Case_T<" << discriminant_type->full_name () << ", " - << "char const *, CORBA::TypeCode_ptr const *> const " + << "char const *, ::CORBA::TypeCode_ptr const *> const " << fields_name.c_str () << "_" << i <<" ("; if (branch->label ()->label_kind () == AST_UnionLabel::UL_label) @@ -198,7 +198,7 @@ TAO::be_visitor_union_typecode::visit_cases (be_union * node) // Now generate the TAO::TypeCode::Case array. os << be_nl - << "static TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const " + << "static TAO::TypeCode::Case<char const *, ::CORBA::TypeCode_ptr const *> const * const " << fields_name.c_str () << "[] =" << be_idt_nl << "{" << be_idt_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp index c1d18586cad..c5675ad88c1 100644 --- a/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp @@ -110,7 +110,7 @@ TAO::be_visitor_value_typecode::visit_valuetype (be_valuetype * node) + node->flat_name ()); // Generate array containing value field characteristics. - os << "static TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const "; + os << "static TAO::TypeCode::Value_Field<char const *, ::CORBA::TypeCode_ptr const *> const "; if (count == 0) { @@ -131,10 +131,10 @@ TAO::be_visitor_value_typecode::visit_valuetype (be_valuetype * node) // Generate the TypeCode instantiation. static char const StringType[] = "char const *"; - static char const TypeCodeType[] = "CORBA::TypeCode_ptr const *"; + static char const TypeCodeType[] = "::CORBA::TypeCode_ptr const *"; static char const MemberArrayType[] = "TAO::TypeCode::Value_Field<char const *, " - "CORBA::TypeCode_ptr const *> const *"; + "::CORBA::TypeCode_ptr const *> const *"; os << "static "; @@ -159,7 +159,7 @@ TAO::be_visitor_value_typecode::visit_valuetype (be_valuetype * node) os << be_idt_nl << "_tao_tc_" << node->flat_name () << " (" << be_idt_nl - << "CORBA::tk_" + << "::CORBA::tk_" << (dynamic_cast<be_eventtype *> (node) ? "event" : "value") << "," << be_nl << "\"" << node->repoID () << "\"," << be_nl @@ -169,7 +169,7 @@ TAO::be_visitor_value_typecode::visit_valuetype (be_valuetype * node) // // TAO doesn't support CUSTOM or TRUNCATABLE valuetypes. Go // with VM_NONE or VM_ABSTRACT. - os << "CORBA::" + os << "::CORBA::" << (node->is_abstract () ? "VM_ABSTRACT" : "VM_NONE") << "," << be_nl; // Concrete base type. @@ -188,7 +188,7 @@ TAO::be_visitor_value_typecode::visit_valuetype (be_valuetype * node) else { // No concrete base. - os << "&CORBA::_tc_null," << be_nl; + os << "&::CORBA::_tc_null," << be_nl; } // Fields @@ -289,11 +289,11 @@ TAO::be_visitor_value_typecode::visit_members (be_valuetype * node) switch (vis) { case AST_Field::vis_PUBLIC: - os << "CORBA::PUBLIC_MEMBER"; + os << "::CORBA::PUBLIC_MEMBER"; break; case AST_Field::vis_PRIVATE: - os << "CORBA::PRIVATE_MEMBER"; + os << "::CORBA::PRIVATE_MEMBER"; break; default: diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp index 0bffbb06837..352deb05e42 100644 --- a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp @@ -417,19 +417,19 @@ be_visitor_typedef_ch::visit_string (be_string *node) *os << "typedef char *" << " " << tdef->nested_type_name (scope) << ";" << be_nl; // Typedef the _var and _out types. - *os << "typedef CORBA::String_var" + *os << "typedef ::CORBA::String_var" << " " << tdef->nested_type_name (scope, "_var") << ";" << be_nl; - *os << "typedef CORBA::String_out" + *os << "typedef ::CORBA::String_out" << " " << tdef->nested_type_name (scope, "_out") << ";"; } else { - *os << "typedef CORBA::WChar *" + *os << "typedef ::CORBA::WChar *" << " " << tdef->nested_type_name (scope) << ";" << be_nl; // Typedef the _var and _out types. - *os << "typedef CORBA::WString_var" + *os << "typedef ::CORBA::WString_var" << " " << tdef->nested_type_name (scope, "_var") << ";" << be_nl; - *os << "typedef CORBA::WString_out" + *os << "typedef ::CORBA::WString_out" << " " << tdef->nested_type_name (scope, "_out") << ";"; } diff --git a/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp index 2f4286b1328..8031b017d40 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp @@ -52,16 +52,16 @@ be_visitor_union_any_op_ch::visit_union (be_union *node) << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; *os << 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 () << " *&);"; if (this->visit_scope (node) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp index af7d89570d7..3e16d48b1c7 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp @@ -65,7 +65,7 @@ be_visitor_union_any_op_cs::visit_union (be_union *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 @@ -74,7 +74,7 @@ be_visitor_union_any_op_cs::visit_union (be_union *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 @@ -86,7 +86,7 @@ be_visitor_union_any_op_cs::visit_union (be_union *node) // Copying insertion. *os << "// 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 @@ -102,7 +102,7 @@ be_visitor_union_any_op_cs::visit_union (be_union *node) // Non-copying insertion. *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 @@ -117,8 +117,8 @@ be_visitor_union_any_op_cs::visit_union (be_union *node) // Extraction to non-const pointer (deprecated, just calls the other). *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 @@ -130,8 +130,8 @@ be_visitor_union_any_op_cs::visit_union (be_union *node) // Extraction to const pointer. *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_union/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp index bd4683ea50a..c65afad6779 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp @@ -53,10 +53,10 @@ be_visitor_union_cdr_op_ch::visit_union (be_union *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; - *os << be_global->stub_export_macro () << " CORBA::Boolean" + *os << 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_union/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp index f340e1ce35b..d7eddab04c5 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp @@ -69,7 +69,7 @@ be_visitor_union_cdr_op_cs::visit_union (be_union *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->name () << " &_tao_union" << be_uidt_nl << ")" << be_uidt_nl @@ -78,17 +78,17 @@ be_visitor_union_cdr_op_cs::visit_union (be_union *node) switch (node->udisc_type ()) { case AST_Expression::EV_bool: - *os << "CORBA::Any::from_boolean tmp (_tao_union._d ());" << be_nl + *os << "::CORBA::Any::from_boolean tmp (_tao_union._d ());" << be_nl << "if ( !(strm << tmp) )" << be_idt_nl; break; case AST_Expression::EV_char: - *os << "CORBA::Any::from_char tmp (_tao_union._d ());" << be_nl + *os << "::CORBA::Any::from_char tmp (_tao_union._d ());" << be_nl << "if ( !(strm << tmp) )" << be_idt_nl; break; case AST_Expression::EV_wchar: - *os << "CORBA::Any::from_wchar tmp (_tao_union._d ());" << be_nl + *os << "::CORBA::Any::from_wchar tmp (_tao_union._d ());" << be_nl << "if ( !(strm << tmp) )" << be_idt_nl; break; @@ -101,7 +101,7 @@ be_visitor_union_cdr_op_cs::visit_union (be_union *node) *os << "{" << be_idt_nl << "return false;" << be_uidt_nl << "}" << be_uidt_nl << be_nl - << "CORBA::Boolean result = true;" << be_nl << be_nl + << "::CORBA::Boolean result = true;" << be_nl << be_nl << "switch (_tao_union._d ())" << be_nl << "{" << be_idt; @@ -132,7 +132,7 @@ be_visitor_union_cdr_op_cs::visit_union (be_union *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->name () << " &_tao_union" << be_uidt_nl << ")" << be_uidt_nl @@ -148,17 +148,17 @@ be_visitor_union_cdr_op_cs::visit_union (be_union *node) switch (node->udisc_type ()) { case AST_Expression::EV_bool: - *os << "CORBA::Any::to_boolean tmp (_tao_discriminant);" << be_nl + *os << "::CORBA::Any::to_boolean tmp (_tao_discriminant);" << be_nl << "if ( !(strm >> tmp) )" << be_idt_nl; break; case AST_Expression::EV_char: - *os << "CORBA::Any::to_char tmp (_tao_discriminant);" << be_nl + *os << "::CORBA::Any::to_char tmp (_tao_discriminant);" << be_nl << "if ( !(strm >> tmp) )" << be_idt_nl; break; case AST_Expression::EV_wchar: - *os << "CORBA::Any::to_wchar tmp (_tao_discriminant);" << be_nl + *os << "::CORBA::Any::to_wchar tmp (_tao_discriminant);" << be_nl << "if ( !(strm >> tmp) )" << be_idt_nl; break; @@ -171,7 +171,7 @@ be_visitor_union_cdr_op_cs::visit_union (be_union *node) *os << "{" << be_idt_nl << "return false;" << be_uidt_nl << "}" << be_uidt_nl << be_nl - << "CORBA::Boolean result = true;" << be_nl << be_nl + << "::CORBA::Boolean result = true;" << be_nl << be_nl << "switch (_tao_discriminant)" << be_nl << "{" << be_idt; diff --git a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp index 43fe93d8b0d..124845ab053 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp @@ -115,9 +115,9 @@ be_visitor_union_discriminant_ch::visit_predefined_type (be_predefined_type // The set method. *os << be_nl << be_nl - << "void _d (" << bt->nested_type_name (bu) << ");" << be_nl; + << "void _d ( ::" << bt->nested_type_name (bu) << ");" << be_nl; // The get method. - *os << bt->nested_type_name (bu) << " _d (void) const;"; + *os << "::" << bt->nested_type_name (bu) << " _d (void) const;"; return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp index dbdc57ed3d1..e9873b90439 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp @@ -222,7 +222,7 @@ be_visitor_union_discriminant_ci::visit_predefined_type ( << "// Accessor to set the discriminant." << be_nl << "ACE_INLINE" << be_nl << "void" << be_nl - << bu->name () << "::_d (" << bt->name () + << bu->name () << "::_d ( ::" << bt->name () << " discval)" << be_nl << "{" << be_idt_nl << "this->disc_ = discval;" << be_uidt_nl @@ -231,7 +231,7 @@ be_visitor_union_discriminant_ci::visit_predefined_type ( // The get method. *os << "// Accessor to get the discriminant." << be_nl << "ACE_INLINE" << be_nl - << bt->name () << be_nl + << "::" << bt->name () << be_nl << bu->name () << "::_d (void) const" << be_nl << "{" << be_idt_nl << "return this->disc_;" << be_uidt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_union/serializer_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/serializer_op_ch.cpp index aaf7e19ae48..4fcef2945ff 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/serializer_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/serializer_op_ch.cpp @@ -59,7 +59,7 @@ be_visitor_union_serializer_op_ch::visit_union (be_union *node) << node->name() << "& _tao_union);" << be_nl; //- _tao_is_bounded_size(type) method *os << be_global->stub_export_macro () - << " CORBA::Boolean _tao_is_bounded_size (const " + << " ::CORBA::Boolean _tao_is_bounded_size (const " << node->name() << "& _tao_union);" << be_nl; //- _dcps_find_size(type) method *os << be_global->stub_export_macro () @@ -67,10 +67,10 @@ be_visitor_union_serializer_op_ch::visit_union (be_union *node) << node->name() << "& _tao_union);" << be_nl; - *os << be_global->stub_export_macro () << " CORBA::Boolean" + *os << be_global->stub_export_macro () << " ::CORBA::Boolean" << " operator<< (TAO::DCPS::Serializer &, const " << node->name () << " &);" << be_nl; - *os << be_global->stub_export_macro () << " CORBA::Boolean" + *os << be_global->stub_export_macro () << " ::CORBA::Boolean" << " operator>> (TAO::DCPS::Serializer &, " << node->name () << " &);"; diff --git a/TAO/TAO_IDL/be/be_visitor_union/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/serializer_op_cs.cpp index 6fd6c316b41..6d619d9e9d0 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/serializer_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/serializer_op_cs.cpp @@ -126,7 +126,7 @@ be_visitor_union_serializer_op_cs::visit_union (be_union *node) //--------------------------------------------------------------- // Set the sub state as generating code for _tao_is_bounded_size. this->ctx_->sub_state(TAO_CodeGen::TAO_IS_BOUNDED_SIZE); - *os << "CORBA::Boolean _tao_is_bounded_size (" << be_idt << be_idt_nl + *os << "::CORBA::Boolean _tao_is_bounded_size (" << be_idt << be_idt_nl << "const " << node->name () << " &" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl @@ -173,13 +173,13 @@ be_visitor_union_serializer_op_cs::visit_union (be_union *node) switch (node->udisc_type ()) { case AST_Expression::EV_bool: - *os << "_dcps_max_marshaled_size (CORBA::Any::from_boolean (_tao_union._d ()));" << be_nl; + *os << "_dcps_max_marshaled_size ( ::CORBA::Any::from_boolean (_tao_union._d ()));" << be_nl; break; case AST_Expression::EV_char: - *os << "_dcps_max_marshaled_size (CORBA::Any::from_char (_tao_union._d ()));" << be_nl; + *os << "_dcps_max_marshaled_size ( ::CORBA::Any::from_char (_tao_union._d ()));" << be_nl; break; case AST_Expression::EV_wchar: - *os << "_dcps_max_marshaled_size (CORBA::Any::from_wchar (_tao_union._d ()));" << be_nl; + *os << "_dcps_max_marshaled_size ( ::CORBA::Any::from_wchar (_tao_union._d ()));" << be_nl; break; default: *os << "_dcps_max_marshaled_size (_tao_union._d ());" << be_nl; @@ -219,7 +219,7 @@ be_visitor_union_serializer_op_cs::visit_union (be_union *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::DCPS::Serializer &strm," << be_nl << "const " << node->name () << " &_tao_union" << be_uidt_nl << ")" << be_uidt_nl @@ -228,17 +228,17 @@ be_visitor_union_serializer_op_cs::visit_union (be_union *node) switch (node->udisc_type ()) { case AST_Expression::EV_bool: - *os << "CORBA::Any::from_boolean tmp (_tao_union._d ());" << be_nl + *os << "::CORBA::Any::from_boolean tmp (_tao_union._d ());" << be_nl << "if ( !(strm << tmp) )" << be_idt_nl; break; case AST_Expression::EV_char: - *os << "CORBA::Any::from_char tmp (_tao_union._d ());" << be_nl + *os << "::CORBA::Any::from_char tmp (_tao_union._d ());" << be_nl << "if ( !(strm << tmp) )" << be_idt_nl; break; case AST_Expression::EV_wchar: - *os << "CORBA::Any::from_wchar tmp (_tao_union._d ());" << be_nl + *os << "::CORBA::Any::from_wchar tmp (_tao_union._d ());" << be_nl << "if ( !(strm << tmp) )" << be_idt_nl; break; @@ -251,7 +251,7 @@ be_visitor_union_serializer_op_cs::visit_union (be_union *node) *os << "{" << be_idt_nl << "return 0;" << be_uidt_nl << "}" << be_uidt_nl << be_nl - << "CORBA::Boolean result = 1;" << be_nl << be_nl + << "::CORBA::Boolean result = 1;" << be_nl << be_nl << "switch (_tao_union._d ())" << be_nl << "{" << be_idt; @@ -283,7 +283,7 @@ be_visitor_union_serializer_op_cs::visit_union (be_union *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::DCPS::Serializer &strm," << be_nl << node->name () << " &_tao_union" << be_uidt_nl << ")" << be_uidt_nl @@ -299,17 +299,17 @@ be_visitor_union_serializer_op_cs::visit_union (be_union *node) switch (node->udisc_type ()) { case AST_Expression::EV_bool: - *os << "CORBA::Any::to_boolean tmp (_tao_discriminant);" << be_nl + *os << "::CORBA::Any::to_boolean tmp (_tao_discriminant);" << be_nl << "if ( !(strm >> tmp) )" << be_idt_nl; break; case AST_Expression::EV_char: - *os << "CORBA::Any::to_char tmp (_tao_discriminant);" << be_nl + *os << "::CORBA::Any::to_char tmp (_tao_discriminant);" << be_nl << "if ( !(strm >> tmp) )" << be_idt_nl; break; case AST_Expression::EV_wchar: - *os << "CORBA::Any::to_wchar tmp (_tao_discriminant);" << be_nl + *os << "::CORBA::Any::to_wchar tmp (_tao_discriminant);" << be_nl << "if ( !(strm >> tmp) )" << be_idt_nl; break; @@ -322,7 +322,7 @@ be_visitor_union_serializer_op_cs::visit_union (be_union *node) *os << "{" << be_idt_nl << "return 0;" << be_uidt_nl << "}" << be_uidt_nl << be_nl - << "CORBA::Boolean result = 1;" << be_nl << be_nl + << "::CORBA::Boolean result = 1;" << be_nl << be_nl << "switch (_tao_discriminant)" << be_nl << "{" << be_idt; diff --git a/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp index 6de94a7ddcb..331ef16974f 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp @@ -182,7 +182,7 @@ int be_visitor_union_ch::visit_union (be_union *node) *os << be_nl << be_nl << "// TAO extension - frees any allocated storage." << be_nl; *os << "void _reset (" << bt->nested_type_name (node) - << ", CORBA::Boolean /* finalize */);"; + << ", ::CORBA::Boolean /* finalize */);"; *os << be_uidt_nl << "};"; diff --git a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp index fa072653473..db15ce18116 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp @@ -252,7 +252,7 @@ int be_visitor_union_cs::visit_union (be_union *node) os->indent (); *os << "// Reset method to reset old values of a union." << be_nl; *os << "void " << node->name () << "::_reset (" << bt->name () - << ", CORBA::Boolean /*finalize*/)" << be_nl; + << ", ::CORBA::Boolean /*finalize*/)" << be_nl; *os << "{" << be_idt_nl; *os << "switch (this->disc_)" << be_nl; *os << "{" << be_idt_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp index 1caf1471076..86f9110fadc 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp @@ -475,7 +475,9 @@ be_visitor_union_branch_cdr_op_cs::emit_valuetype_common (be_type *node) } int -be_visitor_union_branch_cdr_op_cs::visit_predefined_type (be_predefined_type *node) +be_visitor_union_branch_cdr_op_cs::visit_predefined_type ( + be_predefined_type *node + ) { TAO_OutStream *os = this->ctx_->stream (); @@ -500,7 +502,7 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type (be_predefined_type *no case TAO_CodeGen::TAO_CDR_INPUT: if (pt == AST_PredefinedType::PT_object) { - *os << "CORBA::Object_var _tao_union_tmp;" << be_nl; + *os << "::CORBA::Object_var _tao_union_tmp;" << be_nl; *os << "result = strm >> _tao_union_tmp.out ();" << be_nl << be_nl << "if (result)" << be_idt_nl @@ -510,7 +512,7 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type (be_predefined_type *no } else if (pt == AST_PredefinedType::PT_pseudo) { - *os << "CORBA::TypeCode_var _tao_union_tmp;" << be_nl + *os << "::CORBA::TypeCode_var _tao_union_tmp;" << be_nl << "result = strm >> _tao_union_tmp.out ();" << be_nl << be_nl << "if (result)" << be_idt_nl << "{" << be_idt_nl @@ -519,7 +521,7 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type (be_predefined_type *no } else if (pt == AST_PredefinedType::PT_value) { - *os << "CORBA::ValueBase * _tao_union_tmp;" << be_nl + *os << "::CORBA::ValueBase * _tao_union_tmp;" << be_nl << "result = strm >> _tao_union_tmp;" << be_nl << be_nl << "if (result)" << be_idt_nl << "{" << be_idt_nl @@ -528,8 +530,8 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type (be_predefined_type *no } else if (pt == AST_PredefinedType::PT_char) { - *os << "CORBA::Char _tao_union_tmp;" << be_nl - << "CORBA::Any::to_char _tao_union_helper " + *os << "::CORBA::Char _tao_union_tmp;" << be_nl + << "::CORBA::Any::to_char _tao_union_helper " << "(_tao_union_tmp);" << be_nl << "result = strm >> _tao_union_helper;" << be_nl << be_nl << "if (result)" << be_idt_nl @@ -539,8 +541,8 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type (be_predefined_type *no } else if (pt == AST_PredefinedType::PT_wchar) { - *os << "CORBA::WChar _tao_union_tmp;" << be_nl - << "CORBA::Any::to_wchar _tao_union_helper " + *os << "::CORBA::WChar _tao_union_tmp;" << be_nl + << "::CORBA::Any::to_wchar _tao_union_helper " << "(_tao_union_tmp);" << be_nl << "result = strm >> _tao_union_helper;" << be_nl << be_nl << "if (result)" << be_idt_nl @@ -550,8 +552,8 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type (be_predefined_type *no } else if (pt == AST_PredefinedType::PT_octet) { - *os << "CORBA::Octet _tao_union_tmp;" << be_nl - << "CORBA::Any::to_octet _tao_union_helper " + *os << "::CORBA::Octet _tao_union_tmp;" << be_nl + << "::CORBA::Any::to_octet _tao_union_helper " << "(_tao_union_tmp);" << be_nl << "result = strm >> _tao_union_helper;" << be_nl << be_nl << "if (result)" << be_idt_nl @@ -561,8 +563,8 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type (be_predefined_type *no } else if (pt == AST_PredefinedType::PT_boolean) { - *os << "CORBA::Boolean _tao_union_tmp;" << be_nl - << "CORBA::Any::to_boolean _tao_union_helper " + *os << "::CORBA::Boolean _tao_union_tmp;" << be_nl + << "::CORBA::Any::to_boolean _tao_union_helper " << "(_tao_union_tmp);" << be_nl << "result = strm >> _tao_union_helper;" << be_nl << be_nl << "if (result)" << be_idt_nl @@ -597,22 +599,22 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type (be_predefined_type *no } else if (pt == AST_PredefinedType::PT_char) { - *os << "strm << CORBA::Any::from_char (_tao_union." + *os << "strm << ::CORBA::Any::from_char (_tao_union." << f->local_name () << " ());"; } else if (pt == AST_PredefinedType::PT_wchar) { - *os << "strm << CORBA::Any::from_wchar (_tao_union." + *os << "strm << ::CORBA::Any::from_wchar (_tao_union." << f->local_name () << " ());"; } else if (pt == AST_PredefinedType::PT_octet) { - *os << "strm << CORBA::Any::from_octet (_tao_union." + *os << "strm << ::CORBA::Any::from_octet (_tao_union." << f->local_name () << " ());"; } else if (pt == AST_PredefinedType::PT_boolean) { - *os << "strm << CORBA::Any::from_boolean (_tao_union." + *os << "strm << ::CORBA::Any::from_boolean (_tao_union." << f->local_name () << " ());"; } else @@ -752,11 +754,11 @@ be_visitor_union_branch_cdr_op_cs::visit_string (be_string *node) case TAO_CodeGen::TAO_CDR_INPUT: if (node->width () == (long) sizeof (char)) { - *os << "CORBA::String_var _tao_union_tmp;" << be_nl; + *os << "::CORBA::String_var _tao_union_tmp;" << be_nl; } else { - *os << "CORBA::WString_var _tao_union_tmp;" << be_nl; + *os << "::CORBA::WString_var _tao_union_tmp;" << be_nl; } *os << "result = strm >> _tao_union_tmp.out ();" << be_nl << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp index 05711795185..6fa3cf819de 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp @@ -386,7 +386,8 @@ be_visitor_union_branch_private_ch::visit_predefined_type ( *os << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; - *os << be_nl; + *os << be_nl + << "::"; if (node->pt () == AST_PredefinedType::PT_object) { @@ -395,13 +396,13 @@ be_visitor_union_branch_private_ch::visit_predefined_type ( } else if (node->pt () == AST_PredefinedType::PT_pseudo) { - *os << bt->nested_type_name (bu, "_ptr") << " " << ub->local_name () - << "_;"; + *os << bt->nested_type_name (bu, "_ptr") + << " " << ub->local_name () << "_;"; } else if (node->pt () == AST_PredefinedType::PT_value) { - *os << bt->nested_type_name (bu, " *") << " " << ub->local_name () - << "_;"; + *os << bt->nested_type_name (bu, " *") + << " " << ub->local_name () << "_;"; } else if (node->pt () == AST_PredefinedType::PT_any) { @@ -488,7 +489,7 @@ be_visitor_union_branch_private_ch::visit_string (be_string *node) } else { - *os << "CORBA::WChar *" << ub->local_name () << "_;"; + *os << "::CORBA::WChar *" << ub->local_name () << "_;"; } return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp index 3d3b1cbac4d..c4644d2e2a4 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp @@ -457,7 +457,7 @@ be_visitor_union_branch_public_assign_cs::emit_valuetype_common (be_type *node) // So the template will work with the macro. *os << "typedef " << bt->name () << "_var OBJECT_FIELD;" << be_nl; - *os << "CORBA::add_ref (u.u_." << ub->local_name () + *os << "::CORBA::add_ref (u.u_." << ub->local_name () << "_->ptr ());" << be_nl; if (this->ctx_->sub_state () == TAO_CodeGen::TAO_UNION_COPY_CONSTRUCTOR) @@ -522,14 +522,14 @@ be_visitor_union_branch_public_assign_cs::visit_predefined_type ( { case AST_PredefinedType::PT_object: // So the template will work with the macro. - *os << "typedef CORBA::Object_var OBJECT_FIELD;" << be_nl; + *os << "typedef ::CORBA::Object_var OBJECT_FIELD;" << be_nl; if (this->ctx_->sub_state () == TAO_CodeGen::TAO_UNION_COPY_CONSTRUCTOR) { // We are generating the copy constructor. *os << "ACE_NEW (" << be_idt << be_idt_nl << "this->u_." << ub->local_name () << "_," << be_nl - << "OBJECT_FIELD (CORBA::Object" + << "OBJECT_FIELD ( ::CORBA::Object" << "::_duplicate (u.u_." << ub->local_name () << "_->ptr ()))" << be_uidt_nl << ");" << be_uidt << be_uidt_nl; @@ -539,7 +539,7 @@ be_visitor_union_branch_public_assign_cs::visit_predefined_type ( // We are generating the assignment operator. *os << "ACE_NEW_RETURN (" << be_idt << be_idt_nl << "this->u_." << ub->local_name () << "_," << be_nl - << "OBJECT_FIELD (CORBA::Object" + << "OBJECT_FIELD ( ::CORBA::Object" << "::_duplicate (u.u_." << ub->local_name () << "_->ptr ()))," << be_nl << "*this" << be_uidt_nl @@ -688,11 +688,11 @@ be_visitor_union_branch_public_assign_cs::visit_string (be_string *node) if (node->width () == (long) sizeof (char)) { - *os << "CORBA::string_dup (u.u_."; + *os << "::CORBA::string_dup (u.u_."; } else { - *os << "CORBA::wstring_dup (u.u_."; + *os << "::CORBA::wstring_dup (u.u_."; } *os << ub->local_name () << "_);" << be_uidt_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp index 3b231d439c8..32cd3f21b70 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp @@ -463,35 +463,35 @@ be_visitor_union_branch_public_ch::visit_predefined_type (be_predefined_type *no case AST_PredefinedType::PT_pseudo: case AST_PredefinedType::PT_object: *os << be_nl << be_nl - << "void " << ub->local_name () << " (const " + << "void " << ub->local_name () << " (const ::" << bt->nested_type_name (bu, "_ptr") << ");" << be_nl; - *os << bt->nested_type_name (bu, "_ptr") << " " << ub->local_name () - << " (void) const;"; + *os << "::" << bt->nested_type_name (bu, "_ptr") << " " + << ub->local_name () << " (void) const;"; break; case AST_PredefinedType::PT_value: *os << be_nl << be_nl - << "void " << ub->local_name () << " (" + << "void " << ub->local_name () << " ( ::" << bt->nested_type_name (bu, " *") << ");" << be_nl; - *os << bt->nested_type_name (bu, " *") << " " << ub->local_name () - << " (void) const;"; + *os << "::" << bt->nested_type_name (bu, " *") << " " + << ub->local_name () << " (void) const;"; break; case AST_PredefinedType::PT_any: *os << be_nl << be_nl - << "void " << ub->local_name () << " (const " + << "void " << ub->local_name () << " (const ::" << bt->nested_type_name (bu) << " &);" << be_nl; - *os << "const " << bt->nested_type_name (bu) << " &" + *os << "const ::" << bt->nested_type_name (bu) << " &" << ub->local_name () << " (void) const;" << be_nl; - *os << bt->nested_type_name (bu) << " &" + *os << "::" << bt->nested_type_name (bu) << " &" << ub->local_name () << " (void);"; break; case AST_PredefinedType::PT_void: break; default: *os << be_nl << be_nl - << "void " << ub->local_name () << " (" + << "void " << ub->local_name () << " ( ::" << bt->nested_type_name (bu) << ");" << be_nl; - *os << bt->nested_type_name (bu) << " " << ub->local_name () - << " (void) const;"; + *os << "::" << bt->nested_type_name (bu) << " " + << ub->local_name () << " (void) const;"; } return 0; @@ -595,7 +595,7 @@ be_visitor_union_branch_public_ch::visit_string (be_string *node) << "void " << ub->local_name () << " (char *);" << be_nl; *os << "void " << ub->local_name () << " (const char *);" << be_nl; - *os << "void " << ub->local_name () << " (const CORBA::String_var&);" + *os << "void " << ub->local_name () << " (const ::CORBA::String_var&);" << be_nl; *os << "const char *" << ub->local_name () << " (void) const;"; @@ -603,12 +603,12 @@ be_visitor_union_branch_public_ch::visit_string (be_string *node) else { *os << be_nl << be_nl - << "void " << ub->local_name () << " (CORBA::WChar *);" << be_nl; - *os << "void " << ub->local_name () << " (const CORBA::WChar *);" + << "void " << ub->local_name () << " ( ::CORBA::WChar *);" << be_nl; + *os << "void " << ub->local_name () << " (const ::CORBA::WChar *);" << be_nl; - *os << "void " << ub->local_name () << " (const CORBA::WString_var&);" + *os << "void " << ub->local_name () << " (const ::CORBA::WString_var&);" << be_nl; - *os << "const CORBA::WChar *" << ub->local_name () + *os << "const ::CORBA::WChar *" << ub->local_name () << " (void) const;"; } diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp index 968da978ce8..ab48fae03db 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp @@ -564,7 +564,7 @@ be_visitor_union_branch_public_ci::emit_valuetype_common (be_type *node) } *os << ";" << be_nl - << "CORBA::add_ref (val);" << be_nl + << "::CORBA::add_ref (val);" << be_nl << "typedef " << bt->nested_type_name (bu, "_var") << " OBJECT_FIELD;" << be_nl @@ -631,20 +631,15 @@ be_visitor_union_branch_public_ci::visit_predefined_type ( if (pt == AST_PredefinedType::PT_pseudo || pt == AST_PredefinedType::PT_object) { - *os << "const " - << bt->name () - << "_ptr"; + *os << "const ::" << bt->name () << "_ptr"; } else if (pt == AST_PredefinedType::PT_value) { - *os << bt->name () - << " *"; + *os << "::" << bt->name () << " *"; } else if (pt == AST_PredefinedType::PT_any) { - *os << "const " - << bt->name () - << " &"; + *os << "const ::" << bt->name () << " &"; } else { @@ -681,21 +676,21 @@ be_visitor_union_branch_public_ci::visit_predefined_type ( switch (pt) { case AST_PredefinedType::PT_object: - *os << "typedef CORBA::Object_var OBJECT_FIELD;" << be_nl + *os << "typedef ::CORBA::Object_var OBJECT_FIELD;" << be_nl << "ACE_NEW (" << be_idt << be_idt_nl << "this->u_." << ub->local_name () << "_," << be_nl - << "OBJECT_FIELD (CORBA::Object::_duplicate (val))" + << "OBJECT_FIELD ( ::CORBA::Object::_duplicate (val))" << be_uidt_nl << ");" << be_uidt << be_uidt_nl; break; case AST_PredefinedType::PT_pseudo: - *os << "this->u_." << ub->local_name () << "_ = " + *os << "this->u_." << ub->local_name () << "_ = ::" << bt->name () << "::_duplicate (val);" << be_uidt_nl; break; case AST_PredefinedType::PT_value: - *os << "CORBA::add_ref (val);" << be_nl + *os << "::CORBA::add_ref (val);" << be_nl << "this->u_." << ub->local_name () << "_ = val;" << be_uidt_nl; @@ -704,7 +699,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type ( *os << "ACE_NEW (" << be_idt << be_idt_nl << "this->u_." << ub->local_name () << "_," << be_nl - << bt->name () << " (val)" << be_uidt_nl + << "::" << bt->name () << " (val)" << be_uidt_nl << ");" << be_uidt << be_uidt_nl; break; @@ -726,7 +721,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type ( // Get method. *os << "// Retrieve the member." << be_nl << "ACE_INLINE" << be_nl - << bt->name () << "_ptr" << be_nl + << "::" << bt->name () << "_ptr" << be_nl << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl << "{" << be_idt_nl; @@ -739,7 +734,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type ( // Get method. *os << "// Retrieve the member." << be_nl << "ACE_INLINE" << be_nl - << bt->name () << "_ptr" << be_nl + << "::" << bt->name () << "_ptr" << be_nl << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl << "{" << be_idt_nl; @@ -752,7 +747,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type ( // Get method. *os << "// Retrieve the member." << be_nl << "ACE_INLINE" << be_nl - << bt->name () << " *" << be_nl + << "::" << bt->name () << " *" << be_nl << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl << "{" << be_idt_nl; @@ -765,7 +760,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type ( // Get method with read-only access. *os << "// Retrieve the member." << be_nl << "ACE_INLINE" << be_nl - << "const " << bt->name () << " &" << be_nl + << "const ::" << bt->name () << " &" << be_nl << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl << "{" << be_idt_nl @@ -775,7 +770,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type ( // Get method with read/write access *os << "// Retrieve the member." << be_nl << "ACE_INLINE" << be_nl - << bt->name () << " &" << be_nl + << "::" << bt->name () << " &" << be_nl << bu->name () << "::" << ub->local_name () << " (void)" << be_nl << "{" << be_idt_nl @@ -788,7 +783,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type ( // Get method. *os << "// Retrieve the member." << be_nl << "ACE_INLINE" << be_nl - << bt->name () << be_nl + << "::" << bt->name () << be_nl << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl << "{" << be_idt_nl @@ -924,7 +919,7 @@ be_visitor_union_branch_public_ci::visit_string (be_string *node) else { *os << bu->name () << "::" << ub->local_name () - << " (CORBA::WChar *val)"; + << " ( ::CORBA::WChar *val)"; } *os << be_nl @@ -968,7 +963,7 @@ be_visitor_union_branch_public_ci::visit_string (be_string *node) } else { - *os << " (const CORBA::WChar *val)" << be_nl << "{" << be_idt_nl; + *os << " (const ::CORBA::WChar *val)" << be_nl << "{" << be_idt_nl; } *os << "// Set the discriminant value." << be_nl @@ -1000,12 +995,12 @@ be_visitor_union_branch_public_ci::visit_string (be_string *node) if (node->width () == (long) sizeof (char)) { - *os << "CORBA::string_dup (val);" << be_uidt_nl + *os << "::CORBA::string_dup (val);" << be_uidt_nl << "}" << be_nl << be_nl; } else { - *os << "CORBA::wstring_dup (val);" << be_uidt_nl + *os << "::CORBA::wstring_dup (val);" << be_uidt_nl << "}" << be_nl << be_nl; } @@ -1017,11 +1012,11 @@ be_visitor_union_branch_public_ci::visit_string (be_string *node) if (node->width () == (long) sizeof (char)) { - *os << " (const CORBA::String_var &val)" << be_nl; + *os << " (const ::CORBA::String_var &val)" << be_nl; } else { - *os << " (const CORBA::WString_var &val)" << be_nl; + *os << " (const ::CORBA::WString_var &val)" << be_nl; } *os << "{" << be_idt_nl @@ -1053,11 +1048,11 @@ be_visitor_union_branch_public_ci::visit_string (be_string *node) if (node->width () == (long) sizeof (char)) { - *os << "CORBA::String_var " << ub->local_name (); + *os << "::CORBA::String_var " << ub->local_name (); } else { - *os << "CORBA::WString_var " << ub->local_name (); + *os << "::CORBA::WString_var " << ub->local_name (); } *os << "_var = val;" << be_nl @@ -1074,7 +1069,7 @@ be_visitor_union_branch_public_ci::visit_string (be_string *node) } else { - *os << "const CORBA::WChar *" << be_nl; + *os << "const ::CORBA::WChar *" << be_nl; } *os << bu->name () << "::" << ub->local_name () diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp index c8103180e89..37a40381b20 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp @@ -356,7 +356,7 @@ be_visitor_union_branch_public_reset_cs::visit_predefined_type ( break; case AST_PredefinedType::PT_pseudo: - *os << "CORBA::release (this->u_." + *os << "::CORBA::release (this->u_." << ub->local_name () << "_);" << be_nl; *os << "this->u_." << ub->local_name () << "_ = 0;" << be_nl @@ -432,11 +432,11 @@ be_visitor_union_branch_public_reset_cs::visit_string (be_string *node) if (node->width () == (long) sizeof (char)) { - *os << "CORBA::string_free (this->u_."; + *os << "::CORBA::string_free (this->u_."; } else { - *os << "CORBA::wstring_free (this->u_."; + *os << "::CORBA::wstring_free (this->u_."; } *os << ub->local_name () << "_);" << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp index 9e7e5ded421..6ef307b8783 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp @@ -372,7 +372,7 @@ be_visitor_union_branch_serializer_op_cs::visit_interface (be_interface *node) } else { - *os << "CORBA::Object::marshal (" << be_idt << be_idt_nl + *os << "::CORBA::Object::marshal (" << be_idt << be_idt_nl << "_tao_union." << f->local_name () << " ()," << be_nl << "strm" << be_uidt_nl << ");" << be_uidt; @@ -618,7 +618,7 @@ be_visitor_union_branch_serializer_op_cs::visit_predefined_type (be_predefined_t else if (pt == AST_PredefinedType::PT_char) { *os << "size_t " << tmp_name << " = _dcps_max_marshaled_size (" - << "CORBA::Any::from_char (_tao_union." + << "::CORBA::Any::from_char (_tao_union." << f->local_name () << " ()));" << be_nl << "if (" << tmp_name << " > max_size) max_size = " << tmp_name << ";" << be_nl; @@ -626,7 +626,7 @@ be_visitor_union_branch_serializer_op_cs::visit_predefined_type (be_predefined_t else if (pt == AST_PredefinedType::PT_wchar) { *os << "size_t " << tmp_name << " = _dcps_max_marshaled_size (" - << "CORBA::Any::from_wchar (_tao_union." + << "::CORBA::Any::from_wchar (_tao_union." << f->local_name () << " ()));" << be_nl << "if (" << tmp_name << " > max_size) max_size = " << tmp_name << ";" << be_nl; @@ -634,7 +634,7 @@ be_visitor_union_branch_serializer_op_cs::visit_predefined_type (be_predefined_t else if (pt == AST_PredefinedType::PT_octet) { *os << "size_t " << tmp_name << " = _dcps_max_marshaled_size (" - << "CORBA::Any::from_octet (_tao_union." + << "::CORBA::Any::from_octet (_tao_union." << f->local_name () << " ()));" << be_nl << "if (" << tmp_name << " > max_size) max_size = " << tmp_name << ";" << be_nl; @@ -642,7 +642,7 @@ be_visitor_union_branch_serializer_op_cs::visit_predefined_type (be_predefined_t else if (pt == AST_PredefinedType::PT_boolean) { *os << "size_t " << tmp_name << " = _dcps_max_marshaled_size (" - << "CORBA::Any::from_boolean (_tao_union." + << "::CORBA::Any::from_boolean (_tao_union." << f->local_name () << " ()));" << be_nl << "if (" << tmp_name << " > max_size) max_size = " << tmp_name << ";" << be_nl; @@ -686,22 +686,22 @@ be_visitor_union_branch_serializer_op_cs::visit_predefined_type (be_predefined_t } else if (pt == AST_PredefinedType::PT_char) { - *os << "_dcps_max_marshaled_size (CORBA::Any::from_char (_tao_union." + *os << "_dcps_max_marshaled_size ( ::CORBA::Any::from_char (_tao_union." << f->local_name () << " ()));"; } else if (pt == AST_PredefinedType::PT_wchar) { - *os << "_dcps_max_marshaled_size (CORBA::Any::from_wchar (_tao_union." + *os << "_dcps_max_marshaled_size ( ::CORBA::Any::from_wchar (_tao_union." << f->local_name () << " ()));"; } else if (pt == AST_PredefinedType::PT_octet) { - *os << "_dcps_max_marshaled_size (CORBA::Any::from_octet (_tao_union." + *os << "_dcps_max_marshaled_size ( ::CORBA::Any::from_octet (_tao_union." << f->local_name () << " ()));"; } else if (pt == AST_PredefinedType::PT_boolean) { - *os << "_dcps_max_marshaled_size (CORBA::Any::from_boolean (_tao_union." + *os << "_dcps_max_marshaled_size ( ::CORBA::Any::from_boolean (_tao_union." << f->local_name () << " ()));"; } else @@ -715,7 +715,7 @@ be_visitor_union_branch_serializer_op_cs::visit_predefined_type (be_predefined_t case TAO_CodeGen::TAO_CDR_INPUT: if (pt == AST_PredefinedType::PT_object) { - *os << "CORBA::Object_var _tao_union_tmp;" << be_nl; + *os << "::CORBA::Object_var _tao_union_tmp;" << be_nl; *os << "result = strm >> _tao_union_tmp.out ();" << be_nl << be_nl << "if (result)" << be_idt_nl @@ -725,7 +725,7 @@ be_visitor_union_branch_serializer_op_cs::visit_predefined_type (be_predefined_t } else if (pt == AST_PredefinedType::PT_pseudo) { - *os << "CORBA::TypeCode_var _tao_union_tmp;" << be_nl + *os << "::CORBA::TypeCode_var _tao_union_tmp;" << be_nl << "result = strm >> _tao_union_tmp.out ();" << be_nl << be_nl << "if (result)" << be_idt_nl << "{" << be_idt_nl @@ -734,7 +734,7 @@ be_visitor_union_branch_serializer_op_cs::visit_predefined_type (be_predefined_t } else if (pt == AST_PredefinedType::PT_value) { - *os << "CORBA::ValueBase * _tao_union_tmp;" << be_nl + *os << "::CORBA::ValueBase * _tao_union_tmp;" << be_nl << "result = strm >> _tao_union_tmp;" << be_nl << be_nl << "if (result)" << be_idt_nl << "{" << be_idt_nl @@ -743,8 +743,8 @@ be_visitor_union_branch_serializer_op_cs::visit_predefined_type (be_predefined_t } else if (pt == AST_PredefinedType::PT_char) { - *os << "CORBA::Char _tao_union_tmp;" << be_nl - << "CORBA::Any::to_char _tao_union_helper " + *os << "::CORBA::Char _tao_union_tmp;" << be_nl + << "::CORBA::Any::to_char _tao_union_helper " << "(_tao_union_tmp);" << be_nl << "result = strm >> _tao_union_helper;" << be_nl << be_nl << "if (result)" << be_idt_nl @@ -754,8 +754,8 @@ be_visitor_union_branch_serializer_op_cs::visit_predefined_type (be_predefined_t } else if (pt == AST_PredefinedType::PT_wchar) { - *os << "CORBA::WChar _tao_union_tmp;" << be_nl - << "CORBA::Any::to_wchar _tao_union_helper " + *os << "::CORBA::WChar _tao_union_tmp;" << be_nl + << "::CORBA::Any::to_wchar _tao_union_helper " << "(_tao_union_tmp);" << be_nl << "result = strm >> _tao_union_helper;" << be_nl << be_nl << "if (result)" << be_idt_nl @@ -765,8 +765,8 @@ be_visitor_union_branch_serializer_op_cs::visit_predefined_type (be_predefined_t } else if (pt == AST_PredefinedType::PT_octet) { - *os << "CORBA::Octet _tao_union_tmp;" << be_nl - << "CORBA::Any::to_octet _tao_union_helper " + *os << "::CORBA::Octet _tao_union_tmp;" << be_nl + << "::CORBA::Any::to_octet _tao_union_helper " << "(_tao_union_tmp);" << be_nl << "result = strm >> _tao_union_helper;" << be_nl << be_nl << "if (result)" << be_idt_nl @@ -776,8 +776,8 @@ be_visitor_union_branch_serializer_op_cs::visit_predefined_type (be_predefined_t } else if (pt == AST_PredefinedType::PT_boolean) { - *os << "CORBA::Boolean _tao_union_tmp;" << be_nl - << "CORBA::Any::to_boolean _tao_union_helper " + *os << "::CORBA::Boolean _tao_union_tmp;" << be_nl + << "::CORBA::Any::to_boolean _tao_union_helper " << "(_tao_union_tmp);" << be_nl << "result = strm >> _tao_union_helper;" << be_nl << be_nl << "if (result)" << be_idt_nl @@ -812,22 +812,22 @@ be_visitor_union_branch_serializer_op_cs::visit_predefined_type (be_predefined_t } else if (pt == AST_PredefinedType::PT_char) { - *os << "strm << CORBA::Any::from_char (_tao_union." + *os << "strm << ::CORBA::Any::from_char (_tao_union." << f->local_name () << " ());"; } else if (pt == AST_PredefinedType::PT_wchar) { - *os << "strm << CORBA::Any::from_wchar (_tao_union." + *os << "strm << ::CORBA::Any::from_wchar (_tao_union." << f->local_name () << " ());"; } else if (pt == AST_PredefinedType::PT_octet) { - *os << "strm << CORBA::Any::from_octet (_tao_union." + *os << "strm << ::CORBA::Any::from_octet (_tao_union." << f->local_name () << " ());"; } else if (pt == AST_PredefinedType::PT_boolean) { - *os << "strm << CORBA::Any::from_boolean (_tao_union." + *os << "strm << ::CORBA::Any::from_boolean (_tao_union." << f->local_name () << " ());"; } else @@ -1031,11 +1031,11 @@ be_visitor_union_branch_serializer_op_cs::visit_string (be_string *node) case TAO_CodeGen::TAO_CDR_INPUT: if (node->width () == (long) sizeof (char)) { - *os << "CORBA::String_var _tao_union_tmp;" << be_nl; + *os << "::CORBA::String_var _tao_union_tmp;" << be_nl; } else { - *os << "CORBA::WString_var _tao_union_tmp;" << be_nl; + *os << "::CORBA::WString_var _tao_union_tmp;" << be_nl; } *os << "result = strm >> _tao_union_tmp.out ();" << be_nl << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp index eb2cdd2da41..7b2c09eeb99 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp @@ -77,15 +77,15 @@ be_visitor_valuebox_any_op_ch::visit_valuebox (be_valuebox *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 () << " *); // copying" << be_nl; *os << be_global->stub_export_macro () << " void" - << " operator<<= (CORBA::Any &, " << node->local_name () + << " operator<<= ( ::CORBA::Any &, " << node->local_name () << " **); // 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 () << " *&);"; be_util::gen_nested_namespace_end (os, module); @@ -95,15 +95,15 @@ be_visitor_valuebox_any_op_ch::visit_valuebox (be_valuebox *node) } *os << be_global->stub_export_macro () << " void" - << " operator<<= (CORBA::Any &, " << node->name () + << " operator<<= ( ::CORBA::Any &, " << node->name () << " *); // copying" << be_nl; *os << be_global->stub_export_macro () << " void" - << " operator<<= (CORBA::Any &, " << node->name () + << " operator<<= ( ::CORBA::Any &, " << node->name () << " **); // 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 () << " *&);"; if (module != 0) diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp index 226edc52bd1..b4945e33bf9 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp @@ -61,13 +61,13 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *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_value (" << be_idt << be_idt_nl - << "CORBA::ValueBase *&_tao_elem" << be_uidt_nl + << "::CORBA::ValueBase *&_tao_elem" << be_uidt_nl << ") const" << be_uidt_nl << "{" << be_idt_nl - << "CORBA::add_ref (this->value_);" << be_nl + << "::CORBA::add_ref (this->value_);" << be_nl << "_tao_elem = this->value_;" << be_nl << "return 1;" << be_uidt_nl << "}" << be_uidt_nl @@ -100,18 +100,18 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node) *os << "// 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 () << " *_tao_elem" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl - << "CORBA::add_ref (_tao_elem);" << be_nl + << "::CORBA::add_ref (_tao_elem);" << be_nl << "_tao_any <<= &_tao_elem;" << be_uidt_nl << "}" << be_nl << be_nl; *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 () << " **_tao_elem" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl @@ -124,9 +124,9 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *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 () << " *&_tao_elem" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl @@ -149,18 +149,18 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node) *os << "// 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 () << " *_tao_elem" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl - << "CORBA::add_ref (_tao_elem);" << be_nl + << "::CORBA::add_ref (_tao_elem);" << be_nl << "_tao_any <<= &_tao_elem;" << be_uidt_nl << "}" << be_nl << be_nl; *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 () << " **_tao_elem" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl @@ -173,9 +173,9 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *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 () << " *&_tao_elem" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp index 7a5ad6e0bc1..e6984d70a1f 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp @@ -50,11 +50,11 @@ be_visitor_valuebox_cdr_op_ch::visit_valuebox (be_valuebox *node) << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; *os << be_global->stub_export_macro () << " " - << "CORBA::Boolean operator<< (TAO_OutputCDR &, const " + << "::CORBA::Boolean operator<< (TAO_OutputCDR &, const " << node->full_name () << " *);" << be_nl; *os << be_global->stub_export_macro () << " " - << "CORBA::Boolean operator>> (TAO_InputCDR &, " + << "::CORBA::Boolean operator>> (TAO_InputCDR &, " << node->full_name () << " *&);"; node->cli_hdr_cdr_op_gen (1); diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp index b96b1baa6e5..44534680d0e 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp @@ -54,7 +54,7 @@ be_visitor_valuebox_cdr_op_cs::visit_valuebox (be_valuebox *node) // Set the sub state as generating code for the output operator. this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_OUTPUT); - *os << "CORBA::Boolean" << be_nl + *os << "::CORBA::Boolean" << be_nl << "operator<< (" << be_idt << be_idt_nl << "TAO_OutputCDR &strm," << be_nl << "const " << node->full_name () @@ -62,7 +62,7 @@ be_visitor_valuebox_cdr_op_cs::visit_valuebox (be_valuebox *node) << ")" << be_uidt_nl << "{" << be_idt_nl; *os << "return" << be_idt_nl - << "CORBA::ValueBase::_tao_marshal (" << be_idt << be_idt_nl + << "::CORBA::ValueBase::_tao_marshal (" << be_idt << be_idt_nl << "strm," << be_nl << "_tao_valuebox," << be_nl << "reinterpret_cast<ptrdiff_t> (&" @@ -71,7 +71,7 @@ be_visitor_valuebox_cdr_op_cs::visit_valuebox (be_valuebox *node) << ");" << be_uidt << 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 << "TAO_InputCDR &strm," << be_nl << node->full_name () diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp index ae5c3dbbaa8..1ac3ef40268 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp @@ -301,20 +301,20 @@ be_visitor_valuebox_field_ch::visit_predefined_type (be_predefined_type *node) { case AST_PredefinedType::PT_pseudo: case AST_PredefinedType::PT_object: - this->emit_member_set (field, bt, "", "_ptr"); - this->emit_member_get (field, bt, "", "_ptr", "const"); + this->emit_member_set (field, bt, " ::", "_ptr"); + this->emit_member_get (field, bt, " ::", "_ptr", "const"); break; case AST_PredefinedType::PT_any: - this->emit_member_set (field, bt, "const ", " &"); - this->emit_member_get (field, bt, "const ", " &", "const"); - this->emit_member_get (field, bt, "", " &", ""); + this->emit_member_set (field, bt, "const ::", " &"); + this->emit_member_get (field, bt, "const ::", " &", "const"); + this->emit_member_get (field, bt, " ::", " &", ""); break; case AST_PredefinedType::PT_void: break; default: - this->emit_member_set (field, bt, "", ""); - this->emit_member_get (field, bt, "", "", "const"); + this->emit_member_set (field, bt, " ::", ""); + this->emit_member_get (field, bt, " ::", "", "const"); } return 0; @@ -402,7 +402,7 @@ be_visitor_valuebox_field_ch::visit_string (be_string *node) } *os << "void " << field->local_name () - << " (const CORBA::" << string_type << "_var &);" << be_nl; + << " (const ::CORBA::" << string_type << "_var &);" << be_nl; this->emit_member_get (field, bt, "const ", "", "const"); diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp index 3532b38bd0b..645379236ce 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp @@ -352,25 +352,25 @@ be_visitor_valuebox_field_ci::visit_predefined_type (be_predefined_type *node) *os << "ACE_INLINE void" << be_nl << vb_node->name () << "::" << field->local_name () - << " (" << bt->name () << "_ptr val)" + << " ( ::" << bt->name () << "_ptr val)" << be_nl << "{" << be_idt_nl << "this->_pd_value->" << field->local_name () - << " = " << bt->name() << "::_duplicate (val);" << be_uidt_nl + << " = ::" << bt->name() << "::_duplicate (val);" << be_uidt_nl << "}" << be_nl << be_nl; - this->emit_member_get (vb_node, field, bt, "", "_ptr", "const", + this->emit_member_get (vb_node, field, bt, " ::", "_ptr", "const", ".in ()"); break; case AST_PredefinedType::PT_any: - this->emit_member_set (vb_node, field, bt, "const ", " &"); - this->emit_member_get (vb_node, field, bt, "const ", " &", "const", ""); - this->emit_member_get (vb_node, field, bt, "", " &", "", ""); + this->emit_member_set (vb_node, field, bt, "const ::", " &"); + this->emit_member_get (vb_node, field, bt, "const ::", " &", "const", ""); + this->emit_member_get (vb_node, field, bt, " ::", " &", "", ""); break; case AST_PredefinedType::PT_void: break; default: - this->emit_member_set (vb_node, field, bt, "", ""); - this->emit_member_get (vb_node, field, bt, "", "", "const", ""); + this->emit_member_set (vb_node, field, bt, " ::", ""); + this->emit_member_get (vb_node, field, bt, " ::", "", "const", ""); break; } @@ -463,7 +463,7 @@ be_visitor_valuebox_field_ci::visit_string (be_string *node) *os << "ACE_INLINE void" << be_nl << vb_node->name () << "::" << field->local_name () - << " (const CORBA::" << string_type << "_var & val)" + << " (const ::CORBA::" << string_type << "_var & val)" << be_nl << "{" << be_idt_nl << "this->_pd_value->" << field->local_name () << " = val;" << be_uidt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp index 2a55eda7c59..0e1e291cb9c 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp @@ -313,19 +313,19 @@ be_visitor_valuebox_union_member_ci::visit_predefined_type (be_predefined_type * { case AST_PredefinedType::PT_pseudo: case AST_PredefinedType::PT_object: - this->emit_member_set (vb_node, field, bt, "", "_ptr"); - this->emit_member_get (vb_node, field, bt, "", "_ptr", "const"); + this->emit_member_set (vb_node, field, bt, " ::", "_ptr"); + this->emit_member_get (vb_node, field, bt, " ::", "_ptr", "const"); break; case AST_PredefinedType::PT_any: - this->emit_member_set (vb_node, field, bt, "const ", " &"); - this->emit_member_get (vb_node, field, bt, "const ", " &", "const"); - this->emit_member_get (vb_node, field, bt, "", " &", ""); + this->emit_member_set (vb_node, field, bt, "const ::", " &"); + this->emit_member_get (vb_node, field, bt, "const ::", " &", "const"); + this->emit_member_get (vb_node, field, bt, "::", " &", ""); break; case AST_PredefinedType::PT_void: break; default: - this->emit_member_set (vb_node, field, bt, "", ""); - this->emit_member_get (vb_node, field, bt, "", "", "const"); + this->emit_member_set (vb_node, field, bt, " ::", ""); + this->emit_member_get (vb_node, field, bt, " ::", "", "const"); break; } @@ -418,7 +418,7 @@ be_visitor_valuebox_union_member_ci::visit_string (be_string *node) *os << "ACE_INLINE void" << be_nl << vb_node->name () << "::" << field->local_name () - << " (const CORBA::" << string_type << "_var & val)" + << " (const ::CORBA::" << string_type << "_var & val)" << be_nl << "{" << be_idt_nl << "this->_pd_value->" << field->local_name () << " (val);" << be_uidt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp index 5a892f9586f..ec713d6758e 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp @@ -71,7 +71,7 @@ be_visitor_valuebox_ch::visit_valuebox (be_valuebox *node) *os << be_nl << be_nl << "class " << be_global->stub_export_macro () << " " << node->local_name (); - *os << be_idt_nl <<": public virtual CORBA::DefaultValueRefCountBase"; + *os << be_idt_nl <<": public virtual ::CORBA::DefaultValueRefCountBase"; *os << be_uidt << be_nl << "{" << be_nl @@ -80,10 +80,10 @@ be_visitor_valuebox_ch::visit_valuebox (be_valuebox *node) // _downcast method *os << "static " << node->local_name () << "* " - << "_downcast (CORBA::ValueBase *);" << be_nl; + << "_downcast ( ::CORBA::ValueBase *);" << be_nl; // _copy_value method - *os << "CORBA::ValueBase * _copy_value (void);" << be_nl << be_nl; + *os << "::CORBA::ValueBase * _copy_value (void);" << be_nl << be_nl; // repository id methods *os << "virtual const char* " @@ -93,7 +93,7 @@ be_visitor_valuebox_ch::visit_valuebox (be_valuebox *node) << "_tao_obv_static_repository_id (void);" << be_nl << be_nl; // unmarshal method - *os << "static CORBA::Boolean _tao_unmarshal (" << be_idt << be_idt_nl + *os << "static ::CORBA::Boolean _tao_unmarshal (" << be_idt << be_idt_nl << "TAO_InputCDR &," << be_nl << node->local_name () << " *&" << be_uidt_nl << ");" << be_uidt_nl << be_nl; @@ -121,9 +121,9 @@ be_visitor_valuebox_ch::visit_valuebox (be_valuebox *node) *os << "virtual ~" << node->local_name () << " (void);" << be_nl; // Methods for marshalling and unmarshalling the value - *os << "virtual CORBA::Boolean " + *os << "virtual ::CORBA::Boolean " << "_tao_marshal_v (TAO_OutputCDR &) const;" << be_nl; - *os << "virtual CORBA::Boolean " + *os << "virtual ::CORBA::Boolean " << "_tao_unmarshal_v (TAO_InputCDR &);" << be_nl; // Private unimplemented default assignment operator @@ -193,10 +193,10 @@ be_visitor_valuebox_ch::visit_array (be_array *node) // Overloaded subscript operators *os << "const " << node->full_name () - << "_slice & operator[] (CORBA::ULong index) const;" << be_nl; + << "_slice & operator[] ( ::CORBA::ULong index) const;" << be_nl; *os << node->full_name () - << "_slice & operator[] (CORBA::ULong index);" << be_nl << be_nl; + << "_slice & operator[] ( ::CORBA::ULong index);" << be_nl << be_nl; // Explicit conversion functions *os << "const " << node->full_name () << "_slice * _boxed_in (void) const;" @@ -286,7 +286,7 @@ be_visitor_valuebox_ch::visit_sequence (be_sequence *node) if (node->unbounded ()) { // Public constructor with one argument of type ULong - *os << vb_node->local_name () << " (CORBA::ULong max);" << be_nl; + *os << vb_node->local_name () << " ( ::CORBA::ULong max);" << be_nl; } // Public constructor for sequence with supplied buffer @@ -294,10 +294,10 @@ be_visitor_valuebox_ch::visit_sequence (be_sequence *node) if (node->unbounded ()) { - *os << be_nl << "CORBA::ULong max,"; + *os << be_nl << "::CORBA::ULong max,"; } - *os << be_nl << "CORBA::ULong length," << be_nl; + *os << be_nl << "::CORBA::ULong length," << be_nl; // Generate the base type for the buffer. be_visitor_context ctx (*this->ctx_); @@ -312,7 +312,7 @@ be_visitor_valuebox_ch::visit_sequence (be_sequence *node) } *os << " * buf," << be_nl - << "CORBA::Boolean release = 0" << be_uidt_nl << ");" << be_uidt_nl; + << "::CORBA::Boolean release = 0" << be_uidt_nl << ");" << be_uidt_nl; // Public constructor with single argument of type const T& this->emit_constructor_one_arg (node, "", "const ", "&"); @@ -342,7 +342,7 @@ be_visitor_valuebox_ch::visit_sequence (be_sequence *node) "base type visit failed\n"), -1); } - *os << "& operator[] (CORBA::ULong index);" << be_nl; + *os << "& operator[] ( ::CORBA::ULong index);" << be_nl; // Generate base type for sequence then remainder of operator [] *os << "const "; @@ -354,14 +354,14 @@ be_visitor_valuebox_ch::visit_sequence (be_sequence *node) "base type visit failed\n"), -1); } - *os << "& operator[] (CORBA::ULong index) const;" << be_nl << be_nl; + *os << "& operator[] ( ::CORBA::ULong index) const;" << be_nl << be_nl; - *os << "CORBA::ULong maximum (void) const;" << be_nl; + *os << "::CORBA::ULong maximum (void) const;" << be_nl; - *os << "CORBA::ULong length (void) const;" << be_nl; + *os << "::CORBA::ULong length (void) const;" << be_nl; - *os << "void length (CORBA::ULong len);" << be_nl << be_nl; + *os << "void length ( ::CORBA::ULong len);" << be_nl << be_nl; // Member variable of underlying type; this->emit_boxed_member_var (node, "_var"); @@ -386,7 +386,7 @@ be_visitor_valuebox_ch::visit_string (be_string *node) else if (node->node_type () == AST_Decl::NT_wstring) { string_type = "WString"; - char_type = "CORBA::WChar"; + char_type = "::CORBA::WChar"; } else { @@ -410,7 +410,7 @@ be_visitor_valuebox_ch::visit_string (be_string *node) this->emit_constructor_one_arg (node, "", "const ", ""); // Public constructor with one argument of type const CORBA::String_var& - *os << vb_node->local_name () << " (const CORBA::" << string_type + *os << vb_node->local_name () << " (const ::CORBA::" << string_type << "_var& var);" << be_nl; // Public copy constructor @@ -426,7 +426,7 @@ be_visitor_valuebox_ch::visit_string (be_string *node) // Public assignment operator with one argument of type // const CORBA::String_var& - *os << vb_node->local_name () << "& operator= (const CORBA::" + *os << vb_node->local_name () << "& operator= (const ::CORBA::" << string_type << "_var& var);" << be_nl << be_nl; *os << "// accessor" << be_nl; @@ -445,7 +445,7 @@ be_visitor_valuebox_ch::visit_string (be_string *node) << be_nl; // Modifier function with one argument of type const CORBA::String_var& - *os << "void" << " _value (const CORBA::" << string_type << "_var& var);" + *os << "void" << " _value (const ::CORBA::" << string_type << "_var& var);" << be_nl << be_nl; // Access to the boxed value for method signatures @@ -453,16 +453,16 @@ be_visitor_valuebox_ch::visit_string (be_string *node) // Overloaded subscript operators *os << "// allows access and modification using a slot." << be_nl; - *os << char_type << " & operator[] (CORBA::ULong slot);" << be_nl << be_nl; + *os << char_type << " & operator[] ( ::CORBA::ULong slot);" << be_nl << be_nl; *os << "// allows only accessing thru a slot." << be_nl; - *os << char_type << " operator[] (CORBA::ULong slot) const;" << be_nl; + *os << char_type << " operator[] ( ::CORBA::ULong slot) const;" << be_nl; // Member variable of underlying type; *os << be_uidt_nl << "private:" << be_idt_nl; - *os << "CORBA::" << string_type << "_var" << " _pd_value;" << be_nl; + *os << "::CORBA::" << string_type << "_var" << " _pd_value;" << be_nl; return 0; } @@ -704,12 +704,12 @@ be_visitor_valuebox_ch::emit_for_predef_enum(be_type *node, if (is_any) { // Public assignment operator with one argument of type const T& - this->emit_assignment (node, "", "const ", "&"); + this->emit_assignment (node, "", "const ::", "&"); this->emit_accessor_modifier (node); // Access to the boxed value for method signatures - this->emit_boxed_access (node, "", "const ", "&", "*"); + this->emit_boxed_access (node, "", "const ::", "&", "*"); // Member variable of underlying type; this->emit_boxed_member_var (node, "_var"); diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp index 948e47cbdd0..651ea9ab656 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp @@ -68,7 +68,7 @@ be_visitor_valuebox_ci::visit_valuebox (be_valuebox *node) // _tao_unmarshal_v method. Generated because ValueBase interface // requires it. But there is nothing for it to do in the valuebox // case. - *os << "ACE_INLINE CORBA::Boolean " << be_nl + *os << "ACE_INLINE ::CORBA::Boolean " << be_nl << node->name () << "::_tao_unmarshal_v (TAO_InputCDR &)" << be_nl << "{" << be_idt_nl @@ -119,8 +119,8 @@ be_visitor_valuebox_ci::visit_array (be_array *node) *os << "ACE_INLINE" << be_nl << vb_node->name () << "::" << vb_node->local_name () << " (const " << vb_node->local_name () << "& val)" << be_idt_nl - << ": ACE_NESTED_CLASS (CORBA, ValueBase) (val)," << be_nl - << " ACE_NESTED_CLASS (CORBA, DefaultValueRefCountBase) (val)" + << ": ACE_NESTED_CLASS ( ::CORBA, ValueBase) (val)," << be_nl + << " ACE_NESTED_CLASS ( ::CORBA, DefaultValueRefCountBase) (val)" << be_uidt_nl << "{" << be_idt_nl << "this->_pd_value = " << node->full_name () @@ -160,14 +160,14 @@ be_visitor_valuebox_ci::visit_array (be_array *node) // Overloaded subscript operators *os << "ACE_INLINE const " << node->full_name () << "_slice &" << be_nl - << vb_node->name () << "::operator[] (CORBA::ULong index) const" + << vb_node->name () << "::operator[] ( ::CORBA::ULong index) const" << be_nl << "{" << be_idt_nl << "return this->_pd_value[index];" << be_uidt_nl << "}" << be_nl << be_nl; *os << "ACE_INLINE "<< node->full_name () << "_slice &" << be_nl - << vb_node->name () << "::operator[] (CORBA::ULong index)" << be_nl + << vb_node->name () << "::operator[] ( ::CORBA::ULong index)" << be_nl << "{" << be_idt_nl << "return this->_pd_value[index];" << be_uidt_nl << "}" << be_nl << be_nl; @@ -192,7 +192,7 @@ be_visitor_valuebox_ci::visit_array (be_array *node) << "}" << be_nl << be_nl; // _tao_marshal_v method - *os << "ACE_INLINE CORBA::Boolean " << be_nl + *os << "ACE_INLINE ::CORBA::Boolean " << be_nl << vb_node->name () << "::_tao_marshal_v (TAO_OutputCDR & strm) const" << be_nl << "{" << be_idt_nl @@ -226,19 +226,19 @@ be_visitor_valuebox_ci::visit_predefined_type (be_predefined_type *node) switch (node->pt()) { case AST_PredefinedType::PT_boolean: - marshal_arg = "CORBA::Any::from_boolean (this->_pd_value)"; + marshal_arg = "::CORBA::Any::from_boolean (this->_pd_value)"; break; case AST_PredefinedType::PT_char: - marshal_arg = "CORBA::Any::from_char (this->_pd_value)"; + marshal_arg = "::CORBA::Any::from_char (this->_pd_value)"; break; case AST_PredefinedType::PT_wchar: - marshal_arg = "CORBA::Any::from_wchar (this->_pd_value)"; + marshal_arg = "::CORBA::Any::from_wchar (this->_pd_value)"; break; case AST_PredefinedType::PT_octet: - marshal_arg = "CORBA::Any::from_octet (this->_pd_value)"; + marshal_arg = "::CORBA::Any::from_octet (this->_pd_value)"; break; case AST_PredefinedType::PT_any: @@ -272,14 +272,14 @@ be_visitor_valuebox_ci::visit_sequence (be_sequence *node) this->emit_boxed_access(node, "*"); // Generate maximum() accessor - *os << "ACE_INLINE CORBA::ULong " << be_nl + *os << "ACE_INLINE ::CORBA::ULong " << be_nl << vb_node->name () << "::maximum (void) const" << be_nl << "{" << be_idt_nl << "return this->_pd_value->maximum ();" << be_uidt_nl << "}" << be_nl << be_nl; // Generate length() accessor - *os << "ACE_INLINE CORBA::ULong " << be_nl + *os << "ACE_INLINE ::CORBA::ULong " << be_nl << vb_node->name () << "::length (void) const" << be_nl << "{" << be_idt_nl << "return this->_pd_value->length ();" << be_uidt_nl @@ -287,13 +287,13 @@ be_visitor_valuebox_ci::visit_sequence (be_sequence *node) // Generate length() setter *os << "ACE_INLINE void " << be_nl - << vb_node->name () << "::length (CORBA::ULong length)" << be_nl + << vb_node->name () << "::length ( ::CORBA::ULong length)" << be_nl << "{" << be_idt_nl << "this->_pd_value->length (length);" << be_uidt_nl << "}" << be_nl << be_nl; // _tao_marshal_v method - *os << "ACE_INLINE CORBA::Boolean " << be_nl + *os << "ACE_INLINE ::CORBA::Boolean " << be_nl << vb_node->name () << "::_tao_marshal_v (TAO_OutputCDR & strm) const" << be_nl << "{" << be_idt_nl @@ -318,7 +318,7 @@ be_visitor_valuebox_ci::visit_string (be_string *node) else if (node->node_type () == AST_Decl::NT_wstring) { string_type = "WString"; - char_type = "CORBA::WChar"; + char_type = "::CORBA::WChar"; } else { @@ -352,7 +352,7 @@ be_visitor_valuebox_ci::visit_string (be_string *node) // Public constructor with one argument of type const CORBA::String_var& *os << "ACE_INLINE" << be_nl << vb_node->name () << "::" << vb_node->local_name () - << " (const CORBA::" << string_type << "_var& var)" << be_nl + << " (const ::CORBA::" << string_type << "_var& var)" << be_nl << "{" << be_idt_nl << "this->_pd_value = var;" << be_uidt_nl << "}" << be_nl << be_nl; @@ -369,7 +369,7 @@ be_visitor_valuebox_ci::visit_string (be_string *node) // Public assignment operator with one argument of type // const CORBA::String_var& *os << "ACE_INLINE " << vb_node->name () << " &" << be_nl - << vb_node->name () << "::operator= (const CORBA::" + << vb_node->name () << "::operator= (const ::CORBA::" << string_type << "_var& var)" << be_nl << "{" << be_idt_nl @@ -402,7 +402,7 @@ be_visitor_valuebox_ci::visit_string (be_string *node) // Modifier function with one argument of type const CORBA::String_var& *os << "ACE_INLINE void" << be_nl - << vb_node->name () << "::_value (const CORBA::" << string_type + << vb_node->name () << "::_value (const ::CORBA::" << string_type << "_var& var)" << be_nl << "{" << be_idt_nl << "this->_pd_value = var;" << be_uidt_nl @@ -429,20 +429,20 @@ be_visitor_valuebox_ci::visit_string (be_string *node) // Overloaded subscript operators *os << "ACE_INLINE " << char_type << " &" << be_nl - << vb_node->name () << "::operator[] (CORBA::ULong slot)" << be_nl + << vb_node->name () << "::operator[] ( ::CORBA::ULong slot)" << be_nl << "{" << be_idt_nl << "return this->_pd_value[slot];" << be_uidt_nl << "}" << be_nl << be_nl; *os << "ACE_INLINE " << char_type << be_nl - << vb_node->name () << "::operator[] (CORBA::ULong slot) const" << be_nl + << vb_node->name () << "::operator[] ( ::CORBA::ULong slot) const" << be_nl << "{" << be_idt_nl << "return this->_pd_value[slot];" << be_uidt_nl << "}" << be_nl << be_nl; // _tao_marshal_v method - *os << "ACE_INLINE CORBA::Boolean " << be_nl + *os << "ACE_INLINE ::CORBA::Boolean " << be_nl << vb_node->name () << "::_tao_marshal_v (TAO_OutputCDR & strm) const" << be_nl << "{" << be_idt_nl @@ -514,7 +514,7 @@ be_visitor_valuebox_ci::visit_structure (be_structure *node) } // _tao_marshal_v method - *os << "ACE_INLINE CORBA::Boolean " << be_nl + *os << "ACE_INLINE ::CORBA::Boolean " << be_nl << vb_node->name () << "::_tao_marshal_v (TAO_OutputCDR & strm) const" << be_nl << "{" << be_idt_nl @@ -631,7 +631,7 @@ be_visitor_valuebox_ci::visit_union (be_union *node) // _tao_marshal_v method - *os << "ACE_INLINE CORBA::Boolean " << be_nl + *os << "ACE_INLINE ::CORBA::Boolean " << be_nl << vb_node->name () << "::_tao_marshal_v (TAO_OutputCDR & strm) const" << be_nl << "{" << be_idt_nl @@ -713,7 +713,7 @@ be_visitor_valuebox_ci::emit_for_predef_enum (be_type *node, } // _tao_marshal_v method - *os << "ACE_INLINE CORBA::Boolean " << be_nl + *os << "ACE_INLINE ::CORBA::Boolean " << be_nl << vb_node->name () << "::_tao_marshal_v (TAO_OutputCDR & strm) const" << be_nl << "{" << be_idt_nl @@ -825,8 +825,8 @@ be_visitor_valuebox_ci::emit_copy_constructor (void) *os << "ACE_INLINE " << be_nl << vb_node->name () << "::" << vb_node->local_name () << " (const " << vb_node->full_name () << "& val)" << be_idt_nl - << ": ACE_NESTED_CLASS (CORBA, ValueBase) (val)," << be_nl - << " ACE_NESTED_CLASS (CORBA, DefaultValueRefCountBase) (val)" + << ": ACE_NESTED_CLASS ( ::CORBA, ValueBase) (val)," << be_nl + << " ACE_NESTED_CLASS ( ::CORBA, DefaultValueRefCountBase) (val)" << be_uidt_nl << "{" << be_idt_nl << "this->_pd_value = val._pd_value;" << be_uidt_nl @@ -845,8 +845,8 @@ be_visitor_valuebox_ci::emit_copy_constructor_alloc (be_decl *node) *os << "ACE_INLINE " << be_nl << vb_node->name () << "::" << vb_node->local_name () << " (const " << vb_node->full_name () << "& val)" << be_idt_nl - << ": ACE_NESTED_CLASS (CORBA, ValueBase) (val)," << be_nl - << " ACE_NESTED_CLASS (CORBA, DefaultValueRefCountBase) (val)" + << ": ACE_NESTED_CLASS ( ::CORBA, ValueBase) (val)," << be_nl + << " ACE_NESTED_CLASS ( ::CORBA, DefaultValueRefCountBase) (val)" << be_uidt_nl << "{" << be_idt_nl << node->full_name () << "* p;" << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp index f6cbcd5a0ce..5f7adb89581 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp @@ -64,16 +64,16 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node) // The _downcast method. *os << be_nl << node->name () << " *" << be_nl - << node->name () << "::_downcast (CORBA::ValueBase *v)" << be_nl + << node->name () << "::_downcast ( ::CORBA::ValueBase *v)" << be_nl << "{" << be_idt_nl << "return dynamic_cast< ::" << node->name () << " * > (v);" << be_uidt_nl << "}" << be_nl << be_nl; // _copy_value method - *os << be_nl << "CORBA::ValueBase *" << be_nl + *os << be_nl << "::CORBA::ValueBase *" << be_nl << node->name () << "::_copy_value (void)" << be_nl << "{" << be_idt_nl - << "CORBA::ValueBase *result = 0;" << be_nl + << "::CORBA::ValueBase *result = 0;" << be_nl << "ACE_NEW_RETURN (" << be_idt_nl << "result," << be_nl << node->local_name () << " (*this)," << be_nl @@ -99,19 +99,19 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node) switch (bpt->pt()) { case AST_PredefinedType::PT_boolean: - unmarshal_arg = "CORBA::Any::to_boolean (vb_object->_pd_value)"; + unmarshal_arg = "::CORBA::Any::to_boolean (vb_object->_pd_value)"; break; case AST_PredefinedType::PT_char: - unmarshal_arg = "CORBA::Any::to_char (vb_object->_pd_value)"; + unmarshal_arg = "::CORBA::Any::to_char (vb_object->_pd_value)"; break; case AST_PredefinedType::PT_wchar: - unmarshal_arg = "CORBA::Any::to_wchar (vb_object->_pd_value)"; + unmarshal_arg = "::CORBA::Any::to_wchar (vb_object->_pd_value)"; break; case AST_PredefinedType::PT_octet: - unmarshal_arg = "CORBA::Any::to_octet (vb_object->_pd_value)"; + unmarshal_arg = "::CORBA::Any::to_octet (vb_object->_pd_value)"; break; case AST_PredefinedType::PT_any: @@ -135,14 +135,14 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node) } // The _tao_unmarshal method. - *os << "CORBA::Boolean " << be_nl + *os << "::CORBA::Boolean " << be_nl << node->name () << "::_tao_unmarshal (" << be_idt << be_idt_nl << "TAO_InputCDR &strm," << be_nl << node->local_name () << " *&vb_object" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl - << "CORBA::Boolean is_null_object;" << be_nl - << "if (CORBA::ValueBase::_tao_validate_box_type (" << be_idt + << "::CORBA::Boolean is_null_object;" << be_nl + << "if ( ::CORBA::ValueBase::_tao_validate_box_type (" << be_idt << be_idt << be_idt_nl << "strm," << be_nl << node->local_name () << "::_tao_obv_static_repository_id ()," << be_nl @@ -261,7 +261,7 @@ be_visitor_valuebox_cs::visit_sequence (be_sequence *node) { // Public constructor with one argument of type ULong *os << vb_node->name () << "::" << vb_node->local_name () - << " (CORBA::ULong max)" << be_nl + << " ( ::CORBA::ULong max)" << be_nl << "{" << be_idt_nl << node->full_name () << "* p;" << be_nl << "ACE_NEW (" << be_idt_nl @@ -277,10 +277,10 @@ be_visitor_valuebox_cs::visit_sequence (be_sequence *node) if (node->unbounded ()) { - *os << be_nl << "CORBA::ULong max,"; + *os << be_nl << "::CORBA::ULong max,"; } - *os << be_nl << "CORBA::ULong length, " << be_nl; + *os << be_nl << "::CORBA::ULong length, " << be_nl; if (bt->accept (&bt_visitor) == -1) @@ -293,7 +293,7 @@ be_visitor_valuebox_cs::visit_sequence (be_sequence *node) } *os << " * buf," << be_nl - << "CORBA::Boolean release)" << be_uidt_nl + << "::CORBA::Boolean release)" << be_uidt_nl << "{" << be_idt_nl << node->full_name () << "* p;" << be_nl << "ACE_NEW (" << be_idt_nl @@ -322,7 +322,7 @@ be_visitor_valuebox_cs::visit_sequence (be_sequence *node) } *os << " & " << be_nl - << vb_node->name () << "::operator[] (CORBA::ULong index)" << be_nl + << vb_node->name () << "::operator[] ( ::CORBA::ULong index)" << be_nl << "{" << be_idt_nl << "return ("; @@ -350,7 +350,7 @@ be_visitor_valuebox_cs::visit_sequence (be_sequence *node) } *os << " &" << be_nl; *os << vb_node->name () - << "::operator[] (CORBA::ULong index) const" << be_nl + << "::operator[] ( ::CORBA::ULong index) const" << be_nl << "{" << be_idt_nl; switch (bt->node_type()) diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_ch.cpp index 6efbc506efa..32ebe90e547 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_ch.cpp @@ -56,7 +56,7 @@ be_visitor_valuetype_ami_exception_holder_ch::visit_valuetype ( *os << node->local_name () << "," << be_nl << " public virtual OBV_Messaging::ExceptionHolder," << be_nl - << " public virtual CORBA::DefaultValueRefCountBase" << be_uidt_nl + << " public virtual ::CORBA::DefaultValueRefCountBase" << be_uidt_nl << "{" << be_nl; *os << "public:" << be_idt_nl; *os << "_tao_" << node->local_name () << " ();" << be_nl << be_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp index b998dfb1404..2ebf715c7a2 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp @@ -78,15 +78,15 @@ be_visitor_valuetype_any_op_ch::visit_valuetype (be_valuetype *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 () << " *); // copying" << be_nl; *os << be_global->stub_export_macro () << " void" - << " operator<<= (CORBA::Any &, " << node->local_name () + << " operator<<= ( ::CORBA::Any &, " << node->local_name () << " **); // 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 () << " *&);"; be_util::gen_nested_namespace_end (os, module); @@ -96,15 +96,15 @@ be_visitor_valuetype_any_op_ch::visit_valuetype (be_valuetype *node) } *os << be_global->stub_export_macro () << " void" - << " operator<<= (CORBA::Any &, " << node->name () + << " operator<<= ( ::CORBA::Any &, " << node->name () << " *); // copying" << be_nl; *os << be_global->stub_export_macro () << " void" - << " operator<<= (CORBA::Any &, " << node->name () + << " operator<<= ( ::CORBA::Any &, " << node->name () << " **); // 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 () << " *&);"; if (module != 0) diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp index 9b922610c3c..53d1bc7234d 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp @@ -62,13 +62,13 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *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_value (" << be_idt << be_idt_nl - << "CORBA::ValueBase *&_tao_elem" << be_uidt_nl + << "::CORBA::ValueBase *&_tao_elem" << be_uidt_nl << ") const" << be_uidt_nl << "{" << be_idt_nl - << "CORBA::add_ref (this->value_);" << be_nl + << "::CORBA::add_ref (this->value_);" << be_nl << "_tao_elem = this->value_;" << be_nl << "return 1;" << be_uidt_nl << "}" << be_uidt_nl @@ -101,18 +101,18 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node) *os << "// 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 () << " *_tao_elem" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl - << "CORBA::add_ref (_tao_elem);" << be_nl + << "::CORBA::add_ref (_tao_elem);" << be_nl << "_tao_any <<= &_tao_elem;" << be_uidt_nl << "}" << be_nl << be_nl; *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 () << " **_tao_elem" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl @@ -125,9 +125,9 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *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 () << " *&_tao_elem" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl @@ -150,18 +150,18 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node) *os << "// 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 () << " *_tao_elem" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl - << "CORBA::add_ref (_tao_elem);" << be_nl + << "::CORBA::add_ref (_tao_elem);" << be_nl << "_tao_any <<= &_tao_elem;" << be_uidt_nl << "}" << be_nl << be_nl; *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 () << " **_tao_elem" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl @@ -174,9 +174,9 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *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 () << " *&_tao_elem" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp index effc2db8a7c..2ee76042dcb 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp @@ -61,11 +61,11 @@ be_visitor_valuetype_cdr_op_ch::visit_valuetype (be_valuetype *node) << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; *os << be_global->stub_export_macro () << " " - << "CORBA::Boolean operator<< (TAO_OutputCDR &, const " + << "::CORBA::Boolean operator<< (TAO_OutputCDR &, const " << node->full_name () << " *);" << be_nl; *os << be_global->stub_export_macro () << " " - << "CORBA::Boolean operator>> (TAO_InputCDR &, " + << "::CORBA::Boolean operator>> (TAO_InputCDR &, " << node->full_name () << " *&);"; // Set the substate as generating code for the types defined in our scope. diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp index 96a21c4430a..35084bec6c4 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp @@ -75,7 +75,7 @@ be_visitor_valuetype_cdr_op_cs::visit_valuetype (be_valuetype *node) // Set the sub state as generating code for the output operator. this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_OUTPUT); - *os << "CORBA::Boolean" << be_nl + *os << "::CORBA::Boolean" << be_nl << "operator<< (" << be_idt << be_idt_nl << "TAO_OutputCDR &strm," << be_nl << "const " << node->full_name () @@ -83,7 +83,7 @@ be_visitor_valuetype_cdr_op_cs::visit_valuetype (be_valuetype *node) << ")" << be_uidt_nl << "{" << be_idt_nl; *os << "return" << be_idt_nl - << "CORBA::ValueBase::_tao_marshal (" << be_idt << be_idt_nl + << "::CORBA::ValueBase::_tao_marshal (" << be_idt << be_idt_nl << "strm," << be_nl << "_tao_valuetype," << be_nl << "reinterpret_cast<ptrdiff_t> (&" @@ -92,7 +92,7 @@ be_visitor_valuetype_cdr_op_cs::visit_valuetype (be_valuetype *node) << ");" << be_uidt << 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 << "TAO_InputCDR &strm," << be_nl << node->full_name () diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp index e4e89802204..1cf4f9b6c3e 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp @@ -489,22 +489,22 @@ be_visitor_valuetype_field_cdr_cs::visit_predefined_type (be_predefined_type *no } else if (pt == AST_PredefinedType::PT_char) { - *os << "(strm >> CORBA::Any::to_char (" + *os << "(strm >> ::CORBA::Any::to_char (" << this->pre_ << f->local_name () << this->post_ << "))"; } else if (pt == AST_PredefinedType::PT_wchar) { - *os << "(strm >> CORBA::Any::to_wchar (" + *os << "(strm >> ::CORBA::Any::to_wchar (" << this->pre_ << f->local_name () << this->post_ << "))"; } else if (pt == AST_PredefinedType::PT_octet) { - *os << "(strm >> CORBA::Any::to_octet (" + *os << "(strm >> ::CORBA::Any::to_octet (" << this->pre_ << f->local_name () << this->post_ << "))"; } else if (pt == AST_PredefinedType::PT_boolean) { - *os << "(strm >> CORBA::Any::to_boolean (" + *os << "(strm >> ::CORBA::Any::to_boolean (" << this->pre_ << f->local_name () << this->post_ << "))"; } else @@ -522,22 +522,22 @@ be_visitor_valuetype_field_cdr_cs::visit_predefined_type (be_predefined_type *no } else if (pt == AST_PredefinedType::PT_char) { - *os << "(strm << CORBA::Any::from_char (" + *os << "(strm << ::CORBA::Any::from_char (" << this->pre_ << f->local_name () << this->post_ << "))"; } else if (pt == AST_PredefinedType::PT_wchar) { - *os << "(strm << CORBA::Any::from_wchar (" + *os << "(strm << ::CORBA::Any::from_wchar (" << this->pre_ << f->local_name () << this->post_ << "))"; } else if (pt == AST_PredefinedType::PT_octet) { - *os << "(strm << CORBA::Any::from_octet (" + *os << "(strm << ::CORBA::Any::from_octet (" << this->pre_ << f->local_name () << this->post_ << "))"; } else if (pt == AST_PredefinedType::PT_boolean) { - *os << "(strm << CORBA::Any::from_boolean (" + *os << "(strm << ::CORBA::Any::from_boolean (" << this->pre_ << f->local_name () << this->post_ << "))"; } else diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp index ed9f295a3db..9ba043d54a0 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp @@ -473,25 +473,25 @@ be_visitor_valuetype_field_ch::visit_predefined_type (be_predefined_type *node) case AST_PredefinedType::PT_pseudo: case AST_PredefinedType::PT_object: // Set method. - *os << pre_op () << "void " << ub->local_name () << " (" + *os << pre_op () << "void " << ub->local_name () << " ( ::" << bt->name () << "_ptr)" << post_op () << be_nl; // Get method. *os << pre_op () - << bt->name () << "_ptr " << ub->local_name () + << "::" << bt->name () << "_ptr " << ub->local_name () << " (void) const" << post_op (); break; case AST_PredefinedType::PT_any: // Set method. - *os << pre_op () << "void " << ub->local_name () << " (" + *os << pre_op () << "void " << ub->local_name () << " ( ::" << bt->name () << " &)" << post_op () << be_nl; // Get method (read-only). - *os << pre_op () << "const " << bt->name () << " &" + *os << pre_op () << "const ::" << bt->name () << " &" << ub->local_name () << " (void) const" << post_op () << be_nl; // Get method (read/write). - *os << pre_op () << bt->name () << " &" + *os << pre_op () << "::" << bt->name () << " &" << ub->local_name () << " (void)" << post_op (); break; @@ -499,11 +499,11 @@ be_visitor_valuetype_field_ch::visit_predefined_type (be_predefined_type *node) break; default: // Set method. - *os << pre_op () << "void " << ub->local_name () << " (" + *os << pre_op () << "void " << ub->local_name () << " (::" << bt->name () << ")" << post_op () << be_nl; // Get method. - *os << pre_op () << bt->name () << " " << ub->local_name () + *os << pre_op () << "::" << bt->name () << " " << ub->local_name () << " (void) const" << post_op (); } @@ -625,7 +625,7 @@ be_visitor_valuetype_field_ch::visit_string (be_string *node) << "void " << ub->local_name () << " (const char *)" << post_op () << be_nl; *os << pre_op () - << "void " << ub->local_name () << " (const CORBA::String_var&)" + << "void " << ub->local_name () << " (const ::CORBA::String_var&)" << post_op () << be_nl; // Get method. *os << pre_op () << "const char *" << ub->local_name () @@ -634,16 +634,16 @@ be_visitor_valuetype_field_ch::visit_string (be_string *node) else { *os << pre_op () - << "void " << ub->local_name () << " (CORBA::WChar *)" + << "void " << ub->local_name () << " ( ::CORBA::WChar *)" << post_op () << be_nl; *os << pre_op () - << "void " << ub->local_name () << " (const CORBA::WChar *)" + << "void " << ub->local_name () << " (const ::CORBA::WChar *)" << post_op () << be_nl; *os << pre_op () - << "void " << ub->local_name () << " (const CORBA::WString_var&)" + << "void " << ub->local_name () << " (const ::CORBA::WString_var&)" << post_op () << be_nl; // Get method. - *os << pre_op() << "const CORBA::WChar *" << ub->local_name () + *os << pre_op() << "const ::CORBA::WChar *" << ub->local_name () << " (void) const" << post_op(); } diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp index 32e15c03e76..5c896c1888f 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp @@ -446,7 +446,7 @@ be_visitor_valuetype_field_cs::valuetype_common (be_type *node) << "* val)" << be_nl << "{" << be_idt_nl; - *os << "CORBA::add_ref (val);" << be_nl + *os << "::CORBA::add_ref (val);" << be_nl << "this->" << bu->field_pd_prefix () << ub->local_name () << bu->field_pd_postfix () @@ -526,7 +526,7 @@ be_visitor_valuetype_field_cs::visit_valuetype_fwd (be_valuetype_fwd *node) << "* val)" << be_nl << "{" << be_idt_nl; - *os << "CORBA::add_ref (val);" << be_nl + *os << "::CORBA::add_ref (val);" << be_nl << "this->" << bu->field_pd_prefix () << ub->local_name () << bu->field_pd_postfix () @@ -594,8 +594,7 @@ be_visitor_valuetype_field_cs::visit_predefined_type (be_predefined_type *node) *os << "// Accessor to set the member." << be_nl << this->pre_op () << "void" << be_nl; - this->op_name (bu, - os); + this->op_name (bu, os); *os << "::" << ub->local_name () << " (" << bt->name (); @@ -620,7 +619,7 @@ be_visitor_valuetype_field_cs::visit_predefined_type (be_predefined_type *node) case AST_PredefinedType::PT_pseudo: case AST_PredefinedType::PT_object: *os << "this->" << bu->field_pd_prefix () << ub->local_name () - << bu->field_pd_postfix () << " = " + << bu->field_pd_postfix () << " = ::" << bt->name () << "::_duplicate (val);" << be_uidt_nl; break; @@ -647,7 +646,7 @@ be_visitor_valuetype_field_cs::visit_predefined_type (be_predefined_type *node) case AST_PredefinedType::PT_pseudo: case AST_PredefinedType::PT_object: *os << "// Retrieve the member" << be_nl - << this->pre_op () << bt->name () << "_ptr" << be_nl; + << this->pre_op () << "::" << bt->name () << "_ptr" << be_nl; this->op_name (bu, os); @@ -664,10 +663,9 @@ be_visitor_valuetype_field_cs::visit_predefined_type (be_predefined_type *node) break; case AST_PredefinedType::PT_any: *os << "// Retrieve the member." << be_nl - << this->pre_op () << "const " << bt->name () << " &" << be_nl; + << this->pre_op () << "const ::" << bt->name () << " &" << be_nl; - this->op_name (bu, - os); + this->op_name (bu, os); *os << "::" << ub->local_name () << " (void) const" << be_nl @@ -679,10 +677,9 @@ be_visitor_valuetype_field_cs::visit_predefined_type (be_predefined_type *node) << "}" << be_nl << be_nl; *os << "// Retrieve the member" << be_nl - << this->pre_op () << bt->name () << " &" << be_nl; + << this->pre_op () << "::" << bt->name () << " &" << be_nl; - this->op_name (bu, - os); + this->op_name (bu, os); *os << "::" << ub->local_name () << " (void)" << be_nl @@ -698,10 +695,9 @@ be_visitor_valuetype_field_cs::visit_predefined_type (be_predefined_type *node) break; default: *os << "// Retrieve the member" << be_nl - << this->pre_op () << bt->name () << be_nl; + << this->pre_op () << "::" << bt->name () << be_nl; - this->op_name (bu, - os); + this->op_name (bu, os); *os << "::" << ub->local_name () << " (void) const" << be_nl @@ -849,7 +845,7 @@ be_visitor_valuetype_field_cs::visit_string (be_string *node) } else { - *os << "::" << ub->local_name () << " (CORBA::WChar *val)"; + *os << "::" << ub->local_name () << " ( ::CORBA::WChar *val)"; } *os << be_nl @@ -874,7 +870,7 @@ be_visitor_valuetype_field_cs::visit_string (be_string *node) } else { - *os << " (const CORBA::WChar *val)" << be_nl; + *os << " (const ::CORBA::WChar *val)" << be_nl; } *os << "{" << be_idt_nl; @@ -887,11 +883,11 @@ be_visitor_valuetype_field_cs::visit_string (be_string *node) if (node->width () == (long) sizeof (char)) { - *os << "CORBA::string_dup (val);" << be_uidt_nl; + *os << "::CORBA::string_dup (val);" << be_uidt_nl; } else { - *os << "CORBA::wstring_dup (val);" << be_uidt_nl; + *os << "::CORBA::wstring_dup (val);" << be_uidt_nl; } *os << "}" << be_nl << be_nl; @@ -907,22 +903,22 @@ be_visitor_valuetype_field_cs::visit_string (be_string *node) if (node->width () == (long) sizeof (char)) { - *os << " (const CORBA::String_var &val)" << be_nl; + *os << " (const ::CORBA::String_var &val)" << be_nl; } else { - *os << " (const CORBA::WString_var &val)" << be_nl; + *os << " (const ::CORBA::WString_var &val)" << be_nl; } *os << "{" << be_idt_nl; if (node->width () == (long) sizeof (char)) { - *os << "CORBA::String_var " << ub->local_name (); + *os << "::CORBA::String_var " << ub->local_name (); } else { - *os << "CORBA::WString_var " << ub->local_name (); + *os << "::CORBA::WString_var " << ub->local_name (); } *os << "_var = val;" << be_nl @@ -939,7 +935,7 @@ be_visitor_valuetype_field_cs::visit_string (be_string *node) } else { - *os << this->pre_op () << "const CORBA::WChar *" << be_nl; + *os << this->pre_op () << "const ::CORBA::WChar *" << be_nl; } this->op_name (bu, diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp index 1b5c3ea9979..c13746e8dae 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp @@ -43,7 +43,7 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node) *os << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; - *os << "CORBA::Boolean" << be_nl; + *os << "::CORBA::Boolean" << be_nl; this->class_name (node, os); @@ -103,7 +103,7 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node) // Set the substate as generating code for the input operator. this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_INPUT); - *os << "CORBA::Boolean" << be_nl; + *os << "::CORBA::Boolean" << be_nl; this->class_name (node, os); diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp index b4b89f4d92c..f1748719882 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp @@ -834,7 +834,7 @@ be_visitor_valuetype::gen_init_defn (be_valuetype *node) *os << "class " << be_global->stub_export_macro () << " " << node->local_name () - << "_init : public CORBA::ValueFactoryBase" << be_nl; + << "_init : public ::CORBA::ValueFactoryBase" << be_nl; // Generate the body. *os << "{" << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp index 3af5c259c9a..5760338f9b8 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp @@ -149,7 +149,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) *os << "," << be_nl; } - *os << "public virtual CORBA::DefaultValueRefCountBase"; + *os << "public virtual ::CORBA::DefaultValueRefCountBase"; } if (node->node_type () == AST_Decl::NT_eventtype) @@ -171,7 +171,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) *os << "," << be_nl; } - *os << "public virtual CORBA::ValueBase"; + *os << "public virtual ::CORBA::ValueBase"; } // Generate the supported interfaces. @@ -192,7 +192,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) if (is_an_amh_exception_holder) { // Generate the constructor and destructor. - *os << node->local_name () << " (CORBA::Exception *ex)" << be_idt_nl + *os << node->local_name () << " ( ::CORBA::Exception *ex)" << be_idt_nl << ": exception (ex)" << be_uidt_nl << "{}" << be_nl << be_nl << "virtual ~" << node->local_name () << " (void);" @@ -200,10 +200,10 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) } *os << "static " << node->local_name () << "* " - << "_downcast (CORBA::ValueBase *);" << be_nl + << "_downcast ( ::CORBA::ValueBase *);" << be_nl << be_nl << "// (TAO extensions or internals)" << be_nl - << "static CORBA::Boolean _tao_unmarshal (" << be_idt << be_idt_nl + << "static ::CORBA::Boolean _tao_unmarshal (" << be_idt << be_idt_nl << "TAO_InputCDR &," << be_nl << node->local_name () << " *&" << be_uidt_nl << ");" << be_uidt_nl << be_nl @@ -258,7 +258,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) *os << be_uidt_nl << be_nl << "public:" << be_idt_nl; *os << be_nl << "virtual void _add_ref (void) = 0;" << be_nl; *os << "virtual void _remove_ref (void) = 0;" << be_nl; - *os << "virtual CORBA::ValueBase *_tao_to_value (void);"; + *os << "virtual ::CORBA::ValueBase *_tao_to_value (void);"; } // Generate the "protected" constructor so that users cannot @@ -276,9 +276,9 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) // Support for marshalling. if (!node->is_abstract () || is_an_amh_exception_holder) { - *os << "virtual CORBA::Boolean " + *os << "virtual ::CORBA::Boolean " << "_tao_marshal_v (TAO_OutputCDR &) const;" << be_nl; - *os << "virtual CORBA::Boolean " + *os << "virtual ::CORBA::Boolean " << "_tao_unmarshal_v (TAO_InputCDR &);" << be_nl; } @@ -297,7 +297,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) if (is_an_amh_exception_holder) { *os << be_nl - << "CORBA::Exception *exception;" + << "::CORBA::Exception *exception;" << be_nl; } /*********************************************************/ @@ -307,9 +307,9 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) if (node->opt_accessor ()) { *os << be_uidt_nl << "protected:" << be_idt_nl; - *os << "CORBA::Boolean " + *os << "::CORBA::Boolean " << "_tao_marshal_state (TAO_OutputCDR &) const;" << be_nl - << "CORBA::Boolean " + << "::CORBA::Boolean " << "_tao_unmarshal_state (TAO_InputCDR &);" << be_uidt_nl << be_nl; *os << "private:" << be_idt_nl; @@ -324,21 +324,21 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) if (is_an_amh_exception_holder) { - *os << "virtual CORBA::Boolean" << be_nl + *os << "virtual ::CORBA::Boolean" << be_nl << "_tao_marshal__" << node->flat_name () << " (TAO_OutputCDR &) const;" << be_nl << be_nl; - *os << "virtual CORBA::Boolean" << be_nl + *os << "virtual ::CORBA::Boolean" << be_nl << "_tao_unmarshal__" << node->flat_name () << " (TAO_InputCDR &);"; } else { - *os << "virtual CORBA::Boolean" << be_nl + *os << "virtual ::CORBA::Boolean" << be_nl << "_tao_marshal__" << node->flat_name () << " (TAO_OutputCDR &) const = 0;" << be_nl << be_nl; - *os << "virtual CORBA::Boolean" << be_nl + *os << "virtual ::CORBA::Boolean" << be_nl << "_tao_unmarshal__" << node->flat_name () << " (TAO_InputCDR &) = 0;"; } diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp index 10b40aa5a6f..8e9a6f25b3f 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp @@ -74,7 +74,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) << node->name () << " * p" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl - << "CORBA::add_ref (p);" << be_uidt_nl + << "::CORBA::add_ref (p);" << be_uidt_nl << "}"; *os << be_nl << be_nl @@ -84,7 +84,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) << node->name () << " * p" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl - << "CORBA::remove_ref (p);" << be_uidt_nl + << "::CORBA::remove_ref (p);" << be_uidt_nl << "}"; *os << be_nl << be_nl @@ -94,14 +94,14 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) << node->name () << " * p" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl - << "CORBA::remove_ref (p);" << be_uidt_nl + << "::CORBA::remove_ref (p);" << be_uidt_nl << "}"; } // The _downcast method. *os << be_nl << be_nl << node->name () << " *" << be_nl << node->name () - << "::_downcast (CORBA::ValueBase *v)" << be_nl + << "::_downcast ( ::CORBA::ValueBase *v)" << be_nl << "{" << be_idt_nl << "return dynamic_cast< ::" << node->name () << " * > (v);" << be_uidt_nl @@ -124,7 +124,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) << "static_cast<" << be_idt << node->local_name () << " *> (" << "_tao_void_pointer);" << be_uidt << be_uidt_nl - << "CORBA::remove_ref (_tao_tmp_pointer);" << be_uidt_nl + << "::CORBA::remove_ref (_tao_tmp_pointer);" << be_uidt_nl << "}" << be_nl << be_nl; } @@ -144,7 +144,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) if (!node->is_abstract () && !is_an_amh_exception_holder) { // The virtual _tao_marshal_v method. - *os << "CORBA::Boolean " << node->name () + *os << "::CORBA::Boolean " << node->name () << "::_tao_marshal_v (TAO_OutputCDR & strm) const" << be_nl << "{" << be_idt_nl @@ -169,7 +169,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) *os << "}" << be_nl << be_nl; // The virtual _tao_unmarshal_v method. - *os << "CORBA::Boolean " << node->name () + *os << "::CORBA::Boolean " << node->name () << "::_tao_unmarshal_v (TAO_InputCDR & strm)" << be_nl << "{" << be_idt_nl @@ -201,7 +201,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) // "-fvisibility-inlines-hidden" command line option is used. // The virtual _tao_marshal_v method. - *os << "CORBA::Boolean" << be_nl + *os << "::CORBA::Boolean" << be_nl << node->name () << "::_tao_marshal_v (TAO_OutputCDR &) const" << be_nl << "{" << be_idt_nl @@ -209,7 +209,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) << "}" << be_nl << be_nl; // The virtual _tao_unmarshal_v method. - *os << "CORBA::Boolean" << be_nl + *os << "::CORBA::Boolean" << be_nl << node->name () << "::_tao_unmarshal_v (TAO_InputCDR &)" << be_nl << "{" << be_idt_nl @@ -219,14 +219,14 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) if (!node->opt_accessor () && !node->is_abstract ()) { - *os << "CORBA::Boolean" << be_nl + *os << "::CORBA::Boolean" << be_nl << node->name () << "::_tao_marshal__" << node->flat_name () << " (TAO_OutputCDR &) const" << be_nl << "{" << be_idt_nl << "return 1;" << be_uidt_nl << "}" << be_nl << be_nl; - *os << "CORBA::Boolean" << be_nl + *os << "::CORBA::Boolean" << be_nl << node->name () << "::_tao_unmarshal__" << node->flat_name () << " (TAO_InputCDR &)" << be_nl << "{" << be_idt_nl @@ -237,16 +237,16 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) // The static T::_tao_unmarshal method - *os << "CORBA::Boolean " << node->name() + *os << "::CORBA::Boolean " << node->name() << "::_tao_unmarshal (" << be_idt << be_idt_nl << "TAO_InputCDR &strm," << be_nl << node->local_name () << " *&new_object" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl - << "CORBA::ValueBase *base = 0;" << be_nl - << "CORBA::ValueFactory_var factory;" << be_nl - << "CORBA::Boolean retval =" << be_idt_nl - << "CORBA::ValueBase::_tao_unmarshal_pre (" << be_idt << be_idt_nl + << "::CORBA::ValueBase *base = 0;" << be_nl + << "::CORBA::ValueFactory_var factory;" << be_nl + << "::CORBA::Boolean retval =" << be_idt_nl + << "::CORBA::ValueBase::_tao_unmarshal_pre (" << be_idt << be_idt_nl << "strm," << be_nl << "factory.out ()," << be_nl << "base," << be_nl @@ -281,7 +281,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) if (node->n_supports () > 0) { *os << be_nl << be_nl - << "CORBA::ValueBase *" << be_nl + << "::CORBA::ValueBase *" << be_nl << node->name () << "::_tao_to_value (void)" << be_nl << "{" << be_idt_nl << "return this;" << be_uidt_nl @@ -396,7 +396,7 @@ be_visitor_valuetype_cs::visit_operation (be_operation *node) *os << be_nl << "{" << be_nl << "#if defined (TAO_HAS_EXCEPTIONS)" << be_idt_nl - << "auto_ptr<CORBA::Exception> safety (this->exception);" << be_nl + << "auto_ptr< ::CORBA::Exception> safety (this->exception);" << be_nl << "// Direct throw because we don't have the ACE_TRY_ENV." << be_nl << "this->exception->_raise ();" << be_uidt_nl << "#else" << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp index f26ebfbb386..c0c9e8e97f6 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp @@ -131,7 +131,7 @@ be_visitor_valuetype_init_arglist_ch::gen_throw_spec (be_factory *node) } *os << be_nl << throw_spec_open; - *os << be_idt_nl << "CORBA::SystemException"; + *os << be_idt_nl << "::CORBA::SystemException"; if (node->exceptions ()) { diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp index 0d27a6f5cef..704fd460b48 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp @@ -74,7 +74,7 @@ be_visitor_valuetype_init_ch::visit_valuetype (be_valuetype *node) //@@ If I'm generating concrete class I need a RefCounter. os << "class " << be_global->stub_export_macro () << " " << node->local_name () - << "_init : public virtual CORBA::ValueFactoryBase" << be_nl; + << "_init : public virtual ::CORBA::ValueFactoryBase" << be_nl; // Generate the body. os << "{" << be_nl @@ -99,14 +99,14 @@ be_visitor_valuetype_init_ch::visit_valuetype (be_valuetype *node) // Generate _downcast method. os << be_nl << be_nl << "static " << node->local_name () << "_init* " - << "_downcast (CORBA::ValueFactoryBase *);"; + << "_downcast ( ::CORBA::ValueFactoryBase *);"; if (factory_style == be_valuetype::FS_CONCRETE_FACTORY) { //@@ Boris: create_for_unmarshal is still public... // generate create_for_unmarshal os << be_nl << be_nl - << "virtual CORBA::ValueBase *" << be_nl + << "virtual ::CORBA::ValueBase *" << be_nl << "create_for_unmarshal (" << be_idt << be_idt_nl << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl @@ -115,7 +115,7 @@ be_visitor_valuetype_init_ch::visit_valuetype (be_valuetype *node) if (node->supports_abstract ()) { os << be_nl << be_nl - << "virtual CORBA::AbstractBase_ptr" << be_nl + << "virtual ::CORBA::AbstractBase_ptr" << be_nl << "create_for_unmarshal_abstract (" << be_idt << be_idt_nl << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt; diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp index 4adbbc0e883..37c2eb0a2da 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp @@ -97,7 +97,7 @@ be_visitor_valuetype_init_cs::visit_valuetype (be_valuetype *node) // The _downcast method. *os << be_nl << be_nl << node->name () << "_init *" << be_nl << node->name () - << "_init::_downcast (CORBA::ValueFactoryBase *v)" << be_nl + << "_init::_downcast ( ::CORBA::ValueFactoryBase *v)" << be_nl << "{" << be_idt_nl << "return dynamic_cast< ::" << node->name () << "_init * > (v);" << be_uidt_nl @@ -117,15 +117,15 @@ be_visitor_valuetype_init_cs::visit_valuetype (be_valuetype *node) { // generate create_for_unmarshal() *os << be_nl << be_nl - << "CORBA::ValueBase *" << be_nl + << "::CORBA::ValueBase *" << be_nl << fname << "::create_for_unmarshal" << " " << "(ACE_ENV_SINGLE_ARG_DECL)" << be_nl << "{" << be_idt_nl - << "CORBA::ValueBase *ret_val = 0;" << be_nl + << "::CORBA::ValueBase *ret_val = 0;" << be_nl << "ACE_NEW_THROW_EX (" << be_idt << be_idt_nl << "ret_val," << be_nl << "OBV_" << node->full_name () << "," << be_nl - << "CORBA::NO_MEMORY ()" << be_uidt_nl + << "::CORBA::NO_MEMORY ()" << be_uidt_nl << ");" << be_uidt_nl << "return ret_val;" << be_uidt_nl << "}"; @@ -133,14 +133,14 @@ be_visitor_valuetype_init_cs::visit_valuetype (be_valuetype *node) if (node->supports_abstract ()) { *os << be_nl << be_nl - << "CORBA::AbstractBase_ptr" << be_nl + << "::CORBA::AbstractBase_ptr" << be_nl << fname << "::create_for_unmarshal_abstract (ACE_ENV_SINGLE_ARG_DECL)" << be_nl << "{" << be_idt_nl - << "CORBA::AbstractBase *ret_val = 0;" << be_nl + << "::CORBA::AbstractBase *ret_val = 0;" << be_nl << "ACE_NEW_THROW_EX (" << be_idt << be_idt_nl << "ret_val," << be_nl << "OBV_" << node->full_name () << "," << be_nl - << "CORBA::NO_MEMORY ()" << be_uidt_nl + << "::CORBA::NO_MEMORY ()" << be_uidt_nl << ");" << be_uidt_nl << "return ret_val;" << be_uidt_nl << "}"; diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp index 2eeecb13117..e0d5cb52626 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp @@ -133,7 +133,7 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node) *os << "," << be_nl; // dump the scoped name. - *os << " public virtual CORBA::DefaultValueRefCountBase"; + *os << " public virtual ::CORBA::DefaultValueRefCountBase"; } *os << be_uidt_nl; @@ -220,17 +220,17 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node) { *os << be_nl << be_uidt_nl << "protected:" << be_idt_nl; - *os << "virtual CORBA::Boolean" << be_nl + *os << "virtual ::CORBA::Boolean" << be_nl << "_tao_marshal__" << node->flat_name () << " (TAO_OutputCDR &) const;" << be_nl << be_nl; - *os << "virtual CORBA::Boolean" << be_nl + *os << "virtual ::CORBA::Boolean" << be_nl << "_tao_unmarshal__" << node->flat_name () << " (TAO_InputCDR &);" << be_nl << be_nl; - *os << "CORBA::Boolean " + *os << "::CORBA::Boolean " << "_tao_marshal_state (TAO_OutputCDR &) const;" << be_nl - << "CORBA::Boolean " + << "::CORBA::Boolean " << "_tao_unmarshal_state (TAO_InputCDR &);" << be_uidt_nl << be_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp index a3d427ec64d..34dd41725df 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp @@ -82,7 +82,7 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node) // or the valuetype is abstract. if (!node->opt_accessor ()) { - *os << be_nl << be_nl << "CORBA::Boolean" << be_nl + *os << be_nl << be_nl << "::CORBA::Boolean" << be_nl << node->full_obv_skel_name () << "::_tao_marshal__" << node->flat_name () << " (TAO_OutputCDR &strm) const" << be_nl @@ -90,7 +90,7 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node) << "return _tao_marshal_state (strm);" << be_uidt_nl << "}" << be_nl << be_nl; - *os << "CORBA::Boolean" << be_nl + *os << "::CORBA::Boolean" << be_nl << node->full_obv_skel_name () << "::_tao_unmarshal__" << node->flat_name () << " (TAO_InputCDR &strm)" << be_nl @@ -116,7 +116,7 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node) << node->full_obv_skel_name () << "::_add_ref (void)" << be_nl << "{" << be_idt_nl - << "this->ACE_NESTED_CLASS (CORBA,DefaultValueRefCountBase)::_add_ref ();" + << "this->ACE_NESTED_CLASS ( ::CORBA,DefaultValueRefCountBase)::_add_ref ();" << be_uidt_nl << "}" << be_nl; @@ -124,7 +124,7 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node) << node->full_obv_skel_name () << "::_remove_ref (void)" << be_nl << "{" << be_idt_nl - << "this->ACE_NESTED_CLASS (CORBA,DefaultValueRefCountBase)::_remove_ref ();" + << "this->ACE_NESTED_CLASS ( ::CORBA,DefaultValueRefCountBase)::_remove_ref ();" << be_uidt_nl << "}"; } diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp index 8ac5a38e962..c0a87d4aed2 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp @@ -90,13 +90,13 @@ be_visitor_valuetype_fwd_any_op_ch::visit_valuetype_fwd ( // 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 () << " *); // copying" << be_nl; *os << be_global->stub_export_macro () << " void" - << " operator<<= (CORBA::Any &, " << node->local_name () + << " operator<<= ( ::CORBA::Any &, " << node->local_name () << " **); // 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 () << " *&);"; be_util::gen_nested_namespace_end (os, module); @@ -106,13 +106,13 @@ be_visitor_valuetype_fwd_any_op_ch::visit_valuetype_fwd ( } *os << be_global->stub_export_macro () << " void" - << " operator<<= (CORBA::Any &, " << node->name () + << " operator<<= ( ::CORBA::Any &, " << node->name () << " *); // copying" << be_nl; *os << be_global->stub_export_macro () << " void" - << " operator<<= (CORBA::Any &, " << node->name () + << " operator<<= ( ::CORBA::Any &, " << node->name () << " **); // 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 () << " *&);"; if (module != 0) diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp index b89f35115c3..2280f0d5444 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp @@ -79,11 +79,11 @@ be_visitor_valuetype_fwd_cdr_op_ch::visit_valuetype_fwd ( << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; *os << be_global->stub_export_macro () - << " CORBA::Boolean operator<< (TAO_OutputCDR &, const " + << " ::CORBA::Boolean operator<< (TAO_OutputCDR &, const " << node->full_name () << " *);" << be_nl; *os << be_global->stub_export_macro () - << " CORBA::Boolean operator>> (TAO_InputCDR &, " + << " ::CORBA::Boolean operator>> (TAO_InputCDR &, " << node->full_name () << " *&);" << be_nl; node->cli_hdr_cdr_op_gen (I_TRUE); diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ci.cpp index 60807ec7f15..307fd0c236d 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ci.cpp @@ -84,11 +84,11 @@ be_visitor_valuetype_fwd_cdr_op_ci::visit_valuetype_fwd ( //This is just declaration so no ACE_INLINE *os << be_global->stub_export_macro () - << " CORBA::Boolean operator<< (TAO_OutputCDR &, const " + << " ::CORBA::Boolean operator<< (TAO_OutputCDR &, const " << node->full_name () << " *);" << be_nl; *os << be_global->stub_export_macro () - << " CORBA::Boolean operator>> (TAO_InputCDR &, " + << " ::CORBA::Boolean operator>> (TAO_InputCDR &, " << node->full_name () << " *&);"; // Done with this. |