*** empty log message ***

1 files changed, 8 insertions, 9 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp
index cb0cdc2ef4c..a7362fc599b 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp
@@ -96,21 +96,20 @@ be_visitor_union_branch_private_ch::visit_array (be_array *node)
 
   os = this->ctx_->stream ();
 
-  os->indent ();
-  // are we fixed size or variable. This will decide our type
-#if 0
-  if (node->size_type () == be_type::VARIABLE)
+  if (bt->node_type () != AST_Decl::NT_typedef // not a typedef
+      && bt->is_child (bu)) // bt is defined inside the union
     {
-      *os << bt->nested_type_name (bu, "_slice") << " *" << ub->local_name ()
+      // case of anonymous array in union
+      os->indent ();
+      *os << "_" << bt->local_name () << "_slice *" << ub->local_name ()
           << "_;\n";
     }
   else
     {
-      *os << bt->nested_type_name (bu) << " " << ub->local_name () << "_;\n";
+      os->indent ();
+      *os << bt->nested_type_name (bu, "_slice") << " *" << ub->local_name ()
+          << "_;\n";
     }
-#endif
-  *os << bt->nested_type_name (bu, "_slice") << " *" << ub->local_name ()
-      << "_;\n";
 
   return 0;
 }