1 files changed, 114 insertions, 3 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype_pre_invoke_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype_pre_invoke_cs.cpp
index 5b0c21c3a24..469226ec3cf 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/rettype_pre_invoke_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype_pre_invoke_cs.cpp
@@ -12,7 +12,7 @@
 //
 // = DESCRIPTION
 //    Visitor generating code for doing any pre-processing of return type prior
-//    to making the do_static_call.
+//    to making the invocation.
 //
 // = AUTHOR
 //    Aniruddha Gokhale
@@ -30,12 +30,11 @@ ACE_RCSID(be_visitor_operation, rettype_pre_invoke_cs, "$Id$")
 
 // *****************************************************************************
 //    be_visitor_operation_rettype_pre_invoke_cs
-//
 // *****************************************************************************
 
 be_visitor_operation_rettype_pre_invoke_cs::
 be_visitor_operation_rettype_pre_invoke_cs (be_visitor_context *ctx)
-  : be_visitor_operation_rettype_pre_docall_cs (ctx)
+  : be_visitor_decl (ctx)
 {
 }
 
@@ -45,6 +44,24 @@ be_visitor_operation_rettype_pre_invoke_cs::
 }
 
 int
+be_visitor_operation_rettype_pre_invoke_cs::visit_array (be_array *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
+  be_type *bt; // return type
+
+  if (this->ctx_->alias ()) // a typedefed return type
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  os->indent ();
+  *os << "ACE_ALLOCATOR_RETURN (_tao_retval, " << bt->name ()
+      << "_alloc (), _tao_retval);" << be_nl;
+  *os << bt->name () << "_var _tao_safe_retval (_tao_retval);\n";
+  return 0;
+}
+
+int
 be_visitor_operation_rettype_pre_invoke_cs::visit_interface (be_interface *)
 {
   // don't do anything. This is the overriding action
@@ -57,3 +74,97 @@ be_visitor_operation_rettype_pre_invoke_cs::visit_interface_fwd (be_interface_fw
   return 0;
 }
 
+int
+be_visitor_operation_rettype_pre_invoke_cs::
+visit_predefined_type (be_predefined_type *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
+
+  switch (node->pt ())
+    {
+    case AST_PredefinedType::PT_any:
+      os->indent ();
+      *os << "ACE_NEW_RETURN (_tao_retval, CORBA::Any, _tao_retval);" << be_nl
+          << "CORBA::Any_var _tao_safe_retval (_tao_retval);\n";
+      break;
+    default:
+      break;
+    }
+  return 0;
+}
+
+int
+be_visitor_operation_rettype_pre_invoke_cs::visit_sequence (be_sequence *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
+  be_type *bt; // return type
+
+  if (this->ctx_->alias ()) // a typedefed return type
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  os->indent ();
+  *os << "ACE_NEW_RETURN (_tao_retval, " << bt->name () << ", _tao_retval);" << be_nl
+      << bt->name () << "_var _tao_safe_retval (_tao_retval);\n";
+  return 0;
+}
+
+int
+be_visitor_operation_rettype_pre_invoke_cs::visit_structure (be_structure *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
+  be_type *bt; // return type
+
+  if (this->ctx_->alias ()) // a typedefed return type
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  // check if the union is variable
+  if (node->size_type () == be_type::VARIABLE)
+    {
+      os->indent ();
+      *os << "ACE_NEW_RETURN (_tao_retval, " << bt->name () << ", _tao_retval);" << be_nl
+          << bt->name () << "_var _tao_safe_retval (_tao_retval);\n";
+    }
+  return 0;
+}
+
+int
+be_visitor_operation_rettype_pre_invoke_cs::visit_typedef (be_typedef *node)
+{
+  this->ctx_->alias (node); // set the alias node
+  if (node->primitive_base_type ()->accept (this) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_operation_rettype_pre_docall_cs::"
+                         "visit_typedef - "
+                         "accept on primitive type failed\n"),
+                        -1);
+    }
+  this->ctx_->alias (0);
+  return 0;
+}
+
+int
+be_visitor_operation_rettype_pre_invoke_cs::visit_union (be_union *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
+  be_type *bt; // return type
+
+  if (this->ctx_->alias ()) // a typedefed return type
+    bt = this->ctx_->alias ();
+  else
+    bt = node;
+
+  // check if the union is variable
+  if (node->size_type () == be_type::VARIABLE)
+    {
+      os->indent ();
+      *os << "ACE_NEW_RETURN (_tao_retval, " << bt->name () << ", _tao_retval);" << be_nl
+          << bt->name () << "_var _tao_safe_retval (_tao_retval);\n";
+    }
+  return 0;
+}
+