Tue Jan 2 09:13:36 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>

1 files changed, 9 insertions, 17 deletions

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 909176025cf..ba881c6039a 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
@@ -125,8 +125,7 @@ be_visitor_amh_operation_ss::visit_operation (be_operation *node)
       *os << be_uidt_nl << "))" << be_nl;
 
       // If marshaling fails, raise exception.
-      if (this->gen_raise_exception (0,
-                                     "::CORBA::MARSHAL",
+      if (this->gen_raise_exception ("::CORBA::MARSHAL",
                                      "") == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -173,8 +172,6 @@ be_visitor_amh_operation_ss::visit_operation (be_operation *node)
                               -1);
           }
       }
-
-    *os << env_arg;
   }
 
   if (this->generate_shared_epilogue (os) == -1)
@@ -202,8 +199,6 @@ be_visitor_amh_operation_ss::visit_attribute (be_attribute *node)
       return -1;
     }
 
-  *os << env_arg;
-
   if (this->generate_shared_epilogue (os) == -1)
     {
       return -1;
@@ -222,7 +217,7 @@ be_visitor_amh_operation_ss::visit_attribute (be_attribute *node)
   be_argument the_argument (AST_Argument::dir_IN,
                             node->field_type (),
                             node->name ());
-                            
+
   int status = 0;
 
   {
@@ -230,7 +225,7 @@ be_visitor_amh_operation_ss::visit_attribute (be_attribute *node)
     be_visitor_args_vardecl_ss vardecl_visitor (&ctx);
 
     status = vardecl_visitor.visit_argument (&the_argument);
-    
+
     if (-1 == status)
       {
         the_argument.destroy ();
@@ -251,7 +246,7 @@ be_visitor_amh_operation_ss::visit_attribute (be_attribute *node)
     be_visitor_args_marshal_ss marshal_visitor (&ctx);
 
     status = marshal_visitor.visit_argument (&the_argument);
-    
+
     if (-1 == status)
       {
         the_argument.destroy ();
@@ -263,8 +258,7 @@ be_visitor_amh_operation_ss::visit_attribute (be_attribute *node)
       << "{" << be_idt_nl;
 
   // If marshaling fails, raise exception.
-  status = this->gen_raise_exception (0,
-                                      "::CORBA::MARSHAL",
+  status = this->gen_raise_exception ("::CORBA::MARSHAL",
                                       "");
   if (-1 == status)
     {
@@ -285,17 +279,15 @@ be_visitor_amh_operation_ss::visit_attribute (be_attribute *node)
 
   {
     be_visitor_args_upcall_ss upcall_visitor (this->ctx_);
-    status = upcall_visitor.visit_argument (&the_argument);   
+    status = upcall_visitor.visit_argument (&the_argument);
     the_argument.destroy ();
-    
+
     if (-1 == status)
       {
         return -1;
       }
   }
 
-  *os << env_arg;
-
   if (-1 == this->generate_shared_epilogue (os))
     {
       return -1;
@@ -344,11 +336,11 @@ be_visitor_amh_operation_ss::generate_shared_prologue (be_decl *node,
       << "_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest & _tao_server_request," << be_nl
       << "void * /* context */," << be_nl
-      << "void * _tao_servant" << env_decl << be_uidt_nl
+      << "void * _tao_servant" << be_uidt_nl
       << ")" << be_uidt_nl;
 
   // Generate the actual code for the skeleton.
-  // last argument - is always ACE_ENV_ARG_PARAMETER.
+  // last argument
   *os << "{" << be_idt_nl;
 
   // Get the right object implementation.