ChangeLogTag:Tue Jan 22 15:32:10 2002 Carlos O'Ryan <coryan@uci.edu>

11 files changed, 94 insertions, 475 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp
index b6d5fc3c1de..015cc1c1c85 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp
@@ -151,7 +151,6 @@ be_visitor_amh_rh_operation_ss::marshal_params (be_operation *node)
       // If marshaling fails, raise exception.
       if (this->gen_raise_exception (0,
                                      "CORBA::MARSHAL",
-                                     "",
                                      "") == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
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 d4763415245..dc2728eaca8 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
@@ -190,7 +190,6 @@ be_visitor_amh_operation_ss::demarshal_params (be_operation *node)
       // If marshaling fails, raise exception.
       if (this->gen_raise_exception (0,
                                      "CORBA::MARSHAL",
-                                     "",
                                      "") == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
index 3375400ad79..c99aced2cbe 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
@@ -239,88 +239,6 @@ be_visitor_operation_ami_cs::visit_argument (be_argument *node)
   return 0;
 }
 
-int
-be_visitor_operation_ami_cs::gen_raise_exception (be_type *bt,
-                                              const char *excep,
-                                              const char *completion_status)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  be_visitor *visitor;
-  be_visitor_context ctx;
-
-  if (this->void_return_type (bt))
-    {
-      if (be_global->use_raw_throw ())
-        *os << "throw ";
-      else
-        *os << "ACE_THROW (";
-
-      *os << excep << " (" << completion_status << ")";
-
-      if (be_global->use_raw_throw ())
-        *os << ";\n";
-      else
-        *os << ");\n";
-    }
-  else
-    {
-      *os << "ACE_THROW_RETURN ("
-          << excep << " (" << completion_status << "), ";
-
-      // return the appropriate return value
-      ctx = *this->ctx_;
-      ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS);
-      visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor || (bt->accept (visitor) == -1))
-        {
-          delete visitor;
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_operation_ami_cs::"
-                             "gen_raise_exception - "
-                             "codegen for return var failed\n"),
-                            -1);
-        }
-      *os << ");\n";
-    }
-  return 0;
-}
-
-int
-be_visitor_operation_ami_cs::gen_check_exception (be_type *bt)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  be_visitor *visitor;
-  be_visitor_context ctx;
-
-  os->indent ();
-  // check if there is an exception
-  if (this->void_return_type (bt))
-    {
-      *os << "ACE_CHECK;\n";
-    }
-  else
-    {
-      *os << "ACE_CHECK_RETURN (";
-
-      // return the appropriate return value
-      ctx = *this->ctx_;
-      ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS);
-      visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor || (bt->accept (visitor) == -1))
-        {
-          delete visitor;
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_operation_ami_cs::"
-                             "gen_check_exception - "
-                             "codegen failed\n"),
-                            -1);
-        }
-      *os << ");\n";
-    }
-
-  return 0;
-}
-
 // ************************************************************
 // Operation visitor for interpretive client stubs
 // ************************************************************
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 20e0acfc094..599429e8e43 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
@@ -310,138 +310,6 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_argument (be_arg
   return 0;
 }
 
-int
-be_visitor_operation_ami_handler_reply_stub_operation_cs::gen_raise_exception (
-    be_type *bt,
-    const char *excep,
-    const char *completion_status
-  )
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  be_visitor *visitor;
-  be_visitor_context ctx;
-
-  if (this->void_return_type (bt))
-    {
-      if (be_global->use_raw_throw ())
-        *os << "throw ";
-      else
-        *os << "ACE_THROW (";
-
-      *os << excep << " (" << completion_status << ")";
-
-      if (be_global->use_raw_throw ())
-        *os << ";\n";
-      else
-        *os << ");\n";
-    }
-  else
-    {
-      *os << "ACE_THROW_RETURN ("
-          << excep << " (" << completion_status << "), ";
-
-      // return the appropriate return value
-      ctx = *this->ctx_;
-      ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS);
-      visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor || (bt->accept (visitor) == -1))
-        {
-          delete visitor;
-          ACE_ERROR_RETURN ((
-              LM_ERROR,
-              "(%N:%l) be_visitor_operation_ami_handler_reply_stub_operation_cs::"
-              "gen_raise_exception - "
-              "codegen for return var failed\n"
-            ),
-            -1
-          );
-        }
-      *os << ");\n";
-    }
-  return 0;
-}
-
-int
-be_visitor_operation_ami_handler_reply_stub_operation_cs::gen_check_exception (be_type *bt)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  be_visitor *visitor;
-  be_visitor_context ctx;
-
-  os->indent ();
-  // check if there is an exception
-  if (this->void_return_type (bt))
-    {
-      *os << "ACE_CHECK;\n";
-    }
-  else
-    {
-      *os << "ACE_CHECK_RETURN (";
-
-      // return the appropriate return value
-      ctx = *this->ctx_;
-      ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS);
-      visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor || (bt->accept (visitor) == -1))
-        {
-          delete visitor;
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_operation_ami_handler_reply_stub_operation_cs::"
-                             "gen_check_exception - "
-                             "codegen failed\n"),
-                            -1);
-        }
-      *os << ");\n";
-    }
-
-  return 0;
-}
-
-// Currently we do not support interpretative exception handling for AMI
-#if 0
-
-
-// ************************************************************
-// Operation visitor for interpretive client skeletons of the AMI reply handler
-// ************************************************************
-
-be_interpretive_visitor_operation_ami_handler_reply_stub_operation_cs::
-be_interpretive_visitor_operation_ami_handler_reply_stub_operation_cs (be_visitor_context *ctx)
-  : be_visitor_operation_ami_handler_reply_stub_operation_cs (ctx)
-{
-}
-
-be_interpretive_visitor_operation_ami_handler_reply_stub_operation_cs::~be_interpretive_visitor_operation_ami_handler_reply_stub_operation_cs (void)
-{
-}
-
-// concrete implementation of the template methods
-
-int
-be_interpretive_visitor_operation_ami_handler_reply_stub_operation_cs::gen_pre_stub_info (be_operation *node,
-                                                                              be_type *bt)
-{
-  ACE_UNUSED_ARG (node);
-  ACE_UNUSED_ARG (bt);
-
-  // @@ Michael: To be done.
-  return 0;
-}
-
-int
-be_interpretive_visitor_operation_ami_handler_reply_stub_operation_cs::
-gen_marshal_and_invoke (be_operation*node,
-                        be_type *bt)
-{
-  ACE_UNUSED_ARG (node);
-  ACE_UNUSED_ARG (bt);
-
-  // @@ Michael: To be done.
-  return 0;
-}
-
-#endif /* 0 */
-
 // ************************************************************
 // Operation visitor for compiled client skeletons of the AMI reply handler
 // ************************************************************
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/direct_collocated_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/direct_collocated_ss.cpp
index e38d56d8272..a253d39b1e7 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/direct_collocated_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/direct_collocated_ss.cpp
@@ -18,9 +18,9 @@
 //
 // ============================================================================
 
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
+#include "idl.h"
+#include "idl_extern.h"
+#include "be.h"
 
 #include "be_visitor_operation.h"
 
@@ -175,42 +175,6 @@ int be_visitor_operation_direct_collocated_ss::gen_invoke (be_visitor_context &c
 }
 
 int
-be_visitor_operation_direct_collocated_ss::gen_check_exception (be_type *bt)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  be_visitor *visitor;
-  be_visitor_context ctx;
-
-  os->indent ();
-  // check if there is an exception
-  if (!this->void_return_type (bt))
-    {
-      *os << "ACE_CHECK_RETURN (";
-
-      // return the appropriate return value
-      ctx = *this->ctx_;
-      ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS);
-      visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor || (bt->accept (visitor) == -1))
-        {
-          delete visitor;
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_operation_direct_collocated_cs::"
-                             "gen_check_exception - "
-                             "codegen failed\n"),
-                            -1);
-        }
-      *os << ");\n";
-    }
-  else
-    {
-      *os << "ACE_CHECK;\n";
-    }
-
-  return 0;
-}
-
-int
 be_visitor_operation_direct_collocated_ss::void_return_type (be_type *bt)
 {
   // is the operation return type void?
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp
index 64b7e6587ad..9b24f4fa611 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp
@@ -1,6 +1,8 @@
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
+// $Id$
+
+#include "idl.h"
+#include "idl_extern.h"
+#include "be.h"
 
 #include "be_visitor_operation.h"
 
@@ -133,7 +135,7 @@ be_visitor_operation_direct_proxy_impl_ss::visit_operation (be_operation *node)
 
 int
 be_visitor_operation_direct_proxy_impl_ss::gen_invoke (be_visitor_context &ctx,
-						       be_operation *node)
+                                                       be_operation *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
@@ -159,43 +161,6 @@ be_visitor_operation_direct_proxy_impl_ss::gen_invoke (be_visitor_context &ctx,
   return 0;
 }
 
-
-int
-be_visitor_operation_direct_proxy_impl_ss::gen_check_exception (be_type *bt)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  be_visitor *visitor;
-  be_visitor_context ctx;
-
-  os->indent ();
-  // check if there is an exception
-  if (!this->void_return_type (bt))
-    {
-      *os << "ACE_CHECK_RETURN (";
-
-      // return the appropriate return value
-      ctx = *this->ctx_;
-      ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS);
-      visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor || (bt->accept (visitor) == -1))
-        {
-          delete visitor;
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_operation_direct_collocated_cs::"
-                             "gen_check_exception - "
-                             "codegen failed\n"),
-                            -1);
-        }
-      *os << ");\n";
-    }
-  else
-    {
-      *os << "ACE_CHECK;\n";
-    }
-
-  return 0;
-}
-
 int
 be_visitor_operation_direct_proxy_impl_ss::void_return_type (be_type *bt)
 {
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
index 95fffeefd59..219c359562b 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
@@ -238,63 +238,113 @@ be_visitor_operation::gen_environment_var ()
 }
 
 int
-be_visitor_operation::gen_raise_exception (be_type *,
-                                           const char *excep,
-                                           const char *completion_status,
-                                           const char * /* env */)
+be_visitor_operation::gen_raise_exception (be_type *return_type,
+                                           const char *exception_name,
+                                           const char *exception_arguments)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
   os->indent ();
-
   if (be_global->use_raw_throw ())
     {
-      *os << "throw ";
+      *os << "throw "
+          << exception_name << "(" << exception_arguments << ");\n";
+      return 0;
     }
-  else
+
+  if (return_type == 0 || this->void_return_type (return_type))
     {
       *os << "ACE_THROW (";
     }
-
-  *os << excep << "(" << completion_status << ")";
-
-  if (be_global->use_raw_throw ())
+  else
     {
-      *os << ";\n";
+      *os << "ACE_THROW_RETURN (";
     }
-  else
+  *os << exception_name << " (" << exception_arguments << ")";
+
+  if (this->void_return_type (return_type))
     {
       *os << ");\n";
+      return 0;
     }
+  *os << "," << be_nl;
+
+  // Non-void return type....
+  be_visitor_context ctx (*this->ctx_);
+  ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS);
+
+  be_visitor_operation_rettype_return_cs visitor (&ctx);
+  if (return_type->accept (&visitor) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation::"
+                         "gen_raise_exception - "
+                         "codegen for return var failed\n"),
+                        -1);
+    }
+  *os << ");\n";
 
   return 0;
 }
 
 int
-be_visitor_operation::gen_check_exception (be_type *,
-                                           const char * /* env */)
+be_visitor_operation::gen_check_exception (be_type *return_type)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-
   os->indent ();
 
-  // Check if there is an exception.
-  *os << "ACE_CHECK;\n";
+  if (return_type == 0 || this->void_return_type (return_type))
+    {
+      *os << "ACE_CHECK;\n";
+      return 0;
+    }
+
+  // Non-void return type....
+  *os << "ACE_CHECK_RETURN (";
+  be_visitor_context ctx (*this->ctx_);
+  ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS);
+
+  be_visitor_operation_rettype_return_cs visitor (&ctx);
+  if (return_type->accept (&visitor) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation::"
+                         "gen_check_exception - "
+                         "codegen for return var failed\n"),
+                        -1);
+    }
+  *os << ");\n";
 
   return 0;
 }
 
 int
-be_visitor_operation::gen_check_interceptor_exception (be_type *,
-                                                       const char * /* env */)
+be_visitor_operation::gen_check_interceptor_exception (be_type *return_type)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-
   os->indent ();
 
-  // Check if there is an exception.
-  *os << "TAO_INTERCEPTOR_CHECK;\n";
+  if (return_type == 0 || this->void_return_type (return_type))
+    {
+      *os << "TAO_INTERCEPTOR_CHECK;\n";
+      return 0;
+    }
+
+  // Non-void return type....
+  *os << "TAO_INTERCEPTOR_CHECK_RETURN (";
+  be_visitor_context ctx (*this->ctx_);
+  ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS);
+
+  be_visitor_operation_rettype_return_cs visitor (&ctx);
+  if (return_type->accept (&visitor) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation::"
+                         "gen_check_exception - "
+                         "codegen for return var failed\n"),
+                        -1);
+    }
+  *os << ");\n";
 
   return 0;
 }
-
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
index b5791b226c5..7d3526f16c8 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
@@ -585,9 +585,9 @@ be_visitor_operation_ss::gen_demarshal_params (be_operation *node,
       *os << be_uidt_nl << "))\n" << be_idt;
 
       // If marshaling fails, raise exception.
-      if (this->gen_raise_exception (bt, "CORBA::MARSHAL",
-                                     "",
-                                     "ACE_TRY_ENV") == -1)
+      if (this->gen_raise_exception (bt,
+                                     "CORBA::MARSHAL",
+                                     "") == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_compiled_visitor_operation_ss::"
@@ -715,9 +715,9 @@ be_visitor_operation_ss::gen_marshal_params (be_operation *node,
 
   *os << be_uidt_nl << "))\n";
   // if marshaling fails, raise exception
-  if (this->gen_raise_exception (bt, "CORBA::MARSHAL",
-                                 "",
-                                 "ACE_TRY_ENV") == -1)
+  if (this->gen_raise_exception (bt,
+                                 "CORBA::MARSHAL",
+                                 "") == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_compiled_visitor_operation_ss::"
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp
index d9c4b8b3ea4..13904d6a4c4 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp
@@ -150,7 +150,8 @@ be_visitor_operation_remote_proxy_impl_cs::visit_operation (be_operation *node)
 
   if (node->has_native ()) // native exists => no stub
     {
-      if (this->gen_raise_exception (bt, "CORBA::MARSHAL",
+      if (this->gen_raise_exception (bt,
+                                     "CORBA::MARSHAL",
                                      "") == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -169,7 +170,8 @@ be_visitor_operation_remote_proxy_impl_cs::visit_operation (be_operation *node)
           << "if (istub == 0)" << be_idt_nl;
 
       // if the stub object was bad, then we raise a system exception
-      if (this->gen_raise_exception (bt, "CORBA::INTERNAL",
+      if (this->gen_raise_exception (bt,
+                                     "CORBA::INTERNAL",
                                      "") == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -928,44 +930,6 @@ be_visitor_operation_remote_proxy_impl_cs::gen_marshal_and_invoke (
 }
 
 int
-be_visitor_operation_remote_proxy_impl_cs::gen_raise_exception (be_type *bt,
-                                              const char *excep,
-                                              const char *completion_status)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  if (this->void_return_type (bt))
-    {
-      if (be_global->use_raw_throw ())
-        *os << "throw ";
-      else
-        *os << "ACE_THROW (";
-
-      *os << excep << " (" << completion_status << ")";
-
-      if (be_global->use_raw_throw ())
-        *os << ";\n";
-      else
-        *os << ");\n";
-    }
-  else
-    {
-      if (bt->size_type () == be_decl::VARIABLE
-          || bt->base_node_type () == AST_Decl::NT_array)
-        {
-          *os << "ACE_THROW_RETURN (" << excep
-              << " (" << completion_status << "), 0);\n";
-        }
-      else
-        {
-          *os << "ACE_THROW_RETURN (" << excep
-              << " (" << completion_status << "), _tao_retval);\n";
-        }
-    }
-  return 0;
-}
-
-int
 be_visitor_operation_remote_proxy_impl_cs::gen_raise_interceptor_exception (be_type *bt,
                                                           const char *excep,
                                                           const char *completion_status)
@@ -1008,58 +972,6 @@ be_visitor_operation_remote_proxy_impl_cs::gen_raise_interceptor_exception (be_t
   return 0;
 }
 
-int
-be_visitor_operation_remote_proxy_impl_cs::gen_check_exception (be_type *bt)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  // check if there is an exception
-  if (this->void_return_type (bt))
-    {
-      *os << "ACE_CHECK;" << be_nl;
-    }
-  else
-    {
-      if (bt->size_type () == be_decl::VARIABLE
-          || bt->base_node_type () == AST_Decl::NT_array)
-        {
-          *os << "ACE_CHECK_RETURN (0);" << be_nl;
-        }
-      else
-        {
-          *os << "ACE_CHECK_RETURN  (_tao_retval);" << be_nl;
-        }
-    }
-
-  return 0;
-}
-
-int
-be_visitor_operation_remote_proxy_impl_cs::gen_check_interceptor_exception (be_type *bt)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  // Check if there is an exception.
-  if (this->void_return_type (bt))
-    {
-      *os << "TAO_INTERCEPTOR_CHECK;" << be_nl;
-    }
-  else
-    {
-      if (bt->size_type () == be_decl::VARIABLE
-          || bt->base_node_type () == AST_Decl::NT_array)
-        {
-          *os << "TAO_INTERCEPTOR_CHECK_RETURN (0);" << be_nl;
-        }
-      else
-        {
-          *os << "TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);" << be_nl;
-        }
-    }
-
-  return 0;
-}
-
 const char*
 be_visitor_operation_remote_proxy_impl_cs::compute_operation_name (be_operation *node)
 {
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_collocated_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_collocated_ss.cpp
index 6dde06d632b..eb09538510f 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_collocated_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_collocated_ss.cpp
@@ -35,7 +35,7 @@ ACE_RCSID(be_visitor_operation, thru_poa_collocated_ss, "$Id$")
 
 be_visitor_operation_thru_poa_collocated_ss::be_visitor_operation_thru_poa_collocated_ss
 (be_visitor_context *ctx)
-  : be_visitor_scope (ctx)
+  : be_visitor_operation (ctx)
 {
 }
 
@@ -253,33 +253,6 @@ int be_visitor_operation_thru_poa_collocated_ss::gen_invoke (
 }
 
 int
-be_visitor_operation_thru_poa_collocated_ss::gen_check_exception (be_type *bt)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  os->indent ();
-  // check if there is an exception
-  if (!this->void_return_type (bt))
-    {
-      if (bt->size_type () == be_decl::VARIABLE
-          || bt->base_node_type () == AST_Decl::NT_array)
-        {
-          *os << "ACE_CHECK_RETURN (0);\n";
-        }
-      else
-        {
-          *os << "ACE_CHECK_RETURN  (_tao_retval);\n";
-        }
-    }
-  else
-    {
-      *os << "ACE_CHECK;\n";
-    }
-
-  return 0;
-}
-
-int
 be_visitor_operation_thru_poa_collocated_ss::void_return_type (be_type *bt)
 {
   // is the operation return type void?
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp
index 018da5f23f1..2b632c91905 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp
@@ -252,35 +252,6 @@ be_visitor_operation_thru_poa_proxy_impl_ss::gen_invoke (
   return 0;
 }
 
-
-int
-be_visitor_operation_thru_poa_proxy_impl_ss::gen_check_exception (be_type *bt)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  os->indent ();
-  // check if there is an exception
-  if (!this->void_return_type (bt))
-    {
-      if (bt->size_type () == be_decl::VARIABLE
-          || bt->base_node_type () == AST_Decl::NT_array)
-        {
-          *os << "ACE_CHECK_RETURN (0);" << be_nl;
-        }
-      else
-        {
-          *os << "ACE_CHECK_RETURN  (_tao_retval);" << be_nl;
-        }
-    }
-  else
-    {
-      *os << "ACE_CHECK;" << be_nl;
-    }
-
-  return 0;
-}
-
-
 int
 be_visitor_operation_thru_poa_proxy_impl_ss::void_return_type (be_type *bt)
 {