From 88b0c4f177f5bdc9fb9f64f77af154051750b3f8 Mon Sep 17 00:00:00 2001
From: parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>
Date: Mon, 9 Jun 2003 16:36:07 +0000
Subject: ChangeLogTag: Mon Jun  9 11:30:36 2003  Jeff Parsons
 <j.parsons@vanderbilt.edu>

---
 TAO/ChangeLog                                | 9 +++++++++
 TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 488c32edd54..bdd68d30e16 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Mon Jun  9 11:30:36 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_union/union_cs.cpp:
+
+          Removed check for non-locality in conditional typecode generation.
+          This one was overlooked in the general removal of these checks
+          some time ago. Thanks to Anand <anand@iCMGworld.com> for reporting
+          the bug.
+
 Mon Jun  9 10:09:52 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/Strategies/Makefile.bor:
diff --git a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
index 34e4b8ecb44..f94ef1b6e32 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
@@ -275,7 +275,7 @@ int be_visitor_union_cs::visit_union (be_union *node)
   *os << be_uidt_nl << "}" << be_uidt_nl
       << "}";
 
-  if (!node->is_local () && be_global->tc_support ())
+  if (be_global->tc_support ())
     {
       ctx = *this->ctx_;
       ctx.sub_state (TAO_CodeGen::TAO_TC_DEFN_TYPECODE);
-- 
cgit v1.2.1