summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-10-26 18:02:34 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-10-26 18:02:34 +0000
commit4ad80fefe19b042516277425865df8be0e88dda9 (patch)
treed2745362a411b758c89bc6ee4f8312ca97e12075 /TAO
parent51a708987b4ebea33f1d2bd1808d158c8f892843 (diff)
downloadATCD-4ad80fefe19b042516277425865df8be0e88dda9.tar.gz
replaced the final return 0, but this time wrapped with ACE_NOTREACHED
Diffstat (limited to 'TAO')
-rw-r--r--TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp9
-rw-r--r--TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp13
-rw-r--r--TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp9
-rw-r--r--TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp3
-rw-r--r--TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp11
-rw-r--r--TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp11
-rw-r--r--TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp11
7 files changed, 37 insertions, 30 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 04d698e395e..37753dc8311 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
@@ -19,9 +19,9 @@
//
// ============================================================================
-#include "idl.h"
-#include "idl_extern.h"
-#include "be.h"
+#include "idl.h"
+#include "idl_extern.h"
+#include "be.h"
#include "be_visitor_array.h"
@@ -110,7 +110,8 @@ be_visitor_array_any_op_cs::visit_array (be_array *node)
<< node->name () << "_free (_tao_elem._retn ());" << be_nl
<< "return 0;" << be_uidt_nl
<< "}" << be_nl
- << "TAO_ENDTRY;" << be_uidt_nl
+ << "TAO_ENDTRY;" << be_nl
+ << "ACE_NOTREACHED (return 0);" << be_uidt_nl
<< "}\n\n";
node->cli_stub_any_op_gen (1);
diff --git a/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp
index ef7a5bca8db..d37f520ae80 100644
--- a/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp
@@ -18,9 +18,9 @@
//
// ============================================================================
-#include "idl.h"
-#include "idl_extern.h"
-#include "be.h"
+#include "idl.h"
+#include "idl_extern.h"
+#include "be.h"
#include "be_visitor_enum.h"
@@ -57,11 +57,11 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node)
<< node->name () << " _tao_elem)" << be_nl
<< "{" << be_idt_nl
<< node->name () << " *_any_val;" << be_nl
- << "ACE_NEW (_any_val, " << node->name ()
+ << "ACE_NEW (_any_val, " << node->name ()
<< " (_tao_elem));" << be_nl
<< "TAO_TRY" << be_nl
<< "{" << be_idt_nl
- << "_tao_any.replace (" << node->tc_name ()
+ << "_tao_any.replace (" << node->tc_name ()
<< ", _any_val, 1, TAO_TRY_ENV);" << be_nl
<< "TAO_CHECK_ENV;" << be_uidt_nl
<< "}" << be_nl
@@ -94,7 +94,8 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node)
<< "{" << be_idt_nl
<< "return 0;" << be_uidt_nl
<< "}" << be_nl
- << "TAO_ENDTRY;" << be_uidt_nl
+ << "TAO_ENDTRY;" << be_nl
+ << "ACE_NOTREACHED (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 79b62977e59..572ad1856f8 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
@@ -18,9 +18,9 @@
//
// ============================================================================
-#include "idl.h"
-#include "idl_extern.h"
-#include "be.h"
+#include "idl.h"
+#include "idl_extern.h"
+#include "be.h"
#include "be_visitor_exception.h"
@@ -127,7 +127,8 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
<< "delete _tao_elem;" << be_nl
<< "return 0;" << be_uidt_nl
<< "}" << be_nl
- << "TAO_ENDTRY;" << be_uidt_nl
+ << "TAO_ENDTRY;" << be_nl
+ << "ACE_NOTREACHED (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 ae4d4049647..afa82866d55 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
@@ -106,7 +106,8 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
<< "{" << be_idt_nl
<< "return 0;" << be_uidt_nl
<< "}" << be_nl
- << "TAO_ENDTRY;" << be_uidt_nl
+ << "TAO_ENDTRY;" << be_nl
+ << "ACE_NOTREACHED (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 f6264263d61..9a2f9be5f4f 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
@@ -18,9 +18,9 @@
//
// ============================================================================
-#include "idl.h"
-#include "idl_extern.h"
-#include "be.h"
+#include "idl.h"
+#include "idl_extern.h"
+#include "be.h"
#include "be_visitor_sequence.h"
@@ -57,7 +57,7 @@ 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 = new " << node->name ()
+ << node->name () << " *_tao_any_val = new " << node->name ()
<< " (_tao_elem);" << be_nl
<< "if (!_tao_any_val) return;" << be_nl
<< "TAO_TRY" << be_nl
@@ -130,7 +130,8 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
<< "delete _tao_elem;" << be_nl
<< "return 0;" << be_uidt_nl
<< "}" << be_nl
- << "TAO_ENDTRY;" << be_uidt_nl
+ << "TAO_ENDTRY;" << be_nl
+ << "ACE_NOTREACHED (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 4d262d1de85..07a15708baf 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
@@ -18,9 +18,9 @@
//
// ============================================================================
-#include "idl.h"
-#include "idl_extern.h"
-#include "be.h"
+#include "idl.h"
+#include "idl_extern.h"
+#include "be.h"
#include "be_visitor_structure.h"
@@ -60,7 +60,7 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
<< "ACE_NEW (_any_val, " << node->name () << " (_tao_elem));" << be_nl
<< "TAO_TRY" << be_nl
<< "{" << be_idt_nl
- << "_tao_any.replace (" << node->tc_name ()
+ << "_tao_any.replace (" << node->tc_name ()
<< ", _any_val, 1, TAO_TRY_ENV);" << " // copy the value" << be_nl
<< "TAO_CHECK_ENV;" << be_uidt_nl
<< "}" << be_nl
@@ -126,7 +126,8 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
<< "delete _tao_elem;" << be_nl
<< "return 0; " << be_uidt_nl
<< "}" << be_nl
- << "TAO_ENDTRY;" << be_uidt_nl
+ << "TAO_ENDTRY;" << be_nl
+ << "ACE_NOTREACHED (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 06ce1e02e17..212a226e90c 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
@@ -18,9 +18,9 @@
//
// ============================================================================
-#include "idl.h"
-#include "idl_extern.h"
-#include "be.h"
+#include "idl.h"
+#include "idl_extern.h"
+#include "be.h"
#include "be_visitor_union.h"
@@ -59,7 +59,7 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
<< "ACE_NEW (_any_val, " << node->name () << " (_tao_elem));" << be_nl
<< "TAO_TRY" << be_nl
<< "{" << be_idt_nl
- << "_tao_any.replace (" << node->tc_name ()
+ << "_tao_any.replace (" << node->tc_name ()
<< ", _any_val, 1, TAO_TRY_ENV);" << " // copy the value" << be_nl
<< "TAO_CHECK_ENV;" << be_uidt_nl
<< "}" << be_nl
@@ -125,7 +125,8 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
<< "delete _tao_elem;" << be_nl
<< "return 0; " << be_uidt_nl
<< "}" << be_nl
- << "TAO_ENDTRY;" << be_uidt_nl
+ << "TAO_ENDTRY;" << be_nl
+ << "ACE_NOTREACHED (return 0);" << be_uidt_nl
<< "}\n\n";