diff options
Diffstat (limited to 'TAO/tao/AnyTypeCode/DynamicC.cpp')
| -rw-r--r-- | TAO/tao/AnyTypeCode/DynamicC.cpp | 119 |
1 files changed, 10 insertions, 109 deletions
diff --git a/TAO/tao/AnyTypeCode/DynamicC.cpp b/TAO/tao/AnyTypeCode/DynamicC.cpp index bb693ede9b8..4cd49b59b28 100644 --- a/TAO/tao/AnyTypeCode/DynamicC.cpp +++ b/TAO/tao/AnyTypeCode/DynamicC.cpp @@ -58,7 +58,7 @@ Dynamic::ParameterList::ParameterList (void) Dynamic::ParameterList::ParameterList ( CORBA::ULong max ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< Dynamic::Parameter > (max) @@ -70,7 +70,7 @@ Dynamic::ParameterList::ParameterList ( Dynamic::Parameter * buffer, CORBA::Boolean release ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< Dynamic::Parameter > (max, length, buffer, release) @@ -79,7 +79,7 @@ Dynamic::ParameterList::ParameterList ( Dynamic::ParameterList::ParameterList ( const ParameterList &seq ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< Dynamic::Parameter > (seq) @@ -112,7 +112,7 @@ Dynamic::ExceptionList::ExceptionList (void) Dynamic::ExceptionList::ExceptionList ( CORBA::ULong max ) - : TAO_Unbounded_Object_Sequence< + : TAO::unbounded_object_reference_sequence< CORBA::TypeCode, CORBA::TypeCode_var > @@ -125,7 +125,7 @@ Dynamic::ExceptionList::ExceptionList ( CORBA::TypeCode_ptr * buffer, CORBA::Boolean release ) - : TAO_Unbounded_Object_Sequence< + : TAO::unbounded_object_reference_sequence< CORBA::TypeCode, CORBA::TypeCode_var > @@ -135,7 +135,7 @@ Dynamic::ExceptionList::ExceptionList ( Dynamic::ExceptionList::ExceptionList ( const ExceptionList &seq ) - : TAO_Unbounded_Object_Sequence< + : TAO::unbounded_object_reference_sequence< CORBA::TypeCode, CORBA::TypeCode_var > @@ -167,22 +167,7 @@ CORBA::Boolean operator<< ( const Dynamic::ParameterList &_tao_sequence ) { - const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm << _tao_sequence[i]); - } - - return _tao_marshal_flag; - } - - return false; + return TAO::marshal_sequence(strm, _tao_sequence); } CORBA::Boolean operator>> ( @@ -190,40 +175,7 @@ CORBA::Boolean operator>> ( Dynamic::ParameterList &_tao_sequence ) { - CORBA::ULong _tao_seq_len; - - if (strm >> _tao_seq_len) - { - // Add a check to the length of the sequence - // to make sure it does not exceed the length - // of the stream. (See bug 58.) - if (_tao_seq_len > strm.length ()) - { - return false; - } - - // Set the length of the sequence. - _tao_sequence.length (_tao_seq_len); - - // If length is 0 we return true. - if (0 >= _tao_seq_len) - { - return true; - } - - // Retrieve all the elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm >> _tao_sequence[i]); - } - - return _tao_marshal_flag; - - } - - return false; + return TAO::demarshal_sequence(strm, _tao_sequence); } #endif /* _TAO_CDR_OP_Dynamic_ParameterList_CPP_ */ @@ -240,25 +192,7 @@ CORBA::Boolean operator<< ( const Dynamic::ExceptionList &_tao_sequence ) { - const CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = - TAO::Objref_Traits<CORBA::TypeCode>::marshal ( - _tao_sequence[i].in (), strm - ); - } - - return _tao_marshal_flag; - } - - return false; + return TAO::marshal_sequence(strm, _tao_sequence); } CORBA::Boolean operator>> ( @@ -266,40 +200,7 @@ CORBA::Boolean operator>> ( Dynamic::ExceptionList &_tao_sequence ) { - CORBA::ULong _tao_seq_len; - - if (strm >> _tao_seq_len) - { - // Add a check to the length of the sequence - // to make sure it does not exceed the length - // of the stream. (See bug 58.) - if (_tao_seq_len > strm.length ()) - { - return false; - } - - // Set the length of the sequence. - _tao_sequence.length (_tao_seq_len); - - // If length is 0 we return true. - if (0 >= _tao_seq_len) - { - return true; - } - - // Retrieve all the elements. - CORBA::Boolean _tao_marshal_flag = true; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm >> _tao_sequence[i].out ()); - } - - return _tao_marshal_flag; - - } - - return false; + return TAO::demarshal_sequence(strm, _tao_sequence); } #endif /* _TAO_CDR_OP_Dynamic_ExceptionList_CPP_ */ |