diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.cpp | 64 |
1 files changed, 10 insertions, 54 deletions
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.cpp index 5bb8026bb9f..e0db9e121f9 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.cpp @@ -36,7 +36,7 @@ #include "tao/AnyTypeCode/String_TypeCode_Static.h" #include "tao/AnyTypeCode/Struct_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Struct_Field.h" -#include "htiop_endpointsC.h" +#include "orbsvcs/HTIOP/htiop_endpointsC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) @@ -46,6 +46,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -94,7 +96,7 @@ HTIOPEndpointSequence::HTIOPEndpointSequence (void) HTIOPEndpointSequence::HTIOPEndpointSequence ( CORBA::ULong max ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< HTIOP_Endpoint_Info > (max) @@ -106,7 +108,7 @@ HTIOPEndpointSequence::HTIOPEndpointSequence ( HTIOP_Endpoint_Info * buffer, CORBA::Boolean release ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< HTIOP_Endpoint_Info > (max, length, buffer, release) @@ -115,7 +117,7 @@ HTIOPEndpointSequence::HTIOPEndpointSequence ( HTIOPEndpointSequence::HTIOPEndpointSequence ( const HTIOPEndpointSequence &seq ) - : TAO_Unbounded_Sequence< + : TAO::unbounded_value_sequence< HTIOP_Endpoint_Info > (seq) @@ -204,22 +206,7 @@ CORBA::Boolean operator<< ( const HTIOPEndpointSequence &_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>> ( @@ -227,40 +214,9 @@ CORBA::Boolean operator>> ( HTIOPEndpointSequence &_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_HTIOPEndpointSequence_CPP_ */ + +TAO_END_VERSIONED_NAMESPACE_DECL |