diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-04-27 18:19:32 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-04-27 18:19:32 +0000 |
| commit | 0d2f5e91c9b8e32194f516c37498dc129e165bf4 (patch) | |
| tree | 98839fafe9cc2055915c29ff3bb55c4ec236b3af /TAO/tao | |
| parent | 351c6f4652c0e811a7c841ee2a833e1bb351af18 (diff) | |
| download | ATCD-0d2f5e91c9b8e32194f516c37498dc129e165bf4.tar.gz | |
ChangeLogTag:Thu Apr 27 11:10:51 2000 Carlos O'Ryan <coryan@uci.edu>
Diffstat (limited to 'TAO/tao')
35 files changed, 1189 insertions, 853 deletions
diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp index 2905725154b..7126f96ceaf 100644 --- a/TAO/tao/Any.cpp +++ b/TAO/tao/Any.cpp @@ -345,9 +345,10 @@ CORBA_Any::_tao_encode (TAO_OutputCDR &cdr, TAO_InputCDR in (this->cdr_, this->byte_order_, orb_core); - cdr.append (this->type_, - &in, - ACE_TRY_ENV); + TAO_Marshal_Object::perform_append (this->type_, + &in, + &cdr, + ACE_TRY_ENV); } void @@ -366,7 +367,7 @@ CORBA_Any::_tao_decode (TAO_InputCDR &cdr, // Skip over the next aregument. CORBA::TypeCode::traverse_status status = - cdr.skip (this->type_, ACE_TRY_ENV); + TAO_Marshal_Object::perform_skip (this->type_, &cdr, ACE_TRY_ENV); ACE_CHECK; if (status != CORBA::TypeCode::TRAVERSE_CONTINUE) @@ -1596,9 +1597,10 @@ operator<< (TAO_OutputCDR& cdr, { TAO_InputCDR input (x._tao_get_cdr (), x._tao_byte_order ()); - cdr.append (x.type (), - &input, - ACE_TRY_ENV); + TAO_Marshal_Object::perform_append (x.type (), + &input, + &cdr, + ACE_TRY_ENV); ACE_TRY_CHECK; } ACE_CATCH (CORBA_Exception, ex) @@ -1629,7 +1631,7 @@ operator>> (TAO_InputCDR &cdr, // Skip over the next aregument. CORBA::TypeCode::traverse_status status = - cdr.skip (tc.in (), ACE_TRY_ENV); + TAO_Marshal_Object::perform_skip (tc.in (), &cdr, ACE_TRY_ENV); ACE_TRY_CHECK; if (status != CORBA::TypeCode::TRAVERSE_CONTINUE) diff --git a/TAO/tao/BoundsC.cpp b/TAO/tao/BoundsC.cpp index ac889a9ef50..57baecb9549 100644 --- a/TAO/tao/BoundsC.cpp +++ b/TAO/tao/BoundsC.cpp @@ -9,6 +9,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html #include "tao/BoundsC.h" +#include "tao/Typecode.h" #if !defined (__ACE_INLINE__) #include "tao/BoundsC.i" diff --git a/TAO/tao/CDR.cpp b/TAO/tao/CDR.cpp index fec38f7d6da..bf5d7d90fb8 100644 --- a/TAO/tao/CDR.cpp +++ b/TAO/tao/CDR.cpp @@ -125,22 +125,6 @@ TAO_OutputCDR::TAO_OutputCDR (ACE_Message_Block *data, this->wchar_translator_ = wchar_translator; } -CORBA::TypeCode::traverse_status -TAO_OutputCDR::append (CORBA::TypeCode_ptr tc, - TAO_InputCDR *src, - CORBA::Environment &ACE_TRY_ENV) -{ - TAO_Marshal_Object *mobj = - TAO_MARSHAL_FACTORY::instance ()->make_marshal_object (tc, - ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - - if (mobj == 0) - return CORBA::TypeCode::TRAVERSE_STOP; - - return mobj->append (tc, src, this, ACE_TRY_ENV); -} - // **************************************************************** TAO_InputCDR::TAO_InputCDR (const TAO_OutputCDR& rhs, @@ -169,20 +153,3 @@ TAO_InputCDR::init_translators (void) this->wchar_translator_ = this->orb_core_->from_unicode (); } } - -CORBA::TypeCode::traverse_status -TAO_InputCDR::skip (CORBA::TypeCode_ptr tc, - CORBA::Environment &ACE_TRY_ENV) -{ - TAO_Marshal_Object *mobj = - TAO_MARSHAL_FACTORY::instance ()->make_marshal_object - (tc, ACE_TRY_ENV); - ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - - if (mobj == 0) - return CORBA::TypeCode::TRAVERSE_STOP; - - return mobj->skip (tc, - this, - ACE_TRY_ENV); -} diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h index b2218ed7108..85f049930d8 100644 --- a/TAO/tao/CDR.h +++ b/TAO/tao/CDR.h @@ -1,9 +1,6 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ -// $Id$ - - // ============================================================================ // // = LIBRARY @@ -54,8 +51,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Typecode.h" - class TAO_ORB_Core; class TAO_Export TAO_OutputCDR : public ACE_OutputCDR @@ -120,13 +115,6 @@ public: ~TAO_OutputCDR (void); // Destructor. - CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, - TAO_InputCDR *src, - CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment ()); - // Append the contents of the CDR stream based on information - // described by <tc>; returning any errors in <ACE_TRY_ENV>. - // @@ TODO: do we want a special method to write an array of // strings and wstrings? @@ -221,12 +209,6 @@ public: // = TAO specific methods. - CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, - CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment ()); - // Skip the contents of the CDR stream based on information - // described by <tc>; returning any errors in <ACE_TRY_ENV>. - TAO_ORB_Core *orb_core (void) const; // Accessor diff --git a/TAO/tao/CONV_FRAMEC.cpp b/TAO/tao/CONV_FRAMEC.cpp index c9f880f52c1..0cedf833888 100644 --- a/TAO/tao/CONV_FRAMEC.cpp +++ b/TAO/tao/CONV_FRAMEC.cpp @@ -19,6 +19,7 @@ #include "tao/CONV_FRAMEC.h" #include "tao/Any.h" +#include "tao/Typecode.h" #if !defined (__ACE_INLINE__) #include "tao/CONV_FRAMEC.i" diff --git a/TAO/tao/DomainS.cpp b/TAO/tao/DomainS.cpp index d3551ce9509..fc8e3c7953e 100644 --- a/TAO/tao/DomainS.cpp +++ b/TAO/tao/DomainS.cpp @@ -14,6 +14,7 @@ #include "tao/Server_Request.h" #include "tao/POA_CORBA.h" #include "tao/ORB.h" +#include "tao/Typecode.h" class TAO_CORBA_DomainManager_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable { diff --git a/TAO/tao/DynAnyC.h b/TAO/tao/DynAnyC.h index 7ff74c40d33..4adf53f842c 100644 --- a/TAO/tao/DynAnyC.h +++ b/TAO/tao/DynAnyC.h @@ -38,6 +38,7 @@ #include "tao/Any.h" #include "tao/Object.h" #include "tao/Sequence.h" +#include "tao/Exception.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO diff --git a/TAO/tao/DynAnyS.cpp b/TAO/tao/DynAnyS.cpp index 05fb60705b6..eb5d33e7e5a 100644 --- a/TAO/tao/DynAnyS.cpp +++ b/TAO/tao/DynAnyS.cpp @@ -29,6 +29,7 @@ #include "tao/POA_CORBA.h" #include "tao/Servant_Base.h" #include "tao/POAC.h" +#include "tao/Typecode.h" ACE_RCSID(tao, DynAnyS, "$Id$") @@ -578,7 +579,7 @@ POA_CORBA::DynAny::_this (CORBA_Environment &ACE_TRY_ENV) CORBA_DynAny *retval = CORBA_DynAny::_nil (); ACE_NEW_RETURN (retval, - POA_CORBA::_tao_collocated_DynAny (this, + POA_CORBA::_tao_collocated_DynAny (this, stub), CORBA_DynAny::_nil ()); @@ -733,7 +734,7 @@ POA_CORBA::DynEnum::_this (CORBA_Environment &ACE_TRY_ENV) CORBA_DynEnum *retval = CORBA_DynEnum::_nil (); ACE_NEW_RETURN (retval, - POA_CORBA::_tao_collocated_DynEnum (this, + POA_CORBA::_tao_collocated_DynEnum (this, stub), CORBA_DynEnum::_nil ()); @@ -882,7 +883,7 @@ POA_CORBA::DynStruct::_this (CORBA_Environment &ACE_TRY_ENV) CORBA_DynStruct *retval = CORBA_DynStruct::_nil (); ACE_NEW_RETURN (retval, - POA_CORBA::_tao_collocated_DynStruct (this, + POA_CORBA::_tao_collocated_DynStruct (this, stub), CORBA_DynStruct::_nil ()); @@ -1070,7 +1071,7 @@ POA_CORBA::DynUnion::_this (CORBA_Environment &ACE_TRY_ENV) CORBA_DynUnion *retval = CORBA_DynUnion::_nil (); ACE_NEW_RETURN (retval, - POA_CORBA::_tao_collocated_DynUnion (this, + POA_CORBA::_tao_collocated_DynUnion (this, stub), CORBA_DynUnion::_nil ()); @@ -1219,7 +1220,7 @@ POA_CORBA::DynSequence::_this (CORBA_Environment &ACE_TRY_ENV) CORBA_DynSequence *retval = CORBA_DynSequence::_nil (); ACE_NEW_RETURN (retval, - POA_CORBA::_tao_collocated_DynSequence (this, + POA_CORBA::_tao_collocated_DynSequence (this, stub), CORBA_DynSequence::_nil ()); @@ -1345,7 +1346,7 @@ POA_CORBA::DynArray::_this (CORBA_Environment &ACE_TRY_ENV) CORBA_DynArray *retval = CORBA_DynArray::_nil (); ACE_NEW_RETURN (retval, - POA_CORBA::_tao_collocated_DynArray (this, + POA_CORBA::_tao_collocated_DynArray (this, stub), CORBA_DynArray::_nil ()); diff --git a/TAO/tao/DynArray_i.cpp b/TAO/tao/DynArray_i.cpp index 117aa83bef9..6b88946f4ae 100644 --- a/TAO/tao/DynArray_i.cpp +++ b/TAO/tao/DynArray_i.cpp @@ -20,6 +20,7 @@ #include "tao/DynArray_i.h" #include "tao/InconsistentTypeCodeC.h" +#include "tao/Marshal.h" // Constructors and destructor @@ -74,7 +75,10 @@ TAO_DynArray_i::TAO_DynArray_i (const CORBA_Any& any) ACE_TRY_CHECK; // Move to the next field in the CDR stream. - cdr.skip (field_tc.in ()); + (void) TAO_Marshal_Object::perform_skip (field_tc.in (), + &cdr, + ACE_TRY_ENV); + ACE_TRY_CHECK; } } else @@ -313,7 +317,10 @@ TAO_DynArray_i::from_any (const CORBA_Any& any, ACE_CHECK; // Move to the next field in the CDR stream. - cdr.skip (field_tc.in ()); + (void) TAO_Marshal_Object::perform_skip (field_tc.in (), + &cdr, + ACE_TRY_ENV); + ACE_TRY_CHECK; } } else @@ -350,9 +357,10 @@ TAO_DynArray_i::to_any (CORBA::Environment& ACE_TRY_ENV) TAO_InputCDR field_cdr (field_mb, field_any->_tao_byte_order ()); - out_cdr.append (field_tc.in (), - &field_cdr, - ACE_TRY_ENV); + (void) TAO_Marshal_Object::perform_append (field_tc.in (), + &field_cdr, + &out_cdr, + ACE_TRY_ENV); ACE_CHECK_RETURN (0); } diff --git a/TAO/tao/DynSequence_i.cpp b/TAO/tao/DynSequence_i.cpp index 3a4174f2f1d..1b822571552 100644 --- a/TAO/tao/DynSequence_i.cpp +++ b/TAO/tao/DynSequence_i.cpp @@ -20,6 +20,7 @@ #include "tao/DynSequence_i.h" #include "tao/InconsistentTypeCodeC.h" +#include "tao/Marshal.h" // Constructors and destructor. @@ -76,8 +77,12 @@ TAO_DynSequence_i::TAO_DynSequence_i (const CORBA_Any& any) TAO_DynAny_i::create_dyn_any (field_any, ACE_TRY_ENV); ACE_TRY_CHECK; + // Move to the next field in the CDR stream. - cdr.skip (field_tc.in ()); + (void) TAO_Marshal_Object::perform_skip (field_tc.in (), + &cdr, + ACE_TRY_ENV); + ACE_TRY_CHECK; } } else @@ -334,7 +339,10 @@ TAO_DynSequence_i::from_any (const CORBA_Any& any, ACE_CHECK; // Move to the next field in the CDR stream. - cdr.skip (field_tc.in ()); + (void) TAO_Marshal_Object::perform_skip (field_tc.in (), + &cdr, + ACE_TRY_ENV); + ACE_TRY_CHECK; } } else @@ -373,9 +381,10 @@ TAO_DynSequence_i::to_any (CORBA::Environment& ACE_TRY_ENV) TAO_InputCDR field_cdr (field_mb, field_any->_tao_byte_order ()); - out_cdr.append (field_tc.in (), - &field_cdr, - ACE_TRY_ENV); + (void) TAO_Marshal_Object::perform_append (field_tc.in (), + &field_cdr, + &out_cdr, + ACE_TRY_ENV); ACE_CHECK_RETURN (0); } diff --git a/TAO/tao/DynStruct_i.cpp b/TAO/tao/DynStruct_i.cpp index 7f03d01cd0e..52f1a8c1131 100644 --- a/TAO/tao/DynStruct_i.cpp +++ b/TAO/tao/DynStruct_i.cpp @@ -1,8 +1,6 @@ /* -*- C++ -*- */ // $Id$ - - // ==================================================================== // // = LIBRARY @@ -23,6 +21,7 @@ #include "tao/DynStruct_i.h" #include "tao/InconsistentTypeCodeC.h" #include "tao/ORB.h" +#include "tao/Marshal.h" // Constructors and destructor @@ -77,7 +76,10 @@ TAO_DynStruct_i::TAO_DynStruct_i (const CORBA_Any& any) ACE_TRY_CHECK; // Move to the next field in the CDR stream. - cdr.skip (field_tc.in ()); + (void) TAO_Marshal_Object::perform_skip (field_tc.in (), + &cdr, + ACE_TRY_ENV); + ACE_TRY_CHECK; } } else @@ -345,7 +347,10 @@ TAO_DynStruct_i::from_any (const CORBA_Any& any, ACE_CHECK; // Move to the next field in the CDR stream. - cdr.skip (field_tc.in ()); + (void) TAO_Marshal_Object::perform_skip (field_tc.in (), + &cdr, + ACE_TRY_ENV); + ACE_TRY_CHECK; } } else @@ -394,9 +399,10 @@ TAO_DynStruct_i::to_any (CORBA::Environment& ACE_TRY_ENV) TAO_InputCDR field_cdr (field_mb, field_any->_tao_byte_order ()); - out_cdr.append (field_tc, - &field_cdr, - ACE_TRY_ENV); + (void) TAO_Marshal_Object::perform_append (field_tc, + &field_cdr, + &out_cdr, + ACE_TRY_ENV); ACE_CHECK_RETURN (0); } diff --git a/TAO/tao/DynUnion_i.cpp b/TAO/tao/DynUnion_i.cpp index e1c8222cc6f..c9db7b1cae7 100644 --- a/TAO/tao/DynUnion_i.cpp +++ b/TAO/tao/DynUnion_i.cpp @@ -8,6 +8,7 @@ #include "tao/DynUnion_i.h" #include "tao/InconsistentTypeCodeC.h" +#include "tao/Marshal.h" #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class DU_Extractor<CORBA::Short>; @@ -344,9 +345,10 @@ TAO_DynUnion_i::to_any (CORBA::Environment& ACE_TRY_ENV) TAO_InputCDR disc_cdr (disc_mb, disc_any->_tao_byte_order ()); - out_cdr.append (disc_tc, - &disc_cdr, - ACE_TRY_ENV); + (void) TAO_Marshal_Object::perform_append (disc_tc, + &disc_cdr, + &out_cdr, + ACE_TRY_ENV); ACE_CHECK_RETURN (0); // Add the member to the CDR stream. @@ -365,9 +367,10 @@ TAO_DynUnion_i::to_any (CORBA::Environment& ACE_TRY_ENV) TAO_InputCDR member_cdr (member_mb, member_any->_tao_byte_order ()); - out_cdr.append (member_tc, - &member_cdr, - ACE_TRY_ENV); + (void) TAO_Marshal_Object::perform_append (member_tc, + &member_cdr, + &out_cdr, + ACE_TRY_ENV); ACE_CHECK_RETURN (0); // Make the Any. @@ -2136,7 +2139,11 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any& any, ACE_TRY_ENV); ACE_CHECK; - cdr.skip (disc_tc); + // Move to the next field in the CDR stream. + (void) TAO_Marshal_Object::perform_skip (disc_tc, + &cdr, + ACE_TRY_ENV); + ACE_TRY_CHECK; CORBA::ULong count = any.type ()->member_count (ACE_TRY_ENV); ACE_CHECK; diff --git a/TAO/tao/GIOPC.cpp b/TAO/tao/GIOPC.cpp index 8c3f9858f36..7008ab690ce 100644 --- a/TAO/tao/GIOPC.cpp +++ b/TAO/tao/GIOPC.cpp @@ -20,7 +20,7 @@ #include "tao/GIOPC.h" #include "tao/Environment.h" #include "tao/Any.h" - +#include "tao/Typecode.h" #if !defined (__ACE_INLINE__) #include "GIOPC.i" diff --git a/TAO/tao/GIOP_Server_Request.cpp b/TAO/tao/GIOP_Server_Request.cpp index 97388e74024..decc1bde30f 100644 --- a/TAO/tao/GIOP_Server_Request.cpp +++ b/TAO/tao/GIOP_Server_Request.cpp @@ -13,6 +13,7 @@ #include "tao/ORB.h" #include "tao/Timeprobe.h" #include "tao/Any.h" +#include "tao/Marshal.h" #include "tao/debug.h" #include "tao/GIOP_Utils.h" @@ -250,7 +251,7 @@ TAO_GIOP_ServerRequest::dsi_marshal (CORBA::Environment &ACE_TRY_ENV) if (this->retval_) { CORBA::TypeCode_var tc = this->retval_->type (); - if (this->retval_->any_owns_data ()) + if (this->retval_->any_owns_data ()) { this->retval_->_tao_encode (*this->outgoing_, this->orb_core_, @@ -261,8 +262,10 @@ TAO_GIOP_ServerRequest::dsi_marshal (CORBA::Environment &ACE_TRY_ENV) { TAO_InputCDR cdr (this->retval_->_tao_get_cdr (), this->retval_->_tao_byte_order ()); - (void) this->outgoing_->append (tc.in (), &cdr, - ACE_TRY_ENV); + (void) TAO_Marshal_Object::perform_append (tc.in (), + &cdr, + this->outgoing_, + ACE_TRY_ENV); ACE_CHECK; } } @@ -286,7 +289,7 @@ TAO_GIOP_ServerRequest::init_reply (CORBA::Environment &ACE_TRY_ENV) { // Construct our reply generator TAO_Pluggable_Reply_Params reply_params; - + // We put all the info that we have in to this <reply_params> and // call the <write_reply_header> in the // pluggable_messaging_interface. One point to be noted however is @@ -294,7 +297,7 @@ TAO_GIOP_ServerRequest::init_reply (CORBA::Environment &ACE_TRY_ENV) // delegated us to do work on its behalf. But we would be calling // back. As we dont have a LOCK or any such things we can call // pluggable_messaging guys again. We would be on the same thread of - // invocation. So *theoratically* there should not be a problem. + // invocation. So *theoratically* there should not be a problem. reply_params.request_id_ = this->request_id_; #if (TAO_HAS_MINIMUM_CORBA == 0) @@ -306,7 +309,7 @@ TAO_GIOP_ServerRequest::init_reply (CORBA::Environment &ACE_TRY_ENV) // Pass in the service context reply_params.service_context_notowned (&this->service_info_); - + // Forward exception only. if (!CORBA::is_nil (this->forward_location_.in ())) { @@ -347,15 +350,17 @@ TAO_GIOP_ServerRequest::init_reply (CORBA::Environment &ACE_TRY_ENV) // We are checking for NO exception. If there was a NO_EXCEPTION // type the IDL compiler would marshall the return values, the // out & inout parameters in to the stream <*this->output> - + // In this special case we only marshall the exception type - CORBA::TypeCode_ptr except_tc; - except_tc = this->exception_->type (); + CORBA::TypeCode_ptr except_tc = this->exception_->type (); // we use the any's ACE_Message_Block TAO_InputCDR cdr (this->exception_->_tao_get_cdr (), this->exception_->_tao_byte_order ()); - (void) this->outgoing_->append (except_tc, &cdr, ACE_TRY_ENV); + (void) TAO_Marshal_Object::perform_append (except_tc, + &cdr, + this->outgoing_, + ACE_TRY_ENV); } } @@ -381,14 +386,14 @@ TAO_GIOP_ServerRequest::send_no_exception_reply (TAO_Transport *transport) reply_params.request_id_ = this->request_id_; #if (TAO_HAS_MINIMUM_CORBA == 0) - reply_params.params_ = 0; + reply_params.params_ = 0; #endif /*TAO_HAS_MINIMUM_CORBA*/ reply_params.svc_ctx_.length (0); // Pass in the service context reply_params.service_context_notowned (& reply_params.svc_ctx_); - + reply_params.reply_status_ = TAO_GIOP_NO_EXCEPTION; // Construct a REPLY header. diff --git a/TAO/tao/IOPC.cpp b/TAO/tao/IOPC.cpp index c1b4f298d60..00e81837691 100644 --- a/TAO/tao/IOPC.cpp +++ b/TAO/tao/IOPC.cpp @@ -20,6 +20,7 @@ #include "tao/IOPC.h" #include "tao/Any.h" +#include "tao/Typecode.h" #if !defined (__ACE_INLINE__) #include "tao/IOPC.i" diff --git a/TAO/tao/IORC.h b/TAO/tao/IORC.h index e30401ea91e..27647416b77 100644 --- a/TAO/tao/IORC.h +++ b/TAO/tao/IORC.h @@ -19,7 +19,7 @@ #include "tao/CDR.h" #include "tao/Object.h" #include "tao/Sequence.h" -#include "tao/Sequence_T.h" +#include "tao/Exception.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/InterfaceC.h b/TAO/tao/InterfaceC.h index e78aa806cd6..bf65973bc55 100644 --- a/TAO/tao/InterfaceC.h +++ b/TAO/tao/InterfaceC.h @@ -19,7 +19,8 @@ #include "tao/Object.h" #include "tao/varout.h" #include "tao/Managed_Types.h" -#include "tao/Sequence_T.h" +#include "tao/Sequence.h" +#include "tao/Typecode.h" #if (TAO_HAS_INTERFACE_REPOSITORY == 1) diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile index 710c692b29e..b5dd7088e7b 100644 --- a/TAO/tao/Makefile +++ b/TAO/tao/Makefile @@ -538,13 +538,11 @@ realclean: Object.i \ CurrentC.i \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Environment.h \ Environment.i \ + Exception.h \ + Exception.i \ Sequence.h \ Managed_Types.h \ Managed_Types.i \ @@ -572,6 +570,11 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ POAS.i \ Active_Object_Map.h \ Active_Object_Map.i \ @@ -691,8 +694,6 @@ realclean: ObjectIDList.h \ ObjectIDList.i \ WrongTransactionC.h \ - InterfaceC.h \ - ifrfwd.h \ BoundsC.h \ BoundsC.i \ ImplRepoC.i \ @@ -834,13 +835,11 @@ realclean: Object.i \ CurrentC.i \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Environment.h \ Environment.i \ + Exception.h \ + Exception.i \ Sequence.h \ Managed_Types.h \ Managed_Types.i \ @@ -991,13 +990,11 @@ realclean: Object.i \ CurrentC.i \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Environment.h \ Environment.i \ + Exception.h \ + Exception.i \ Sequence.h \ Managed_Types.h \ Managed_Types.i \ @@ -1025,6 +1022,11 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ POAS.i \ Active_Object_Map.h \ Active_Object_Map.i \ @@ -1143,8 +1145,6 @@ realclean: ObjectIDList.h \ ObjectIDList.i \ WrongTransactionC.h \ - InterfaceC.h \ - ifrfwd.h \ BoundsC.h \ BoundsC.i \ ImplRepoC.i \ @@ -1244,13 +1244,11 @@ realclean: Object.i \ CurrentC.i \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Environment.h \ Environment.i \ + Exception.h \ + Exception.i \ Sequence.h \ Managed_Types.h \ Managed_Types.i \ @@ -1275,6 +1273,11 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ POAS.i \ POA.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ @@ -1443,8 +1446,6 @@ realclean: ObjectIDList.h \ ObjectIDList.i \ WrongTransactionC.h \ - InterfaceC.h \ - ifrfwd.h \ BoundsC.h \ BoundsC.i \ ImplRepoC.i \ @@ -1537,13 +1538,11 @@ realclean: Object.i \ CurrentC.i \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Environment.h \ Environment.i \ + Exception.h \ + Exception.i \ Sequence.h \ Managed_Types.h \ Managed_Types.i \ @@ -1567,6 +1566,11 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ POAS.i \ Server_Request.h \ IOPC.h \ @@ -1740,13 +1744,11 @@ realclean: Object.i \ CurrentC.i \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Environment.h \ Environment.i \ + Exception.h \ + Exception.i \ Sequence.h \ Managed_Types.h \ Managed_Types.i \ @@ -1770,6 +1772,11 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ POAS.i \ poa_macros.h \ POAManager.i \ @@ -1937,8 +1944,6 @@ realclean: ObjectIDList.h \ ObjectIDList.i \ WrongTransactionC.h \ - InterfaceC.h \ - ifrfwd.h \ BoundsC.h \ BoundsC.i \ ImplRepoC.i \ @@ -2076,13 +2081,11 @@ realclean: Object.i \ CurrentC.i \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Environment.h \ Environment.i \ + Exception.h \ + Exception.i \ Sequence.h \ Managed_Types.h \ Managed_Types.i \ @@ -2191,13 +2194,11 @@ realclean: Object.i \ CurrentC.i \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Environment.h \ Environment.i \ + Exception.h \ + Exception.i \ Sequence.h \ Managed_Types.h \ Managed_Types.i \ @@ -2267,6 +2268,11 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Pluggable.h \ @@ -2391,8 +2397,6 @@ realclean: ObjectIDList.h \ ObjectIDList.i \ WrongTransactionC.h \ - InterfaceC.h \ - ifrfwd.h \ BoundsC.h \ BoundsC.i \ ImplRepoC.i \ @@ -2486,13 +2490,11 @@ realclean: Object.i \ CurrentC.i \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Environment.h \ Environment.i \ + Exception.h \ + Exception.i \ Sequence.h \ Managed_Types.h \ Managed_Types.i \ @@ -2685,8 +2687,6 @@ realclean: IORS.h \ IORC.h \ CDR.h \ - Typecode.h \ - Typecode.i \ CDR.i \ IORC.i \ Servant_Base.h \ @@ -2733,6 +2733,8 @@ realclean: Server_Request.i \ LocalObject.h \ LocalObject.i \ + Typecode.h \ + Typecode.i \ Marshal.h \ Marshal.i \ singletons.h \ @@ -2766,6 +2768,9 @@ realclean: DynAnyC.i \ DomainC.h \ DomainC.i \ + InterfaceC.h \ + ifrfwd.h \ + InterfaceC.i \ POAS.i \ Active_Object_Map.h \ Active_Object_Map.i \ @@ -2841,8 +2846,6 @@ realclean: ObjectIDList.h \ ObjectIDList.i \ WrongTransactionC.h \ - InterfaceC.h \ - ifrfwd.h \ BoundsC.h \ BoundsC.i \ ImplRepoC.i @@ -2978,8 +2981,6 @@ realclean: IORS.h \ IORC.h \ CDR.h \ - Typecode.h \ - Typecode.i \ CDR.i \ IORC.i \ Servant_Base.h \ @@ -3026,6 +3027,8 @@ realclean: Server_Request.i \ LocalObject.h \ LocalObject.i \ + Typecode.h \ + Typecode.i \ Marshal.h \ Marshal.i \ singletons.h \ @@ -3059,6 +3062,9 @@ realclean: DynAnyC.i \ DomainC.h \ DomainC.i \ + InterfaceC.h \ + ifrfwd.h \ + InterfaceC.i \ POAS.i \ Active_Object_Map.h \ Active_Object_Map.i \ @@ -3134,8 +3140,6 @@ realclean: ObjectIDList.h \ ObjectIDList.i \ WrongTransactionC.h \ - InterfaceC.h \ - ifrfwd.h \ BoundsC.h \ BoundsC.i \ ImplRepoC.i ImplRepoS_T.h ImplRepoS_T.i ImplRepoS_T.cpp ImplRepoS.i @@ -3333,6 +3337,9 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Protocol_Factory.h \ @@ -3460,10 +3467,6 @@ realclean: Tagged_Components.h \ IOPC.h \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Sequence.h \ Managed_Types.h \ @@ -3615,8 +3618,6 @@ realclean: Environment.h \ Environment.i \ CDR.h \ - Typecode.h \ - Typecode.i \ CDR.i \ IORC.i \ Servant_Base.h \ @@ -3645,6 +3646,11 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Pluggable.h \ @@ -3882,6 +3888,9 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + InterfaceC.i \ Policy_Manager.i \ params.h \ params.i \ @@ -4287,6 +4296,9 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ params.h \ @@ -4569,6 +4581,9 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ params.h \ @@ -4700,10 +4715,6 @@ realclean: Tagged_Components.h \ IOPC.h \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Sequence.h \ Managed_Types.h \ @@ -4729,6 +4740,8 @@ realclean: Pluggable_Messaging.i \ GIOP_Message_State.i \ ORB.h \ + Exception.h \ + Exception.i \ IOR_LookupTable.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -4841,6 +4854,8 @@ realclean: Wait_Strategy.h \ IIOP_Transport.h \ Pluggable.h \ + Typecode.h \ + Typecode.i \ Pluggable.i \ operation_details.h \ operation_details.i \ @@ -4857,6 +4872,9 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Protocol_Factory.h \ @@ -4943,8 +4961,6 @@ realclean: ObjectIDList.h \ ObjectIDList.i \ WrongTransactionC.h \ - InterfaceC.h \ - ifrfwd.h \ BoundsC.h \ BoundsC.i \ ImplRepoC.i \ @@ -5204,6 +5220,9 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Protocol_Factory.h \ @@ -5501,6 +5520,9 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + InterfaceC.i \ Policy_Manager.i \ params.h \ params.i \ @@ -5747,6 +5769,9 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Protocol_Factory.h \ @@ -6013,6 +6038,9 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Protocol_Factory.h \ @@ -6303,6 +6331,9 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ params.h \ @@ -6592,6 +6623,9 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ params.h \ @@ -6722,10 +6756,6 @@ realclean: Tagged_Components.h \ IOPC.h \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Sequence.h \ Managed_Types.h \ @@ -6796,6 +6826,10 @@ realclean: $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ + Typecode.h \ + Exception.h \ + Exception.i \ + Typecode.i \ Pluggable.i \ GIOP_Message_State.h \ Pluggable_Messaging.h \ @@ -6885,6 +6919,9 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Protocol_Factory.h \ @@ -6973,8 +7010,6 @@ realclean: ObjectIDList.h \ ObjectIDList.i \ WrongTransactionC.h \ - InterfaceC.h \ - ifrfwd.h \ BoundsC.h \ BoundsC.i \ ImplRepoC.i \ @@ -7240,6 +7275,9 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Protocol_Factory.h \ @@ -7545,6 +7583,9 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + InterfaceC.i \ Policy_Manager.i \ params.h \ params.i \ @@ -7796,6 +7837,9 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Protocol_Factory.h \ @@ -8062,6 +8106,9 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Protocol_Factory.h \ @@ -8356,6 +8403,9 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ params.h \ @@ -8487,10 +8537,6 @@ realclean: Tagged_Components.h \ IOPC.h \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Sequence.h \ Managed_Types.h \ @@ -8510,6 +8556,8 @@ realclean: Tagged_Components.i \ Profile.i \ ORB.h \ + Exception.h \ + Exception.i \ IOR_LookupTable.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -8638,6 +8686,8 @@ realclean: Wait_Strategy.h \ SHMIOP_Transport.h \ Pluggable.h \ + Typecode.h \ + Typecode.i \ Pluggable.i \ SHMIOP_Transport.i \ SHMIOP_Connect.i \ @@ -8652,6 +8702,9 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Protocol_Factory.h \ @@ -8740,8 +8793,6 @@ realclean: ObjectIDList.h \ ObjectIDList.i \ WrongTransactionC.h \ - InterfaceC.h \ - ifrfwd.h \ BoundsC.h \ BoundsC.i \ ImplRepoC.i \ @@ -9009,6 +9060,9 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Protocol_Factory.h \ @@ -9316,6 +9370,9 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + InterfaceC.i \ Policy_Manager.i \ params.h \ params.i \ @@ -9570,6 +9627,9 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Protocol_Factory.h \ @@ -9841,6 +9901,9 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Protocol_Factory.h \ @@ -9952,10 +10015,6 @@ realclean: Environment.h \ Environment.i \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Object.h \ Object.i \ @@ -9969,6 +10028,8 @@ realclean: varout.h \ varout.i \ varout.cpp \ + Exception.h \ + Exception.i \ IORC.i \ IORS.h \ Servant_Base.h \ @@ -10029,6 +10090,8 @@ realclean: $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ + Typecode.h \ + Typecode.i \ IOPC.h \ IOPC.i \ Pluggable.i \ @@ -10063,6 +10126,9 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Protocol_Factory.h \ @@ -10192,10 +10258,6 @@ realclean: Environment.h \ Environment.i \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Object.h \ Object.i \ @@ -10209,6 +10271,8 @@ realclean: varout.h \ varout.i \ varout.cpp \ + Exception.h \ + Exception.i \ IORC.i \ Servant_Base.h \ POAC.h \ @@ -10307,10 +10371,6 @@ realclean: Environment.h \ Environment.i \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Sequence.h \ Managed_Types.h \ @@ -10322,6 +10382,8 @@ realclean: varout.h \ varout.i \ varout.cpp \ + Exception.h \ + Exception.i \ IORC.i \ Servant_Base.h \ POAC.h \ @@ -10391,6 +10453,8 @@ realclean: $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ + Typecode.h \ + Typecode.i \ Pluggable.i \ ORB.h \ IOR_LookupTable.h \ @@ -10539,8 +10603,6 @@ realclean: Environment.h \ Environment.i \ CDR.h \ - Typecode.h \ - Typecode.i \ CDR.i \ IORC.i \ Servant_Base.h \ @@ -10569,6 +10631,11 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Pluggable.h \ @@ -10745,8 +10812,6 @@ realclean: Environment.h \ Environment.i \ CDR.h \ - Typecode.h \ - Typecode.i \ CDR.i \ IORC.i \ Servant_Base.h \ @@ -10775,6 +10840,11 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Pluggable.h \ @@ -10999,6 +11069,9 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + InterfaceC.i \ Policy_Manager.i \ params.h \ params.i \ @@ -11963,8 +12036,6 @@ realclean: Environment.h \ Environment.i \ CDR.h \ - Typecode.h \ - Typecode.i \ CDR.i \ IORC.i \ Servant_Base.h \ @@ -12116,8 +12187,6 @@ realclean: Environment.h \ Environment.i \ CDR.h \ - Typecode.h \ - Typecode.i \ CDR.i \ IORC.i \ Servant_Base.h \ @@ -12218,16 +12287,16 @@ realclean: orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ corbafwd.i \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Environment.h \ Environment.i \ Object.h \ Object.i \ Any.i \ + Typecode.h \ + Exception.h \ + Exception.i \ + Typecode.i \ Marshal.h \ Principal.h \ Sequence.h \ @@ -12301,6 +12370,9 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Pluggable.h \ @@ -12528,7 +12600,10 @@ realclean: DomainC.h \ DomainC.i \ PollableC.h \ - PollableC.i + PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + InterfaceC.i .obj/CurrentS.o .obj/CurrentS.so .shobj/CurrentS.o .shobj/CurrentS.so: CurrentS.cpp \ CurrentC.h \ @@ -12643,13 +12718,11 @@ realclean: POA_CORBA.h \ PolicyC.h \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Environment.h \ Environment.i \ + Exception.h \ + Exception.i \ Sequence.h \ Managed_Types.h \ Managed_Types.i \ @@ -12673,6 +12746,11 @@ realclean: Servant_Base.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ Server_Request.h \ IOPC.h \ IOPC.i \ @@ -12857,8 +12935,6 @@ realclean: Environment.h \ Environment.i \ CDR.h \ - Typecode.h \ - Typecode.i \ CDR.i .obj/Environment.o .obj/Environment.so .shobj/Environment.o .shobj/Environment.so: Environment.cpp \ @@ -12991,8 +13067,6 @@ realclean: IORS.h \ IORC.h \ CDR.h \ - Typecode.h \ - Typecode.i \ CDR.i \ IORC.i \ Servant_Base.h \ @@ -13021,6 +13095,11 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Pluggable.h \ @@ -13188,13 +13267,11 @@ realclean: CurrentC.h \ CurrentC.i \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Environment.h \ Environment.i \ + Exception.h \ + Exception.i \ Sequence.h \ Managed_Types.h \ Managed_Types.i \ @@ -13222,6 +13299,11 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ POAS.i \ Active_Object_Map.h \ Active_Object_Map.i \ @@ -13457,13 +13539,11 @@ realclean: CurrentC.h \ CurrentC.i \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Environment.h \ Environment.i \ + Exception.h \ + Exception.i \ Sequence.h \ Managed_Types.h \ Managed_Types.i \ @@ -13491,6 +13571,11 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ POAS.i \ Active_Object_Map.h \ Active_Object_Map.i \ @@ -13878,8 +13963,6 @@ realclean: Environment.h \ Environment.i \ CDR.h \ - Typecode.h \ - Typecode.i \ CDR.i \ IORC.i \ Servant_Base.h \ @@ -13921,6 +14004,8 @@ realclean: $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ + Typecode.h \ + Typecode.i \ Pluggable.i \ Resource_Factory.h \ Protocol_Factory.h \ @@ -13979,6 +14064,9 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + InterfaceC.i \ ORB_Core.h \ Policy_Manager.h \ Policy_Manager.i \ @@ -13989,10 +14077,6 @@ realclean: Server_Strategy_Factory.h \ debug.h \ TAO_Internal.h \ - Marshal.h \ - Principal.h \ - Principal.i \ - Marshal.i \ Object_Adapter.h \ Key_Adapters.h \ $(ACE_ROOT)/ace/Map.h \ @@ -14024,6 +14108,8 @@ realclean: POAManager.i \ ImplRepoC.h \ corba.h \ + Principal.h \ + Principal.i \ Request.h \ Context.h \ Context.i \ @@ -14042,6 +14128,8 @@ realclean: Server_Request.i \ LocalObject.h \ LocalObject.i \ + Marshal.h \ + Marshal.i \ singletons.h \ Operation_Table.h \ Client_Strategy_Factory.h \ @@ -14065,8 +14153,6 @@ realclean: ObjectIDList.h \ ObjectIDList.i \ WrongTransactionC.h \ - InterfaceC.h \ - ifrfwd.h \ BoundsC.h \ BoundsC.i \ ImplRepoC.i \ @@ -14259,13 +14345,11 @@ realclean: Object.i \ CurrentC.i \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Environment.h \ Environment.i \ + Exception.h \ + Exception.i \ Sequence.h \ Managed_Types.h \ Managed_Types.i \ @@ -14326,6 +14410,8 @@ realclean: $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ + Typecode.h \ + Typecode.i \ IOPC.h \ IOPC.i \ Pluggable.i \ @@ -14365,6 +14451,9 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + InterfaceC.i \ Invocation.h \ ORB_Core.h \ Policy_Manager.h \ @@ -14498,13 +14587,11 @@ realclean: Object.i \ CurrentC.i \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Environment.h \ Environment.i \ + Exception.h \ + Exception.i \ Sequence.h \ Managed_Types.h \ Managed_Types.i \ @@ -14562,6 +14649,11 @@ realclean: Servant_Base.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ ORB.h \ IOR_LookupTable.h \ Services.h \ @@ -14663,13 +14755,11 @@ realclean: Object.i \ CurrentC.i \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Environment.h \ Environment.i \ + Exception.h \ + Exception.i \ Sequence.h \ Managed_Types.h \ Managed_Types.i \ @@ -14733,6 +14823,8 @@ realclean: $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ + Typecode.h \ + Typecode.i \ IOPC.h \ IOPC.i \ Pluggable.i \ @@ -14771,6 +14863,9 @@ realclean: DynAnyC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Protocol_Factory.h \ @@ -14901,13 +14996,11 @@ realclean: Object.i \ CurrentC.i \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Environment.h \ Environment.i \ + Exception.h \ + Exception.i \ Sequence.h \ Managed_Types.h \ Managed_Types.i \ @@ -14965,6 +15058,11 @@ realclean: Servant_Base.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ ORB.h \ IOR_LookupTable.h \ Services.h \ @@ -15062,10 +15160,6 @@ realclean: orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ corbafwd.i \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Environment.h \ Environment.i \ @@ -15077,7 +15171,11 @@ realclean: TimeBaseS_T.h \ TimeBaseS_T.i \ TimeBaseS_T.cpp \ - TimeBaseS.i + TimeBaseS.i \ + Typecode.h \ + Exception.h \ + Exception.i \ + Typecode.i .obj/TimeBaseS.o .obj/TimeBaseS.so .shobj/TimeBaseS.o .shobj/TimeBaseS.so: TimeBaseS.cpp \ TimeBaseS.h \ @@ -15162,10 +15260,6 @@ realclean: orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ corbafwd.i \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Environment.h \ Environment.i \ @@ -15272,10 +15366,6 @@ realclean: varout.cpp \ Principal.i \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i .obj/Sequence.o .obj/Sequence.so .shobj/Sequence.o .shobj/Sequence.so: Sequence.cpp \ @@ -15452,10 +15542,6 @@ realclean: corbafwd.i \ IOPC.h \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Sequence.h \ Managed_Types.h \ @@ -15479,6 +15565,8 @@ realclean: CurrentC.i \ Environment.h \ Environment.i \ + Exception.h \ + Exception.i \ PolicyC.i \ POAC.i \ NVList.h \ @@ -15538,6 +15626,11 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Pluggable.h \ @@ -15659,10 +15752,6 @@ realclean: Tagged_Components.h \ IOPC.h \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Sequence.h \ Managed_Types.h \ @@ -15730,6 +15819,10 @@ realclean: $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ + Typecode.h \ + Exception.h \ + Exception.i \ + Typecode.i \ Pluggable.i \ Environment.h \ Environment.i @@ -15930,6 +16023,9 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Protocol_Factory.h \ @@ -16238,12 +16334,10 @@ realclean: orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ corbafwd.i \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ ORB.h \ + Exception.h \ + Exception.i \ IOR_LookupTable.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -16318,6 +16412,11 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Pluggable.h \ @@ -16570,8 +16669,6 @@ realclean: Environment.h \ Environment.i \ CDR.h \ - Typecode.h \ - Typecode.i \ CDR.i \ IORC.i \ Servant_Base.h \ @@ -16673,13 +16770,11 @@ realclean: orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ corbafwd.i \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ ORB_Core.h \ ORB.h \ + Exception.h \ + Exception.i \ IOR_LookupTable.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -16753,6 +16848,11 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Pluggable.h \ @@ -16787,11 +16887,7 @@ realclean: ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service.cpp \ - singletons.h \ - Marshal.h \ - Principal.h \ - Principal.i \ - Marshal.i + singletons.h .obj/Client_Strategy_Factory.o .obj/Client_Strategy_Factory.so .shobj/Client_Strategy_Factory.o .shobj/Client_Strategy_Factory.so: Client_Strategy_Factory.cpp \ Client_Strategy_Factory.h \ @@ -17138,13 +17234,11 @@ realclean: orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ corbafwd.i \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ ORB_Core.h \ ORB.h \ + Exception.h \ + Exception.i \ IOR_LookupTable.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -17218,6 +17312,11 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Pluggable.h \ @@ -17405,10 +17504,6 @@ realclean: corbafwd.i \ IOPC.h \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Sequence.h \ Managed_Types.h \ @@ -17508,10 +17603,6 @@ realclean: InterceptorC.h \ IOPC.h \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Sequence.h \ Managed_Types.h \ @@ -17612,10 +17703,6 @@ realclean: try_macros.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ corbafwd.i \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Sequence.h \ Managed_Types.h \ @@ -17800,13 +17887,11 @@ realclean: orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ corbafwd.i \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ ORB_Core.h \ ORB.h \ + Exception.h \ + Exception.i \ IOR_LookupTable.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -17880,6 +17965,11 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Pluggable.h \ @@ -18095,8 +18185,6 @@ realclean: Environment.h \ Environment.i \ CDR.h \ - Typecode.h \ - Typecode.i \ CDR.i \ IORC.i \ Servant_Base.h \ @@ -18125,6 +18213,11 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Pluggable.h \ @@ -18272,8 +18365,6 @@ realclean: ObjectIDList.h \ ObjectIDList.i \ WrongTransactionC.h \ - InterfaceC.h \ - ifrfwd.h \ BoundsC.h \ BoundsC.i \ ImplRepoC.i \ @@ -18416,8 +18507,6 @@ realclean: Environment.h \ Environment.i \ CDR.h \ - Typecode.h \ - Typecode.i \ CDR.i \ IORC.i \ Servant_Base.h \ @@ -18446,6 +18535,11 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Pluggable.h \ @@ -18698,8 +18792,6 @@ realclean: Environment.h \ Environment.i \ CDR.h \ - Typecode.h \ - Typecode.i \ CDR.i \ IORC.i \ Servant_Base.h \ @@ -18728,6 +18820,11 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Pluggable.h \ @@ -18902,8 +18999,6 @@ realclean: Environment.h \ Environment.i \ CDR.h \ - Typecode.h \ - Typecode.i \ CDR.i \ IORC.i \ Servant_Base.h \ @@ -18932,6 +19027,11 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Pluggable.h \ @@ -19266,6 +19366,9 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + InterfaceC.i \ Policy_Manager.i \ params.h \ params.i \ @@ -19535,6 +19638,9 @@ realclean: Servant_Base.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + InterfaceC.i \ TAOS_T.h \ TAOS_T.i \ TAOS_T.cpp \ @@ -20120,13 +20226,11 @@ realclean: Object.i \ CurrentC.i \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Environment.h \ Environment.i \ + Exception.h \ + Exception.i \ Sequence.h \ Managed_Types.h \ Managed_Types.i \ @@ -20368,6 +20472,9 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Protocol_Factory.h \ @@ -20468,10 +20575,6 @@ realclean: orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ corbafwd.i \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Sequence.h \ Managed_Types.h \ @@ -20518,6 +20621,8 @@ realclean: Reply_Dispatcher.h \ Request.h \ ORB.h \ + Exception.h \ + Exception.i \ IOR_LookupTable.h \ Services.h \ Services.i \ @@ -20584,6 +20689,8 @@ realclean: $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ + Typecode.h \ + Typecode.i \ Pluggable.i .obj/Reply_Dispatcher.o .obj/Reply_Dispatcher.so .shobj/Reply_Dispatcher.o .shobj/Reply_Dispatcher.so: Reply_Dispatcher.cpp \ @@ -20717,8 +20824,6 @@ realclean: Environment.h \ Environment.i \ CDR.h \ - Typecode.h \ - Typecode.i \ CDR.i \ IORC.i \ Servant_Base.h \ @@ -20770,6 +20875,11 @@ realclean: DynAnyC.i \ DomainC.h \ DomainC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Pluggable.h \ @@ -20889,10 +20999,6 @@ realclean: orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ corbafwd.i \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Sequence.h \ Managed_Types.h \ @@ -20910,7 +21016,11 @@ realclean: Any.h \ Environment.h \ Environment.i \ - Any.i + Any.i \ + Typecode.h \ + Exception.h \ + Exception.i \ + Typecode.i .obj/IOPS.o .obj/IOPS.so .shobj/IOPS.o .shobj/IOPS.so: IOPS.cpp \ IOPS.h \ @@ -20994,10 +21104,6 @@ realclean: orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ corbafwd.i \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Sequence.h \ Managed_Types.h \ @@ -21102,8 +21208,6 @@ realclean: Exception.h \ Exception.i \ CDR.h \ - Typecode.h \ - Typecode.i \ CDR.i \ PollableC.i \ POA_CORBA.h \ @@ -21133,6 +21237,11 @@ realclean: POAC.h \ POAC.i \ Servant_Base.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ Stub.h \ Pluggable.h \ $(ACE_ROOT)/ace/Message_Queue.h \ @@ -21342,8 +21451,6 @@ realclean: Exception.h \ Exception.i \ CDR.h \ - Typecode.h \ - Typecode.i \ CDR.i \ PollableC.i \ POA_CORBA.h \ @@ -21373,6 +21480,11 @@ realclean: POAC.h \ POAC.i \ Servant_Base.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ PollableS.i \ Operation_Table.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ @@ -21503,10 +21615,6 @@ realclean: orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ corbafwd.i \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Sequence.h \ Managed_Types.h \ @@ -21524,7 +21632,11 @@ realclean: Any.h \ Environment.h \ Environment.i \ - Any.i + Any.i \ + Typecode.h \ + Exception.h \ + Exception.i \ + Typecode.i .obj/CONV_FRAMES.o .obj/CONV_FRAMES.so .shobj/CONV_FRAMES.o .shobj/CONV_FRAMES.so: CONV_FRAMES.cpp \ CONV_FRAMES.h \ @@ -21608,10 +21720,6 @@ realclean: orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ corbafwd.i \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Sequence.h \ Managed_Types.h \ @@ -21713,10 +21821,6 @@ realclean: orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ corbafwd.i \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Sequence.h \ Managed_Types.h \ @@ -21817,10 +21921,6 @@ realclean: corbafwd.i \ IOPC.h \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Sequence.h \ Managed_Types.h \ @@ -21841,7 +21941,11 @@ realclean: Environment.h \ Environment.i \ Any.h \ - Any.i + Any.i \ + Typecode.h \ + Exception.h \ + Exception.i \ + Typecode.i .obj/BoundsC.o .obj/BoundsC.so .shobj/BoundsC.o .shobj/BoundsC.so: BoundsC.cpp \ BoundsC.h \ @@ -21926,8 +22030,6 @@ realclean: Exception.h \ Exception.i \ CDR.h \ - Typecode.h \ - Typecode.i \ CDR.i \ Any.h \ Environment.h \ @@ -21935,7 +22037,9 @@ realclean: Object.h \ Object.i \ Any.i \ - BoundsC.i + BoundsC.i \ + Typecode.h \ + Typecode.i .obj/TAOC.o .obj/TAOC.so .shobj/TAOC.o .shobj/TAOC.so: TAOC.cpp \ TAOC.h \ @@ -22033,13 +22137,11 @@ realclean: CurrentC.h \ CurrentC.i \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Environment.h \ Environment.i \ + Exception.h \ + Exception.i \ PolicyC.i \ TimeBaseC.h \ Any.h \ @@ -22058,6 +22160,11 @@ realclean: Servant_Base.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ TAOS_T.h \ TAOS_T.i \ TAOS_T.cpp \ @@ -22160,13 +22267,11 @@ realclean: CurrentC.h \ CurrentC.i \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Environment.h \ Environment.i \ + Exception.h \ + Exception.i \ PolicyC.i \ TimeBaseC.h \ Any.h \ @@ -22184,6 +22289,11 @@ realclean: Servant_Base.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ TAOS_T.h \ TAOS_T.i \ TAOS_T.cpp \ @@ -22579,8 +22689,6 @@ realclean: Environment.h \ Environment.i \ CDR.h \ - Typecode.h \ - Typecode.i \ CDR.i \ IORC.i \ Servant_Base.h \ @@ -22641,6 +22749,8 @@ realclean: $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ + Typecode.h \ + Typecode.i \ Pluggable.i \ MProfile.h \ Profile.h \ @@ -22748,15 +22858,15 @@ realclean: varout.cpp \ Services.i \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Any.h \ Environment.h \ Environment.i \ - Any.i + Any.i \ + Typecode.h \ + Exception.h \ + Exception.i \ + Typecode.i .obj/NVList.o .obj/NVList.so .shobj/NVList.o .shobj/NVList.so: NVList.cpp \ NVList.h \ @@ -22840,10 +22950,6 @@ realclean: try_macros.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ corbafwd.i \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Environment.h \ Environment.i \ @@ -22851,6 +22957,8 @@ realclean: Object.i \ Any.i \ NVList.i \ + Exception.h \ + Exception.i \ ORB.h \ IOR_LookupTable.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ @@ -22914,6 +23022,12 @@ realclean: BoundsC.h \ BoundsC.i \ debug.h \ + Typecode.h \ + Typecode.i \ + Marshal.h \ + Principal.h \ + Principal.i \ + Marshal.i \ $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp @@ -23004,10 +23118,6 @@ realclean: ValueFactory.i \ Any.h \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Environment.h \ Environment.i \ @@ -23019,6 +23129,8 @@ realclean: PolicyC.h \ CurrentC.h \ CurrentC.i \ + Exception.h \ + Exception.i \ Sequence.h \ Managed_Types.h \ Managed_Types.i \ @@ -23052,6 +23164,11 @@ realclean: POAC.h \ POAC.i \ Servant_Base.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ MessagingS.i \ Stub.h \ Pluggable.h \ @@ -23248,10 +23365,6 @@ realclean: try_macros.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ corbafwd.i \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Environment.h \ Environment.i \ @@ -23267,6 +23380,8 @@ realclean: CurrentC.h \ CurrentC.i \ PolicyC.h \ + Exception.h \ + Exception.i \ Sequence.h \ Managed_Types.h \ Managed_Types.i \ @@ -23288,6 +23403,11 @@ realclean: Servant_Base.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ MessagingC.h \ ValueBase.h \ ValueBase.i \ @@ -23503,13 +23623,11 @@ realclean: CurrentC.i \ PolicyC.h \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Environment.h \ Environment.i \ + Exception.h \ + Exception.i \ Sequence.h \ Managed_Types.h \ Managed_Types.i \ @@ -23533,6 +23651,11 @@ realclean: Servant_Base.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ Policy_Manager.i \ ORB_Core.h \ ORB.h \ @@ -23726,10 +23849,6 @@ realclean: try_macros.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ corbafwd.i \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Environment.h \ Environment.i \ @@ -23745,6 +23864,8 @@ realclean: CurrentC.h \ CurrentC.i \ PolicyC.h \ + Exception.h \ + Exception.i \ Sequence.h \ Managed_Types.h \ Managed_Types.i \ @@ -23766,6 +23887,11 @@ realclean: Servant_Base.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ MessagingC.h \ ValueBase.h \ ValueBase.i \ @@ -23878,13 +24004,11 @@ realclean: CurrentC.h \ CurrentC.i \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Environment.h \ Environment.i \ + Exception.h \ + Exception.i \ PolicyC.i \ TimeBaseC.h \ Any.h \ @@ -23902,6 +24026,11 @@ realclean: Servant_Base.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ TAOS_T.h \ TAOS_T.i \ TAOS_T.cpp \ @@ -24006,13 +24135,11 @@ realclean: CurrentC.h \ CurrentC.i \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Environment.h \ Environment.i \ + Exception.h \ + Exception.i \ PolicyC.i \ TimeBaseC.h \ Any.h \ @@ -24030,6 +24157,11 @@ realclean: Servant_Base.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ TAOS_T.h \ TAOS_T.i \ TAOS_T.cpp \ @@ -24577,6 +24709,9 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Protocol_Factory.h \ @@ -24721,8 +24856,6 @@ realclean: Environment.h \ Environment.i \ CDR.h \ - Typecode.h \ - Typecode.i \ CDR.i \ IORC.i \ Servant_Base.h \ @@ -24785,6 +24918,11 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Pluggable.h \ @@ -24890,10 +25028,6 @@ realclean: corbafwd.i \ Any.h \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Environment.h \ Environment.i \ @@ -24910,6 +25044,8 @@ realclean: varout.h \ varout.i \ varout.cpp \ + Exception.h \ + Exception.i \ DynAnyC.i \ Stub.h \ Pluggable.h \ @@ -24960,6 +25096,8 @@ realclean: $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ + Typecode.h \ + Typecode.i \ IOPC.h \ IOPC.i \ Pluggable.i \ @@ -24998,7 +25136,10 @@ realclean: DomainC.h \ DomainC.i \ PollableC.h \ - PollableC.i + PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + InterfaceC.i .obj/DynAnyS.o .obj/DynAnyS.so .shobj/DynAnyS.o .shobj/DynAnyS.so: DynAnyS.cpp \ DynAnyC.h \ @@ -25082,10 +25223,6 @@ realclean: corbafwd.i \ Any.h \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Environment.h \ Environment.i \ @@ -25102,6 +25239,8 @@ realclean: varout.h \ varout.i \ varout.cpp \ + Exception.h \ + Exception.i \ DynAnyC.i \ POA_CORBA.h \ CurrentC.h \ @@ -25115,7 +25254,12 @@ realclean: POAC.i \ Servant_Base.i \ PollableC.h \ - PollableC.i + PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i .obj/DynAny_i.o .obj/DynAny_i.so .shobj/DynAny_i.o .shobj/DynAny_i.so: DynAny_i.cpp \ DynAny_i.h \ @@ -25204,13 +25348,11 @@ realclean: CurrentC.i \ PolicyC.h \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Environment.h \ Environment.i \ + Exception.h \ + Exception.i \ Sequence.h \ Managed_Types.h \ Managed_Types.i \ @@ -25234,6 +25376,11 @@ realclean: Servant_Base.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ DynStruct_i.h \ DynSequence_i.h \ DynEnum_i.h \ @@ -25333,13 +25480,11 @@ realclean: CurrentC.i \ PolicyC.h \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Environment.h \ Environment.i \ + Exception.h \ + Exception.i \ Sequence.h \ Managed_Types.h \ Managed_Types.i \ @@ -25363,8 +25508,59 @@ realclean: Servant_Base.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ DynArray_i.h \ - InconsistentTypeCodeC.h + InconsistentTypeCodeC.h \ + Marshal.h \ + Principal.h \ + Principal.i \ + ORB.h \ + IOR_LookupTable.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + Services.h \ + Services.i \ + IORManipulation.h \ + IORS.h \ + IORC.h \ + IORC.i \ + IORS.i \ + Interceptor.h \ + InterceptorC.h \ + IOPC.h \ + IOPC.i \ + InterceptorC.i \ + Interceptor.i \ + ORB.i \ + Marshal.i .obj/DynEnum_i.o .obj/DynEnum_i.so .shobj/DynEnum_i.o .shobj/DynEnum_i.so: DynEnum_i.cpp \ DynAny_i.h \ @@ -25453,13 +25649,11 @@ realclean: CurrentC.i \ PolicyC.h \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Environment.h \ Environment.i \ + Exception.h \ + Exception.i \ Sequence.h \ Managed_Types.h \ Managed_Types.i \ @@ -25483,6 +25677,11 @@ realclean: Servant_Base.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ DynEnum_i.h \ InconsistentTypeCodeC.h @@ -25573,13 +25772,11 @@ realclean: CurrentC.i \ PolicyC.h \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Environment.h \ Environment.i \ + Exception.h \ + Exception.i \ Sequence.h \ Managed_Types.h \ Managed_Types.i \ @@ -25603,8 +25800,59 @@ realclean: Servant_Base.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ DynSequence_i.h \ - InconsistentTypeCodeC.h + InconsistentTypeCodeC.h \ + Marshal.h \ + Principal.h \ + Principal.i \ + ORB.h \ + IOR_LookupTable.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + Services.h \ + Services.i \ + IORManipulation.h \ + IORS.h \ + IORC.h \ + IORC.i \ + IORS.i \ + Interceptor.h \ + InterceptorC.h \ + IOPC.h \ + IOPC.i \ + InterceptorC.i \ + Interceptor.i \ + ORB.i \ + Marshal.i .obj/DynStruct_i.o .obj/DynStruct_i.so .shobj/DynStruct_i.o .shobj/DynStruct_i.so: DynStruct_i.cpp \ DynAny_i.h \ @@ -25693,13 +25941,11 @@ realclean: CurrentC.i \ PolicyC.h \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Environment.h \ Environment.i \ + Exception.h \ + Exception.i \ Sequence.h \ Managed_Types.h \ Managed_Types.i \ @@ -25723,6 +25969,11 @@ realclean: Servant_Base.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ DynStruct_i.h \ InconsistentTypeCodeC.h \ ORB.h \ @@ -25766,7 +26017,11 @@ realclean: IOPC.i \ InterceptorC.i \ Interceptor.i \ - ORB.i + ORB.i \ + Marshal.h \ + Principal.h \ + Principal.i \ + Marshal.i .obj/DynUnion_i.o .obj/DynUnion_i.so .shobj/DynUnion_i.o .shobj/DynUnion_i.so: DynUnion_i.cpp \ DynAny_i.h \ @@ -25855,13 +26110,11 @@ realclean: CurrentC.i \ PolicyC.h \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Environment.h \ Environment.i \ + Exception.h \ + Exception.i \ Sequence.h \ Managed_Types.h \ Managed_Types.i \ @@ -25885,10 +26138,61 @@ realclean: Servant_Base.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ DynUnion_i.h \ DynUnion_i_T.h \ DynUnion_i_T.cpp \ - InconsistentTypeCodeC.h + InconsistentTypeCodeC.h \ + Marshal.h \ + Principal.h \ + Principal.i \ + ORB.h \ + IOR_LookupTable.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + Services.h \ + Services.i \ + IORManipulation.h \ + IORS.h \ + IORC.h \ + IORC.i \ + IORS.i \ + Interceptor.h \ + InterceptorC.h \ + IOPC.h \ + IOPC.i \ + InterceptorC.i \ + Interceptor.i \ + ORB.i \ + Marshal.i .obj/InconsistentTypeCodeC.o .obj/InconsistentTypeCodeC.so .shobj/InconsistentTypeCodeC.o .shobj/InconsistentTypeCodeC.so: InconsistentTypeCodeC.cpp \ InconsistentTypeCodeC.h \ @@ -26020,8 +26324,6 @@ realclean: Environment.h \ Environment.i \ CDR.h \ - Typecode.h \ - Typecode.i \ CDR.i \ IORC.i \ Servant_Base.h \ @@ -26123,10 +26425,6 @@ realclean: ifrfwd.h \ Any.h \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Environment.h \ Environment.i \ @@ -26143,6 +26441,11 @@ realclean: Sequence_T.h \ Sequence_T.i \ Sequence_T.cpp \ + Typecode.h \ + Exception.h \ + Exception.i \ + Typecode.i \ + InterfaceC.i \ Stub.h \ Pluggable.h \ $(ACE_ROOT)/ace/Message_Queue.h \ @@ -26236,6 +26539,7 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ Policy_Manager.i \ Resource_Factory.h \ Protocol_Factory.h \ @@ -26364,10 +26668,6 @@ realclean: orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ corbafwd.i \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Sequence.h \ Managed_Types.h \ @@ -26433,6 +26733,10 @@ realclean: $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ + Typecode.h \ + Exception.h \ + Exception.i \ + Typecode.i \ Pluggable.i .obj/Pluggable_Messaging_Utils.o .obj/Pluggable_Messaging_Utils.so .shobj/Pluggable_Messaging_Utils.o .shobj/Pluggable_Messaging_Utils.so: Pluggable_Messaging_Utils.cpp \ @@ -26517,10 +26821,6 @@ realclean: orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ corbafwd.i \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Sequence.h \ Managed_Types.h \ @@ -26622,10 +26922,6 @@ realclean: orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ corbafwd.i \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Sequence.h \ Managed_Types.h \ @@ -26696,6 +26992,10 @@ realclean: $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ + Typecode.h \ + Exception.h \ + Exception.i \ + Typecode.i \ Pluggable.i \ debug.h @@ -26785,10 +27085,6 @@ realclean: orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ corbafwd.i \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Sequence.h \ Managed_Types.h \ @@ -26819,6 +27115,8 @@ realclean: PolicyC.h \ CurrentC.h \ CurrentC.i \ + Exception.h \ + Exception.i \ PolicyC.i \ TimeBaseC.h \ TimeBaseC.i \ @@ -26920,10 +27218,6 @@ realclean: orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ corbafwd.i \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Sequence.h \ Managed_Types.h \ @@ -26952,6 +27246,8 @@ realclean: GIOP_Message_Accept_State.i \ ORB_Core.h \ ORB.h \ + Exception.h \ + Exception.i \ IOR_LookupTable.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -27011,6 +27307,11 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Pluggable.h \ @@ -27129,8 +27430,6 @@ realclean: ObjectIDList.h \ ObjectIDList.i \ WrongTransactionC.h \ - InterfaceC.h \ - ifrfwd.h \ BoundsC.h \ BoundsC.i \ ImplRepoC.i \ @@ -27224,10 +27523,6 @@ realclean: corbafwd.i \ IOPC.h \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Sequence.h \ Managed_Types.h \ @@ -27252,6 +27547,8 @@ realclean: Server_Request.h \ Server_Request.i \ ORB.h \ + Exception.h \ + Exception.i \ IOR_LookupTable.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -27404,10 +27701,6 @@ realclean: Pluggable_Messaging_Utils.h \ IOPC.h \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Sequence.h \ Managed_Types.h \ @@ -27427,6 +27720,8 @@ realclean: GIOP_Utils.i \ ORB_Core.h \ ORB.h \ + Exception.h \ + Exception.i \ IOR_LookupTable.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -27486,6 +27781,11 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Pluggable.h \ @@ -27604,10 +27904,6 @@ realclean: corbafwd.i \ IOPC.h \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Sequence.h \ Managed_Types.h \ @@ -27723,10 +28019,6 @@ realclean: Object_KeyC.i \ IOPC.h \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ IOPC.i \ target_specification.i @@ -27814,10 +28106,6 @@ realclean: Server_Request.h \ IOPC.h \ CDR.h \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Sequence.h \ Managed_Types.h \ @@ -27836,6 +28124,8 @@ realclean: Object_KeyC.i \ Server_Request.i \ ORB.h \ + Exception.h \ + Exception.i \ IOR_LookupTable.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -27911,6 +28201,11 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Pluggable.h \ @@ -27947,6 +28242,8 @@ realclean: $(ACE_ROOT)/ace/Dynamic_Service.cpp \ Timeprobe.h \ $(ACE_ROOT)/ace/Timeprobe.h \ + Marshal.h \ + Marshal.i \ debug.h \ GIOP_Utils.h \ GIOP_Utils.i @@ -28032,10 +28329,6 @@ realclean: orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ corbafwd.i \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ GIOP_Utils.h \ Pluggable_Messaging.h \ @@ -28061,6 +28354,8 @@ realclean: GIOP_Message_State.i \ ORB_Core.h \ ORB.h \ + Exception.h \ + Exception.i \ IOR_LookupTable.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -28120,6 +28415,11 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Pluggable.h \ @@ -28240,8 +28540,6 @@ realclean: ObjectIDList.h \ ObjectIDList.i \ WrongTransactionC.h \ - InterfaceC.h \ - ifrfwd.h \ BoundsC.h \ BoundsC.i \ ImplRepoC.i \ @@ -28339,10 +28637,6 @@ realclean: orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ corbafwd.i \ - Typecode.h \ - Exception.h \ - Exception.i \ - Typecode.i \ CDR.i \ Sequence.h \ Managed_Types.h \ @@ -28364,6 +28658,8 @@ realclean: GIOP_Utils.i \ ORB_Core.h \ ORB.h \ + Exception.h \ + Exception.i \ IOR_LookupTable.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -28423,6 +28719,11 @@ realclean: DomainC.i \ PollableC.h \ PollableC.i \ + InterfaceC.h \ + ifrfwd.h \ + Typecode.h \ + Typecode.i \ + InterfaceC.i \ Policy_Manager.i \ Resource_Factory.h \ Pluggable.h \ diff --git a/TAO/tao/Marshal.cpp b/TAO/tao/Marshal.cpp index 97675134fab..7140c7f8820 100644 --- a/TAO/tao/Marshal.cpp +++ b/TAO/tao/Marshal.cpp @@ -32,92 +32,223 @@ ACE_RCSID(tao, Marshal, "$Id$") -TAO_Marshal_Factory* TAO_Marshal::DEFAULT_MARSHAL_FACTORY = 0; - -void -TAO_Marshal::init (void) +TAO_Marshal_Object::~TAO_Marshal_Object (void) { - DEFAULT_MARSHAL_FACTORY = TAO_MARSHAL_FACTORY::instance(); } -// cosntructor for the factory -TAO_Marshal_Factory::TAO_Marshal_Factory (void) +CORBA::TypeCode::traverse_status +TAO_Marshal_Object::perform_skip (CORBA::TypeCode_ptr tc, + TAO_InputCDR *stream, + CORBA_Environment &ACE_TRY_ENV) { - // initialize the mobj table - mobj_table_[CORBA::tk_null].obj_ = TAO_MARSHAL_PRIMITIVE::instance (); - mobj_table_[CORBA::tk_void].obj_ = TAO_MARSHAL_PRIMITIVE::instance (); - mobj_table_[CORBA::tk_short].obj_ = TAO_MARSHAL_PRIMITIVE::instance (); - mobj_table_[CORBA::tk_long].obj_ = TAO_MARSHAL_PRIMITIVE::instance (); - mobj_table_[CORBA::tk_ushort].obj_ = TAO_MARSHAL_PRIMITIVE::instance (); - mobj_table_[CORBA::tk_ulong].obj_ = TAO_MARSHAL_PRIMITIVE::instance (); - mobj_table_[CORBA::tk_float].obj_ = TAO_MARSHAL_PRIMITIVE::instance (); - mobj_table_[CORBA::tk_double].obj_ = TAO_MARSHAL_PRIMITIVE::instance (); - mobj_table_[CORBA::tk_boolean].obj_ = TAO_MARSHAL_PRIMITIVE::instance (); - mobj_table_[CORBA::tk_char].obj_ = TAO_MARSHAL_PRIMITIVE::instance (); - mobj_table_[CORBA::tk_octet].obj_ = TAO_MARSHAL_PRIMITIVE::instance (); - mobj_table_[CORBA::tk_any].obj_ = TAO_MARSHAL_ANY::instance (); - mobj_table_[CORBA::tk_TypeCode].obj_ = TAO_MARSHAL_TYPECODE::instance (); - mobj_table_[CORBA::tk_Principal].obj_ = TAO_MARSHAL_PRINCIPAL::instance (); - mobj_table_[CORBA::tk_objref].obj_ = TAO_MARSHAL_OBJREF::instance (); - mobj_table_[CORBA::tk_struct].obj_ = TAO_MARSHAL_STRUCT::instance (); - mobj_table_[CORBA::tk_union].obj_ = TAO_MARSHAL_UNION::instance (); - mobj_table_[CORBA::tk_enum].obj_ = TAO_MARSHAL_PRIMITIVE::instance (); - mobj_table_[CORBA::tk_string].obj_ = TAO_MARSHAL_STRING::instance (); - mobj_table_[CORBA::tk_sequence].obj_ = TAO_MARSHAL_SEQUENCE::instance (); - mobj_table_[CORBA::tk_array].obj_ = TAO_MARSHAL_ARRAY::instance (); - mobj_table_[CORBA::tk_alias].obj_ = TAO_MARSHAL_ALIAS::instance (); - mobj_table_[CORBA::tk_except].obj_ = TAO_MARSHAL_EXCEPT::instance (); - mobj_table_[CORBA::tk_longlong].obj_ = TAO_MARSHAL_PRIMITIVE::instance (); - mobj_table_[CORBA::tk_ulonglong].obj_ = TAO_MARSHAL_PRIMITIVE::instance (); - mobj_table_[CORBA::tk_longdouble].obj_ = TAO_MARSHAL_PRIMITIVE::instance (); - mobj_table_[CORBA::tk_wchar].obj_ = TAO_MARSHAL_PRIMITIVE::instance (); - mobj_table_[CORBA::tk_wstring].obj_ = TAO_MARSHAL_WSTRING::instance (); -} + CORBA::ULong kind = tc->kind (ACE_TRY_ENV); + ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); -TAO_Marshal_Factory::~TAO_Marshal_Factory (void) -{ + switch (kind) + { + default: + case CORBA::tk_fixed: + case CORBA::tk_value: + case CORBA::tk_value_box: + case CORBA::tk_native: + case CORBA::tk_abstract_interface: + case CORBA::tk_component: + case CORBA::tk_home: + // @@ We don't know how to handle any of them yet. + return CORBA::TypeCode::TRAVERSE_STOP; + + case CORBA::tk_null: + case CORBA::tk_void: + case CORBA::tk_short: + case CORBA::tk_long: + case CORBA::tk_ushort: + case CORBA::tk_ulong: + case CORBA::tk_float: + case CORBA::tk_double: + case CORBA::tk_boolean: + case CORBA::tk_char: + case CORBA::tk_octet: + case CORBA::tk_longlong: + case CORBA::tk_ulonglong: + case CORBA::tk_longdouble: + case CORBA::tk_wchar: + case CORBA::tk_enum: + { + TAO_Marshal_Primitive marshal; + return marshal.skip (tc, stream, ACE_TRY_ENV); + } + + case CORBA::tk_any: + { + TAO_Marshal_Any marshal; + return marshal.skip (tc, stream, ACE_TRY_ENV); + } + case CORBA::tk_TypeCode: + { + TAO_Marshal_TypeCode marshal; + return marshal.skip (tc, stream, ACE_TRY_ENV); + } + case CORBA::tk_Principal: + { + TAO_Marshal_Principal marshal; + return marshal.skip (tc, stream, ACE_TRY_ENV); + } + case CORBA::tk_objref: + { + TAO_Marshal_ObjRef marshal; + return marshal.skip (tc, stream, ACE_TRY_ENV); + } + case CORBA::tk_struct: + { + TAO_Marshal_Struct marshal; + return marshal.skip (tc, stream, ACE_TRY_ENV); + } + case CORBA::tk_union: + { + TAO_Marshal_Union marshal; + return marshal.skip (tc, stream, ACE_TRY_ENV); + } + case CORBA::tk_string: + { + TAO_Marshal_String marshal; + return marshal.skip (tc, stream, ACE_TRY_ENV); + } + case CORBA::tk_sequence: + { + TAO_Marshal_Sequence marshal; + return marshal.skip (tc, stream, ACE_TRY_ENV); + } + case CORBA::tk_array: + { + TAO_Marshal_Array marshal; + return marshal.skip (tc, stream, ACE_TRY_ENV); + } + case CORBA::tk_alias: + { + TAO_Marshal_Alias marshal; + return marshal.skip (tc, stream, ACE_TRY_ENV); + } + case CORBA::tk_except: + { + TAO_Marshal_Except marshal; + return marshal.skip (tc, stream, ACE_TRY_ENV); + } + case CORBA::tk_wstring: + { + TAO_Marshal_WString marshal; + return marshal.skip (tc, stream, ACE_TRY_ENV); + } + } } -// Factory method that returns the appropriate marshal object based on -// the kind of the typecode. -TAO_Marshal_Object * -TAO_Marshal_Factory::make_marshal_object (CORBA::TypeCode_ptr tc, - CORBA::Environment &ACE_TRY_ENV) +CORBA::TypeCode::traverse_status +TAO_Marshal_Object::perform_append (CORBA::TypeCode_ptr tc, + TAO_InputCDR *src, + TAO_OutputCDR *dest, + CORBA_Environment &ACE_TRY_ENV) { - if (tc && tc->kind_ >= 0 && tc->kind_ < CORBA::TC_KIND_COUNT) - return this->mobj_table_[tc->kind_].obj_; - ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0); -} + CORBA::ULong kind = tc->kind (ACE_TRY_ENV); + ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); + switch (kind) + { + default: + case CORBA::tk_fixed: + case CORBA::tk_value: + case CORBA::tk_value_box: + case CORBA::tk_native: + case CORBA::tk_abstract_interface: + case CORBA::tk_component: + case CORBA::tk_home: + // @@ We don't know how to handle any of them yet. + return CORBA::TypeCode::TRAVERSE_STOP; + + case CORBA::tk_null: + case CORBA::tk_void: + case CORBA::tk_short: + case CORBA::tk_long: + case CORBA::tk_ushort: + case CORBA::tk_ulong: + case CORBA::tk_float: + case CORBA::tk_double: + case CORBA::tk_boolean: + case CORBA::tk_char: + case CORBA::tk_octet: + case CORBA::tk_longlong: + case CORBA::tk_ulonglong: + case CORBA::tk_longdouble: + case CORBA::tk_wchar: + case CORBA::tk_enum: + { + TAO_Marshal_Primitive marshal; + return marshal.append (tc, src, dest, ACE_TRY_ENV); + } + + case CORBA::tk_any: + { + TAO_Marshal_Any marshal; + return marshal.append (tc, src, dest, ACE_TRY_ENV); + } + case CORBA::tk_TypeCode: + { + TAO_Marshal_TypeCode marshal; + return marshal.append (tc, src, dest, ACE_TRY_ENV); + } + case CORBA::tk_Principal: + { + TAO_Marshal_Principal marshal; + return marshal.append (tc, src, dest, ACE_TRY_ENV); + } + case CORBA::tk_objref: + { + TAO_Marshal_ObjRef marshal; + return marshal.append (tc, src, dest, ACE_TRY_ENV); + } + case CORBA::tk_struct: + { + TAO_Marshal_Struct marshal; + return marshal.append (tc, src, dest, ACE_TRY_ENV); + } + case CORBA::tk_union: + { + TAO_Marshal_Union marshal; + return marshal.append (tc, src, dest, ACE_TRY_ENV); + } + case CORBA::tk_string: + { + TAO_Marshal_String marshal; + return marshal.append (tc, src, dest, ACE_TRY_ENV); + } + case CORBA::tk_sequence: + { + TAO_Marshal_Sequence marshal; + return marshal.append (tc, src, dest, ACE_TRY_ENV); + } + case CORBA::tk_array: + { + TAO_Marshal_Array marshal; + return marshal.append (tc, src, dest, ACE_TRY_ENV); + } + case CORBA::tk_alias: + { + TAO_Marshal_Alias marshal; + return marshal.append (tc, src, dest, ACE_TRY_ENV); + } + case CORBA::tk_except: + { + TAO_Marshal_Except marshal; + return marshal.append (tc, src, dest, ACE_TRY_ENV); + } + case CORBA::tk_wstring: + { + TAO_Marshal_WString marshal; + return marshal.append (tc, src, dest, ACE_TRY_ENV); + } + } +} #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Singleton<TAO_Marshal_Factory, ACE_SYNCH_RECURSIVE_MUTEX>; -template class ACE_Singleton<TAO_Marshal_Primitive, ACE_SYNCH_RECURSIVE_MUTEX>; -template class ACE_Singleton<TAO_Marshal_Any, ACE_SYNCH_RECURSIVE_MUTEX>; -template class ACE_Singleton<TAO_Marshal_TypeCode, ACE_SYNCH_RECURSIVE_MUTEX>; -template class ACE_Singleton<TAO_Marshal_Principal, ACE_SYNCH_RECURSIVE_MUTEX>; -template class ACE_Singleton<TAO_Marshal_ObjRef, ACE_SYNCH_RECURSIVE_MUTEX>; -template class ACE_Singleton<TAO_Marshal_Struct, ACE_SYNCH_RECURSIVE_MUTEX>; -template class ACE_Singleton<TAO_Marshal_Union, ACE_SYNCH_RECURSIVE_MUTEX>; -template class ACE_Singleton<TAO_Marshal_String, ACE_SYNCH_RECURSIVE_MUTEX>; -template class ACE_Singleton<TAO_Marshal_Sequence, ACE_SYNCH_RECURSIVE_MUTEX>; -template class ACE_Singleton<TAO_Marshal_Array, ACE_SYNCH_RECURSIVE_MUTEX>; -template class ACE_Singleton<TAO_Marshal_Alias, ACE_SYNCH_RECURSIVE_MUTEX>; -template class ACE_Singleton<TAO_Marshal_Except, ACE_SYNCH_RECURSIVE_MUTEX>; -template class ACE_Singleton<TAO_Marshal_WString, ACE_SYNCH_RECURSIVE_MUTEX>; + #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Singleton<TAO_Marshal_Factory, ACE_SYNCH_RECURSIVE_MUTEX> -#pragma instantiate ACE_Singleton<TAO_Marshal_Primitive, ACE_SYNCH_RECURSIVE_MUTEX> -#pragma instantiate ACE_Singleton<TAO_Marshal_Any, ACE_SYNCH_RECURSIVE_MUTEX> -#pragma instantiate ACE_Singleton<TAO_Marshal_TypeCode, ACE_SYNCH_RECURSIVE_MUTEX> -#pragma instantiate ACE_Singleton<TAO_Marshal_Principal, ACE_SYNCH_RECURSIVE_MUTEX> -#pragma instantiate ACE_Singleton<TAO_Marshal_ObjRef, ACE_SYNCH_RECURSIVE_MUTEX> -#pragma instantiate ACE_Singleton<TAO_Marshal_Struct, ACE_SYNCH_RECURSIVE_MUTEX> -#pragma instantiate ACE_Singleton<TAO_Marshal_Union, ACE_SYNCH_RECURSIVE_MUTEX> -#pragma instantiate ACE_Singleton<TAO_Marshal_String, ACE_SYNCH_RECURSIVE_MUTEX> -#pragma instantiate ACE_Singleton<TAO_Marshal_Sequence, ACE_SYNCH_RECURSIVE_MUTEX> -#pragma instantiate ACE_Singleton<TAO_Marshal_Array, ACE_SYNCH_RECURSIVE_MUTEX> -#pragma instantiate ACE_Singleton<TAO_Marshal_Alias, ACE_SYNCH_RECURSIVE_MUTEX> -#pragma instantiate ACE_Singleton<TAO_Marshal_Except, ACE_SYNCH_RECURSIVE_MUTEX> -#pragma instantiate ACE_Singleton<TAO_Marshal_WString, ACE_SYNCH_RECURSIVE_MUTEX> + #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Marshal.h b/TAO/tao/Marshal.h index 5c32b524b8f..2d3f436e671 100644 --- a/TAO/tao/Marshal.h +++ b/TAO/tao/Marshal.h @@ -51,49 +51,6 @@ class TAO_Marshal_Alias; class TAO_Marshal_Except; class TAO_Marshal_WString; -class TAO_Export TAO_Marshal_Factory -{ - // = TITLE - // A Factory for generating specialized marshaling objects - // - // = DESCRIPTION -public: - TAO_Marshal_Factory (void); - // constructor - - virtual ~TAO_Marshal_Factory (void); - // destructor - - virtual TAO_Marshal_Object *make_marshal_object (CORBA::TypeCode_ptr tc, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - // Factory method that returns the appropriate marshal object. - -private: - struct TAO_Marshal_Object_Entry - { - TAO_Marshal_Object *obj_; - }; - - TAO_Marshal_Object_Entry mobj_table_[CORBA::TC_KIND_COUNT]; - // A table of specialized marshal objects indexed by the kind_ field - -}; - -class TAO_Export TAO_Marshal -{ - // = TITLE - // Namespace in which to put otherwise "global" methods like - // initialize, etc. -public: - static void init (void); - // initializaton method to initialize all the marshaling objects and - // populating them in the Factory. - - static TAO_Marshal_Factory* DEFAULT_MARSHAL_FACTORY; - // default marshaling factory that uses the interpretive marshaling engine of - // TAO. -}; - class TAO_Export TAO_Marshal_Object { // = TITLE @@ -106,22 +63,37 @@ class TAO_Export TAO_Marshal_Object // Provides a set of virtual methods for appending and skipping // data over a CDR stream. public: + TAO_Marshal_Object (void); + // constructor + + virtual ~TAO_Marshal_Object (void); + // destructor + + static CORBA::TypeCode::traverse_status + perform_skip (CORBA::TypeCode_ptr tc, + TAO_InputCDR *context, + CORBA_Environment &ACE_TRY_ENV); + // skip entry point, it allocates the right kind of Marshal_Object + // and invokes skip on it. + virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, - void *context, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; + TAO_InputCDR *context, + CORBA_Environment &ACE_TRY_ENV) = 0; // skip operation + static CORBA::TypeCode::traverse_status + perform_append (CORBA::TypeCode_ptr tc, + TAO_InputCDR *src, + TAO_OutputCDR *dest, + CORBA_Environment &ACE_TRY_ENV); + // append entry point, it allocates the right kind of Marshal_Object + // and invokes skip on it. + virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) = 0; + CORBA_Environment &ACE_TRY_ENV) = 0; // append operation - - TAO_Marshal_Object (void); - // constructor - - virtual ~TAO_Marshal_Object (void); - // destructor }; class TAO_Export TAO_Marshal_Primitive: public TAO_Marshal_Object @@ -133,17 +105,15 @@ class TAO_Export TAO_Marshal_Primitive: public TAO_Marshal_Object public: TAO_Marshal_Primitive (void); - virtual ~TAO_Marshal_Primitive (void); - virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, - void *context, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + TAO_InputCDR *context, + CORBA_Environment &ACE_TRY_ENV); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV); // append operation }; @@ -157,17 +127,15 @@ class TAO_Export TAO_Marshal_Any: public TAO_Marshal_Object public: TAO_Marshal_Any (void); - virtual ~TAO_Marshal_Any (void); - virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, - void *context, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + TAO_InputCDR *context, + CORBA_Environment &ACE_TRY_ENV); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV); // append operation }; @@ -181,17 +149,15 @@ class TAO_Export TAO_Marshal_TypeCode: public TAO_Marshal_Object public: TAO_Marshal_TypeCode (void); - virtual ~TAO_Marshal_TypeCode (void); - virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, - void *context, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + TAO_InputCDR *context, + CORBA_Environment &ACE_TRY_ENV); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV); // append operation }; @@ -205,17 +171,15 @@ class TAO_Export TAO_Marshal_Principal: public TAO_Marshal_Object public: TAO_Marshal_Principal (void); - virtual ~TAO_Marshal_Principal (void); - virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, - void *context, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + TAO_InputCDR *context, + CORBA_Environment &ACE_TRY_ENV); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV); // append operation }; @@ -229,17 +193,15 @@ class TAO_Export TAO_Marshal_ObjRef: public TAO_Marshal_Object public: TAO_Marshal_ObjRef (void); - virtual ~TAO_Marshal_ObjRef (void); - virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, - void *context, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + TAO_InputCDR *context, + CORBA_Environment &ACE_TRY_ENV); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV); // append operation }; @@ -253,17 +215,15 @@ class TAO_Export TAO_Marshal_Struct: public TAO_Marshal_Object public: TAO_Marshal_Struct (void); - virtual ~TAO_Marshal_Struct (void); - virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, - void *context, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + TAO_InputCDR *context, + CORBA_Environment &ACE_TRY_ENV); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV); // append operation }; @@ -277,17 +237,15 @@ class TAO_Export TAO_Marshal_Union: public TAO_Marshal_Object public: TAO_Marshal_Union (void); - virtual ~TAO_Marshal_Union (void); - virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, - void *context, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + TAO_InputCDR *context, + CORBA_Environment &ACE_TRY_ENV); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV); // append operation }; @@ -301,17 +259,15 @@ class TAO_Export TAO_Marshal_String: public TAO_Marshal_Object public: TAO_Marshal_String (void); - virtual ~TAO_Marshal_String (void); - virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, - void *context, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + TAO_InputCDR *context, + CORBA_Environment &ACE_TRY_ENV); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV); // append operation }; @@ -325,17 +281,15 @@ class TAO_Export TAO_Marshal_Sequence: public TAO_Marshal_Object public: TAO_Marshal_Sequence (void); - virtual ~TAO_Marshal_Sequence (void); - virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, - void *context, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + TAO_InputCDR *context, + CORBA_Environment &ACE_TRY_ENV); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV); // append operation }; @@ -349,17 +303,15 @@ class TAO_Export TAO_Marshal_Array: public TAO_Marshal_Object public: TAO_Marshal_Array (void); - virtual ~TAO_Marshal_Array (void); - virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, - void *context, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + TAO_InputCDR *context, + CORBA_Environment &ACE_TRY_ENV); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV); // append operation }; @@ -373,17 +325,15 @@ class TAO_Export TAO_Marshal_Alias: public TAO_Marshal_Object public: TAO_Marshal_Alias (void); - virtual ~TAO_Marshal_Alias (void); - virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, - void *context, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + TAO_InputCDR *context, + CORBA_Environment &ACE_TRY_ENV); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV); // append operation }; @@ -396,17 +346,16 @@ class TAO_Export TAO_Marshal_Except: public TAO_Marshal_Object // marshal an exception public: TAO_Marshal_Except (void); - ~TAO_Marshal_Except (void); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, - void *context, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + TAO_InputCDR *context, + CORBA_Environment &ACE_TRY_ENV); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV); // append operation }; @@ -419,17 +368,16 @@ class TAO_Export TAO_Marshal_WString : public TAO_Marshal_Object // marshal a wide string public: TAO_Marshal_WString (void); - ~TAO_Marshal_WString (void); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, - void *context, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + TAO_InputCDR *context, + CORBA_Environment &ACE_TRY_ENV); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV); // append operation }; diff --git a/TAO/tao/Marshal.i b/TAO/tao/Marshal.i index 9ee1717db49..3be95bbfeef 100644 --- a/TAO/tao/Marshal.i +++ b/TAO/tao/Marshal.i @@ -1,11 +1,7 @@ //$Id$ -ACE_INLINE -TAO_Marshal_Object::TAO_Marshal_Object (void) -{ -} ACE_INLINE -TAO_Marshal_Object::~TAO_Marshal_Object (void) +TAO_Marshal_Object::TAO_Marshal_Object (void) { } @@ -15,126 +11,61 @@ TAO_Marshal_Primitive::TAO_Marshal_Primitive (void) } ACE_INLINE -TAO_Marshal_Primitive::~TAO_Marshal_Primitive (void) -{ -} - -ACE_INLINE TAO_Marshal_Any::TAO_Marshal_Any (void) { } ACE_INLINE -TAO_Marshal_Any::~TAO_Marshal_Any (void) -{ -} - -ACE_INLINE TAO_Marshal_Principal::TAO_Marshal_Principal (void) { } ACE_INLINE -TAO_Marshal_Principal::~TAO_Marshal_Principal (void) -{ -} - -ACE_INLINE TAO_Marshal_TypeCode::TAO_Marshal_TypeCode (void) { } ACE_INLINE -TAO_Marshal_TypeCode::~TAO_Marshal_TypeCode (void) -{ -} - -ACE_INLINE TAO_Marshal_ObjRef::TAO_Marshal_ObjRef (void) { } ACE_INLINE -TAO_Marshal_ObjRef::~TAO_Marshal_ObjRef (void) -{ -} - -ACE_INLINE TAO_Marshal_Struct::TAO_Marshal_Struct (void) { } ACE_INLINE -TAO_Marshal_Struct::~TAO_Marshal_Struct (void) -{ -} - -ACE_INLINE TAO_Marshal_Union::TAO_Marshal_Union (void) { } ACE_INLINE -TAO_Marshal_Union::~TAO_Marshal_Union (void) -{ -} - -ACE_INLINE TAO_Marshal_String::TAO_Marshal_String (void) { } ACE_INLINE -TAO_Marshal_String::~TAO_Marshal_String (void) -{ -} - -ACE_INLINE TAO_Marshal_Sequence::TAO_Marshal_Sequence (void) { } ACE_INLINE -TAO_Marshal_Sequence::~TAO_Marshal_Sequence (void) -{ -} - -ACE_INLINE TAO_Marshal_Array::TAO_Marshal_Array (void) { } ACE_INLINE -TAO_Marshal_Array::~TAO_Marshal_Array (void) -{ -} - -ACE_INLINE TAO_Marshal_Alias::TAO_Marshal_Alias (void) { } ACE_INLINE -TAO_Marshal_Alias::~TAO_Marshal_Alias (void) -{ -} - -ACE_INLINE TAO_Marshal_Except::TAO_Marshal_Except (void) { } ACE_INLINE -TAO_Marshal_Except::~TAO_Marshal_Except (void) -{ -} - -ACE_INLINE TAO_Marshal_WString::TAO_Marshal_WString (void) { } - -ACE_INLINE -TAO_Marshal_WString::~TAO_Marshal_WString (void) -{ -} diff --git a/TAO/tao/NVList.cpp b/TAO/tao/NVList.cpp index a40c2f1ea41..f0db721c9bf 100644 --- a/TAO/tao/NVList.cpp +++ b/TAO/tao/NVList.cpp @@ -11,6 +11,8 @@ #include "tao/ORB.h" #include "tao/BoundsC.h" #include "tao/debug.h" +#include "tao/Typecode.h" +#include "tao/Marshal.h" #include "ace/Auto_Ptr.h" #if !defined (__ACE_INLINE__) @@ -338,9 +340,10 @@ CORBA_NVList::_tao_encode (TAO_OutputCDR &cdr, arg)); } CORBA::TypeCode_var tc = nv->value ()->type (); - cdr.append (tc.in (), - this->incoming_, - ACE_TRY_ENV); + (void) TAO_Marshal_Object::perform_append (tc.in (), + this->incoming_, + &cdr, + ACE_TRY_ENV); ACE_CHECK; } diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index dcf449753e0..ea3facaf09c 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -24,7 +24,6 @@ #include "tao/debug.h" #include "tao/TAO_Internal.h" #include "tao/CDR.h" -#include "tao/Marshal.h" #include "tao/IOR_LookupTable.h" #include "tao/Object_Adapter.h" #include "tao/POA.h" @@ -1179,9 +1178,6 @@ CORBA_ORB::init_orb_globals (CORBA::Environment &ACE_TRY_ENV) // initialize the system TypeCodes TAO_TypeCodes::init (); - // initialize the factory for marshaling - TAO_Marshal::init (); - // initialize the system exceptions TAO_Exceptions::init (ACE_TRY_ENV); ACE_CHECK; diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index b44b64c3f62..267484fae56 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -342,7 +342,7 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV) ACE_DEBUG ((LM_WARNING, ACE_TEXT ("(%P|%t) This option has been deprecated \n") ACE_TEXT ("Please use svc.conf file to load the protcol \n"))); - + arg_shifter.consume_arg (); } else if (arg_shifter.cur_arg_strncasecmp ("-ORBDebug") == 0) @@ -1243,7 +1243,7 @@ TAO_ORB_Core::fini (void) // is statically added to the service configurator, fredk if (!this->resource_factory_from_service_config_) delete resource_factory_; - + // @@ This is not needed since the default client factory // is statically added to the service configurator, fredk diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h index 1d7d3f8bc2f..4baf93342cf 100644 --- a/TAO/tao/PolicyC.h +++ b/TAO/tao/PolicyC.h @@ -20,6 +20,7 @@ #include "tao/CDR.h" #include "tao/Environment.h" +#include "tao/Exception.h" #include "tao/Sequence.h" class TAO_Export CORBA_PolicyError : public CORBA::UserException diff --git a/TAO/tao/PollableS.cpp b/TAO/tao/PollableS.cpp index 343080659e5..071aa8605c8 100644 --- a/TAO/tao/PollableS.cpp +++ b/TAO/tao/PollableS.cpp @@ -24,6 +24,8 @@ #include "tao/Operation_Table.h" #include "tao/Server_Request.h" #include "tao/ORB.h" +#include "tao/Typecode.h" + #if !defined (__ACE_INLINE__) #include "tao/PollableS.i" #endif /* !defined INLINE */ diff --git a/TAO/tao/Services.cpp b/TAO/tao/Services.cpp index 501cddbd6ed..346784e1b14 100644 --- a/TAO/tao/Services.cpp +++ b/TAO/tao/Services.cpp @@ -12,6 +12,7 @@ #include "tao/CDR.h" #include "tao/Any.h" #include "tao/Environment.h" +#include "tao/Typecode.h" #if !defined (__ACE_INLINE__) #include "Services.i" diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp index 839fb244e42..1c9f4bc8a73 100644 --- a/TAO/tao/TAOC.cpp +++ b/TAO/tao/TAOC.cpp @@ -10,6 +10,7 @@ #include "tao/TAOC.h" #include "tao/TAOS.h" +#include "tao/Typecode.h" #if !defined (__ACE_INLINE__) #include "tao/TAOC.i" diff --git a/TAO/tao/TAOS.cpp b/TAO/tao/TAOS.cpp index 8e329889a58..d35515048fb 100644 --- a/TAO/tao/TAOS.cpp +++ b/TAO/tao/TAOS.cpp @@ -8,6 +8,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html #include "tao/TAOS.h" +#include "tao/Typecode.h" #if !defined (__ACE_INLINE__) #include "tao/TAOS.i" diff --git a/TAO/tao/TimeBaseC.cpp b/TAO/tao/TimeBaseC.cpp index 76ba10b4817..3ea71c3f722 100644 --- a/TAO/tao/TimeBaseC.cpp +++ b/TAO/tao/TimeBaseC.cpp @@ -18,6 +18,7 @@ #include "tao/TimeBaseC.h" #include "tao/TimeBaseS.h" +#include "tao/Typecode.h" #if !defined (__ACE_INLINE__) #include "tao/TimeBaseC.i" diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp index f012f8c9408..7f925123140 100644 --- a/TAO/tao/Typecode.cpp +++ b/TAO/tao/Typecode.cpp @@ -18,6 +18,7 @@ #include "tao/Exception.h" #include "tao/Principal.h" #include "tao/singletons.h" +#include "tao/Marshal.h" #include "tao/debug.h" #if !defined (__ACE_INLINE__) @@ -126,9 +127,6 @@ CORBA_TypeCode::CORBA_TypeCode (CORBA::TCKind kind) { } -// Constructor for all other typecodes, including constants with -// non-empty parameter lists. See "corba.hh" for details. - CORBA_TypeCode::CORBA_TypeCode (CORBA::TCKind kind, size_t length, const char *buffer, @@ -1617,9 +1615,11 @@ CORBA_TypeCode::private_member_type (CORBA::ULong slot, for (CORBA::ULong i = 0; i < mcount; i++) // the ith entry will have the typecode of the ith guy { + // skip member label CORBA::TypeCode::traverse_status status = - stream.skip (tc.in (), ACE_TRY_ENV); - // member label + TAO_Marshal_Object::perform_skip (tc.in (), + &stream, + ACE_TRY_ENV); ACE_CHECK_RETURN (0); if (status != CORBA::TypeCode::TRAVERSE_CONTINUE @@ -1813,8 +1813,9 @@ CORBA_TypeCode::private_member_name (CORBA::ULong slot, { // the ith entry will have the name of the ith member CORBA::TypeCode::traverse_status status = - stream.skip (tc.in (), - ACE_TRY_ENV); // member label + TAO_Marshal_Object::perform_skip (tc.in (), + &stream, + ACE_TRY_ENV); ACE_CHECK_RETURN (0); if (status != CORBA::TypeCode::TRAVERSE_CONTINUE) @@ -1911,7 +1912,10 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n, TAO_InputCDR temp (stream); char *begin = stream.rd_ptr (); - int retval = temp.skip (tc.in (), ACE_TRY_ENV); + int retval = + TAO_Marshal_Object::perform_skip (tc.in (), + &temp, + ACE_TRY_ENV); ACE_CHECK_RETURN (0); if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE) @@ -1929,7 +1933,11 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n, ACE_Allocator::instance (), ACE_Allocator::instance ()); - retval = out.append (tc.in (), &stream, ACE_TRY_ENV); + retval = + TAO_Marshal_Object::perform_append (tc.in (), + &stream, + &out, + ACE_TRY_ENV); ACE_CHECK_RETURN (0); if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE) return 0; diff --git a/TAO/tao/append.cpp b/TAO/tao/append.cpp index ee97f042223..f7847225543 100644 --- a/TAO/tao/append.cpp +++ b/TAO/tao/append.cpp @@ -115,7 +115,10 @@ TAO_Marshal_Any::append (CORBA::TypeCode_ptr, // append the data CORBA::TypeCode::traverse_status retval = - dest->append (elem_tc.in (), src, ACE_TRY_ENV); + TAO_Marshal_Object::perform_append (elem_tc.in (), + src, + dest, + ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE) @@ -169,7 +172,11 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr, case CORBA::tk_wstring: { // read and write the bounds - retval = dest->append (CORBA::_tc_long, src, ACE_TRY_ENV); + retval = + TAO_Marshal_Object::perform_append (CORBA::_tc_long, + src, + dest, + ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); } break; @@ -178,7 +185,11 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr, case ~0u: { // read and write the negative offset - retval = dest->append (CORBA::_tc_long, src, ACE_TRY_ENV); + retval = + TAO_Marshal_Object::perform_append (CORBA::_tc_long, + src, + dest, + ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); } break; @@ -195,7 +206,11 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr, case CORBA::tk_except: { // write the encapsulation i.e., octet sequence - retval = dest->append (TC_opaque, src, ACE_TRY_ENV); + retval = + TAO_Marshal_Object::perform_append (TC_opaque, + src, + dest, + ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); } } // end of switch @@ -234,7 +249,10 @@ TAO_Marshal_Principal::append (CORBA::TypeCode_ptr, CORBA::Environment &ACE_TRY_ENV) { // write the octet sequence representing the Principal - return dest->append (TC_opaque, src, ACE_TRY_ENV); + return TAO_Marshal_Object::perform_append (TC_opaque, + src, + dest, + ACE_TRY_ENV); } CORBA::TypeCode::traverse_status @@ -331,7 +349,11 @@ TAO_Marshal_Struct::append (CORBA::TypeCode_ptr tc, param = tc->member_type (i, ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - retval = dest->append (param.in (), src, ACE_TRY_ENV); + retval = + TAO_Marshal_Object::perform_append (param.in (), + src, + dest, + ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); } @@ -557,7 +579,10 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc, CORBA::TypeCode_ptr member_tc = tc->member_type (default_member, ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - return dest->append (member_tc, src, ACE_TRY_ENV); + return TAO_Marshal_Object::perform_append (member_tc, + src, + dest, + ACE_TRY_ENV); } return CORBA::TypeCode::TRAVERSE_STOP; } @@ -566,7 +591,10 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc, CORBA::TypeCode_ptr member_tc = tc->member_type (current_member, ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - return dest->append (member_tc, src, ACE_TRY_ENV); + return TAO_Marshal_Object::perform_append (member_tc, + src, + dest, + ACE_TRY_ENV); } // decode string @@ -634,7 +662,10 @@ TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr tc, // constant, we compute it only once. while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE) { - retval = dest->append (tc2.in (), src, ACE_TRY_ENV); + retval = TAO_Marshal_Object::perform_append (tc2.in (), + src, + dest, + ACE_TRY_ENV); } // CORBA::release (tc2); if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE) @@ -678,7 +709,10 @@ TAO_Marshal_Array::append (CORBA::TypeCode_ptr tc, while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE) { - retval = dest->append (tc2.in (), src, ACE_TRY_ENV); + retval = TAO_Marshal_Object::perform_append (tc2.in (), + src, + dest, + ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); } @@ -712,7 +746,10 @@ TAO_Marshal_Alias::append (CORBA::TypeCode_ptr tc, tc2 = tc->content_type (ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - retval = dest->append (tc2.in (), src, ACE_TRY_ENV); + retval = TAO_Marshal_Object::perform_append (tc2.in (), + src, + dest, + ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); // tc2->_decr_refcnt (); @@ -760,7 +797,10 @@ TAO_Marshal_Except::append (CORBA::TypeCode_ptr tc, param = tc->member_type (i, ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - retval = dest->append (param.in (), src, ACE_TRY_ENV); + retval = TAO_Marshal_Object::perform_append (param.in (), + src, + dest, + ACE_TRY_ENV); } if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h index f599437767a..918c8c92c29 100644 --- a/TAO/tao/corba.h +++ b/TAO/tao/corba.h @@ -49,7 +49,6 @@ #include "tao/Typecode.h" #include "tao/varout.h" -#include "tao/Marshal.h" #include "tao/singletons.h" #include "tao/CDR.h" diff --git a/TAO/tao/singletons.h b/TAO/tao/singletons.h index b6996d461de..d6214be1fb4 100644 --- a/TAO/tao/singletons.h +++ b/TAO/tao/singletons.h @@ -31,22 +31,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Synch.h" -#include "tao/Marshal.h" - -typedef ACE_Singleton<TAO_Marshal_Factory, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_FACTORY; -typedef ACE_Singleton<TAO_Marshal_Primitive, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_PRIMITIVE; -typedef ACE_Singleton<TAO_Marshal_Any, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_ANY; -typedef ACE_Singleton<TAO_Marshal_TypeCode, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_TYPECODE; -typedef ACE_Singleton<TAO_Marshal_Principal, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_PRINCIPAL; -typedef ACE_Singleton<TAO_Marshal_ObjRef, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_OBJREF; -typedef ACE_Singleton<TAO_Marshal_Struct, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_STRUCT; -typedef ACE_Singleton<TAO_Marshal_Union, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_UNION; -typedef ACE_Singleton<TAO_Marshal_String, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_STRING; -typedef ACE_Singleton<TAO_Marshal_Sequence, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_SEQUENCE; -typedef ACE_Singleton<TAO_Marshal_Array, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_ARRAY; -typedef ACE_Singleton<TAO_Marshal_Alias, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_ALIAS; -typedef ACE_Singleton<TAO_Marshal_Except, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_EXCEPT; -typedef ACE_Singleton<TAO_Marshal_WString, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_WSTRING; #include "ace/post.h" #endif /* TAO_SINGLETONS_H */ diff --git a/TAO/tao/skip.cpp b/TAO/tao/skip.cpp index 90d8c4bb5d2..80bb97200d7 100644 --- a/TAO/tao/skip.cpp +++ b/TAO/tao/skip.cpp @@ -29,11 +29,10 @@ ACE_RCSID(tao, skip, "$Id$") CORBA::TypeCode::traverse_status TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr tc, - void *context, + TAO_InputCDR *stream, CORBA::Environment &ACE_TRY_ENV) { CORBA::Boolean continue_skipping = 1; - TAO_InputCDR *stream = ACE_static_cast (TAO_InputCDR *, context); // status of skip operation CORBA::TypeCode::traverse_status retval = @@ -92,32 +91,28 @@ TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr tc, CORBA::TypeCode::traverse_status TAO_Marshal_Any::skip (CORBA::TypeCode_ptr, - void *context, + TAO_InputCDR *stream, CORBA::Environment &ACE_TRY_ENV) { // Typecode of the element that makes the Any. CORBA::TypeCode_var elem_tc; - // Context is the CDR stream. - TAO_InputCDR *stream = ACE_static_cast (TAO_InputCDR *, context); - // Status of encode operation. if (!(*stream >> elem_tc.inout ())) return CORBA::TypeCode::TRAVERSE_STOP; - return stream->skip (elem_tc.in (), ACE_TRY_ENV); + return TAO_Marshal_Object::perform_skip (elem_tc.in (), + stream, + ACE_TRY_ENV); } CORBA::TypeCode::traverse_status TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr, - void *context, + TAO_InputCDR *stream, CORBA::Environment &ACE_TRY_ENV) { CORBA::Boolean continue_skipping = 1; - // Context is the CDR stream. - TAO_InputCDR *stream = ACE_static_cast (TAO_InputCDR *, context); - #if 0 // Typecode to be decoded. CORBA::TypeCode_ptr *tcp; @@ -211,14 +206,11 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr, CORBA::TypeCode::traverse_status TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr, - void *context, + TAO_InputCDR *stream, CORBA::Environment &ACE_TRY_ENV) { CORBA::Boolean continue_skipping = 1; - // Context is the CDR stream. - TAO_InputCDR *stream = ACE_static_cast (TAO_InputCDR *, context); - // specifies the number of bytes in the Principal CORBA::ULong len; @@ -243,13 +235,11 @@ TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr, CORBA::TypeCode::traverse_status TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr, - void *context, + TAO_InputCDR *stream, CORBA::Environment &ACE_TRY_ENV) { CORBA::Boolean continue_skipping = 1; - // Context is the CDR stream. - TAO_InputCDR *stream = ACE_static_cast (TAO_InputCDR *, context); // return status CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE; @@ -306,10 +296,9 @@ TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr, // Decode structs. CORBA::TypeCode::traverse_status TAO_Marshal_Struct::skip (CORBA::TypeCode_ptr tc, - void *context, + TAO_InputCDR *stream, CORBA::Environment &ACE_TRY_ENV) { - TAO_InputCDR *stream = ACE_static_cast (TAO_InputCDR *, context); CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE; CORBA::TypeCode_var param; @@ -325,7 +314,9 @@ TAO_Marshal_Struct::skip (CORBA::TypeCode_ptr tc, param = tc->member_type (i, ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - retval = stream->skip (param.in (), ACE_TRY_ENV); + retval = TAO_Marshal_Object::perform_skip (param.in (), + stream, + ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); } @@ -343,12 +334,9 @@ TAO_Marshal_Struct::skip (CORBA::TypeCode_ptr tc, // Encode unions. CORBA::TypeCode::traverse_status TAO_Marshal_Union::skip (CORBA::TypeCode_ptr tc, - void *context, + TAO_InputCDR *src, CORBA::Environment &ACE_TRY_ENV) { - TAO_InputCDR *src = - ACE_reinterpret_cast (TAO_InputCDR*, context); - CORBA::TypeCode_ptr discrim_tc = tc->discriminator_type (ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); @@ -543,7 +531,9 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr tc, CORBA::TypeCode_ptr member_tc = tc->member_type (default_member, ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - return src->skip (member_tc, ACE_TRY_ENV); + return TAO_Marshal_Object::perform_skip (member_tc, + src, + ACE_TRY_ENV); } return CORBA::TypeCode::TRAVERSE_STOP; } @@ -552,19 +542,18 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr tc, CORBA::TypeCode_ptr member_tc = tc->member_type (current_member, ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - return src->skip (member_tc, ACE_TRY_ENV); + return TAO_Marshal_Object::perform_skip (member_tc, + src, + ACE_TRY_ENV); } // decode string CORBA::TypeCode::traverse_status TAO_Marshal_String::skip (CORBA::TypeCode_ptr, - void *context, + TAO_InputCDR *stream, CORBA::Environment &ACE_TRY_ENV) { CORBA::Boolean continue_skipping = 1; - // Context is the CDR stream. - TAO_InputCDR *stream = ACE_static_cast (TAO_InputCDR *, context); - // On decode, omit the check against specified string bounds, and // cope with illegal "zero length" strings (all lengths on the wire @@ -592,11 +581,10 @@ TAO_Marshal_String::skip (CORBA::TypeCode_ptr, CORBA::TypeCode::traverse_status TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr tc, - void *context, + TAO_InputCDR *stream, CORBA::Environment &ACE_TRY_ENV) { CORBA::Boolean continue_skipping = 1; - TAO_InputCDR *stream = ACE_static_cast (TAO_InputCDR *, context); // Typecode of the element. CORBA::TypeCode_var tc2; // Size of element. @@ -619,8 +607,13 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr tc, while (bounds-- && continue_skipping == 1) { - continue_skipping = (CORBA::Boolean) stream->skip (tc2.in (), ACE_TRY_ENV); + int retval = + TAO_Marshal_Object::perform_skip (tc2.in (), + stream, + ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); + continue_skipping = + (retval == CORBA::TypeCode::TRAVERSE_CONTINUE); } if (continue_skipping) return CORBA::TypeCode::TRAVERSE_CONTINUE; @@ -641,11 +634,10 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr tc, CORBA::TypeCode::traverse_status TAO_Marshal_Array::skip (CORBA::TypeCode_ptr tc, - void *context, + TAO_InputCDR *stream, CORBA::Environment &ACE_TRY_ENV) { CORBA::Boolean continue_skipping = 1; - TAO_InputCDR *stream = ACE_static_cast (TAO_InputCDR *, context); // Typecode of the element. CORBA::TypeCode_var tc2; @@ -660,8 +652,12 @@ TAO_Marshal_Array::skip (CORBA::TypeCode_ptr tc, while (bounds-- && continue_skipping == 1) { - continue_skipping = (CORBA::Boolean) stream->skip (tc2.in (), ACE_TRY_ENV); + int retval = + TAO_Marshal_Object::perform_skip (tc2.in (), + stream, + ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); + continue_skipping = (retval == CORBA::TypeCode::TRAVERSE_CONTINUE); } if (continue_skipping) @@ -678,16 +674,13 @@ TAO_Marshal_Array::skip (CORBA::TypeCode_ptr tc, // Decode alias. CORBA::TypeCode::traverse_status TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr tc, - void *context, + TAO_InputCDR *stream, CORBA::Environment &ACE_TRY_ENV) { // Typecode of the aliased type. CORBA::TypeCode_var tc2; CORBA::Boolean continue_skipping = 1; - // Context is the CDR stream. - TAO_InputCDR *stream = ACE_static_cast (TAO_InputCDR *, context); - // Status of decode operation. CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE; @@ -695,7 +688,9 @@ TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr tc, tc2 = tc->content_type (ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - retval = stream->skip (tc2.in (), ACE_TRY_ENV); + retval = TAO_Marshal_Object::perform_skip (tc2.in (), + stream, + ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); // tc2->_decr_refcnt (); @@ -720,10 +715,9 @@ TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr tc, // NOTE: This is asymmetric with respect to encoding exceptions. CORBA::TypeCode::traverse_status TAO_Marshal_Except::skip (CORBA::TypeCode_ptr tc, - void *context, + TAO_InputCDR *stream, CORBA::Environment &ACE_TRY_ENV) { - TAO_InputCDR *stream = ACE_static_cast (TAO_InputCDR *, context); CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE; CORBA::TypeCode_var param; @@ -743,7 +737,9 @@ TAO_Marshal_Except::skip (CORBA::TypeCode_ptr tc, param = tc->member_type (i, ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - retval = stream->skip (param.in (), ACE_TRY_ENV); + retval = TAO_Marshal_Object::perform_skip (param.in (), + stream, + ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); } @@ -761,11 +757,10 @@ TAO_Marshal_Except::skip (CORBA::TypeCode_ptr tc, // decode wstring CORBA::TypeCode::traverse_status TAO_Marshal_WString::skip (CORBA::TypeCode_ptr, - void *context, + TAO_InputCDR *stream, CORBA::Environment &ACE_TRY_ENV) { CORBA::Boolean continue_skipping = 1; - TAO_InputCDR *stream = ACE_static_cast (TAO_InputCDR *, context); CORBA::ULong len; // On decode, omit the check against specified wstring bounds, and |