removed "return 0" in TAO_TRY block, and therefore the ACE_NOTREACHED wrapper around the "return 0" at the end of the function

6 files changed, 15 insertions, 20 deletions

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 37753dc8311..eccd0a1cc0d 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
@@ -102,8 +102,7 @@ be_visitor_array_any_op_cs::visit_array (be_array *node)
       << "_tao_elem = (" << node->name () << "_slice *)_tao_any.value ();"
       << be_nl
       << "return 1;" << be_uidt_nl
-      << "}" << be_nl
-      << "return 0;" << be_uidt_nl
+      << "}" << be_uidt_nl
       << "}" << be_nl
       << "TAO_CATCHANY" << be_nl
       << "{" << be_idt_nl
@@ -111,7 +110,7 @@ be_visitor_array_any_op_cs::visit_array (be_array *node)
       << "return 0;" << be_uidt_nl
       << "}" << be_nl
       << "TAO_ENDTRY;" << be_nl
-      << "ACE_NOTREACHED (return 0);" << be_uidt_nl
+      << "return 0;" << be_uidt_nl
       << "}\n\n";
 
   node->cli_stub_any_op_gen (1);
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
index 572ad1856f8..9ffd6dc882c 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
@@ -111,8 +111,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
       << "}" << be_nl
       << "else" << be_nl  // decode failed
       << "{" << be_idt_nl
-      << "delete _tao_elem;" << be_nl
-      << "return 0;" << be_uidt_nl
+      << "delete _tao_elem;" << be_uidt_nl
       << "}" << be_uidt_nl
       << "}" << be_nl
       << "else" << be_nl  // else any does not own the data
@@ -128,7 +127,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
       << "return 0;" << be_uidt_nl
       << "}" << be_nl
       << "TAO_ENDTRY;" << be_nl
-      << "ACE_NOTREACHED (return 0);" << be_uidt_nl
+      << "return 0;" << be_uidt_nl
       << "}\n\n";
 
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
index afa82866d55..640c9c1e75f 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
@@ -100,14 +100,14 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
       << "TAO_CHECK_ENV;" << be_nl
       << "return 1;" << be_uidt_nl
       << "}" << be_nl
-      << "return 0; // failure" << be_uidt_nl
+      << "// failure" << be_uidt_nl
       << "}" << be_nl
       << "TAO_CATCHANY" << be_nl
       << "{" << be_idt_nl
       << "return 0;" << be_uidt_nl
       << "}" << be_nl
       << "TAO_ENDTRY;" << be_nl
-      << "ACE_NOTREACHED (return 0);" << be_uidt_nl
+      << "return 0;" << be_uidt_nl
       << "}\n\n";
 
   *os << "#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)" << be_idt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
index ae287aeb8ed..9c89bbf41e4 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
@@ -57,13 +57,13 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
       << "const " << node->name () << " &_tao_elem" << be_uidt_nl
       << ") // copying" << be_uidt_nl
       << "{" << be_idt_nl
-      << node->name () << " *_tao_any_val;" << be_nl 
-      << "ACE_NEW (_tao_any_val, " << node->name () 
+      << node->name () << " *_tao_any_val;" << be_nl
+      << "ACE_NEW (_tao_any_val, " << node->name ()
       << " (_tao_elem));" << be_nl
       << "if (!_tao_any_val) return;" << be_nl
       << "TAO_TRY" << be_nl
       << "{" << be_idt_nl
-      << "_tao_any.replace (" << node->tc_name () 
+      << "_tao_any.replace (" << node->tc_name ()
       << ", _tao_any_val, 1, TAO_TRY_ENV);"
       << " // copy the value" << be_nl
       << "TAO_CHECK_ENV; " << be_uidt_nl
@@ -115,8 +115,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
       << "}" << be_nl
       << "else" << be_nl  // decode failed
       << "{" << be_idt_nl
-      << "delete _tao_elem;" << be_nl
-      << "return 0;" << be_uidt_nl
+      << "delete _tao_elem;" << be_uidt_nl
       << "}" << be_uidt_nl
       << "}" << be_nl
       << "else" << be_nl  // else any does not own the data
@@ -132,7 +131,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
       << "return 0;" << be_uidt_nl
       << "}" << be_nl
       << "TAO_ENDTRY;" << be_nl
-      << "ACE_NOTREACHED (return 0);" << be_uidt_nl
+      << "return 0;" << be_uidt_nl
       << "}\n\n";
 
   node->cli_stub_any_op_gen (1);
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp
index 10937532f50..1f3d4f68f62 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp
@@ -111,8 +111,7 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
       << "}" << be_nl
       << "else" << be_nl
       << "{" << be_idt_nl
-      << "delete _tao_elem;" << be_nl
-      << "return 0;" << be_uidt_nl
+      << "delete _tao_elem;" << be_uidt_nl
       << "}" << be_uidt_nl
       << "}" << be_nl
       << "else" << be_nl  // else any does not own the data
@@ -128,7 +127,7 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
       << "return 0; " << be_uidt_nl
       << "}" << be_nl
       << "TAO_ENDTRY;" << be_nl
-      << "ACE_NOTREACHED (return 0);" << be_uidt_nl
+      << "return 0;" << be_uidt_nl
       << "}\n\n";
 
 
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 02b7538cfe8..7aa0d568376 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
@@ -110,8 +110,7 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
       << "}" << be_nl
       << "else" << be_nl
       << "{" << be_idt_nl
-      << "delete _tao_elem;" << be_nl
-      << "return 0;" << be_uidt_nl
+      << "delete _tao_elem;" << be_uidt_nl
       << "}" << be_uidt_nl
       << "}" << be_nl
       << "else" << be_nl  // else any does not own the data
@@ -127,7 +126,7 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
       << "return 0; " << be_uidt_nl
       << "}" << be_nl
       << "TAO_ENDTRY;" << be_nl
-      << "ACE_NOTREACHED (return 0);" << be_uidt_nl
+      << "return 0;" << be_uidt_nl
       << "}\n\n";