diff options
Diffstat (limited to 'TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp')
| -rw-r--r-- | TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp | 80 |
1 files changed, 18 insertions, 62 deletions
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp index 9ffbc54f337..1a419ab1be5 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "ObjectReferenceTemplate.h" +#include "tao/ObjRefTemplate/ObjectReferenceTemplate.h" #include "tao/CDR.h" #include "tao/Exception_Data.h" #include "tao/Invocation_Adapter.h" @@ -44,12 +44,14 @@ #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) -#include "ObjectReferenceTemplateC.inl" +#include "tao/ObjRefTemplate/ObjectReferenceTemplateC.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Arg traits specializations. namespace TAO { @@ -233,36 +235,36 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceTemplate::_tao_unmarshal ( base, ObjectReferenceTemplate::_tao_obv_static_repository_id () ); - + if (retval == 0) { return 0; } - + if (factory.in () != 0) { base = factory->create_for_unmarshal (); - + if (base == 0) { return 0; // %! except.? } - + retval = base->_tao_unmarshal_v (strm); - + if (retval == 0) { return 0; } } - + // Now base must be null or point to the unmarshaled object. // Align the pointer to the right subobject. new_object = ObjectReferenceTemplate::_downcast (base); return retval; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CS_) @@ -274,7 +276,7 @@ PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (voi PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq ( CORBA::ULong max ) - : TAO_Unbounded_Valuetype_Sequence< + : TAO::unbounded_valuetype_sequence< PortableInterceptor::ObjectReferenceTemplate, PortableInterceptor::ObjectReferenceTemplate_var > @@ -287,7 +289,7 @@ PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq ( PortableInterceptor::ObjectReferenceTemplate * * buffer, CORBA::Boolean release ) - : TAO_Unbounded_Valuetype_Sequence< + : TAO::unbounded_valuetype_sequence< PortableInterceptor::ObjectReferenceTemplate, PortableInterceptor::ObjectReferenceTemplate_var > @@ -297,7 +299,7 @@ PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq ( PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq ( const ObjectReferenceTemplateSeq &seq ) - : TAO_Unbounded_Valuetype_Sequence< + : TAO::unbounded_valuetype_sequence< PortableInterceptor::ObjectReferenceTemplate, PortableInterceptor::ObjectReferenceTemplate_var > @@ -427,22 +429,7 @@ CORBA::Boolean operator<< ( const PortableInterceptor::ObjectReferenceTemplateSeq &_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].in ()); - } - - return _tao_marshal_flag; - } - - return false; + return TAO::marshal_sequence(strm, _tao_sequence); } CORBA::Boolean operator>> ( @@ -450,40 +437,9 @@ CORBA::Boolean operator>> ( PortableInterceptor::ObjectReferenceTemplateSeq &_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_PortableInterceptor_ObjectReferenceTemplateSeq_CPP_ */ + +TAO_END_VERSIONED_NAMESPACE_DECL |