1 files changed, 6 insertions, 11 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype_pre_docall_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype_pre_docall_cs.cpp
index 8d862d26487..f6f656853e4 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/rettype_pre_docall_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype_pre_docall_cs.cpp
@@ -58,9 +58,8 @@ be_visitor_operation_rettype_pre_docall_cs::visit_array (be_array *node)
     bt = node;
 
   os->indent ();
-  *os << "ACE_ALLOCATOR_RETURN (_tao_bare_ptr, " << bt->name ()
-      << "_alloc (), 0);" << be_nl;
-  *os << bt->name () << "_var _tao_retval (_tao_bare_ptr);\n";
+  *os << "ACE_ALLOCATOR_RETURN (_tao_retval, " << bt->name ()
+      << "_alloc (), _tao_retval);\n";
   return 0;
 }
 
@@ -94,8 +93,7 @@ visit_predefined_type (be_predefined_type *node)
     {
     case AST_PredefinedType::PT_any:
       os->indent ();
-      *os << "ACE_NEW_RETURN (_tao_bare_ptr, CORBA::Any, 0);" << be_nl
-          << "CORBA::Any_var _tao_retval (_tao_bare_ptr);\n";
+      *os << "ACE_NEW_RETURN (_tao_retval, CORBA::Any, _tao_retval);\n";
       break;
     default:
       break;
@@ -115,8 +113,7 @@ be_visitor_operation_rettype_pre_docall_cs::visit_sequence (be_sequence *node)
     bt = node;
 
   os->indent ();
-  *os << "ACE_NEW_RETURN (_tao_bare_ptr, " << bt->name () << ", 0);" << be_nl
-      << bt->name () << "_var _tao_retval (_tao_bare_ptr);\n";
+  *os << "ACE_NEW_RETURN (_tao_retval, " << bt->name () << ", _tao_retval);\n";
   return 0;
 }
 
@@ -135,8 +132,7 @@ be_visitor_operation_rettype_pre_docall_cs::visit_structure (be_structure *node)
   if (node->size_type () == be_type::VARIABLE)
     {
       os->indent ();
-      *os << "ACE_NEW_RETURN (_tao_bare_ptr, " << bt->name () << ", 0);" << be_nl
-          << bt->name () << "_var _tao_retval (_tao_bare_ptr);\n";
+      *os << "ACE_NEW_RETURN (_tao_retval, " << bt->name () << ", _tao_retval);\n";
     }
   return 0;
 }
@@ -172,8 +168,7 @@ be_visitor_operation_rettype_pre_docall_cs::visit_union (be_union *node)
   if (node->size_type () == be_type::VARIABLE)
     {
       os->indent ();
-      *os << "ACE_NEW_RETURN (_tao_bare_ptr, " << bt->name () << ", 0);" << be_nl
-          << bt->name () << "_var _tao_retval (_tao_bare_ptr);\n";
+      *os << "ACE_NEW_RETURN (_tao_retval, " << bt->name () << ", _tao_retval);\n";
     }
   return 0;
 }