diff options
Diffstat (limited to 'TAO/TAO_IDL')
9 files changed, 18 insertions, 18 deletions
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp index b926dfc27d4..f2d84c938ad 100644 --- a/TAO/TAO_IDL/be/be_interface.cpp +++ b/TAO/TAO_IDL/be/be_interface.cpp @@ -1687,7 +1687,7 @@ be_interface::gen_skel_helper (be_interface *derived, << "void *obj," << be_nl << "void *context," << be_nl << "CORBA::Environment &env =" << be_idt_nl - << "CORBA::default_environment ()" + << "TAO_default_environment ()" << be_uidt << be_uidt_nl << ");" << be_uidt << "\n\n"; } @@ -1738,7 +1738,7 @@ be_interface::gen_skel_helper (be_interface *derived, << "void *obj," << be_nl << "void *context," << be_nl << "CORBA::Environment &env =" << be_idt_nl - << "CORBA::default_environment ()" + << "TAO_default_environment ()" << be_uidt << be_uidt_nl << ");" << be_uidt << "\n\n"; } @@ -1785,7 +1785,7 @@ be_interface::gen_skel_helper (be_interface *derived, << "void *obj," << be_nl << "void *context," << be_nl << "CORBA::Environment &env = " << be_idt_nl - << "CORBA::default_environment ()" + << "TAO_default_environment ()" << be_uidt << be_uidt_nl << ");" << be_uidt << "\n\n"; } 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 6711f5197fa..89f264d9671 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp @@ -161,14 +161,14 @@ be_visitor_interface_ch::visit_interface (be_interface *node) << "_narrow (" << be_idt << be_idt_nl << "CORBA::Object_ptr obj," << be_nl << "CORBA::Environment &env = " << be_idt_nl - << "CORBA::default_environment ()" + << "TAO_default_environment ()" << be_uidt << be_uidt_nl << ");" << be_uidt_nl << "static " << node->local_name () << "_ptr " << "_unchecked_narrow (" << be_idt << be_idt_nl << "CORBA::Object_ptr obj," << be_nl << "CORBA::Environment &env = " << be_idt_nl - << "CORBA::default_environment ()" + << "TAO_default_environment ()" << be_uidt << be_uidt_nl << ");" << be_uidt_nl << "static " << node->local_name () << "_ptr " << "_nil (void);\n\n"; @@ -188,7 +188,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node) *os << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl << "const CORBA::Char *type_id, " << be_nl << "CORBA::Environment &env = " << be_idt_nl - << "CORBA::default_environment ()" + << "TAO_default_environment ()" << be_uidt << be_uidt_nl << ");" << be_uidt_nl << "virtual const char* " 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 6c5ef47158f..15b60a36d95 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp @@ -111,7 +111,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node) << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl << "const char* logical_type_id," << be_nl << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl - << "CORBA::default_environment ()" + << "TAO_default_environment ()" << be_uidt << be_uidt_nl << ");\n" << be_uidt_nl; @@ -125,7 +125,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node) << "void *obj," << be_nl << "void *context," << be_nl << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl - << "CORBA::default_environment ()" + << "TAO_default_environment ()" << be_uidt << be_uidt_nl << ");\n" << be_uidt_nl; @@ -136,7 +136,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node) << "void *obj," << be_nl << "void *context," << be_nl << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl - << "CORBA::default_environment ()" + << "TAO_default_environment ()" << be_uidt << be_uidt_nl << ");\n" << be_uidt_nl; @@ -145,14 +145,14 @@ be_visitor_interface_sh::visit_interface (be_interface *node) << "CORBA::ServerRequest &_tao_req," << be_nl << "void *_tao_context," << be_nl << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl - << "CORBA::default_environment ()" + << "TAO_default_environment ()" << be_uidt << be_uidt_nl << ");\n" << be_uidt_nl; // Print out the _this() method. *os << node->name () << " *_this (" << be_idt << be_idt_nl << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl - << "CORBA::default_environment ()" + << "TAO_default_environment ()" << be_uidt << be_uidt_nl << ");\n" << be_uidt_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 e93e0b40e81..4892051d8b9 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp @@ -116,7 +116,7 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node) << "// overridden ServantBase operations" << be_nl << "PortableServer::POA_ptr _default_POA (" << be_idt << be_idt_nl << "CORBA::Environment &env = " << be_idt_nl - << "CORBA::default_environment ()" + << "TAO_default_environment ()" << be_uidt << be_uidt_nl << ");" << be_uidt << "\n"; diff --git a/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp index 969e55e2c04..71ed8c459f7 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp @@ -71,7 +71,7 @@ be_visitor_operation_arglist::visit_operation (be_operation *node) os->indent (); *os << "CORBA::Environment &ACE_TRY_ENV"; *os << " = " << be_idt_nl - << "CORBA::default_environment ()" + << "TAO_default_environment ()" << be_uidt; break; case TAO_CodeGen::TAO_OPERATION_ARGLIST_IS: diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp index 0e3244afec0..406daad2b87 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp @@ -139,7 +139,7 @@ be_visitor_operation_sh::visit_operation (be_operation *node) << "void *_tao_obj, " << be_nl << "void *_tao_context, " << be_nl << "CORBA::Environment &_tao_env = " << be_idt_nl - << "CORBA::default_environment ()" + << "TAO_default_environment ()" << be_uidt << be_uidt_nl << ");" << be_uidt << "\n\n"; } diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp index b453bbe12d2..d16b35b5528 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp @@ -157,7 +157,7 @@ be_visitor_sequence_ch::gen_bounded_obj_sequence (be_sequence *node) << "void* target," << be_nl << "CORBA_Object *src," << be_nl << "CORBA_Environment &ACE_TRY_ENV = " << be_idt_nl - << "CORBA::default_environment ()" + << "TAO_default_environment ()" << be_uidt << be_uidt_nl << ");" << be_uidt_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp index 3edf1668afd..98259e83e53 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp @@ -147,7 +147,7 @@ be_visitor_sequence_ch::gen_unbounded_obj_sequence (be_sequence *node) << "void* target," << be_nl << "CORBA_Object *src," << be_nl << "CORBA_Environment &ACE_TRY_ENV = " << be_idt_nl - << "CORBA::default_environment ()" + << "TAO_default_environment ()" << be_uidt << be_uidt_nl << ");" << be_uidt_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 9fbe2ab935a..5f4b00a0966 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 @@ -244,11 +244,11 @@ be_visitor_union_branch_private_ch::visit_predefined_type (be_predefined_type *n // check if we are dealing with a CORBA::Object if (!ACE_OS::strcmp (bt->local_name ()->get_string (), "Object")) { - *os << "TAO_Object_Field_T<CORBA::Object> *" << ub->local_name () + *os << "TAO_Object_Field_T<CORBA::Object> *" << ub->local_name () << "_;\n"; } else - *os << bt->nested_type_name (bu, "_ptr") << " " << ub->local_name () + *os << bt->nested_type_name (bu, "_ptr") << " " << ub->local_name () << "_;\n"; } else if (node->pt () == AST_PredefinedType::PT_any) |