ChangeLogTag:Fri Apr 28 19:57:41 2000 Carlos O'Ryan <coryan@uci.edu>

20 files changed, 243 insertions, 169 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 78a2d459464..d9e7ada4ea4 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,28 +1,74 @@
+Fri Apr 28 19:57:41 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * Minor fixes to the IDL compiler to facilitate the automatic
+          generation of code in the TAO library (i.e. the locality
+          constrained interfaces).
+
+        * TAO_IDL/be/be_visitor_operation/arglist.cpp:
+          Operations in locality constrained interfaces should have a
+          default value for the CORBA::Environment argument.
+
+        * TAO_IDL/be/be_visitor_exception/exception_cs.cpp:
+          Do not generate a _tao_any_destructor implementation for
+          locality constrained types.
+          The _tao_encode() and _tao_decode() methods should be trivial
+          for locality constrained exceptions.
+
+        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp:
+          Use CORBA_Object in place of ACE_CORBA_1(Object), the former is
+          more readable and easier to maintain.  Ditto cor CORBA_ValueBase
+          and CORBA_ValueFactoryBase
+
+        * TAO_IDL/be/be_interface.cpp:
+        * TAO_IDL/be/be_visitor_interface/cdr_op_ci.cpp:
+        * TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/tie_sh.cpp:
+        * TAO_IDL/be/be_visitor_interface/tie_si.cpp:
+          Use ACE_TRY_ENV for all the CORBA::Environment arguments.
+
+        * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp:
+          Fixed indentation in the generated code.
+
+        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+          Removed spurious blank at the end of a line.
+
+        * TAO_IDL/be/be_visitor_interface/interface_is.cpp:
+        * TAO_IDL/be/be_visitor_operation/ami_arglist.cpp:
+        * TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_ch.cpp:
+        * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp:
+        * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp:
+        * TAO_IDL/be/be_visitor_operation/argument.cpp:
+
+          Cosmetic fixes
+
 Fri Apr 28 14:41:52 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-	* tests/Xt_Stopwatch/Makefile: Ran a make depend on the
-	  file. Thanks to Bill Tonseth <tonseth@shamra.mv.com> for
-	  reporting this. 
+        * tests/Xt_Stopwatch/Makefile: Ran a make depend on the
+          file. Thanks to Bill Tonseth <tonseth@shamra.mv.com> for
+          reporting this.
 
 Fri Apr 28 13:40:34 2000  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-	* tao/diffs/InterceptorC.h.diff:
-	* tao/diffs/InterceptorC.cpp.diff:
-	* tao/diffs/InterceptorC.cpp:
-	* tao/Makefile (interceptor.target): Updated the patches for
-	  Interceptor.pidl and regenerate InterceptorC.*.
+        * tao/diffs/InterceptorC.h.diff:
+        * tao/diffs/InterceptorC.cpp.diff:
+        * tao/diffs/InterceptorC.cpp:
+        * tao/Makefile (interceptor.target): Updated the patches for
+          Interceptor.pidl and regenerate InterceptorC.*.
 
 Fri Apr 28 13:16:58 2000  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-	* tao/InterceptorC.h: This file needs to be conditionally
-	  compiled.
+        * tao/InterceptorC.h: This file needs to be conditionally
+          compiled.
 
 Fri Apr 28 11:17:35 2000  Jeff Parsons  <parsons@cs.wustl.edu>
 
-	* tao/InterceptorC.cpp:
-	  Moved the line '#if (TAO_HAS_INTERCEPTORS == 1)' line to come
-	  after the line '#include tao/InterceptorC.h' to avoid link
-	  errors on NT.
+        * tao/InterceptorC.cpp:
+          Moved the line '#if (TAO_HAS_INTERCEPTORS == 1)' line to come
+          after the line '#include tao/InterceptorC.h' to avoid link
+          errors on NT.
 
 Fri Apr 28 08:29:09 2000  Carlos O'Ryan  <coryan@uci.edu>
 
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index cf75362126d..c26f361a8ff 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -1875,7 +1875,7 @@ be_interface::gen_skel_helper (be_interface *derived,
                       << "CORBA::ServerRequest &req, " << be_nl
                       << "void *obj," << be_nl
                       << "void *context," << be_nl
-                      << "CORBA::Environment &env =" << be_idt_nl
+                      << "CORBA::Environment &ACE_TRY_ENV =" << be_idt_nl
                       << "TAO_default_environment ()"
                       << be_uidt << be_uidt_nl
                       << ");" << be_uidt << "\n\n";
@@ -1890,7 +1890,7 @@ be_interface::gen_skel_helper (be_interface *derived,
                       << "CORBA::ServerRequest &req," << be_nl
                       << "void *obj," << be_nl
                       << "void *context," << be_nl
-                      << "CORBA::Environment &env" << be_uidt_nl
+                      << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl
                       << ")" << be_uidt_nl
                       << "{" << be_idt_nl;
                   *os << ancestor->full_skel_name ()
@@ -1926,7 +1926,7 @@ be_interface::gen_skel_helper (be_interface *derived,
                       << "CORBA::ServerRequest &req," << be_nl
                       << "void *obj," << be_nl
                       << "void *context," << be_nl
-                      << "CORBA::Environment &env =" << be_idt_nl
+                      << "CORBA::Environment &ACE_TRY_ENV =" << be_idt_nl
                       << "TAO_default_environment ()"
                       << be_uidt << be_uidt_nl
                       << ");" << be_uidt << "\n\n";
@@ -1941,7 +1941,7 @@ be_interface::gen_skel_helper (be_interface *derived,
                       << "CORBA::ServerRequest &req," << be_nl
                       << "void *obj," << be_nl
                       << "void *context," << be_nl
-                      << "CORBA::Environment &env" << be_uidt_nl
+                      << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl
                       << ")" << be_uidt_nl
                       << "{" << be_idt_nl
                       << ancestor->full_skel_name ()
@@ -1973,7 +1973,7 @@ be_interface::gen_skel_helper (be_interface *derived,
                           << "CORBA::ServerRequest &req," << be_nl
                           << "void *obj," << be_nl
                           << "void *context," << be_nl
-                          << "CORBA::Environment &env = " << be_idt_nl
+                          << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
                           << "TAO_default_environment ()"
                           << be_uidt << be_uidt_nl
                           << ");" << be_uidt << "\n\n";
@@ -1989,7 +1989,7 @@ be_interface::gen_skel_helper (be_interface *derived,
                           << "CORBA::ServerRequest &req," << be_nl
                           << "void *obj," << be_nl
                           << "void *context," << be_nl
-                          << "CORBA::Environment &env" << be_uidt_nl
+                          << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl
                           << ")" << be_uidt_nl
                           << "{" << be_idt_nl
                           << ancestor->full_skel_name ()
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 15207f71f03..2f0ead2e1c7 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
@@ -76,13 +76,16 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
       *os << "{" << be_nl;
       *os << "}\n\n";
 
-      *os << "void "
-          << node->name () << "::_tao_any_destructor (void *x)" << be_nl
-          << "{" << be_idt_nl
-          << node->local_name () << " *tmp = ACE_static_cast ("
-          << node->local_name () << "*,x);" << be_nl
-          << "delete tmp;" << be_uidt_nl
-          << "}\n\n";
+      if (!node->is_local ())
+        {
+          *os << "void "
+              << node->name () << "::_tao_any_destructor (void *x)" << be_nl
+              << "{" << be_idt_nl
+              << node->local_name () << " *tmp = ACE_static_cast ("
+              << node->local_name () << "*,x);" << be_nl
+              << "delete tmp;" << be_uidt_nl
+              << "}\n\n";
+        }
 
       // copy constructor
       os->indent ();
@@ -159,27 +162,52 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
 
       *os << be_nl
           << "void " << node->name ()
-          << "::_tao_encode (" << be_idt << be_idt_nl
-          << "TAO_OutputCDR &cdr," << be_nl
-          << "CORBA::Environment &ACE_TRY_ENV) const"
-          << be_uidt << be_uidt_nl
-          << "{" << be_idt_nl
-          << "if (cdr << *this)" << be_nl
-          << "  return;" << be_nl
-          << "ACE_THROW (CORBA::MARSHAL ());" << be_uidt_nl
-          << "}\n\n";
+          << "::_tao_encode (" << be_idt << be_idt_nl;
+      if (!node->is_local ())
+        {
+          *os << "TAO_OutputCDR &cdr," << be_nl
+              << "CORBA::Environment &ACE_TRY_ENV) const"
+              << be_uidt << be_uidt_nl
+              << "{" << be_idt_nl
+              << "if (cdr << *this)" << be_nl
+              << "  return;" << be_nl
+              << "ACE_THROW (CORBA::MARSHAL ());" << be_uidt_nl
+              << "}\n\n";
+        }
+      else
+        {
+          *os << "TAO_OutputCDR &," << be_nl
+              << "CORBA::Environment &ACE_TRY_ENV) const"
+              << be_uidt << be_uidt_nl
+              << "{" << be_idt_nl
+              << "ACE_THROW (CORBA::MARSHAL ());" << be_uidt_nl
+              << "}\n\n";
+        }
+
 
       *os << be_nl
           << "void " << node->name ()
-          << "::_tao_decode (" << be_idt << be_idt_nl
-          << "TAO_InputCDR &cdr," << be_nl
-          << "CORBA::Environment &ACE_TRY_ENV)"
-          << be_uidt << be_uidt_nl
-          << "{" << be_idt_nl
-          << "if (cdr >> *this)" << be_nl
-          << "  return;" << be_nl
-          << "ACE_THROW (CORBA::MARSHAL ());" << be_uidt_nl
-          << "}\n\n";
+          << "::_tao_decode (" << be_idt << be_idt_nl;
+      if (!node->is_local ())
+        {
+          *os << "TAO_InputCDR &cdr," << be_nl
+              << "CORBA::Environment &ACE_TRY_ENV)"
+              << be_uidt << be_uidt_nl
+              << "{" << be_idt_nl
+              << "if (cdr >> *this)" << be_nl
+              << "  return;" << be_nl
+              << "ACE_THROW (CORBA::MARSHAL ());" << be_uidt_nl
+              << "}\n\n";
+        }
+      else
+        {
+          *os << "TAO_InputCDR &," << be_nl
+              << "CORBA::Environment &ACE_TRY_ENV)"
+              << be_uidt << be_uidt_nl
+              << "{" << be_idt_nl
+              << "ACE_THROW (CORBA::MARSHAL ());" << be_uidt_nl
+              << "}\n\n";
+        }
 
       // generate the _alloc method
       os->indent ();
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ci.cpp b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ci.cpp
index a8514fbfb20..449375eb3b8 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ci.cpp
@@ -119,7 +119,6 @@ be_visitor_interface_cdr_op_ci::visit_interface (be_interface *node)
       << ")" << be_uidt_nl
       << "{" << be_idt_nl;
   // hand over to the TAO's internal marshaling engine
-  //  *os << "CORBA::Environment env;" << be_nl;
   *os << "ACE_TRY_NEW_ENV" << be_nl
       << "{" << be_idt_nl;
   *os << "CORBA::Object_var obj;" << 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 7fb082f0028..444f52404a0 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
@@ -136,7 +136,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
           // CORBA::Object class
           // Generate code that uses the macro. This is required to deal with
           // the MSVC++ insanity
-          *os << " : public virtual ACE_CORBA_1 (Object)" << be_nl;
+          *os << " : public virtual CORBA_Object" << be_nl;
         }
 
       // generate the body
@@ -159,7 +159,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
           << "static " << node->local_name () << "_ptr "
           << "_narrow (" << be_idt << be_idt_nl
           << "CORBA::Object_ptr obj," << be_nl
-          << "CORBA::Environment &env = " << be_idt_nl
+          << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
           << "TAO_default_environment ()"
           << be_uidt << be_uidt_nl
           << ");" << be_uidt_nl;
@@ -168,7 +168,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
       *os << "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::Environment &ACE_TRY_ENV = " << be_idt_nl
           << "TAO_default_environment ()"
           << be_uidt << be_uidt_nl
           << ");" << be_uidt_nl;
@@ -205,7 +205,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
       if (! node->is_local ())
         *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::Environment &ACE_TRY_ENV = " << be_idt_nl
             << "TAO_default_environment ()"
             << be_uidt << be_uidt_nl
             << ");" << be_uidt << be_nl;
@@ -240,7 +240,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
       *os << node->local_name () << " (const " << node->local_name () << " &);"
           << be_nl
           << "void operator= (const " << node->local_name () << " &);";
-      *os << be_uidt <<be_uidt_nl;
+      *os << be_uidt_nl;
       *os << "};\n\n";
 
       be_visitor_context ctx (*this->ctx_);
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 730e9a450aa..616420141cb 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
@@ -177,7 +177,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
 
 
   // The _duplicate method
-  *os << node->full_name () << "_ptr " << be_nl
+  *os << node->full_name () << "_ptr" << be_nl
       << node->full_name () << "::_duplicate ("
       << bt->nested_type_name (this->ctx_->scope ())
       << "_ptr obj)" << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp
index dc0c26be9a3..54dbf737053 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp
@@ -41,9 +41,9 @@ be_visitor_interface_is::~be_visitor_interface_is (void)
 int
 be_visitor_interface_is::visit_interface (be_interface *node)
 {
-  
+
   this->ctx_->interface (node);
-  
+
   TAO_OutStream *os; // output stream
 
   if (node->impl_skel_gen () || node->imported ())
@@ -51,7 +51,7 @@ be_visitor_interface_is::visit_interface (be_interface *node)
 
   os = this->ctx_->stream ();
 
-  
+
   // generate the skeleton class name
 
   os->indent (); // start with whatever indentation level we are at
@@ -62,11 +62,11 @@ be_visitor_interface_is::visit_interface (be_interface *node)
   // find if we are at the top scope or inside some module
   *os << idl_global->impl_class_prefix () << node->flat_name () << idl_global->impl_class_suffix () <<"::" << idl_global->impl_class_prefix () << node->flat_name () << idl_global->impl_class_suffix () <<
         " (void)" << be_idt_nl;
-  
+
   /*
   if(node->n_inherits () >0)
     {
-      //generate the default constructors of all the base classes      
+      //generate the default constructors of all the base classes
       node->gen_def_ctors(os);
     }
   */
@@ -77,19 +77,19 @@ be_visitor_interface_is::visit_interface (be_interface *node)
   // destructor
   os->indent ();
   *os << "// Implementation skeleton destructor" << be_nl;
-  
+
   *os << idl_global->impl_class_prefix () << node->flat_name () << idl_global->impl_class_suffix () <<"::~" << idl_global->impl_class_prefix () << node->flat_name () << idl_global->impl_class_suffix () <<
     " (void)" << be_idt_nl;
-  
+
   *os << "{" <<be_nl;
   *os << "}" << be_nl <<be_uidt_nl;
 
   if (idl_global->gen_copy_ctor () )
     {
       *os << "//Implementation Skeleton Copy Constructor" << be_nl;
-      
+
       *os <<idl_global->impl_class_prefix () << node->flat_name () << idl_global->impl_class_suffix () <<"::"
-          << idl_global->impl_class_prefix () << node->flat_name () << idl_global->impl_class_suffix () << " (const " 
+          << idl_global->impl_class_prefix () << node->flat_name () << idl_global->impl_class_suffix () << " (const "
           << idl_global->impl_class_prefix () << node->flat_name () << idl_global->impl_class_suffix () << "& t)"<< be_idt_nl;
       if(node->n_inherits () >0)
         {
@@ -105,7 +105,7 @@ be_visitor_interface_is::visit_interface (be_interface *node)
       *os << "//Implementation Skeleton Copy Assignment" << be_nl;
 
       *os << idl_global->impl_class_prefix () << node->flat_name () << idl_global->impl_class_suffix () << "& "
-          << idl_global->impl_class_prefix () << node->flat_name () << idl_global->impl_class_suffix () << "::operator=(const " 
+          << idl_global->impl_class_prefix () << node->flat_name () << idl_global->impl_class_suffix () << "::operator=(const "
           << idl_global->impl_class_prefix () << node->flat_name () << idl_global->impl_class_suffix () << "& t)" <<be_idt_nl
           << "{" << be_idt_nl
           << "return *this;" << be_uidt_nl
@@ -113,7 +113,7 @@ be_visitor_interface_is::visit_interface (be_interface *node)
     }
 
   // generate code for elements in the scope (e.g., operations)
-  
+
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -127,7 +127,7 @@ be_visitor_interface_is::visit_interface (be_interface *node)
     {
       // this interface inherits from other interfaces
       be_interface *intf; // inherited interface
-      
+
       for (int i = 0; i < node->n_inherits (); i++)
 	{
 	  intf = be_interface::narrow_from_decl (node->inherits ()[i]);
@@ -150,8 +150,8 @@ be_visitor_interface_is::visit_interface (be_interface *node)
                          "traversal of inhertance graph failed\n"),
                         -1);
     }
-  
-  
+
+
   return 0;
 }
 
@@ -169,7 +169,7 @@ be_visitor_interface_is::method_helper (be_interface *derived,
       ctx.state (TAO_CodeGen::TAO_INTERFACE_IS);
       ctx.interface (derived);
       ctx.stream (os);
-      
+
       be_visitor* visitor = tao_cg->make_visitor (&ctx);
       if (visitor == 0 || visitor->visit_scope (node) == -1)
         {
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp
index 9cbd7c03ad3..71493775fec 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp
@@ -49,9 +49,9 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node)
     {
 
       TAO_OutStream *os = this->ctx_->stream ();
-      
+
       be_type *bt;
-      
+
       // set the right type;
       if (this->ctx_->alias ())
         bt = this->ctx_->alias ();
@@ -59,7 +59,7 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node)
         bt = node;
       // output the class defn
 
-      *os << "class " << idl_global->stub_export_macro ()<< " " 
+      *os << "class " << idl_global->stub_export_macro ()<< " "
           << "TAO_" << node->flat_name ()
           << "_Default_Proxy_Factory" << be_nl
           << "{" << be_nl
@@ -73,12 +73,12 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node)
           << "_ptr create_proxy (" << be_idt << be_idt_nl
           << node->local_name ()
           << "_ptr proxy," << be_nl
-          << "CORBA::Environment &env = " << be_idt_nl
+          << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
           << "TAO_default_environment ()" << be_uidt << be_uidt_nl
           << ");" << be_uidt << be_uidt_nl
           << "};\n\n";
 
-      *os << "class " << idl_global->stub_export_macro ()<< " " 
+      *os << "class " << idl_global->stub_export_macro ()<< " "
           << "TAO_" << node->flat_name ()
           << "_Proxy_Factory_Adapter" << be_nl
           << "{" << be_nl
@@ -87,17 +87,17 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node)
           << "_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;" << be_nl << be_nl
           << "int register_proxy_factory (" << be_idt << be_idt_nl
           << "TAO_" << node->flat_name () << "_Default_Proxy_Factory *df,"<< be_nl
-          << "CORBA::Environment &env = " << be_idt_nl
+          << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
           << "TAO_default_environment ()" << be_uidt << be_uidt_nl
           << ");" << be_uidt_nl << be_nl
           << "int unregister_proxy_factory (" << be_idt << be_idt_nl
-          << "CORBA::Environment &env = " << be_idt_nl
+          << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
           << "TAO_default_environment ()" << be_uidt << be_uidt_nl
           << ");" << be_uidt_nl << be_nl
           << node->local_name ()
           << "_ptr create_proxy (" << be_idt << be_idt_nl
           << node->local_name () << "_ptr proxy," << be_nl
-          << "CORBA::Environment &env = " << be_idt_nl
+          << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
           << "TAO_default_environment ()" << be_uidt << be_uidt_nl
           << ");" << be_uidt << be_uidt_nl << be_nl
           << "protected:" << be_idt_nl
@@ -121,7 +121,7 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node)
           << "_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_"
           << node->flat_name ()<< "_PROXY_FACTORY_ADAPTER;"<<be_nl << be_nl;
 
-      *os << "class " << idl_global->stub_export_macro ()<< " " 
+      *os << "class " << idl_global->stub_export_macro ()<< " "
           << "TAO_"<< node->flat_name ()
           << "_Smart_Proxy_Base" << be_idt_nl
           << ": public virtual "
@@ -163,7 +163,8 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node)
         // This method will delegate this method to the <base_proxy_>
         // member of the smart proxy and so the smart proxy's (nil)
         // stubobj will not be returned.
-          << "virtual TAO_Stub *_stubobj (void) const;"<<be_uidt_nl;
+          << "virtual TAO_Stub *_stubobj (void) const;"
+          << be_uidt_nl;
 
       // generate code for the interface definition by traversing thru the
       // elements of its scope. We depend on the front-end to have made sure
@@ -178,8 +179,7 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node)
                              "codegen for scope failed\n"), -1);
         }
 
-      os->decr_indent ();
-      *os << be_uidt_nl << "protected:" << be_idt_nl
+      *os << "protected:" << be_idt_nl
           << "::" << node->full_name ()
           << "_ptr get_proxy (void);" << be_nl
           << "::" << node->full_name () << "_var proxy_;"
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 2116e414279..bf9d80107f5 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
@@ -49,42 +49,42 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
     {
 
       TAO_OutStream *os = this->ctx_->stream ();
-      
+
       this->ctx_->node (node);
-  
+
       os->indent ();
 
       // Its necessary to take care of the nested case. The smart proxy classes
       // are in the same scope as the proxy.
       be_decl* scope = be_scope::narrow_from_scope (node->defined_in ())->decl ();
-  
+
       *os << scope->full_name ();
 
       // Only if there exists any nesting "::" is needed!
       if (node->is_nested ())
         *os << "::";
-  
+
       *os <<"TAO_"<< node->flat_name () << "_Default_Proxy_Factory::";
       *os << "TAO_"
           << node->flat_name () << "_Default_Proxy_Factory (int register_proxy_factory)"
-          << be_nl 
+          << be_nl
           << "{" << be_idt_nl
           << "if (register_proxy_factory)"<< be_idt_nl
           << "{" << be_idt_nl
-          << "TAO_" << node->flat_name () 
+          << "TAO_" << node->flat_name ()
           << "_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);"<< be_uidt_nl
-          << "}" << be_uidt << be_uidt_nl 
+          << "}" << be_uidt << be_uidt_nl
           << "}\n\n";
 
       os->indent ();
 
       *os << scope->full_name ();
-  
+
       // Only if there exists any nesting "::" is needed!
       if (node->is_nested ())
         *os << "::";
-  
-      *os << "TAO_"<< node->flat_name () 
+
+      *os << "TAO_"<< node->flat_name ()
           << "_Default_Proxy_Factory::~";
       *os <<"TAO_"
           << node->flat_name () << "_Default_Proxy_Factory (void)"
@@ -99,15 +99,15 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
       // Only if there exists any nesting "::" is needed!
       if (node->is_nested ())
         *os << "::";
-  
-      *os << "TAO_" << node->flat_name () 
-          << "_Default_Proxy_Factory::create_proxy (" << be_idt << be_idt_nl 
-          << "::" << node->full_name () 
-          << "_ptr proxy," << be_nl 
-          << "CORBA::Environment &" << be_uidt_nl 
+
+      *os << "TAO_" << node->flat_name ()
+          << "_Default_Proxy_Factory::create_proxy (" << be_idt << be_idt_nl
+          << "::" << node->full_name ()
+          << "_ptr proxy," << be_nl
+          << "CORBA::Environment &" << be_uidt_nl
           << ")" << be_uidt << be_uidt_nl
           << "{" << be_idt_nl
-          << "return proxy;" << be_uidt << be_uidt_nl 
+          << "return proxy;" << be_uidt << be_uidt_nl
           << "}\n\n";
 
       os->indent ();
@@ -116,8 +116,8 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
       // Only if there exists any nesting "::" is needed!
       if (node->is_nested ())
         *os << "::";
-  
-      *os << "TAO_" << node->flat_name () << "_Proxy_Factory_Adapter::"; 
+
+      *os << "TAO_" << node->flat_name () << "_Proxy_Factory_Adapter::";
       *os << "TAO_"
           << node->flat_name () << "_Proxy_Factory_Adapter (void)" <<be_idt_nl
           << " : proxy_factory_ (0)," << be_idt_nl
@@ -131,8 +131,8 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
       // Only if there exists any nesting "::" is needed!
       if (node->is_nested ())
         *os << "::";
-  
-      *os << "TAO_" << node->flat_name () << "_Proxy_Factory_Adapter::"; 
+
+      *os << "TAO_" << node->flat_name () << "_Proxy_Factory_Adapter::";
       *os << "~TAO_"
           << node->flat_name () << "_Proxy_Factory_Adapter (void)" <<be_nl
           << "{" << be_idt_nl
@@ -147,15 +147,15 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
 
       // Only if there exists any nesting "::" is needed!
       if (node->is_nested ())
-        *os << "::";  
-      *os << "TAO_" << node->flat_name () 
+        *os << "::";
+      *os << "TAO_" << node->flat_name ()
           << "_Proxy_Factory_Adapter::register_proxy_factory (" << be_idt_nl
           << "TAO_" << node->flat_name ()
           << "_Default_Proxy_Factory *df," << be_idt_nl
           << " CORBA::Environment &ACE_TRY_ENV" << be_idt_nl
           << ")" << be_uidt << be_uidt << be_uidt_nl
           << "{" << be_idt_nl
-          << "ACE_MT (ACE_GUARD_RETURN (" 
+          << "ACE_MT (ACE_GUARD_RETURN ("
           << "ACE_Recursive_Thread_Mutex, ace_mon," << be_idt_nl
           << "this->lock_, 0));" <<be_uidt_nl
           << "// Remove any existing <proxy_factory_> and replace with the new one."<<be_nl
@@ -171,14 +171,14 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
 
       // Only if there exists any nesting "::" is needed!
       if (node->is_nested ())
-        *os << "::";  
- 
+        *os << "::";
+
       *os << "TAO_"<< node->flat_name ()
           << "_Proxy_Factory_Adapter::unregister_proxy_factory (" << be_idt_nl
           << "CORBA::Environment &" << be_idt_nl
           << ")" << be_uidt << be_uidt_nl
           << "{" << be_idt_nl
-          << "ACE_MT (ACE_GUARD_RETURN (" 
+          << "ACE_MT (ACE_GUARD_RETURN ("
           << "ACE_Recursive_Thread_Mutex, ace_mon," << be_idt_nl
           << "this->lock_, 0));" <<be_uidt_nl
           << "if ("
@@ -187,7 +187,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
           << "// Its necessary to set <delete_proxy_factory_> to 1 to make sure that it" <<be_nl
           << "// doesnt get into an infinite loop in <unregister_proxy_factory> as it is "<<be_nl
           << "// invoked in the destructor of the class too."<<be_nl
-          << "this->delete_proxy_factory_ = 1;" << be_nl     
+          << "this->delete_proxy_factory_ = 1;" << be_nl
           << "delete "
           << "this->proxy_factory_;" << be_nl
           << "this->proxy_factory_ = 0;" << be_uidt_nl
@@ -201,40 +201,40 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
 
       // Only if there exists any nesting "::" is needed!
       if (node->is_nested ())
-        *os << "::";  
- 
+        *os << "::";
+
       *os << "TAO_"<< node->flat_name ()
           << "_Proxy_Factory_Adapter::create_proxy (" << be_idt << be_idt_nl
-          << "::" << node->full_name () 
+          << "::" << node->full_name ()
           << "_ptr proxy," << be_nl
           << "CORBA::Environment &" << be_uidt_nl
           << ")" << be_uidt << be_uidt_nl
           << "{" << be_idt_nl
-          << "ACE_MT (ACE_GUARD_RETURN (" 
+          << "ACE_MT (ACE_GUARD_RETURN ("
           << "ACE_Recursive_Thread_Mutex, ace_mon," << be_idt_nl
           << "this->lock_, 0));" <<be_uidt_nl
           << "// Verify that an <proxy_factory_> is available else make one."<<be_nl
-          << "if (" 
+          << "if ("
           <<"this->proxy_factory_ == 0)" << be_idt_nl
           << "ACE_NEW_RETURN ("
           << "this->proxy_factory_," << be_idt <<be_idt_nl
-          << "TAO_" << node->flat_name () 
+          << "TAO_" << node->flat_name ()
           << "_Default_Proxy_Factory (1), "<< be_nl
           << " 0);" << be_uidt_nl << be_uidt_nl << be_uidt_nl
           << "return "
           << "this->proxy_factory_->create_proxy (proxy);"
           << be_uidt << be_uidt_nl
           << "}\n\n";
-  
+
       os->indent ();
       *os << scope->full_name ();
 
       // Only if there exists any nesting "::" is needed!
       if (node->is_nested ())
-        *os << "::";  
- 
+        *os << "::";
+
       *os <<  "TAO_" << node->flat_name () << "_Smart_Proxy_Base::";
-      *os << "TAO_" 
+      *os << "TAO_"
           <<  node->flat_name () << "_Smart_Proxy_Base (void)" << be_uidt_nl
           << "{" << be_nl
           << "}" << be_nl << be_nl;
@@ -244,10 +244,10 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
 
       // Only if there exists any nesting "::" is needed!
       if (node->is_nested ())
-        *os << "::";  
- 
+        *os << "::";
+
       *os <<  "TAO_" << node->flat_name () << "_Smart_Proxy_Base::";
-      *os << "~TAO_" 
+      *os << "~TAO_"
           <<  node->flat_name () << "_Smart_Proxy_Base (void)" <<be_nl
           << "{" << be_nl
           << "}\n\n";
@@ -259,8 +259,8 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
 
       // Only if there exists any nesting "::" is needed!
       if (node->is_nested ())
-        *os << "::";  
-  
+        *os << "::";
+
       *os <<  "TAO_" << node->flat_name () << "_Smart_Proxy_Base::";
       *os << "_stubobj (void) const"<<be_nl
           << "{" << be_idt_nl
@@ -277,20 +277,20 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
                             -1);
         }
 
- 
+
       os->indent ();
-  
+
       *os << node->full_name() << "_ptr" << be_nl;
       *os << scope->full_name ();
-  
+
       // Only if there exists any nesting "::" is needed!
       if (node->is_nested ())
-        *os << "::";  
-  
+        *os << "::";
+
       *os <<  "TAO_" << node->flat_name () << "_Smart_Proxy_Base::"
 	  << "get_proxy (void)" << be_idt_nl
           << be_uidt_nl;
-  
+
       *os << "{" << be_idt_nl
           << "// Obtain the real proxy stored in <base_proxy_>" << be_nl
           << "if (CORBA::is_nil (this->proxy_.in ()))" << be_idt_nl
@@ -304,13 +304,13 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
           << be_uidt_nl << "}" << be_nl << be_nl
           << "return this->proxy_.in ();" << be_uidt_nl
           << "}" << be_nl << be_nl;
-  
+
       os->indent ();
       *os << "#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \\"
           << be_idt_nl<<"defined (ACE_HAS_GNU_REPO)"<<be_uidt_nl
           << "template class ACE_Singleton<";
       *os << scope->full_name ();
-    
+
       // Only if there exists any nesting "::" is needed!
       if (node->is_nested ())
         *os << "::";
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 084a86599b3..4045873173b 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
@@ -115,7 +115,7 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node)
       << "// set the ownership" << be_nl << be_nl
       << "// overridden ServantBase operations" << be_nl
       << "PortableServer::POA_ptr _default_POA (" << be_idt << be_idt_nl
-      << "CORBA::Environment &env = " << be_idt_nl
+      << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
       << "TAO_default_environment ()"
       << be_uidt << be_uidt_nl
       << ");" << be_uidt << "\n";
@@ -169,4 +169,3 @@ be_visitor_interface_tie_sh::method_helper (be_interface *,
   delete visitor;
   return 0;
 }
-
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 3e48f8cd187..ed9e487ffa8 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp
@@ -160,12 +160,14 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node)
 
   *os << "template <class T> ACE_INLINE "
       << "PortableServer::POA_ptr" << be_nl
-      << fulltiename << "<T>::_default_POA (CORBA::Environment &env)" << be_nl
+      << fulltiename
+      << "<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)" << be_nl
       << "{" << be_idt_nl
       << "if (!CORBA::is_nil (this->poa_.in ()))" << be_idt_nl
       << "return PortableServer::POA::_duplicate (this->poa_.in ());\n"
       << be_uidt_nl
-      << "return this->" << localskelname << "::_default_POA (env);" << be_uidt_nl
+      << "return this->" << localskelname
+      << "::_default_POA (ACE_TRY_ENV);" << be_uidt_nl
       << "}\n\n";
 
   if (node->traverse_inheritance_graph (be_visitor_interface_tie_si::method_helper, os) == -1)
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_arglist.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_arglist.cpp
index c05852df8d9..ab945a32a60 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_arglist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_arglist.cpp
@@ -14,7 +14,7 @@
 //    Visitor generating code for the parameter list of the Operation signature.
 //
 // = AUTHOR
-//    Alexander Babu Arulanthu <alex@cs.wustl.edu> 
+//    Alexander Babu Arulanthu <alex@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -29,11 +29,11 @@ ACE_RCSID(be_visitor_operation, ami_arglist, "$Id$")
 
 // ************************************************************
 //   operation visitor  to generate the argument list for the AMI
-//   stub. 
+//   stub.
 //   We have separated code generation for this from the 4 main
 //   visitors to avoid code duplication and tight coupling
   // ************************************************************
-  
+
 be_visitor_operation_ami_arglist::be_visitor_operation_ami_arglist (be_visitor_context
                                                                     *ctx)
   : be_visitor_scope (ctx)
@@ -48,25 +48,25 @@ int
 be_visitor_operation_ami_arglist::visit_operation (be_operation *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  
+
   *os << " (" << be_idt << be_idt << "\n";
 
-  
+
   // Start with current indentation level.
   os->indent ();
 
-  
+
   be_decl *interface =
     be_interface::narrow_from_scope (node->defined_in ())->decl ();
   if (interface == 0)
     cerr << "Invalid interface";
 
-  // @@ Michael: This is not very nice, but we do not have 
+  // @@ Michael: This is not very nice, but we do not have
   //             a be_interface pointer and therefor no strategy.
   {
     char *full_name = 0;
-    
-    interface->compute_full_name ("AMI_", 
+
+    interface->compute_full_name ("AMI_",
                                   "Handler",
                                   full_name);
     // Genereate scope name.
@@ -102,13 +102,13 @@ be_visitor_operation_ami_arglist::visit_operation (be_operation *node)
           << "TAO_default_environment ()"
           << be_uidt;
     }
-  
+
   // Done with the argument list.
   *os << be_uidt_nl << ")" << be_uidt;
-  
+
   if (this->ctx_->state () == TAO_CodeGen::TAO_AMI_OPERATION_ARGLIST_CH)
     *os << ";";
-  
+
   *os << "\n";
 
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_ch.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_ch.cpp
index abf9f784dda..123c4b6d4cc 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_ch.cpp
@@ -12,11 +12,11 @@
 //
 // = DESCRIPTION
 //    Visitor generating code for AMI Handler call back operation in
-//    the client header.  
+//    the client header.
 //
 // = AUTHOR
 //    Aniruddha Gokhale and Alexander Babu Arulanthu
-//    <alex@cs.wustl.edu> 
+//    <alex@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -46,7 +46,7 @@ int
 be_visitor_operation_ami_exception_holder_operation_ch::visit_operation (be_operation *node)
 {
   TAO_OutStream *os; // output stream
-  
+
   os = this->ctx_->stream ();
   this->ctx_->node (node); // save the node
 
@@ -55,7 +55,7 @@ be_visitor_operation_ami_exception_holder_operation_ch::visit_operation (be_oper
   // every operation is declared virtual in the client code
   *os << be_idt << "virtual ";
 
-  // STEP I: generate the return type. Return type is simpy void. 
+  // STEP I: generate the return type. Return type is simpy void.
   *os << "void raise_";
 
   // check if we are an attribute node in disguise
@@ -66,15 +66,15 @@ be_visitor_operation_ami_exception_holder_operation_ch::visit_operation (be_oper
         *os << "set_";
       else
         *os << "get_";
-    }  
+    }
 
   // Generate the operation name.
-  *os  << node->local_name () 
+  *os  << node->local_name ()
        << " (";
-  
+
   if (!idl_global->exception_support ())
     *os << "CORBA::Environment &ACE_TRY_ENV =" << be_idt << be_idt_nl
-        << "TAO_default_environment ()" << be_uidt << be_uidt; 
+        << "TAO_default_environment ()" << be_uidt << be_uidt;
   *os << ")" << be_idt;
 
   // now generate the throw specs
@@ -86,7 +86,7 @@ be_visitor_operation_ami_exception_holder_operation_ch::visit_operation (be_oper
                          ACE_TEXT ("Failed to generate throw spec\n")),
                         -1);
     }
-       
+
   *os << ";\n" << be_uidt << be_uidt;
 
   return 0;
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 2e7d4644813..59d44bd274c 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
@@ -12,11 +12,11 @@
 //
 // = DESCRIPTION
 //    Visitor generating code for AMI Handler call back operation in
-//    the client header.  
+//    the client header.
 //
 // = AUTHOR
 //    Aniruddha Gokhale and Alexander Babu Arulanthu
-//    <alex@cs.wustl.edu> 
+//    <alex@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -46,7 +46,7 @@ int
 be_visitor_operation_ami_handler_reply_stub_operation_ch::visit_operation (be_operation *node)
 {
   TAO_OutStream *os; // output stream
-  
+
   os = this->ctx_->stream ();
   this->ctx_->node (node); // save the node
 
@@ -55,10 +55,10 @@ be_visitor_operation_ami_handler_reply_stub_operation_ch::visit_operation (be_op
   // operation only if there was no "native" type.
   if (!node->has_native ())
     {
-     
+
       // Indent.
       os->indent ();
-      
+
       // Next line.
       *os << be_nl
           << "static void ";
@@ -72,7 +72,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_ch::visit_operation (be_op
           else
             *os << "_get_";
         }
-      *os << node->local_name () 
+      *os << node->local_name ()
           << "_reply_stub (" << be_idt << be_idt_nl;
 
       *os << "TAO_InputCDR &_tao_reply_cdr," << be_nl
@@ -82,7 +82,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_ch::visit_operation (be_op
       *os << "," << be_nl
           << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
           << "TAO_default_environment ()" << be_uidt;
-      
+
       *os << ");"
           << be_uidt << be_nl
           << be_uidt << "\n\n";
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 9ebc1718a4c..9ecb1ee0c96 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
@@ -114,7 +114,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation (be_op
 
   *os << "," << be_nl
       << "CORBA::Environment &ACE_TRY_ENV";
-        
+
   *os << ")" << be_uidt << be_uidt_nl;
 
   // Generate the actual code for the stub. However, if any of the argument
@@ -209,7 +209,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation (be_op
   if (original->defined_in ()->scope_node_type () == AST_Decl::NT_module)
     {
       be_decl *scope = be_scope::narrow_from_scope (original->defined_in ())->decl ();
-      *os << "OBV_" << scope->name() << "::" 
+      *os << "OBV_" << scope->name() << "::"
           << "_tao_" << original->compute_local_name ("AMI_", "ExceptionHolder");
     }
   else
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp
index 0654180e461..bc66c21e7cf 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp
@@ -71,6 +71,7 @@ be_visitor_operation_arglist::visit_operation (be_operation *node)
       switch (this->ctx_->state ())
         {
         case TAO_CodeGen::TAO_OPERATION_ARGLIST_CH:
+        case TAO_CodeGen::TAO_LOCAL_OPERATION_ARGLIST_H:
         case TAO_CodeGen::TAO_OPERATION_ARGLIST_COLLOCATED_SH:
         case TAO_CodeGen::TAO_OPERATION_ARGLIST_SH:
           // last argument - is always CORBA::Environment
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp b/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp
index cbaa17ba9a5..a36cdc1baaa 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp
@@ -90,7 +90,7 @@ be_visitor_operation_argument::visit_operation (be_operation *node)
         {
         case TAO_CodeGen::TAO_OPERATION_ARG_UPCALL_SS:
         case TAO_CodeGen::TAO_OPERATION_COLLOCATED_ARG_UPCALL_SS:
-          // applicable only to these cases where the actual upcall is made 
+          // applicable only to these cases where the actual upcall is made
 
           if (node->argument_count () > 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 598317a96d5..f141a087aac 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
@@ -380,7 +380,6 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
   os->indent ();
   *os << "typedef " << node->local_name () << "_var _var_type;\n"
       << "#endif /* ! __GNUC__ || g++ >= 2.8 */\n\n";
-  os->decr_indent ();
 
   // TAO provides extensions for octet sequences, first find out if
   // the base type is an octet (or an alias for octet)
@@ -396,7 +395,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
 	      }
       else
 	      {
-	        predef = 
+	        predef =
             be_predefined_type::narrow_from_decl (
                 alias->primitive_base_type ()
               );
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
index cfce04fbc5e..b5dee89d924 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
@@ -786,7 +786,7 @@ be_visitor_valuetype::gen_init_defn (be_valuetype *node)
 
   *os << "class " << idl_global->skel_export_macro ()
       << " " << node->local_name ()
-      << "_init : public ACE_CORBA_1 (ValueFactoryBase)" << be_nl;
+      << "_init : public CORBA_ValueFactoryBase" << be_nl;
 
   // generate the body
 
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 3d335d282fc..8d93ac634b7 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
@@ -165,7 +165,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
             {
               *os << ", ";
             }
-          *os << "public virtual ACE_CORBA_1 (ValueBase)" << be_nl;
+          *os << "public virtual CORBA_ValueBase" << be_nl;
         }
 
       // generate the body