Changed to generate ACE_TRY_ENV

5 files changed, 10 insertions, 10 deletions

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 500a35f55ad..2b14e10b3cf 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
@@ -327,11 +327,11 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
   // the _this () operation
   *os << node->name () << "*" << be_nl
       << node->full_skel_name ()
-      << "::_this (CORBA_Environment &TAO_IN_ENV)" << be_nl
+      << "::_this (CORBA_Environment &ACE_TRY_ENV)" << be_nl
       << "{" << be_idt_nl
-      << "STUB_Object *stub = this->_create_stub (TAO_IN_ENV);" << be_nl
-      << "TAO_CHECK_ENV_RETURN (TAO_IN_ENV, 0);" << be_nl
-    //      << "if (TAO_IN_ENV.exception () != 0)" << be_idt_nl
+      << "STUB_Object *stub = this->_create_stub (ACE_TRY_ENV);" << be_nl
+      << "TAO_CHECK_ENV_RETURN (ACE_TRY_ENV, 0);" << be_nl
+    //      << "if (ACE_TRY_ENV.exception () != 0)" << be_idt_nl
     //      << "return 0;" << be_uidt_nl
       << "return new " << node->full_coll_name ()
       << " (this, stub);" << be_uidt << be_nl;
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 8149733988c..f9e2ef18168 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
@@ -156,7 +156,7 @@ be_visitor_sequence_ch::gen_bounded_obj_sequence (be_sequence *node)
       *os << "virtual void _downcast (" << be_idt << be_idt_nl
 	  << "void* target," << be_nl
 	  << "CORBA_Object *src," << be_nl
-	  << "CORBA_Environment &TAO_IN_ENV = "  << be_idt_nl
+	  << "CORBA_Environment &ACE_TRY_ENV = "  << be_idt_nl
 	  << "CORBA::Environment::default_environment ()"
 	  << be_uidt << be_uidt_nl
 	  << ");" << be_uidt_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp
index 1896796b859..d1f50bfd03d 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp
@@ -165,7 +165,7 @@ be_visitor_sequence_cs::gen_bounded_obj_sequence (be_sequence *node)
           << full_class_name << "::_downcast (" << be_idt << be_idt_nl
 	  << "void* target," << be_nl
 	  << "CORBA_Object *src," << be_nl
-	  << "CORBA::Environment &TAO_IN_ENV" << be_uidt_nl
+	  << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl
 	  << ")" << be_uidt_nl
 	  << "{" << be_idt_nl;
       pt->accept (visitor);
@@ -174,7 +174,7 @@ be_visitor_sequence_cs::gen_bounded_obj_sequence (be_sequence *node)
       *os << "**, target);" << be_nl
 	  << "*tmp = ";
       pt->accept (visitor);
-      *os << "::_narrow (src, TAO_IN_ENV);" << be_uidt_nl
+      *os << "::_narrow (src, ACE_TRY_ENV);" << be_uidt_nl
 	  << "}\n" << be_nl;
 
       *os << "CORBA_Object*" << be_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 62d83d05ec7..1f9e88780c2 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
@@ -146,7 +146,7 @@ be_visitor_sequence_ch::gen_unbounded_obj_sequence (be_sequence *node)
       *os << "virtual void _downcast (" << be_idt << be_idt_nl
 	  << "void* target," << be_nl
 	  << "CORBA_Object *src," << be_nl
-	  << "CORBA_Environment &TAO_IN_ENV = "  << be_idt_nl
+	  << "CORBA_Environment &ACE_TRY_ENV = "  << be_idt_nl
 	  << "CORBA::Environment::default_environment ()"
 	  << be_uidt << be_uidt_nl
 	  << ");" << be_uidt_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp
index 53eeaac7b26..9686a29bd3d 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp
@@ -188,7 +188,7 @@ be_visitor_sequence_cs::gen_unbounded_obj_sequence (be_sequence *node)
           << full_class_name << "::_downcast (" << be_idt << be_idt_nl
 	  << "void* target," << be_nl
 	  << "CORBA_Object *src," << be_nl
-	  << "CORBA_Environment &TAO_IN_ENV"
+	  << "CORBA_Environment &ACE_TRY_ENV"
 	  << be_uidt_nl
 	  << ")" << be_uidt_nl
 	  << "{" << be_idt_nl;
@@ -198,7 +198,7 @@ be_visitor_sequence_cs::gen_unbounded_obj_sequence (be_sequence *node)
       *os << "**, target);" << be_nl
 	  << "*tmp = ";
       pt->accept (visitor);
-      *os << "::_narrow (src, TAO_IN_ENV);" << be_uidt_nl
+      *os << "::_narrow (src, ACE_TRY_ENV);" << be_uidt_nl
 	  << "}\n" << be_nl;
       
       *os << "CORBA_Object*" << be_nl