From 07d5ad80a0ec9a1365b7e25e65956e22631ba374 Mon Sep 17 00:00:00 2001 From: bala Date: Wed, 24 Dec 2003 02:36:33 +0000 Subject: ChangeLogTag:Tue Dec 23 20:35:00 2003 Balachandran Natarajan --- TAO/ChangeLog | 31 ++++ TAO/tao/Buffering_Constraint_Policy.cpp | 2 + TAO/tao/Makefile.bor | 2 + TAO/tao/Makefile.tao | 2 + TAO/tao/Messaging_PolicyValue.pidl | 2 +- TAO/tao/Messaging_PolicyValueA.cpp | 12 +- TAO/tao/Messaging_PolicyValueC.cpp | 255 ++++++++------------------- TAO/tao/Messaging_PolicyValueC.h | 123 ++----------- TAO/tao/Messaging_PolicyValueC.i | 18 -- TAO/tao/TAOA.cpp | 188 ++++++++++++++++++++ TAO/tao/TAOA.h | 54 ++++++ TAO/tao/TAOC.cpp | 295 +++++++++----------------------- TAO/tao/TAOC.h | 132 +++++++------- TAO/tao/WrongTransaction.pidl | 2 +- TAO/tao/WrongTransactionA.cpp | 135 +++++++++++++++ TAO/tao/WrongTransactionA.h | 47 +++++ TAO/tao/WrongTransactionC.cpp | 151 +++------------- TAO/tao/WrongTransactionC.h | 60 +++---- TAO/tao/WrongTransactionC.i | 2 +- TAO/tao/tao.mpc | 2 + 20 files changed, 751 insertions(+), 764 deletions(-) create mode 100644 TAO/tao/TAOA.cpp create mode 100644 TAO/tao/TAOA.h create mode 100644 TAO/tao/WrongTransactionA.cpp create mode 100644 TAO/tao/WrongTransactionA.h (limited to 'TAO') diff --git a/TAO/ChangeLog b/TAO/ChangeLog index e78baa05cbe..1e20f0ced50 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,34 @@ +Tue Dec 23 20:35:00 2003 Balachandran Natarajan + + * tao/Buffering_Constraint_Policy.cpp: + + Added a new header. + + * tao/Messaging_PolicyValue.pidl: + * tao/Messaging_PolicyValueA.cpp: + * tao/Messaging_PolicyValueA.h: + * tao/Messaging_PolicyValueC.cpp: + * tao/Messaging_PolicyValueC.h: + * tao/Messaging_PolicyValueC.i: + * tao/TAOA.cpp: + * tao/TAOA.h: + * tao/TAOC.cpp: + * tao/TAOC.h: + * tao/TAOC.i: + * tao/WrongTransaction.pidl: + * tao/WrongTransactionA.cpp: + * tao/WrongTransactionA.h: + * tao/WrongTransactionC.cpp: + * tao/WrongTransactionC.h: + * tao/WrongTransactionC.i: + + Regenerated all these files. + + * tao/Makefile.tao: + * tao/Makefile.bor: + * tao/tao.mpc: Added new files. + + Tue Dec 23 20:11:23 2003 Balachandran Natarajan * tao/Bounds.pidl: diff --git a/TAO/tao/Buffering_Constraint_Policy.cpp b/TAO/tao/Buffering_Constraint_Policy.cpp index 97b5f269590..3f145bc717d 100644 --- a/TAO/tao/Buffering_Constraint_Policy.cpp +++ b/TAO/tao/Buffering_Constraint_Policy.cpp @@ -5,6 +5,8 @@ #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) +#include "TAOA.h" + ACE_RCSID(TAO, Buffering_Constraint_Policy, "$Id$") #if ! defined (__ACE_INLINE__) diff --git a/TAO/tao/Makefile.bor b/TAO/tao/Makefile.bor index 2c5719ad5b0..d412e39dbb0 100644 --- a/TAO/tao/Makefile.bor +++ b/TAO/tao/Makefile.bor @@ -231,6 +231,7 @@ OBJFILES = \ $(OBJDIR)\Synch_Refcountable.obj \ $(OBJDIR)\Synch_Reply_Dispatcher.obj \ $(OBJDIR)\TAOC.obj \ + $(OBJDIR)\TAOA.obj \ $(OBJDIR)\TAO_Internal.obj \ $(OBJDIR)\TAO_Server_Request.obj \ $(OBJDIR)\TAO_Singleton_Manager.obj \ @@ -257,6 +258,7 @@ OBJFILES = \ $(OBJDIR)\Wait_On_Read.obj \ $(OBJDIR)\Wait_Strategy.obj \ $(OBJDIR)\WrongTransactionC.obj \ + $(OBJDIR)\WrongTransactionA.obj \ $(OBJDIR)\append.obj \ $(OBJDIR)\debug.obj \ $(OBJDIR)\default_client.obj \ diff --git a/TAO/tao/Makefile.tao b/TAO/tao/Makefile.tao index 7c34d1881de..1d74ef4c6bd 100644 --- a/TAO/tao/Makefile.tao +++ b/TAO/tao/Makefile.tao @@ -157,6 +157,7 @@ ORB_CORE_FILES = \ CurrentA \ Exception \ WrongTransactionC \ + WrongTransactionA \ Environment \ Object \ LocalObject \ @@ -269,6 +270,7 @@ ORB_CORE_FILES = \ BoundsC \ BoundsA \ TAOC \ + TAOA \ Object_Loader \ TAO_Singleton_Manager \ DLL_ORB \ diff --git a/TAO/tao/Messaging_PolicyValue.pidl b/TAO/tao/Messaging_PolicyValue.pidl index af1a9e5f505..df71b495d7f 100644 --- a/TAO/tao/Messaging_PolicyValue.pidl +++ b/TAO/tao/Messaging_PolicyValue.pidl @@ -42,7 +42,7 @@ module Messaging struct PolicyValue { CORBA::PolicyType ptype; - sequence pvalue; + CORBA::OctetSeq pvalue; }; typedef sequence PolicyValueSeq; diff --git a/TAO/tao/Messaging_PolicyValueA.cpp b/TAO/tao/Messaging_PolicyValueA.cpp index 69ea8faace5..5695a6e58f0 100644 --- a/TAO/tao/Messaging_PolicyValueA.cpp +++ b/TAO/tao/Messaging_PolicyValueA.cpp @@ -146,12 +146,9 @@ CORBA::Boolean operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class - TAO::Any_Dual_Impl_T< - Messaging::PolicyValue::_tao_seq_CORBA_Octet_ - >; + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class TAO::Any_Dual_Impl_T< @@ -165,11 +162,6 @@ CORBA::Boolean operator>>= ( #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - Messaging::PolicyValue::_tao_seq_CORBA_Octet_ \ - > - # pragma instantiate \ TAO::Any_Dual_Impl_T< \ Messaging::PolicyValue \ diff --git a/TAO/tao/Messaging_PolicyValueC.cpp b/TAO/tao/Messaging_PolicyValueC.cpp index b3fb633427e..53da0e34f2a 100644 --- a/TAO/tao/Messaging_PolicyValueC.cpp +++ b/TAO/tao/Messaging_PolicyValueC.cpp @@ -30,7 +30,6 @@ #include "Messaging_PolicyValueC.h" -#include "tao/ORB_Core.h" #include "tao/Typecode.h" #if defined (__BORLANDC__) @@ -49,6 +48,7 @@ namespace TAO { } + // TAO_IDL - Generated from // be/be_visitor_typecode/typecode_defn.cpp:284 @@ -56,53 +56,70 @@ static const CORBA::Long _oc_Messaging_PolicyValue[] = { TAO_ENCAP_BYTE_ORDER, // byte order 38, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d657373), - ACE_NTOHL (0x6167696e), - ACE_NTOHL (0x672f506f), - ACE_NTOHL (0x6c696379), - ACE_NTOHL (0x56616c75), - ACE_NTOHL (0x653a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d657373), + ACE_NTOHL (0x6167696e), + ACE_NTOHL (0x672f506f), + ACE_NTOHL (0x6c696379), + ACE_NTOHL (0x56616c75), + ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/Messaging/PolicyValue:1.0 12, - ACE_NTOHL (0x506f6c69), - ACE_NTOHL (0x63795661), + ACE_NTOHL (0x506f6c69), + ACE_NTOHL (0x63795661), ACE_NTOHL (0x6c756500), // name = PolicyValue 2, // member count 6, - ACE_NTOHL (0x70747970), + ACE_NTOHL (0x70747970), ACE_NTOHL (0x65000000), // name = ptype CORBA::tk_alias, // typecode kind for typedefs 64, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 33, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f506f), - ACE_NTOHL (0x6c696379), - ACE_NTOHL (0x54797065), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f506f), + ACE_NTOHL (0x6c696379), + ACE_NTOHL (0x54797065), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/PolicyType:1.0 11, - ACE_NTOHL (0x506f6c69), - ACE_NTOHL (0x63795479), + ACE_NTOHL (0x506f6c69), + ACE_NTOHL (0x63795479), ACE_NTOHL (0x70650000), // name = PolicyType CORBA::tk_ulong, 7, - ACE_NTOHL (0x7076616c), + ACE_NTOHL (0x7076616c), ACE_NTOHL (0x75650000), // name = pvalue - CORBA::tk_sequence, // typecode kind - 12, // encapsulation length + CORBA::tk_alias, // typecode kind for typedefs + 76, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order - CORBA::tk_octet, + 31, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f4f63), + ACE_NTOHL (0x74657453), + ACE_NTOHL (0x65713a31), + ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0 + 9, + ACE_NTOHL (0x4f637465), + ACE_NTOHL (0x74536571), + ACE_NTOHL (0x0), // name = OctetSeq + CORBA::tk_sequence, // typecode kind + 12, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + CORBA::tk_octet, + + 0U, - 0U, }; @@ -120,10 +137,10 @@ namespace Messaging &_tc_TAO_tc_Messaging_PolicyValue; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_visitor_structure/structure_cs.cpp:66 -void +void Messaging::PolicyValue::_tao_any_destructor ( void *_tao_void_pointer ) @@ -133,60 +150,7 @@ Messaging::PolicyValue::_tao_any_destructor ( delete _tao_tmp_pointer; } -// TAO_IDL - Generated from -// be/be_visitor_sequence/sequence_cs.cpp:65 - -#if !defined (_MESSAGING_POLICYVALUE__TAO_SEQ_CORBA_OCTET__CS_) -#define _MESSAGING_POLICYVALUE__TAO_SEQ_CORBA_OCTET__CS_ - -Messaging::PolicyValue::_tao_seq_CORBA_Octet_::_tao_seq_CORBA_Octet_ (void) -{} - -Messaging::PolicyValue::_tao_seq_CORBA_Octet_::_tao_seq_CORBA_Octet_ ( - CORBA::ULong max - ) - : TAO_Unbounded_Sequence< - CORBA::Octet - > - (max) -{} - -Messaging::PolicyValue::_tao_seq_CORBA_Octet_::_tao_seq_CORBA_Octet_ ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::Octet * buffer, - CORBA::Boolean release - ) - : TAO_Unbounded_Sequence< - CORBA::Octet - > - (max, length, buffer, release) -{} - -Messaging::PolicyValue::_tao_seq_CORBA_Octet_::_tao_seq_CORBA_Octet_ ( - const _tao_seq_CORBA_Octet_ &seq - ) - : TAO_Unbounded_Sequence< - CORBA::Octet - > - (seq) -{} - -Messaging::PolicyValue::_tao_seq_CORBA_Octet_::~_tao_seq_CORBA_Octet_ (void) -{} - -void Messaging::PolicyValue::_tao_seq_CORBA_Octet_::_tao_any_destructor ( - void * _tao_void_pointer - ) -{ - _tao_seq_CORBA_Octet_ * _tao_tmp_pointer = - ACE_static_cast (_tao_seq_CORBA_Octet_ *, _tao_void_pointer); - delete _tao_tmp_pointer; -} - -#endif /* end #if !defined */ - -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_MESSAGING_POLICYVALUESEQ_CS_) @@ -263,10 +227,10 @@ static const CORBA::Long _oc_Messaging_PolicyValueSeq[] = ACE_NTOHL (0x6c756553), ACE_NTOHL (0x65710000), // name = PolicyValueSeq CORBA::tk_sequence, // typecode kind - 200, // encapsulation length + 264, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order CORBA::tk_struct, // typecode kind - 184, // encapsulation length + 248, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 38, ACE_NTOHL (0x49444c3a), @@ -310,12 +274,29 @@ static const CORBA::Long _oc_Messaging_PolicyValueSeq[] = 7, ACE_NTOHL (0x7076616c), ACE_NTOHL (0x75650000), // name = pvalue - CORBA::tk_sequence, // typecode kind - 12, // encapsulation length + CORBA::tk_alias, // typecode kind for typedefs + 76, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order - CORBA::tk_octet, + 31, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f4f63), + ACE_NTOHL (0x74657453), + ACE_NTOHL (0x65713a31), + ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0 + 9, + ACE_NTOHL (0x4f637465), + ACE_NTOHL (0x74536571), + ACE_NTOHL (0x0), // name = OctetSeq + CORBA::tk_sequence, // typecode kind + 12, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + CORBA::tk_octet, + + 0U, - 0U, 0U, @@ -339,100 +320,6 @@ namespace Messaging // TAO_IDL - Generated from // be/be_visitor_sequence/cdr_op_cs.cpp:95 -#if !defined _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_CORBA_Octet__CPP_ -#define _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_CORBA_Octet__CPP_ - -CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, - const Messaging::PolicyValue::_tao_seq_CORBA_Octet_ &_tao_sequence - ) -{ - CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - -#if (TAO_NO_COPY_OCTET_SEQUENCES == 1) - { - TAO_Unbounded_Sequence *oseq = - ACE_static_cast (TAO_Unbounded_Sequence*, (Messaging::PolicyValue::_tao_seq_CORBA_Octet_ *)&_tao_sequence); - if (oseq->mb ()) - return strm.write_octet_array_mb (oseq->mb ()); - else - return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - } - -#else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ - return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - -#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ - } - - return 0; -} - -CORBA::Boolean operator>> ( - TAO_InputCDR &strm, - Messaging::PolicyValue::_tao_seq_CORBA_Octet_ &_tao_sequence - ) -{ - CORBA::ULong _tao_seq_len; - - if (strm >> _tao_seq_len) - { - // Add a check to the length of the sequence - // to make sure it does not exceed the length - // of the stream. (See bug 58.) - if (_tao_seq_len > strm.length ()) - { - return 0; - } - - // Set the length of the sequence. - _tao_sequence.length (_tao_seq_len); - - // If length is 0 we return true. - if (0 >= _tao_seq_len) - { - return 1; - } - - // Retrieve all the elements. - -#if (TAO_NO_COPY_OCTET_SEQUENCES == 1) - if (ACE_BIT_DISABLED (strm.start ()->flags (), - ACE_Message_Block::DONT_DELETE)) - { - TAO_ORB_Core* orb_core = strm.orb_core (); - if (orb_core != 0 && - strm.orb_core ()->resource_factory ()-> - input_cdr_allocator_type_locked () == 1) - { - TAO_Unbounded_Sequence *oseq = - ACE_static_cast(TAO_Unbounded_Sequence*, &_tao_sequence); - oseq->replace (_tao_seq_len, strm.start ()); - oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len); - strm.skip_bytes (_tao_seq_len); - return 1; - } - } - return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len); -#else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ - return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - -#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ - - } - - return 0; -} - -#endif /* _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_CORBA_Octet__CPP_ */ - -// TAO_IDL - Generated from -// be/be_visitor_sequence/cdr_op_cs.cpp:95 - #if !defined _TAO_CDR_OP_Messaging_PolicyValueSeq_CPP_ #define _TAO_CDR_OP_Messaging_PolicyValueSeq_CPP_ diff --git a/TAO/tao/Messaging_PolicyValueC.h b/TAO/tao/Messaging_PolicyValueC.h index dbc9eb5f063..69711f2d19a 100644 --- a/TAO/tao/Messaging_PolicyValueC.h +++ b/TAO/tao/Messaging_PolicyValueC.h @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151 +// be/be_codegen.cpp:186 #ifndef _TAO_IDL_ORIG_MESSAGING_POLICYVALUEC_H_ #define _TAO_IDL_ORIG_MESSAGING_POLICYVALUEC_H_ @@ -65,23 +65,13 @@ #endif /* __BORLANDC__ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_ch.cpp:63 - -namespace TAO -{ - class Collocation_Proxy_Broker; - - template class Narrow_Utils; -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48 +// be/be_visitor_module/module_ch.cpp:48 namespace Messaging { // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:258 + // be/be_type.cpp:258 struct PolicyValue; @@ -99,7 +89,7 @@ namespace Messaging PolicyValue_out; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52 + // be/be_visitor_structure/structure_ch.cpp:52 struct TAO_Export PolicyValue { @@ -107,61 +97,16 @@ namespace Messaging static void _tao_any_destructor (void *); CORBA::PolicyType ptype; - - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101 - -#if !defined (_MESSAGING_POLICYVALUE__TAO_SEQ_CORBA_OCTET__CH_) -#define _MESSAGING_POLICYVALUE__TAO_SEQ_CORBA_OCTET__CH_ - - class TAO_Export _tao_seq_CORBA_Octet_ - : public - TAO_Unbounded_Sequence< - CORBA::Octet - > - { - public: - _tao_seq_CORBA_Octet_ (void); - _tao_seq_CORBA_Octet_ (CORBA::ULong max); - _tao_seq_CORBA_Octet_ ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::Octet* buffer, - CORBA::Boolean release = 0 - ); - _tao_seq_CORBA_Octet_ (const _tao_seq_CORBA_Octet_ &); - ~_tao_seq_CORBA_Octet_ (void); - - static void _tao_any_destructor (void *); - - - -#if (TAO_NO_COPY_OCTET_SEQUENCES == 1) - _tao_seq_CORBA_Octet_ ( - CORBA::ULong length, - const ACE_Message_Block* mb - ) - : TAO_Unbounded_Sequence (length, mb) {} -#endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */ - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_field/field_ch.cpp:453 - - typedef _tao_seq_CORBA_Octet_ _pvalue_seq; - _tao_seq_CORBA_Octet_ pvalue; + CORBA::OctetSeq pvalue; }; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 + // be/be_visitor_typecode/typecode_decl.cpp:44 TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyValue; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101 + // be/be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_MESSAGING_POLICYVALUESEQ_CH_) #define _MESSAGING_POLICYVALUESEQ_CH_ @@ -209,27 +154,27 @@ namespace Messaging #endif /* end #if !defined */ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 + // be/be_visitor_typecode/typecode_decl.cpp:44 TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyValueSeq; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + // be/be_visitor_constant/constant_ch.cpp:52 const IOP::ComponentId TAG_POLICIES = 2U; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + // be/be_visitor_constant/constant_ch.cpp:52 const IOP::ServiceId INVOCATION_POLICIES = 2U; // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:66 +// be/be_visitor_module/module_ch.cpp:66 } // module Messaging // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:48 +// be/be_visitor_traits.cpp:59 // Traits specializations. namespace TAO @@ -237,51 +182,18 @@ namespace TAO } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52 - -TAO_Export void operator<<= (CORBA::Any &, const Messaging::PolicyValue &); // copying version -TAO_Export void operator<<= (CORBA::Any &, Messaging::PolicyValue*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::PolicyValue *&); // deprecated -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Messaging::PolicyValue *&); - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52 - -TAO_Export void operator<<= (CORBA::Any &, const Messaging::PolicyValueSeq &); // copying version -TAO_Export void operator<<= (CORBA::Any &, Messaging::PolicyValueSeq*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::PolicyValueSeq *&); // deprecated -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Messaging::PolicyValueSeq *&); - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48 +// be/be_visitor_root/cdr_op.cpp:48 #ifndef __ACE_INLINE__ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:53 +// be/be_visitor_structure/cdr_op_ch.cpp:53 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::PolicyValue &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::PolicyValue &); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:70 - -#if !defined _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_CORBA_Octet__H_ -#define _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_CORBA_Octet__H_ - -TAO_Export CORBA::Boolean operator<< ( - TAO_OutputCDR &, - const Messaging::PolicyValue::_tao_seq_CORBA_Octet_ & - ); -TAO_Export CORBA::Boolean operator>> ( - TAO_InputCDR &, - Messaging::PolicyValue::_tao_seq_CORBA_Octet_ & - ); - -#endif /* _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_CORBA_Octet__H_ */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:70 +// be/be_visitor_sequence/cdr_op_ch.cpp:70 #if !defined _TAO_CDR_OP_Messaging_PolicyValueSeq_H_ #define _TAO_CDR_OP_Messaging_PolicyValueSeq_H_ @@ -298,12 +210,12 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_Messaging_PolicyValueSeq_H_ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64 +// be/be_visitor_root/cdr_op.cpp:64 #endif /* __ACE_INLINE__ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:969 +// be/be_codegen.cpp:1050 #if defined (__ACE_INLINE__) #include "Messaging_PolicyValueC.i" @@ -318,4 +230,5 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* __BORLANDC__ */ #include /**/ "ace/post.h" + #endif /* ifndef */ diff --git a/TAO/tao/Messaging_PolicyValueC.i b/TAO/tao/Messaging_PolicyValueC.i index 33b6e399bd3..14915ad4a96 100644 --- a/TAO/tao/Messaging_PolicyValueC.i +++ b/TAO/tao/Messaging_PolicyValueC.i @@ -26,24 +26,6 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html -// TAO_IDL - Generated from -// be/be_visitor_sequence/cdr_op_ci.cpp:81 - -#if !defined _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_CORBA_Octet__I_ -#define _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_CORBA_Octet__I_ - -CORBA::Boolean TAO_Export operator<< ( - TAO_OutputCDR &, - const Messaging::PolicyValue::_tao_seq_CORBA_Octet_ & - ); - -CORBA::Boolean TAO_Export operator>> ( - TAO_InputCDR &, - Messaging::PolicyValue::_tao_seq_CORBA_Octet_ & - ); - -#endif /* _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_CORBA_Octet__I_ */ - // TAO_IDL - Generated from // be/be_visitor_structure/cdr_op_ci.cpp:70 diff --git a/TAO/tao/TAOA.cpp b/TAO/tao/TAOA.cpp new file mode 100644 index 00000000000..dda09970564 --- /dev/null +++ b/TAO/tao/TAOA.cpp @@ -0,0 +1,188 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + +#include "TAOC.h" +#include "TAOA.h" +#include "tao/Typecode.h" +#include "tao/Any_Impl_T.h" +#include "tao/Any_Dual_Impl_T.h" + +// TAO_IDL - Generated from +// be/be_visitor_structure/any_op_cs.cpp:54 + +// Copying insertion. +void operator<<= ( + CORBA::Any &_tao_any, + const TAO::BufferingConstraint &_tao_elem + ) +{ + TAO::Any_Dual_Impl_T::insert_copy ( + _tao_any, + TAO::BufferingConstraint::_tao_any_destructor, + TAO::_tc_BufferingConstraint, + _tao_elem + ); +} + +// Non-copying insertion. +void operator<<= ( + CORBA::Any &_tao_any, + TAO::BufferingConstraint *_tao_elem + ) +{ + TAO::Any_Dual_Impl_T::insert ( + _tao_any, + TAO::BufferingConstraint::_tao_any_destructor, + TAO::_tc_BufferingConstraint, + _tao_elem + ); +} + +// Extraction to non-const pointer (deprecated). +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + TAO::BufferingConstraint *&_tao_elem + ) +{ + return _tao_any >>= ACE_const_cast ( + const TAO::BufferingConstraint *&, + _tao_elem + ); +} + +// Extraction to const pointer. +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + const TAO::BufferingConstraint *&_tao_elem + ) +{ + return + TAO::Any_Dual_Impl_T::extract ( + _tao_any, + TAO::BufferingConstraint::_tao_any_destructor, + TAO::_tc_BufferingConstraint, + _tao_elem + ); +} + +// TAO_IDL - Generated from +// be/be_visitor_interface/any_op_cs.cpp:50 + +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::Any_Impl_T::to_object ( + CORBA::Object_ptr &_tao_elem + ) const +{ + _tao_elem = CORBA::Object::_duplicate (this->value_); + return 1; +} + +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::Any_Impl_T::marshal_value (TAO_OutputCDR &) +{ + return 0; +} + +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::Any_Impl_T::demarshal_value (TAO_InputCDR &) +{ + return 0; +} + +// Copying insertion. +void +operator<<= ( + CORBA::Any &_tao_any, + TAO::BufferingConstraintPolicy_ptr _tao_elem + ) +{ + TAO::BufferingConstraintPolicy_ptr _tao_objptr = + TAO::BufferingConstraintPolicy::_duplicate (_tao_elem); + _tao_any <<= &_tao_objptr; +} + +// Non-copying insertion. +void +operator<<= ( + CORBA::Any &_tao_any, + TAO::BufferingConstraintPolicy_ptr *_tao_elem + ) +{ + TAO::Any_Impl_T::insert ( + _tao_any, + TAO::BufferingConstraintPolicy::_tao_any_destructor, + TAO::_tc_BufferingConstraintPolicy, + *_tao_elem + ); +} + +CORBA::Boolean +operator>>= ( + const CORBA::Any &_tao_any, + TAO::BufferingConstraintPolicy_ptr &_tao_elem + ) +{ + return + TAO::Any_Impl_T::extract ( + _tao_any, + TAO::BufferingConstraintPolicy::_tao_any_destructor, + TAO::_tc_BufferingConstraintPolicy, + _tao_elem + ); +} + + + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + + template class + TAO::Any_Dual_Impl_T< + TAO::BufferingConstraint + >; + + template class + TAO::Any_Impl_T< + TAO::BufferingConstraintPolicy + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + TAO::BufferingConstraint \ + > + +# pragma instantiate \ + TAO::Any_Impl_T< \ + TAO::BufferingConstraintPolicy \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/TAOA.h b/TAO/tao/TAOA.h new file mode 100644 index 00000000000..7eb3d0cc36a --- /dev/null +++ b/TAO/tao/TAOA.h @@ -0,0 +1,54 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + +// TAO_IDL - Generated from +// be/be_codegen.cpp:848 + +#ifndef _TAO_IDL_ORIG_TAOA_ANYOP_H_ +#define _TAO_IDL_ORIG_TAOA_ANYOP_H_ + +#include /**/ "ace/pre.h" + +// TAO_IDL - Generated from +// be/be_visitor_structure/any_op_ch.cpp:52 + +TAO_Export void operator<<= (CORBA::Any &, const TAO::BufferingConstraint &); // copying version +TAO_Export void operator<<= (CORBA::Any &, TAO::BufferingConstraint*); // noncopying version +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::BufferingConstraint *&); // deprecated +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO::BufferingConstraint *&); + +// TAO_IDL - Generated from +// be/be_visitor_interface/any_op_ch.cpp:52 + +TAO_Export void operator<<= (CORBA::Any &, TAO::BufferingConstraintPolicy_ptr); // copying +TAO_Export void operator<<= (CORBA::Any &, TAO::BufferingConstraintPolicy_ptr *); // non-copying +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::BufferingConstraintPolicy_ptr &); + +#include /**/ "ace/post.h" + +#endif /* ifndef */ + diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp index 3d873169c1f..1c7e152b333 100644 --- a/TAO/tao/TAOC.cpp +++ b/TAO/tao/TAOC.cpp @@ -26,13 +26,11 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be/be_codegen.cpp:302 +// be/be_codegen.cpp:338 #include "TAOC.h" #include "tao/Typecode.h" -#include "tao/Any_Impl_T.h" -#include "tao/Any_Dual_Impl_T.h" #include "ace/OS_NS_string.h" #if defined (__BORLANDC__) @@ -51,6 +49,7 @@ namespace TAO { } + // TAO_IDL - Generated from // be/be_visitor_typecode/typecode_defn.cpp:284 @@ -58,22 +57,22 @@ static const CORBA::Long _oc_TAO_BufferingConstraintMode[] = { TAO_ENCAP_BYTE_ORDER, // byte order 40, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x74616f2f), - ACE_NTOHL (0x54414f2f), - ACE_NTOHL (0x42756666), - ACE_NTOHL (0x6572696e), - ACE_NTOHL (0x67436f6e), - ACE_NTOHL (0x73747261), - ACE_NTOHL (0x696e744d), - ACE_NTOHL (0x6f64653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x74616f2f), + ACE_NTOHL (0x54414f2f), + ACE_NTOHL (0x42756666), + ACE_NTOHL (0x6572696e), + ACE_NTOHL (0x67436f6e), + ACE_NTOHL (0x73747261), + ACE_NTOHL (0x696e744d), + ACE_NTOHL (0x6f64653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:tao/TAO/BufferingConstraintMode:1.0 24, - ACE_NTOHL (0x42756666), - ACE_NTOHL (0x6572696e), - ACE_NTOHL (0x67436f6e), - ACE_NTOHL (0x73747261), - ACE_NTOHL (0x696e744d), + ACE_NTOHL (0x42756666), + ACE_NTOHL (0x6572696e), + ACE_NTOHL (0x67436f6e), + ACE_NTOHL (0x73747261), + ACE_NTOHL (0x696e744d), ACE_NTOHL (0x6f646500), // name = BufferingConstraintMode CORBA::tk_ushort, @@ -100,81 +99,81 @@ static const CORBA::Long _oc_TAO_BufferingConstraint[] = { TAO_ENCAP_BYTE_ORDER, // byte order 36, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x74616f2f), - ACE_NTOHL (0x54414f2f), - ACE_NTOHL (0x42756666), - ACE_NTOHL (0x6572696e), - ACE_NTOHL (0x67436f6e), - ACE_NTOHL (0x73747261), - ACE_NTOHL (0x696e743a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x74616f2f), + ACE_NTOHL (0x54414f2f), + ACE_NTOHL (0x42756666), + ACE_NTOHL (0x6572696e), + ACE_NTOHL (0x67436f6e), + ACE_NTOHL (0x73747261), + ACE_NTOHL (0x696e743a), ACE_NTOHL (0x312e3000), // repository ID = IDL:tao/TAO/BufferingConstraint:1.0 20, - ACE_NTOHL (0x42756666), - ACE_NTOHL (0x6572696e), - ACE_NTOHL (0x67436f6e), - ACE_NTOHL (0x73747261), + ACE_NTOHL (0x42756666), + ACE_NTOHL (0x6572696e), + ACE_NTOHL (0x67436f6e), + ACE_NTOHL (0x73747261), ACE_NTOHL (0x696e7400), // name = BufferingConstraint 4, // member count 5, - ACE_NTOHL (0x6d6f6465), + ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode CORBA::tk_alias, // typecode kind for typedefs 80, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 40, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x74616f2f), - ACE_NTOHL (0x54414f2f), - ACE_NTOHL (0x42756666), - ACE_NTOHL (0x6572696e), - ACE_NTOHL (0x67436f6e), - ACE_NTOHL (0x73747261), - ACE_NTOHL (0x696e744d), - ACE_NTOHL (0x6f64653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x74616f2f), + ACE_NTOHL (0x54414f2f), + ACE_NTOHL (0x42756666), + ACE_NTOHL (0x6572696e), + ACE_NTOHL (0x67436f6e), + ACE_NTOHL (0x73747261), + ACE_NTOHL (0x696e744d), + ACE_NTOHL (0x6f64653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:tao/TAO/BufferingConstraintMode:1.0 24, - ACE_NTOHL (0x42756666), - ACE_NTOHL (0x6572696e), - ACE_NTOHL (0x67436f6e), - ACE_NTOHL (0x73747261), - ACE_NTOHL (0x696e744d), + ACE_NTOHL (0x42756666), + ACE_NTOHL (0x6572696e), + ACE_NTOHL (0x67436f6e), + ACE_NTOHL (0x73747261), + ACE_NTOHL (0x696e744d), ACE_NTOHL (0x6f646500), // name = BufferingConstraintMode CORBA::tk_ushort, 8, - ACE_NTOHL (0x74696d65), + ACE_NTOHL (0x74696d65), ACE_NTOHL (0x6f757400), // name = timeout CORBA::tk_alias, // typecode kind for typedefs 56, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 31, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x54696d65), - ACE_NTOHL (0x42617365), - ACE_NTOHL (0x2f54696d), - ACE_NTOHL (0x65543a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x54696d65), + ACE_NTOHL (0x42617365), + ACE_NTOHL (0x2f54696d), + ACE_NTOHL (0x65543a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/TimeBase/TimeT:1.0 6, - ACE_NTOHL (0x54696d65), + ACE_NTOHL (0x54696d65), ACE_NTOHL (0x54000000), // name = TimeT CORBA::tk_ulonglong, 14, - ACE_NTOHL (0x6d657373), - ACE_NTOHL (0x6167655f), - ACE_NTOHL (0x636f756e), + ACE_NTOHL (0x6d657373), + ACE_NTOHL (0x6167655f), + ACE_NTOHL (0x636f756e), ACE_NTOHL (0x74000000), // name = message_count CORBA::tk_ulong, 14, - ACE_NTOHL (0x6d657373), - ACE_NTOHL (0x6167655f), - ACE_NTOHL (0x62797465), + ACE_NTOHL (0x6d657373), + ACE_NTOHL (0x6167655f), + ACE_NTOHL (0x62797465), ACE_NTOHL (0x73000000), // name = message_bytes CORBA::tk_ulong, @@ -194,10 +193,10 @@ namespace TAO &_tc_TAO_tc_TAO_BufferingConstraint; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_visitor_structure/structure_cs.cpp:66 -void +void TAO::BufferingConstraint::_tao_any_destructor ( void *_tao_void_pointer ) @@ -212,7 +211,7 @@ TAO::BufferingConstraint::_tao_any_destructor ( // Traits specializations for TAO::BufferingConstraintPolicy. -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION +ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION TAO::BufferingConstraintPolicy_ptr TAO::Objref_Traits::tao_duplicate ( TAO::BufferingConstraintPolicy_ptr p @@ -221,7 +220,7 @@ TAO::Objref_Traits::tao_duplicate ( return TAO::BufferingConstraintPolicy::_duplicate (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION +ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION void TAO::Objref_Traits::tao_release ( TAO::BufferingConstraintPolicy_ptr p @@ -230,14 +229,14 @@ TAO::Objref_Traits::tao_release ( CORBA::release (p); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION +ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION TAO::BufferingConstraintPolicy_ptr TAO::Objref_Traits::tao_nil (void) { return TAO::BufferingConstraintPolicy::_nil (); } -ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION +ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION CORBA::Boolean TAO::Objref_Traits::tao_marshal ( TAO::BufferingConstraintPolicy_ptr p, @@ -284,6 +283,23 @@ TAO::BufferingConstraintPolicy::_narrow ( return BufferingConstraintPolicy::_duplicate (proxy); } +TAO::BufferingConstraintPolicy_ptr +TAO::BufferingConstraintPolicy::_unchecked_narrow ( + CORBA::Object_ptr _tao_objref + ACE_ENV_ARG_DECL_NOT_USED + ) +{ + if (CORBA::is_nil (_tao_objref)) + { + return BufferingConstraintPolicy::_nil (); + } + + BufferingConstraintPolicy_ptr proxy = + dynamic_cast (_tao_objref); + + return BufferingConstraintPolicy::_duplicate (proxy); +} + TAO::BufferingConstraintPolicy_ptr TAO::BufferingConstraintPolicy::_duplicate (BufferingConstraintPolicy_ptr obj) { @@ -381,135 +397,8 @@ namespace TAO &_tc_TAO_tc_TAO_BufferingConstraintPolicy; } -// TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 - -// Copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - const TAO::BufferingConstraint &_tao_elem - ) -{ - TAO::Any_Dual_Impl_T::insert_copy ( - _tao_any, - TAO::BufferingConstraint::_tao_any_destructor, - TAO::_tc_BufferingConstraint, - _tao_elem - ); -} - -// Non-copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - TAO::BufferingConstraint *_tao_elem - ) -{ - TAO::Any_Dual_Impl_T::insert ( - _tao_any, - TAO::BufferingConstraint::_tao_any_destructor, - TAO::_tc_BufferingConstraint, - _tao_elem - ); -} - -// Extraction to non-const pointer (deprecated). -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - TAO::BufferingConstraint *&_tao_elem - ) -{ - return _tao_any >>= ACE_const_cast ( - const TAO::BufferingConstraint *&, - _tao_elem - ); -} - -// Extraction to const pointer. -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - const TAO::BufferingConstraint *&_tao_elem - ) -{ - return - TAO::Any_Dual_Impl_T::extract ( - _tao_any, - TAO::BufferingConstraint::_tao_any_destructor, - TAO::_tc_BufferingConstraint, - _tao_elem - ); -} - -// TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:50 - -ACE_TEMPLATE_SPECIALIZATION -CORBA::Boolean -TAO::Any_Impl_T::to_object ( - CORBA::Object_ptr &_tao_elem - ) const -{ - _tao_elem = CORBA::Object::_duplicate (this->value_); - return 1; -} - -ACE_TEMPLATE_SPECIALIZATION -CORBA::Boolean -TAO::Any_Impl_T::marshal_value (TAO_OutputCDR &) -{ - return 0; -} - -ACE_TEMPLATE_SPECIALIZATION -CORBA::Boolean -TAO::Any_Impl_T::demarshal_value (TAO_InputCDR &) -{ - return 0; -} - -// Copying insertion. -void -operator<<= ( - CORBA::Any &_tao_any, - TAO::BufferingConstraintPolicy_ptr _tao_elem - ) -{ - TAO::BufferingConstraintPolicy_ptr _tao_objptr = - TAO::BufferingConstraintPolicy::_duplicate (_tao_elem); - _tao_any <<= &_tao_objptr; -} - -// Non-copying insertion. -void -operator<<= ( - CORBA::Any &_tao_any, - TAO::BufferingConstraintPolicy_ptr *_tao_elem - ) -{ - TAO::Any_Impl_T::insert ( - _tao_any, - TAO::BufferingConstraintPolicy::_tao_any_destructor, - TAO::_tc_BufferingConstraintPolicy, - *_tao_elem - ); -} - -CORBA::Boolean -operator>>= ( - const CORBA::Any &_tao_any, - TAO::BufferingConstraintPolicy_ptr &_tao_elem - ) -{ - return - TAO::Any_Impl_T::extract ( - _tao_any, - TAO::BufferingConstraintPolicy::_tao_any_destructor, - TAO::_tc_BufferingConstraintPolicy, - _tao_elem - ); -} - // TAO_IDL - Generated from -// be/be_visitor_root/root.cpp:1702 +// be/be_visitor_root/root.cpp:1725 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) @@ -523,11 +412,6 @@ operator>>= ( TAO::BufferingConstraint >; - template class - TAO::Any_Dual_Impl_T< - TAO::BufferingConstraint - >; - template class TAO::Objref_Traits< TAO::BufferingConstraintPolicy @@ -543,11 +427,6 @@ operator>>= ( TAO::BufferingConstraintPolicy >; - template class - TAO::Any_Impl_T< - TAO::BufferingConstraintPolicy - >; - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ @@ -560,11 +439,6 @@ operator>>= ( TAO::BufferingConstraint \ > -# pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - TAO::BufferingConstraint \ - > - # pragma instantiate \ TAO::Objref_Traits< \ TAO::BufferingConstraintPolicy \ @@ -580,10 +454,5 @@ operator>>= ( TAO::BufferingConstraintPolicy > -# pragma instantiate \ - TAO::Any_Impl_T< \ - TAO::BufferingConstraintPolicy \ - > - #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/TAOC.h b/TAO/tao/TAOC.h index e7b595a7485..c62f8671241 100644 --- a/TAO/tao/TAOC.h +++ b/TAO/tao/TAOC.h @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be/be_codegen.cpp:150 +// be/be_codegen.cpp:186 #ifndef _TAO_IDL_ORIG_TAOC_H_ #define _TAO_IDL_ORIG_TAOC_H_ @@ -65,13 +65,13 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_visitor_root/root_ch.cpp:63 namespace TAO { class Collocation_Proxy_Broker; - + template class Narrow_Utils; template class AbstractBase_Narrow_Utils; } @@ -81,92 +81,92 @@ namespace TAO namespace TAO { - + // TAO_IDL - Generated from // be/be_visitor_typedef/typedef_ch.cpp:342 - + typedef CORBA::UShort BufferingConstraintMode; typedef CORBA::UShort_out BufferingConstraintMode_out; - + // TAO_IDL - Generated from // be/be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BufferingConstraintMode; - + // TAO_IDL - Generated from // be/be_visitor_constant/constant_ch.cpp:52 - + const TAO::BufferingConstraintMode BUFFER_FLUSH = 0U; - + // TAO_IDL - Generated from // be/be_visitor_constant/constant_ch.cpp:52 - + const TAO::BufferingConstraintMode BUFFER_TIMEOUT = 1U; - + // TAO_IDL - Generated from // be/be_visitor_constant/constant_ch.cpp:52 - + const TAO::BufferingConstraintMode BUFFER_MESSAGE_COUNT = 2U; - + // TAO_IDL - Generated from // be/be_visitor_constant/constant_ch.cpp:52 - + const TAO::BufferingConstraintMode BUFFER_MESSAGE_BYTES = 4U; - + // TAO_IDL - Generated from // be/be_type.cpp:258 - + struct BufferingConstraint; - + typedef TAO_Fixed_Var_T< BufferingConstraint > BufferingConstraint_var; - + typedef BufferingConstraint & BufferingConstraint_out; - + // TAO_IDL - Generated from // be/be_visitor_structure/structure_ch.cpp:52 - + struct TAO_Export BufferingConstraint { typedef BufferingConstraint_var _var_type; - + static void _tao_any_destructor (void *); TAO::BufferingConstraintMode mode; TimeBase::TimeT timeout; CORBA::ULong message_count; CORBA::ULong message_bytes; }; - + // TAO_IDL - Generated from // be/be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BufferingConstraint; - + // TAO_IDL - Generated from // be/be_visitor_constant/constant_ch.cpp:52 - + const CORBA::PolicyType BUFFERING_CONSTRAINT_POLICY_TYPE = 1413545985U; - + // TAO_IDL - Generated from - // be/be_interface.cpp:612 + // be/be_interface.cpp:611 #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY__VAR_OUT_CH_) #define _TAO_BUFFERINGCONSTRAINTPOLICY__VAR_OUT_CH_ - + class BufferingConstraintPolicy; typedef BufferingConstraintPolicy *BufferingConstraintPolicy_ptr; - + typedef TAO_Objref_Var_T< BufferingConstraintPolicy > BufferingConstraintPolicy_var; - + typedef TAO_Objref_Out_T< BufferingConstraintPolicy @@ -174,84 +174,89 @@ namespace TAO BufferingConstraintPolicy_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be/be_visitor_interface/interface_ch.cpp:54 #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY_CH_) #define _TAO_BUFFERINGCONSTRAINTPOLICY_CH_ - + class TAO_Export BufferingConstraintPolicy : public virtual CORBA::Policy { public: typedef BufferingConstraintPolicy_ptr _ptr_type; typedef BufferingConstraintPolicy_var _var_type; - + // The static operations. static BufferingConstraintPolicy_ptr _duplicate (BufferingConstraintPolicy_ptr obj); - + static BufferingConstraintPolicy_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + + static BufferingConstraintPolicy_ptr _unchecked_narrow ( + CORBA::Object_ptr obj + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); + static BufferingConstraintPolicy_ptr _nil (void) { return (BufferingConstraintPolicy_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be/be_visitor_operation/operation_ch.cpp:46 - + virtual ::TAO::BufferingConstraint buffering_constraint ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:192 - + // be/be_visitor_interface/interface_ch.cpp:196 + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. BufferingConstraintPolicy (void); - + virtual ~BufferingConstraintPolicy (void); - + private: // Private and unimplemented for concrete interfaces. BufferingConstraintPolicy (const BufferingConstraintPolicy &); - + void operator= (const BufferingConstraintPolicy &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be/be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BufferingConstraintPolicy; - + // TAO_IDL - Generated from // be/be_visitor_constant/constant_ch.cpp:52 - + const Messaging::SyncScope SYNC_EAGER_BUFFERING = 0; - + // TAO_IDL - Generated from // be/be_visitor_constant/constant_ch.cpp:52 - + const Messaging::SyncScope SYNC_DELAYED_BUFFERING = -2; // TAO_IDL - Generated from @@ -260,7 +265,7 @@ namespace TAO } // module TAO // TAO_IDL - Generated from -// be/be_visitor_traits.cpp:50 +// be/be_visitor_traits.cpp:59 // Traits specializations. namespace TAO @@ -268,7 +273,7 @@ namespace TAO #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY__TRAITS_CH_) #define _TAO_BUFFERINGCONSTRAINTPOLICY__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits { @@ -288,21 +293,6 @@ namespace TAO #endif /* end #if !defined */ } -// TAO_IDL - Generated from -// be/be_visitor_structure/any_op_ch.cpp:52 - -TAO_Export void operator<<= (CORBA::Any &, const TAO::BufferingConstraint &); // copying version -TAO_Export void operator<<= (CORBA::Any &, TAO::BufferingConstraint*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::BufferingConstraint *&); // deprecated -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO::BufferingConstraint *&); - -// TAO_IDL - Generated from -// be/be_visitor_interface/any_op_ch.cpp:52 - -TAO_Export void operator<<= (CORBA::Any &, TAO::BufferingConstraintPolicy_ptr); // copying -TAO_Export void operator<<= (CORBA::Any &, TAO::BufferingConstraintPolicy_ptr *); // non-copying -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::BufferingConstraintPolicy_ptr &); - // TAO_IDL - Generated from // be/be_visitor_root/cdr_op.cpp:48 @@ -320,7 +310,7 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO::BufferingConstraint & #endif /* __ACE_INLINE__ */ // TAO_IDL - Generated from -// be/be_codegen.cpp:911 +// be/be_codegen.cpp:1050 #if defined (__ACE_INLINE__) #include "TAOC.i" diff --git a/TAO/tao/WrongTransaction.pidl b/TAO/tao/WrongTransaction.pidl index 2b5ac5fa4e8..46211bc84a2 100644 --- a/TAO/tao/WrongTransaction.pidl +++ b/TAO/tao/WrongTransaction.pidl @@ -10,7 +10,7 @@ * following command: * * tao_idl - * -o orig -Ge 1 -GT + * -o orig -Ge 1 -GT -GA * -Wb,export_macro=TAO_Export * -Wb,export_include=tao/TAO_Export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/WrongTransactionA.cpp b/TAO/tao/WrongTransactionA.cpp new file mode 100644 index 00000000000..e52519b156c --- /dev/null +++ b/TAO/tao/WrongTransactionA.cpp @@ -0,0 +1,135 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + +#include "WrongTransactionC.h" +#include "WrongTransactionA.h" +#include "tao/Typecode.h" +#include "tao/Any_Dual_Impl_T.h" + +// TAO_IDL - Generated from +// be/be_visitor_exception/any_op_cs.cpp:50 + +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::Any_Dual_Impl_T::demarshal_value ( + TAO_InputCDR & cdr + ) +{ + CORBA::String_var id; + + if ((cdr >> id.out ()) == 0) + { + return 0; + } + + ACE_TRY_NEW_ENV + { + this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + return 0; + } + ACE_ENDTRY; + + return 1; +} + +// Copying insertion. +void operator<<= ( + CORBA::Any &_tao_any, + const CORBA::WrongTransaction &_tao_elem + ) +{ + TAO::Any_Dual_Impl_T::insert_copy ( + _tao_any, + CORBA::WrongTransaction::_tao_any_destructor, + CORBA::_tc_WrongTransaction, + _tao_elem + ); +} + +// Non-copying insertion. +void operator<<= ( + CORBA::Any &_tao_any, + CORBA::WrongTransaction *_tao_elem + ) +{ + TAO::Any_Dual_Impl_T::insert ( + _tao_any, + CORBA::WrongTransaction::_tao_any_destructor, + CORBA::_tc_WrongTransaction, + _tao_elem + ); +} + +// Extraction to non-const pointer (deprecated). +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + CORBA::WrongTransaction *&_tao_elem + ) +{ + return _tao_any >>= ACE_const_cast ( + const CORBA::WrongTransaction *&, + _tao_elem + ); +} + +// Extraction to const pointer. +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + const CORBA::WrongTransaction *&_tao_elem + ) +{ + return + TAO::Any_Dual_Impl_T::extract ( + _tao_any, + CORBA::WrongTransaction::_tao_any_destructor, + CORBA::_tc_WrongTransaction, + _tao_elem + ); +} + + + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + + template class + TAO::Any_Dual_Impl_T< + CORBA::WrongTransaction + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + CORBA::WrongTransaction \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/WrongTransactionA.h b/TAO/tao/WrongTransactionA.h new file mode 100644 index 00000000000..add59879149 --- /dev/null +++ b/TAO/tao/WrongTransactionA.h @@ -0,0 +1,47 @@ +// -*- C++ -*- +// +// $Id$ + +// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** +// TAO and the TAO IDL Compiler have been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// and +// Distributed Object Computing Laboratory +// University of California at Irvine +// Irvine, CA +// USA +// http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about TAO is available at: +// http://www.cs.wustl.edu/~schmidt/TAO.html + +// TAO_IDL - Generated from +// be/be_codegen.cpp:848 + +#ifndef _TAO_IDL_ORIG_WRONGTRANSACTIONA_ANYOP_H_ +#define _TAO_IDL_ORIG_WRONGTRANSACTIONA_ANYOP_H_ + +#include /**/ "ace/pre.h" + +// TAO_IDL - Generated from +// be/be_visitor_exception/any_op_ch.cpp:52 + +TAO_Export void operator<<= (CORBA::Any &, const CORBA::WrongTransaction &); // copying version +TAO_Export void operator<<= (CORBA::Any &, CORBA::WrongTransaction*); // noncopying version +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::WrongTransaction *&); // deprecated +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::WrongTransaction *&); + +#include /**/ "ace/post.h" + +#endif /* ifndef */ + diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp index 1afc35a0083..ec27b7367ec 100644 --- a/TAO/tao/WrongTransactionC.cpp +++ b/TAO/tao/WrongTransactionC.cpp @@ -26,15 +26,12 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:301 +// be/be_codegen.cpp:338 #include "WrongTransactionC.h" - -#if (TAO_HAS_MINIMUM_CORBA == 0) - -#include "tao/Any_Dual_Impl_T.h" #include "tao/Typecode.h" +#include "ace/OS_NS_string.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig @@ -44,18 +41,17 @@ #include "WrongTransactionC.i" #endif /* !defined INLINE */ -#include "ace/OS_NS_string.h" - // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:59 +// be/be_visitor_arg_traits.cpp:62 // Arg traits specializations. namespace TAO { } -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63 + +// TAO_IDL - Generated from +// be/be_visitor_exception/exception_cs.cpp:63 CORBA::WrongTransaction::WrongTransaction (void) : CORBA::UserException ( @@ -94,8 +90,7 @@ void CORBA::WrongTransaction::_tao_any_destructor (void *_tao_void_pointer) CORBA::WrongTransaction * CORBA::WrongTransaction::_downcast (CORBA::Exception *_tao_excp) { - if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/WrongTransaction:1.0", - _tao_excp->_rep_id ())) + if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/WrongTransaction:1.0", _tao_excp->_rep_id ())) { return ACE_dynamic_cast (WrongTransaction *, _tao_excp); } @@ -138,7 +133,7 @@ void CORBA::WrongTransaction::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -151,7 +146,7 @@ void CORBA::WrongTransaction::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -162,27 +157,27 @@ CORBA::TypeCode_ptr CORBA::WrongTransaction::_type (void) const } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 +// be/be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_CORBA_WrongTransaction[] = { TAO_ENCAP_BYTE_ORDER, // byte order 39, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f5772), - ACE_NTOHL (0x6f6e6754), - ACE_NTOHL (0x72616e73), - ACE_NTOHL (0x61637469), - ACE_NTOHL (0x6f6e3a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f5772), + ACE_NTOHL (0x6f6e6754), + ACE_NTOHL (0x72616e73), + ACE_NTOHL (0x61637469), + ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/WrongTransaction:1.0 17, - ACE_NTOHL (0x57726f6e), - ACE_NTOHL (0x67547261), - ACE_NTOHL (0x6e736163), - ACE_NTOHL (0x74696f6e), + ACE_NTOHL (0x57726f6e), + ACE_NTOHL (0x67547261), + ACE_NTOHL (0x6e736163), + ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = WrongTransaction 0, // member count }; @@ -202,107 +197,11 @@ namespace CORBA } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:50 - -ACE_TEMPLATE_SPECIALIZATION -CORBA::Boolean -TAO::Any_Dual_Impl_T::demarshal_value ( - TAO_InputCDR & cdr - ) -{ - CORBA::String_var id; - - if ((cdr >> id.out ()) == 0) - { - return 0; - } - - ACE_TRY_NEW_ENV - { - this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - return 0; - } - ACE_ENDTRY; - - return 1; -} - -// Copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - const CORBA::WrongTransaction &_tao_elem - ) -{ - TAO::Any_Dual_Impl_T::insert_copy ( - _tao_any, - CORBA::WrongTransaction::_tao_any_destructor, - CORBA::_tc_WrongTransaction, - _tao_elem - ); -} - -// Non-copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - CORBA::WrongTransaction *_tao_elem - ) -{ - TAO::Any_Dual_Impl_T::insert ( - _tao_any, - CORBA::WrongTransaction::_tao_any_destructor, - CORBA::_tc_WrongTransaction, - _tao_elem - ); -} - -// Extraction to non-const pointer (deprecated). -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - CORBA::WrongTransaction *&_tao_elem - ) -{ - return _tao_any >>= ACE_const_cast ( - const CORBA::WrongTransaction *&, - _tao_elem - ); -} - -// Extraction to const pointer. -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - const CORBA::WrongTransaction *&_tao_elem - ) -{ - return - TAO::Any_Dual_Impl_T::extract ( - _tao_any, - CORBA::WrongTransaction::_tao_any_destructor, - CORBA::_tc_WrongTransaction, - _tao_elem - ); -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1703 +// be/be_visitor_root/root.cpp:1725 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class - TAO::Any_Dual_Impl_T< - CORBA::WrongTransaction - >; - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - CORBA::WrongTransaction \ - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h index 7fce5653637..2a6da3447d8 100644 --- a/TAO/tao/WrongTransactionC.h +++ b/TAO/tao/WrongTransactionC.h @@ -26,22 +26,22 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151 +// be/be_codegen.cpp:186 #ifndef _TAO_IDL_ORIG_WRONGTRANSACTIONC_H_ #define _TAO_IDL_ORIG_WRONGTRANSACTIONC_H_ #include /**/ "ace/pre.h" -#include "tao/Exception.h" - -#if (TAO_HAS_MINIMUM_CORBA == 0) +#include "tao/ORB.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/TAO_Export.h" #include "tao/CDR.h" +#include "tao/Environment.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -67,29 +67,29 @@ #endif /* __BORLANDC__ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48 +// be/be_visitor_module/module_ch.cpp:48 namespace CORBA { - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51 + // be/be_visitor_exception/exception_ch.cpp:51 #if !defined (_CORBA_WRONGTRANSACTION_CH_) #define _CORBA_WRONGTRANSACTION_CH_ - + class TAO_Export WrongTransaction : public CORBA::UserException { public: - + WrongTransaction (void); WrongTransaction (const WrongTransaction &); ~WrongTransaction (void); WrongTransaction &operator= (const WrongTransaction &); - + static void _tao_any_destructor (void *); - + static WrongTransaction *_downcast (CORBA::Exception *); static CORBA::Exception *_alloc (void); @@ -101,32 +101,32 @@ namespace CORBA TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125 - + // be/be_visitor_exception/exception_ch.cpp:125 + virtual CORBA::TypeCode_ptr _type (void) const; }; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + // be/be_visitor_typecode/typecode_decl.cpp:44 + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_WrongTransaction; #endif /* end #if !defined */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:66 +// be/be_visitor_module/module_ch.cpp:66 } // module CORBA // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:48 +// be/be_visitor_traits.cpp:59 // Traits specializations. namespace TAO @@ -134,31 +134,23 @@ namespace TAO } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52 - -TAO_Export void operator<<= (CORBA::Any &, const CORBA::WrongTransaction &); // copying version -TAO_Export void operator<<= (CORBA::Any &, CORBA::WrongTransaction*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::WrongTransaction *&); // deprecated -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::WrongTransaction *&); - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48 +// be/be_visitor_root/cdr_op.cpp:48 #ifndef __ACE_INLINE__ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ch.cpp:52 +// be/be_visitor_exception/cdr_op_ch.cpp:52 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::WrongTransaction &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::WrongTransaction &); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64 +// be/be_visitor_root/cdr_op.cpp:64 #endif /* __ACE_INLINE__ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:969 +// be/be_codegen.cpp:1050 #if defined (__ACE_INLINE__) #include "WrongTransactionC.i" @@ -172,7 +164,7 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::WrongTransaction &) #pragma option pop #endif /* __BORLANDC__ */ -#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ - #include /**/ "ace/post.h" + #endif /* ifndef */ + diff --git a/TAO/tao/WrongTransactionC.i b/TAO/tao/WrongTransactionC.i index 2ded907841f..124ddda34fe 100644 --- a/TAO/tao/WrongTransactionC.i +++ b/TAO/tao/WrongTransactionC.i @@ -27,7 +27,7 @@ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:71 +// be/be_visitor_exception/cdr_op_ci.cpp:71 ACE_INLINE CORBA::Boolean operator<< ( diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc index 2d7e00aaf62..ca592979c0a 100644 --- a/TAO/tao/tao.mpc +++ b/TAO/tao/tao.mpc @@ -82,6 +82,7 @@ project(TAO) : acelib, taoversion, core, tao_output, extra_core { CurrentA.cpp Exception.cpp WrongTransactionC.cpp + WrongTransactionA.cpp Environment.cpp Object.cpp LocalObject.cpp @@ -194,6 +195,7 @@ project(TAO) : acelib, taoversion, core, tao_output, extra_core { BoundsC.cpp BoundsA.cpp TAOC.cpp + TAOA.cpp Object_Loader.cpp TAO_Singleton_Manager.cpp DLL_ORB.cpp -- cgit v1.2.1