summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-05-16 16:12:10 +0000
committercoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-05-16 16:12:10 +0000
commitdc937b652554bcbf27ea183c90d45ec43f371004 (patch)
treecd41c3821f5e6003be19d4e0b400fd431a34ac51
parentb790c82cee6b421365d9a8397cbe35f2792b3c79 (diff)
downloadATCD-dc937b652554bcbf27ea183c90d45ec43f371004.tar.gz
ChangeLogTag:Sun May 16 10:59:12 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
-rw-r--r--TAO/ChangeLog-99c4
-rw-r--r--TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp6
2 files changed, 7 insertions, 3 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 85c6e290d75..e9a6484caa4 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -8,6 +8,10 @@ Sun May 16 10:59:12 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
* TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp:
Removed unused variable
+ * TAO_IDL/be/be_visitor_union/any_op_cs.cpp:
+ The generated code produced a warning in the extraction operator
+ of unions from anys.
+
Sun May 16 10:35:17 1999 Pradeep Gore <pradeep@flamenco.cs.wustl.edu>
* orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp:
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 175bf554345..8287b104719 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 << "return 1;" << be_uidt_nl
+ *os << be_nl
+ << "return 1;" << be_uidt_nl
<< "}" << be_uidt_nl
<< "}" << be_nl
<< "ACE_CATCHANY" << be_nl
<< "{" << be_idt_nl
- << "delete _tao_elem;" << be_nl
- << "return 0; " << be_uidt_nl
+ << "delete _tao_elem;" << be_uidt_nl
<< "}" << be_nl
<< "ACE_ENDTRY;" << be_nl
<< "return 0;" << be_uidt_nl