summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-06-09 16:36:07 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-06-09 16:36:07 +0000
commit88b0c4f177f5bdc9fb9f64f77af154051750b3f8 (patch)
tree08053999fd23aeed649416bab07e733748dc342f
parentb218af0cf6a0013c2448af35eadb6f1b67a1db22 (diff)
downloadATCD-88b0c4f177f5bdc9fb9f64f77af154051750b3f8.tar.gz
ChangeLogTag: Mon Jun 9 11:30:36 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
-rw-r--r--TAO/ChangeLog9
-rw-r--r--TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp2
2 files changed, 10 insertions, 1 deletions
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);