summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelliott_c <ocielliottc@users.noreply.github.com>2002-06-14 14:12:15 +0000
committerelliott_c <ocielliottc@users.noreply.github.com>2002-06-14 14:12:15 +0000
commitb1aa5c68fc1d4cc823a8eee6edc26f429f1ed876 (patch)
tree33a2aa9d1791870105a834903e5b7944db99a3ef
parent3ccb48ce9c48628c12c260d8114ed55e3f0dceb0 (diff)
downloadATCD-b1aa5c68fc1d4cc823a8eee6edc26f429f1ed876.tar.gz
ChangeLogTag: Fri Jun 14 09:11:11 2002 Chad Elliott <elliott_c@ociweb.com>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a6
-rw-r--r--TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp12
2 files changed, 9 insertions, 9 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 8ef6df11537..208b5d2da21 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,9 @@
+Fri Jun 14 09:11:11 2002 Chad Elliott <elliott_c@ociweb.com>
+
+ * TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp:
+
+ Move the return statement to avoid warnings with gcc.
+
Fri Jun 14 07:46:50 2002 Chad Elliott <elliott_c@ociweb.com>
* orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp:
diff --git a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp
index 32041eceb37..f61e08092f5 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp
@@ -177,16 +177,10 @@ be_visitor_array_any_op_cs::visit_array (be_array *node)
*os << "}" << be_nl
<< "ACE_CATCHANY" << be_nl
<< "{" << be_idt_nl
- << "return 0;" << be_uidt_nl
<< "}" << be_nl
- << "ACE_ENDTRY;";
-
- if (!node->is_local ())
- {
- *os << be_nl << be_nl << "return 0;";
- }
-
- *os << be_uidt_nl << "}\n\n";
+ << "ACE_ENDTRY;"
+ << be_nl << be_nl << "return 0;"
+ << be_uidt_nl << "}\n\n";
node->cli_stub_any_op_gen (1);
return 0;