summaryrefslogtreecommitdiff
path: root/TAO/TAO_IDL/be/be_visitor_union
diff options
context:
space:
mode:
authornobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-05-23 18:28:55 +0000
committernobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-05-23 18:28:55 +0000
commit06ce59d348e30ce3da6106943c2d5660abc4c219 (patch)
tree193a5f6f9b2e16cb3c722e5ef066dd266832a6bd /TAO/TAO_IDL/be/be_visitor_union
parent74205f4d54deada413395d34b3dfa99d51c6f7cb (diff)
downloadATCD-06ce59d348e30ce3da6106943c2d5660abc4c219.tar.gz
This commit was manufactured by cvs2svn to create tag 'IR-base'.IR-base
Diffstat (limited to 'TAO/TAO_IDL/be/be_visitor_union')
-rw-r--r--TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp6
-rw-r--r--TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp1
2 files changed, 3 insertions, 4 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
index 8287b104719..175bf554345 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
@@ -117,13 +117,13 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
if (this->gen_extraction (os, node) != 0)
return -1;
- *os << be_nl
- << "return 1;" << be_uidt_nl
+ *os << "return 1;" << be_uidt_nl
<< "}" << be_uidt_nl
<< "}" << be_nl
<< "ACE_CATCHANY" << be_nl
<< "{" << be_idt_nl
- << "delete _tao_elem;" << be_uidt_nl
+ << "delete _tao_elem;" << be_nl
+ << "return 0; " << be_uidt_nl
<< "}" << be_nl
<< "ACE_ENDTRY;" << be_nl
<< "return 0;" << be_uidt_nl
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 8510fc91314..6cd34f2b473 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
@@ -215,7 +215,6 @@ int be_visitor_union_cs::visit_union (be_union *node)
// based on the command line options. This is still TO-DO
ctx = *this->ctx_;
ctx.state (TAO_CodeGen::TAO_TYPECODE_DEFN);
- ctx.sub_state (TAO_CodeGen::TAO_TC_DEFN_TYPECODE);
visitor = tao_cg->make_visitor (&ctx);
if (!visitor || (node->accept (visitor) == -1))
{