ChangeLogTag: Thu Sep 24 17:32:27 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu>

3 files changed, 10 insertions, 28 deletions

diff --git a/modules/TAO/ChangeLog b/modules/TAO/ChangeLog
index 64164e05377..1bc863166ce 100644
--- a/modules/TAO/ChangeLog
+++ b/modules/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Thu Sep 24 17:32:27 UTC 2009  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_operation/operation_exs.cpp:
+        * TAO_IDL/be_include/be_visitor_operation/operation_exs.h:
+        
+          Fixed bug related to unused args in generated empty executor
+          implementation methods, and removed 2 unused operations
+          from the visitor.
+
 Wed Sep 23 21:48:41 UTC 2009  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/be/be_visitor_iface_inst.cpp:
diff --git a/modules/TAO/TAO_IDL/be/be_visitor_operation/operation_exs.cpp b/modules/TAO/TAO_IDL/be/be_visitor_operation/operation_exs.cpp
index 7cdd288aed6..450554e9e55 100644
--- a/modules/TAO/TAO_IDL/be/be_visitor_operation/operation_exs.cpp
+++ b/modules/TAO/TAO_IDL/be/be_visitor_operation/operation_exs.cpp
@@ -60,7 +60,6 @@ be_visitor_operation_exs::visit_operation (be_operation *node)
   // Generate the return type mapping (same as in the header file)
   be_visitor_context ctx = *this->ctx_;
   be_visitor_operation_rettype rt_visitor (&ctx);
-//  rt_visitor.for_exec (true);
 
   if (rt->accept (&rt_visitor) == -1)
     {
@@ -81,7 +80,7 @@ be_visitor_operation_exs::visit_operation (be_operation *node)
   // Generate the argument list, which will use our overrridden 
   // visit_argument().
   be_visitor_operation_arglist al_visitor (this->ctx_);
-//  al_visitor.unused (true);
+  al_visitor.unused (true);
 
   if (node->accept (&al_visitor) == -1)
     {
@@ -99,29 +98,6 @@ be_visitor_operation_exs::visit_operation (be_operation *node)
   return this->gen_op_body (rt);
 }
 
-int
-be_visitor_operation_exs::visit_argument (be_argument *node)
-{
-  os_ << "/* " << node->local_name () << " */";
-  
-  return 0;
-}
-
-int
-be_visitor_operation_exs::post_process (be_decl *bd)
-{
-  if (this->last_node (bd))
-    {
-      os_ << ");" << be_uidt;
-    }
-  else
-    {
-      os_ << "," << be_nl;
-    }
-
-  return 0;
-}
-
 void
 be_visitor_operation_exs::scope (be_interface *node)
 {
diff --git a/modules/TAO/TAO_IDL/be_include/be_visitor_operation/operation_exs.h b/modules/TAO/TAO_IDL/be_include/be_visitor_operation/operation_exs.h
index 0e85352fffa..62bf38d20a3 100644
--- a/modules/TAO/TAO_IDL/be_include/be_visitor_operation/operation_exs.h
+++ b/modules/TAO/TAO_IDL/be_include/be_visitor_operation/operation_exs.h
@@ -43,9 +43,6 @@ public:
   ~be_visitor_operation_exs (void);
 
   virtual int visit_operation (be_operation *node);
-  virtual int visit_argument (be_argument *node);
-  
-  virtual int post_process (be_decl *bd);
   
   void scope (be_interface *node);