ChangeLogTag: Thu Jan 13 13:50:26 2005 Jeff Parsons <j.parsons@vanderbilt.edu>

2 files changed, 12 insertions, 20 deletions

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 1e7633179b0..5541c9f15bf 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
@@ -67,7 +67,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
           << "TAO::Any_Dual_Impl_T<" << node->name ()
           << ">::marshal_value (TAO_OutputCDR &)" << be_nl
           << "{" << be_idt_nl
-          << "return 0;" << be_uidt_nl
+          << "return false;" << be_uidt_nl
           << "}";
 
       *os << be_nl << be_nl
@@ -76,7 +76,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
           << "TAO::Any_Dual_Impl_T<" << node->name ()
           << ">::demarshal_value (TAO_InputCDR &)" << be_nl
           << "{" << be_idt_nl
-          << "return 0;" << be_uidt_nl
+          << "return false;" << be_uidt_nl
           << "}";
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
index b0bcff72806..93df5e8a155 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
@@ -137,7 +137,7 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
     }
 
   *os << "}" << be_uidt_nl << be_nl
-      << "return 0;" << be_uidt_nl
+      << "return false;" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   //  Set the sub state as generating code for the input operator.
@@ -176,7 +176,7 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
       *os << "// of the stream. (See bug 58.)" << be_nl;
       *os << "if (_tao_seq_len > strm.length ())" << be_idt_nl
           << "{" << be_idt_nl;
-      *os << "return 0;" << be_uidt_nl
+      *os << "return false;" << be_uidt_nl
           << "}" << be_uidt_nl << be_nl;
 
       // Now check if the length does not exceed the maximum. We do this only
@@ -219,7 +219,7 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
       *os << "// If length is 0 we return true." << be_nl;
       *os << "if (0 >= _tao_seq_len) " << be_idt_nl
           << "{" << be_idt_nl;
-      *os << "return 1;" << be_uidt_nl
+      *os << "return true;" << be_uidt_nl
           << "}" << be_uidt_nl << be_nl;
 
       *os << "// Retrieve all the elements." << be_nl;
@@ -249,7 +249,7 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
       *os << be_nl << "}" << be_uidt_nl << be_nl;
     }
 
-  *os << "return 0;" << be_uidt_nl
+  *os << "return false;" << be_uidt_nl
       << "}";
 
   *os << be_nl << be_nl
@@ -591,7 +591,7 @@ be_visitor_sequence_cdr_op_cs::visit_node (be_type *bt)
   be_visitor_sequence_base visitor (&ctx);
 
   // Initialize a boolean variable.
-  *os << "CORBA::Boolean _tao_marshal_flag = 1;" << be_nl << be_nl;
+  *os << "CORBA::Boolean _tao_marshal_flag = true;" << be_nl << be_nl;
 
   // We get here if the "type" of individual elements of the sequence is not a
   // primitive type. In this case, we are left with no other alternative but
@@ -837,19 +837,11 @@ be_visitor_sequence_cdr_op_cs::visit_node (be_type *bt)
           break;
         case AST_Decl::NT_interface:
         case AST_Decl::NT_interface_fwd:
-          *os << "_tao_marshal_flag =" << be_idt_nl;
-
-          if (bt->is_defined ())
-            {
-              *os << "_tao_sequence[i].in ()->marshal (strm);" << be_uidt;
-            }
-          else
-            {
-              *os << "TAO::Objref_Traits<" << bt->name () << ">::marshal ("
-                  << be_idt << be_idt_nl
-                  << "_tao_sequence[i].in (), strm" << be_uidt_nl
-                  << ");" << be_uidt << be_uidt;
-            }
+          *os << "_tao_marshal_flag =" << be_idt_nl
+              << "TAO::Objref_Traits<" << bt->name () << ">::marshal ("
+              << be_idt << be_idt_nl
+              << "_tao_sequence[i].in (), strm" << be_uidt_nl
+              << ");" << be_uidt << be_uidt;
 
           break;
         case AST_Decl::NT_string: