diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-07-22 23:34:51 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-07-22 23:34:51 +0000 |
| commit | 520ec68608a1f7d4382d8e9360449453a33c433e (patch) | |
| tree | ccab9c877ffa4eea10cc8629376b2dcdb963bdb7 | |
| parent | d61a65ab9816f80fe5053cbcba84c403549f0b30 (diff) | |
| download | ATCD-520ec68608a1f7d4382d8e9360449453a33c433e.tar.gz | |
ChangeLogTag: Mon Jul 22 18:25:52 2002 Jeff Parsons <parsons@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp | 19 |
2 files changed, 19 insertions, 9 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 1686df1b820..bc2ae1921f4 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Mon Jul 22 18:25:52 2002 Jeff Parsons <parsons@cs.wustl.edu> + + * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp: + + Moved a block of generated code back to its original + position, since the original move reintroduced + [BUGID:58]. Thanks to Carlos O'Ryan <coryan@atdesk.com> + for pointing this out. + Mon Jul 22 17:26:14 2002 Balachandran Natarajan <bala@cs.wustl.edu> * tests/Stack_Recursion/Client_Task.cpp: 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 0b25d0c741c..d8a96f412ee 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 @@ -162,6 +162,16 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node) *os << "CORBA::ULong _tao_seq_len;" << be_nl << be_nl; *os << "if (strm >> _tao_seq_len)" << be_idt_nl << "{" << be_idt_nl; + + // Add a sanity check for the length of a sequence. + *os << "// Add a check to the length of the sequence" << be_nl; + *os << "// to make sure it does not exceed the length" << be_nl; + *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 + << "}" << be_uidt_nl << be_nl; + // Now check if the length does not exceed the maximum. We do this only // for bounded sequences AST_Expression *expr = node->max_size (); @@ -204,15 +214,6 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node) *os << "return 1;" << be_uidt_nl << "}" << be_uidt_nl << be_nl; - // Add a sanity check for the length of a sequence. - *os << "// Add a check to the length of the sequence" << be_nl; - *os << "// to make sure it does not exceed the length" << be_nl; - *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 - << "}" << be_uidt_nl << be_nl; - *os << "// Retrieve all the elements." << be_nl; |