diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-09-01 18:54:56 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-09-01 18:54:56 +0000 |
| commit | f485a3a4e6ff10b19fb69cbab6f9847c83a228bc (patch) | |
| tree | e14cf34a1484849348ec94da45085f89dcfc82fe | |
| parent | fc6d932f321c1bf5a62c6ccd60154ed744310f3c (diff) | |
| download | ATCD-f485a3a4e6ff10b19fb69cbab6f9847c83a228bc.tar.gz | |
ChangeLogTag: Mon Sep 1 13:51:32 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
66 files changed, 7635 insertions, 6331 deletions
diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref index 9e3e04e998f..8fb43413bd2 100644 --- a/TAO/ChangeLog_ref +++ b/TAO/ChangeLog_ref @@ -1,3 +1,76 @@ +Mon Sep 1 13:51:32 2003 Jeff Parsons <j.parsons@vanderbilt.edu> + + * tao/BoundsC.h: + * tao/CONV_FRAMEC.h: + * tao/CurrentC.cpp: + * tao/CurrentC.h: + * tao/DomainC.cpp: + * tao/DomainC.h: + * tao/DynamicC.h: + * tao/GIOPC.h: + * tao/IIOPC.h: + * tao/IOPC.h: + * tao/IOP_CodecC.cpp: + * tao/IOP_CodecC.h: + * tao/IOP_CodecC.i: + * tao/IOP_IORC.h: + * tao/Messaging_PolicyValueC.h: + * tao/ObjectIdList.pidl: + * tao/ObjectIdListC.cpp: + * tao/ObjectIdListC.h: + * tao/ObjectIdListC.i: + * tao/Object_KeyC.cpp: + * tao/Object_KeyC.h: + * tao/Object_KeyC.i: + * tao/Objref_VarOut_T.cpp: + * tao/OctetSeq.pidl: + * tao/OctetSeqC.cpp: + * tao/OctetSeqC.h: + * tao/OctetSeqC.i: + * tao/PI_Forward.pidl: + * tao/PI_ForwardC.cpp: + * tao/PI_ForwardC.h: + * tao/PI_ForwardC.i: + * tao/PolicyC.cpp: + * tao/PolicyC.h: + * tao/PolicyC.i: + * tao/Policy_Forward.pidl: + * tao/Policy_ForwardC.cpp: + * tao/Policy_ForwardC.h: + * tao/Policy_ForwardC.i: + * tao/Pollable.pidl: + * tao/PollableC.cpp: + * tao/PollableC.h: + * tao/PollableC.i: + * tao/PortableInterceptor.pidl: + * tao/PortableInterceptorC.cpp: + * tao/PortableInterceptorC.h: + * tao/PortableInterceptorC.i: + * tao/Services.pidl: + * tao/ServicesC.cpp: + * tao/ServicesC.h: + * tao/ServicesC.i: + * tao/StringSeq.pidl: + * tao/StringSeqC.cpp: + * tao/StringSeqC.h: + * tao/StringSeqC.i: + * tao/TAO.pidl: + * tao/TAOC.cpp: + * tao/TAOC.h: + * tao/TAOC.i: + * tao/TimeBase.pidl: + * tao/TimeBaseC.cpp: + * tao/TimeBaseC.h: + * tao/TimeBaseC.i: + * tao/WrongTransaction.pidl: + * tao/WrongTransactionC.cpp: + * tao/WrongTransactionC.h: + * tao/WrongTransactionC.i: + + Finished regeneration of hand-crafted files in + $TAO_ROOT/tao. Also made minor changes to files + regenerated in checkin last night. + Mon Sep 1 13:41:47 2003 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/be/be_visitor_root/root_ch.cpp: diff --git a/TAO/tao/BoundsC.h b/TAO/tao/BoundsC.h index 8bc7c825c8e..3bd4b9a474c 100644 --- a/TAO/tao/BoundsC.h +++ b/TAO/tao/BoundsC.h @@ -31,7 +31,7 @@ #ifndef _TAO_IDL_ORIG_BOUNDSC_H_ #define _TAO_IDL_ORIG_BOUNDSC_H_ -#include "ace/pre.h" +#include /**/ "ace/pre.h" #include "tao/orbconf.h" @@ -173,6 +173,6 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Bounds &); #pragma option pop #endif /* __BORLANDC__ */ -#include "ace/post.h" +#include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/CONV_FRAMEC.h b/TAO/tao/CONV_FRAMEC.h index dce87fb59f2..1124699238c 100644 --- a/TAO/tao/CONV_FRAMEC.h +++ b/TAO/tao/CONV_FRAMEC.h @@ -31,7 +31,7 @@ #ifndef _TAO_IDL_ORIG_CONV_FRAMEC_H_ #define _TAO_IDL_ORIG_CONV_FRAMEC_H_ -#include "ace/pre.h" +#include /**/ "ace/pre.h" #include "tao/CDR.h" @@ -292,6 +292,6 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetContext #pragma option pop #endif /* __BORLANDC__ */ -#include "ace/post.h" +#include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp index 174adacca8f..07ec728e875 100644 --- a/TAO/tao/CurrentC.cpp +++ b/TAO/tao/CurrentC.cpp @@ -101,10 +101,15 @@ CORBA::Current::_narrow ( ACE_ENV_ARG_DECL_NOT_USED ) { + if (CORBA::is_nil (_tao_objref)) + { + return Current::_nil (); + } + Current_ptr proxy = dynamic_cast<Current_ptr> (_tao_objref); - proxy->_add_ref (); - return proxy; + + return Current::_duplicate (proxy); } CORBA::Current_ptr diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h index 349e4daef4d..80160db7cbb 100644 --- a/TAO/tao/CurrentC.h +++ b/TAO/tao/CurrentC.h @@ -31,7 +31,7 @@ #ifndef _TAO_IDL_ORIG_CURRENTC_H_ #define _TAO_IDL_ORIG_CURRENTC_H_ -#include "ace/pre.h" +#include /**/ "ace/pre.h" #include "tao/Object.h" @@ -70,6 +70,8 @@ namespace TAO { class Collocation_Proxy_Broker; + + template<typename T> class Narrow_Utils; } // TAO_IDL - Generated from @@ -194,5 +196,5 @@ namespace TAO #pragma option pop #endif /* __BORLANDC__ */ -#include "ace/post.h" +#include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp index dffd2fec0f4..18e4f94b435 100644 --- a/TAO/tao/DomainC.cpp +++ b/TAO/tao/DomainC.cpp @@ -32,6 +32,7 @@ #include "DomainC.h" #include "tao/Stub.h" #include "tao/Invocation_Adapter.h" +#include "tao/Object_T.h" #include "tao/Basic_Arguments.h" #include "tao/Object_Argument_T.h" #include "tao/Special_Basic_Arguments.h" diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h index 2ae8b06055d..3e6578dc2a9 100644 --- a/TAO/tao/DomainC.h +++ b/TAO/tao/DomainC.h @@ -31,7 +31,7 @@ #ifndef _TAO_IDL_ORIG_DOMAINC_H_ #define _TAO_IDL_ORIG_DOMAINC_H_ -#include "ace/pre.h" +#include /**/ "ace/pre.h" #include "tao/corbafwd.h" @@ -39,7 +39,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Object_T.h" #include "tao/Sequence_T.h" #include "tao/Objref_VarOut_T.h" #include "tao/Seq_Var_T.h" @@ -76,6 +75,8 @@ namespace TAO { class Collocation_Proxy_Broker; + + template<typename T> class Narrow_Utils; } // TAO_IDL - Generated from @@ -429,6 +430,6 @@ TAO_Export CORBA::Boolean operator>> ( #pragma option pop #endif /* __BORLANDC__ */ -#include "ace/post.h" +#include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/DynamicC.h b/TAO/tao/DynamicC.h index 3cc6fc6c9e7..57bcd6ed471 100644 --- a/TAO/tao/DynamicC.h +++ b/TAO/tao/DynamicC.h @@ -31,7 +31,7 @@ #ifndef _TAO_IDL_ORIG_DYNAMICC_H_ #define _TAO_IDL_ORIG_DYNAMICC_H_ -#include "ace/pre.h" +#include /**/ "ace/pre.h" #include "tao/corbafwd.h" @@ -76,6 +76,8 @@ namespace TAO { class Collocation_Proxy_Broker; + + template<typename T> class Narrow_Utils; } // TAO_IDL - Generated from @@ -368,6 +370,6 @@ TAO_Export CORBA::Boolean operator>> ( #pragma option pop #endif /* __BORLANDC__ */ -#include "ace/post.h" +#include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/GIOPC.h b/TAO/tao/GIOPC.h index 1bbdda77eba..da41f8a52f1 100644 --- a/TAO/tao/GIOPC.h +++ b/TAO/tao/GIOPC.h @@ -31,7 +31,7 @@ #ifndef _TAO_IDL_ORIG_GIOPC_H_ #define _TAO_IDL_ORIG_GIOPC_H_ -#include "ace/pre.h" +#include /**/ "ace/pre.h" #include "tao/corbafwd.h" @@ -71,6 +71,8 @@ namespace TAO { class Collocation_Proxy_Broker; + + template<typename T> class Narrow_Utils; } // TAO_IDL - Generated from @@ -321,6 +323,6 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, GIOP::TargetAddress &); #pragma option pop #endif /* __BORLANDC__ */ -#include "ace/post.h" +#include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/IIOPC.h b/TAO/tao/IIOPC.h index fc586b328d2..bf5eea91467 100644 --- a/TAO/tao/IIOPC.h +++ b/TAO/tao/IIOPC.h @@ -31,7 +31,7 @@ #ifndef _TAO_IDL_ORIG_IIOPC_H_ #define _TAO_IDL_ORIG_IIOPC_H_ -#include "ace/pre.h" +#include /**/ "ace/pre.h" #include "tao/Sequence_T.h" @@ -260,6 +260,6 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IIOP::BiDirIIOPServiceCont #pragma option pop #endif /* __BORLANDC__ */ -#include "ace/post.h" +#include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/IOPC.h b/TAO/tao/IOPC.h index d59bb70802d..049b2670802 100644 --- a/TAO/tao/IOPC.h +++ b/TAO/tao/IOPC.h @@ -31,7 +31,7 @@ #ifndef _TAO_IDL_ORIG_IOPC_H_ #define _TAO_IDL_ORIG_IOPC_H_ -#include "ace/pre.h" +#include /**/ "ace/pre.h" #include "IOP_IORC.h" @@ -70,6 +70,8 @@ namespace TAO { class Collocation_Proxy_Broker; + + template<typename T> class Narrow_Utils; } // TAO_IDL - Generated from @@ -105,6 +107,6 @@ namespace TAO #pragma option pop #endif /* __BORLANDC__ */ -#include "ace/post.h" +#include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/IOP_CodecC.cpp b/TAO/tao/IOP_CodecC.cpp index 16880dd5ad6..94e01f2073d 100644 --- a/TAO/tao/IOP_CodecC.cpp +++ b/TAO/tao/IOP_CodecC.cpp @@ -574,10 +574,15 @@ IOP::Codec::_narrow ( ACE_ENV_ARG_DECL_NOT_USED ) { + if (CORBA::is_nil (_tao_objref)) + { + return Codec::_nil (); + } + Codec_ptr proxy = dynamic_cast<Codec_ptr> (_tao_objref); - proxy->_add_ref (); - return proxy; + + return Codec::_duplicate (proxy); } IOP::Codec_ptr @@ -987,10 +992,15 @@ IOP::CodecFactory::_narrow ( ACE_ENV_ARG_DECL_NOT_USED ) { + if (CORBA::is_nil (_tao_objref)) + { + return CodecFactory::_nil (); + } + CodecFactory_ptr proxy = dynamic_cast<CodecFactory_ptr> (_tao_objref); - proxy->_add_ref (); - return proxy; + + return CodecFactory::_duplicate (proxy); } IOP::CodecFactory_ptr diff --git a/TAO/tao/IOP_CodecC.h b/TAO/tao/IOP_CodecC.h index d74ddf5e588..67fc0c67dcc 100644 --- a/TAO/tao/IOP_CodecC.h +++ b/TAO/tao/IOP_CodecC.h @@ -77,6 +77,8 @@ namespace TAO { class Collocation_Proxy_Broker; + + template<typename T> class Narrow_Utils; } // TAO_IDL - Generated from diff --git a/TAO/tao/IOP_CodecC.i b/TAO/tao/IOP_CodecC.i index 222d16daace..6dc6b51a7a2 100644 --- a/TAO/tao/IOP_CodecC.i +++ b/TAO/tao/IOP_CodecC.i @@ -53,8 +53,8 @@ CORBA::Boolean operator<< ( { return (strm << _tao_aggregate.format) && - (strm << CORBA::Any::from_octet (_tao_aggregate.major_version)) && - (strm << CORBA::Any::from_octet (_tao_aggregate.minor_version)); + (strm << ACE_OutputCDR::from_octet (_tao_aggregate.major_version)) && + (strm << ACE_OutputCDR::from_octet (_tao_aggregate.minor_version)); } ACE_INLINE @@ -65,7 +65,7 @@ CORBA::Boolean operator>> ( { return (strm >> _tao_aggregate.format) && - (strm >> CORBA::Any::to_octet (_tao_aggregate.major_version)) && - (strm >> CORBA::Any::to_octet (_tao_aggregate.minor_version)); + (strm >> ACE_InputCDR::to_octet (_tao_aggregate.major_version)) && + (strm >> ACE_InputCDR::to_octet (_tao_aggregate.minor_version)); } diff --git a/TAO/tao/IOP_IORC.h b/TAO/tao/IOP_IORC.h index c89a1ffe8bf..ca55a4d649e 100644 --- a/TAO/tao/IOP_IORC.h +++ b/TAO/tao/IOP_IORC.h @@ -72,6 +72,8 @@ namespace TAO { class Collocation_Proxy_Broker; + + template<typename T> class Narrow_Utils; } // TAO_IDL - Generated from @@ -930,6 +932,6 @@ TAO_Export CORBA::Boolean operator>> ( #pragma option pop #endif /* __BORLANDC__ */ -#include "ace/post.h" +#include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/Messaging_PolicyValueC.h b/TAO/tao/Messaging_PolicyValueC.h index b393dd75fcd..22bdfb7e285 100644 --- a/TAO/tao/Messaging_PolicyValueC.h +++ b/TAO/tao/Messaging_PolicyValueC.h @@ -70,6 +70,8 @@ namespace TAO { class Collocation_Proxy_Broker; + + template<typename T> class Narrow_Utils; } // TAO_IDL - Generated from diff --git a/TAO/tao/ObjectIdList.pidl b/TAO/tao/ObjectIdList.pidl index 75233833f94..e97696a64dc 100644 --- a/TAO/tao/ObjectIdList.pidl +++ b/TAO/tao/ObjectIdList.pidl @@ -14,7 +14,7 @@ * command used for this is: * * tao_idl.exe - * -o orig -Ge 1 -GT + * -o orig -Sa -Ge 1 -GT * -Wb,export_macro=TAO_Export * -Wb,export_include="tao/corbafwd.h" * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/ObjectIdListC.cpp b/TAO/tao/ObjectIdListC.cpp index 446fd512690..8201ecfa5e1 100644 --- a/TAO/tao/ObjectIdListC.cpp +++ b/TAO/tao/ObjectIdListC.cpp @@ -15,16 +15,22 @@ // 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 -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:301 #include "ObjectIdListC.h" -#include "tao/Stub.h" +#include "CDR.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig @@ -35,27 +41,35 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:59 + +// Arg traits specializations. +namespace TAO +{ +}; + +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_CORBA_ORB_ObjectId[] = { TAO_ENCAP_BYTE_ORDER, // byte order 35, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f4f52), - ACE_NTOHL (0x425f4f62), - ACE_NTOHL (0x6a656374), - ACE_NTOHL (0x49643a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f4f52), + ACE_NTOHL (0x425f4f62), + ACE_NTOHL (0x6a656374), + ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/ORB_ObjectId:1.0 13, - ACE_NTOHL (0x4f52425f), - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63744964), + ACE_NTOHL (0x4f52425f), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63744964), ACE_NTOHL (0x0), // name = ORB_ObjectId - CORBA::tk_string, + CORBA::tk_string, 0U, // string length }; @@ -67,22 +81,24 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ORB_ObjectId ( sizeof (CORBA::ORB_ObjectId) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_ORB_ObjectId, - &_tc_TAO_tc_CORBA_ORB_ObjectId - ) -TAO_NAMESPACE_END +namespace CORBA +{ + ::CORBA::TypeCode_ptr _tc_ORB_ObjectId = + &_tc_TAO_tc_CORBA_ORB_ObjectId; +} -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50 +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:66 + +#if !defined (_CORBA_ORB_OBJECTIDLIST_CS_) +#define _CORBA_ORB_OBJECTIDLIST_CS_ CORBA::ORB_ObjectIdList::ORB_ObjectIdList (void) {} -CORBA::ORB_ObjectIdList::ORB_ObjectIdList (CORBA::ULong max) +CORBA::ORB_ObjectIdList::ORB_ObjectIdList ( + CORBA::ULong max + ) : TAO_Unbounded_String_Sequence (max) {} @@ -90,14 +106,16 @@ CORBA::ORB_ObjectIdList::ORB_ObjectIdList (CORBA::ULong max) CORBA::ORB_ObjectIdList::ORB_ObjectIdList ( CORBA::ULong max, CORBA::ULong length, - char * *buffer, + char * * buffer, CORBA::Boolean release ) : TAO_Unbounded_String_Sequence (max, length, buffer, release) {} -CORBA::ORB_ObjectIdList::ORB_ObjectIdList (const ORB_ObjectIdList &seq) +CORBA::ORB_ObjectIdList::ORB_ObjectIdList ( + const ORB_ObjectIdList &seq + ) : TAO_Unbounded_String_Sequence (seq) {} @@ -105,41 +123,7 @@ CORBA::ORB_ObjectIdList::ORB_ObjectIdList (const ORB_ObjectIdList &seq) CORBA::ORB_ObjectIdList::~ORB_ObjectIdList (void) {} - - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class - TAO_MngSeq_Var_T< - CORBA::ORB_ObjectIdList, - TAO_SeqElem_String_Manager - >; - -template class TAO_Seq_Var_Base_T<CORBA::ORB_ObjectIdList, TAO_SeqElem_String_Manager>; - -template class - TAO_MngSeq_Out_T< - CORBA::ORB_ObjectIdList, - CORBA::ORB_ObjectIdList_var, - TAO_SeqElem_String_Manager - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO_MngSeq_Var_T< \ - CORBA::ORB_ObjectIdList, \ - TAO_SeqElem_String_Manager \ - > -#pragms instantiate TAO_Seq_Var_Base_T<CORBA::ORB_ObjectIdList, TAO_SeqElem_String_Manager> -# pragma instantiate \ - TAO_Seq_Out_T< \ - CORBA::ORB_ObjectIdList, \ - CORBA::ORB_ObjectIdList_var, \ - TAO_SeqElem_String_Manager \ - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* end #if !defined */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -148,21 +132,21 @@ static const CORBA::Long _oc_CORBA_ORB_ObjectIdList[] = { TAO_ENCAP_BYTE_ORDER, // byte order 39, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f4f52), - ACE_NTOHL (0x425f4f62), - ACE_NTOHL (0x6a656374), - ACE_NTOHL (0x49644c69), - ACE_NTOHL (0x73743a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f4f52), + ACE_NTOHL (0x425f4f62), + ACE_NTOHL (0x6a656374), + ACE_NTOHL (0x49644c69), + ACE_NTOHL (0x73743a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/ORB_ObjectIdList:1.0 17, - ACE_NTOHL (0x4f52425f), - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63744964), - ACE_NTOHL (0x4c697374), + ACE_NTOHL (0x4f52425f), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63744964), + ACE_NTOHL (0x4c697374), ACE_NTOHL (0x0), // name = ORB_ObjectIdList CORBA::tk_sequence, // typecode kind 88, // encapsulation length @@ -171,21 +155,21 @@ static const CORBA::Long _oc_CORBA_ORB_ObjectIdList[] = 72, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 35, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f4f52), - ACE_NTOHL (0x425f4f62), - ACE_NTOHL (0x6a656374), - ACE_NTOHL (0x49643a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f4f52), + ACE_NTOHL (0x425f4f62), + ACE_NTOHL (0x6a656374), + ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/ORB_ObjectId:1.0 13, - ACE_NTOHL (0x4f52425f), - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63744964), + ACE_NTOHL (0x4f52425f), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63744964), ACE_NTOHL (0x0), // name = ORB_ObjectId - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 0U, @@ -200,17 +184,17 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ORB_ObjectIdList ( sizeof (CORBA::ORB_ObjectIdList) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_ORB_ObjectIdList, - &_tc_TAO_tc_CORBA_ORB_ObjectIdList - ) -TAO_NAMESPACE_END +namespace CORBA +{ + ::CORBA::TypeCode_ptr _tc_ORB_ObjectIdList = + &_tc_TAO_tc_CORBA_ORB_ObjectIdList; +} // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:95 + +#if !defined _TAO_CDR_OP_CORBA_ORB_ObjectIdList_CPP_ +#define _TAO_CDR_OP_CORBA_ORB_ObjectIdList_CPP_ CORBA::Boolean operator<< ( TAO_OutputCDR &strm, @@ -218,20 +202,20 @@ CORBA::Boolean operator<< ( ) { CORBA::ULong _tao_seq_len = _tao_sequence.length (); - + if (strm << _tao_seq_len) { // Encode all elements. CORBA::Boolean _tao_marshal_flag = 1; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = (strm << _tao_sequence[i].in ()); } - + return _tao_marshal_flag; } - + return 0; } @@ -241,7 +225,7 @@ CORBA::Boolean operator>> ( ) { CORBA::ULong _tao_seq_len; - + if (strm >> _tao_seq_len) { // Add a check to the length of the sequence @@ -251,26 +235,78 @@ CORBA::Boolean operator>> ( { 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) + if (0 >= _tao_seq_len) { return 1; } - + // Retrieve all the elements. CORBA::Boolean _tao_marshal_flag = 1; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = (strm >> _tao_sequence[i].out ()); - } + + } + + return _tao_marshal_flag; + + } + +return 0; +} - return _tao_marshal_flag; - } +#endif /* _TAO_CDR_OP_CORBA_ORB_ObjectIdList_CPP_ */ + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1703 + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + + template class + TAO_MngSeq_Var_T< + CORBA::ORB_ObjectIdList, + TAO_SeqElem_String_Manager + >; + + template class + TAO_Seq_Var_Base_T< + CORBA::ORB_ObjectIdList, + TAO_SeqElem_String_Manager + >; + + template class + TAO_MngSeq_Out_T< + CORBA::ORB_ObjectIdList, + CORBA::ORB_ObjectIdList_var, + TAO_SeqElem_String_Manager + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# pragma instantiate \ + TAO_MngSeq_Var_T< \ + CORBA::ORB_ObjectIdList, \ + TAO_SeqElem_String_Manager \ + > + +# pragma instantiate \ + TAO_Seq_Var_Base_T< \ + CORBA::ORB_ObjectIdList, \ + TAO_SeqElem_String_Manager \ + > + +# pragma instantiate \ + TAO_MngSeq_Out_T< \ + CORBA::ORB_ObjectIdList, \ + CORBA::ORB_ObjectIdList_var, \ + TAO_SeqElem_String_Manager \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - return 0; -} diff --git a/TAO/tao/ObjectIdListC.h b/TAO/tao/ObjectIdListC.h index f74f6220500..89f505ba4c5 100644 --- a/TAO/tao/ObjectIdListC.h +++ b/TAO/tao/ObjectIdListC.h @@ -15,6 +15,12 @@ // 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 @@ -26,6 +32,7 @@ #define _TAO_IDL_ORIG_OBJECTIDLISTC_H_ #include /**/ "ace/pre.h" + #include "tao/Sequence.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -61,33 +68,36 @@ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48 -TAO_NAMESPACE CORBA +namespace CORBA { - + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:367 - + typedef char * ORB_ObjectId; typedef CORBA::String_var ORB_ObjectId_var; typedef CORBA::String_out ORB_ObjectId_out; - + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ORB_ObjectId; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101 +#if !defined (_CORBA_ORB_OBJECTIDLIST_CH_) +#define _CORBA_ORB_OBJECTIDLIST_CH_ + class ORB_ObjectIdList; - + typedef TAO_MngSeq_Var_T< ORB_ObjectIdList, TAO_SeqElem_String_Manager > ORB_ObjectIdList_var; - + typedef TAO_MngSeq_Out_T< ORB_ObjectIdList, @@ -95,7 +105,7 @@ TAO_NAMESPACE CORBA TAO_SeqElem_String_Manager > ORB_ObjectIdList_out; - + class TAO_Export ORB_ObjectIdList : public TAO_Unbounded_String_Sequence @@ -106,25 +116,34 @@ TAO_NAMESPACE CORBA ORB_ObjectIdList ( CORBA::ULong max, CORBA::ULong length, - char * *buffer, + char ** buffer, CORBA::Boolean release = 0 ); ORB_ObjectIdList (const ORB_ObjectIdList &); ~ORB_ObjectIdList (void); - + typedef ORB_ObjectIdList_var _var_type; }; +#endif /* end #if !defined */ + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ORB_ObjectIdList; // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:66 -} -TAO_NAMESPACE_CLOSE // module CORBA +} // module CORBA + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:48 + +// Traits specializations. +namespace TAO +{ +}; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48 @@ -132,7 +151,7 @@ TAO_NAMESPACE_CLOSE // module CORBA #ifndef __ACE_INLINE__ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:70 #if !defined _TAO_CDR_OP_CORBA_ORB_ObjectIdList_H_ #define _TAO_CDR_OP_CORBA_ORB_ObjectIdList_H_ @@ -154,7 +173,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* __ACE_INLINE__ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "ObjectIdListC.i" @@ -170,3 +189,4 @@ TAO_Export CORBA::Boolean operator>> ( #include /**/ "ace/post.h" #endif /* ifndef */ + diff --git a/TAO/tao/ObjectIdListC.i b/TAO/tao/ObjectIdListC.i index 21c96338279..16912e6127d 100644 --- a/TAO/tao/ObjectIdListC.i +++ b/TAO/tao/ObjectIdListC.i @@ -15,13 +15,19 @@ // 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 -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:81 #if !defined _TAO_CDR_OP_CORBA_ORB_ObjectIdList_I_ #define _TAO_CDR_OP_CORBA_ORB_ObjectIdList_I_ diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp index f5b45a666c5..e1ae38b588f 100644 --- a/TAO/tao/Object_KeyC.cpp +++ b/TAO/tao/Object_KeyC.cpp @@ -26,38 +26,41 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be/be_codegen.cpp:314 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:301 #include "Object_KeyC.h" #include "tao/Stub.h" -#include "tao/Invocation.h" -#include "tao/PortableInterceptor.h" - -#if TAO_HAS_INTERCEPTORS == 1 -#include "tao/RequestInfo_Util.h" -#include "tao/ClientRequestInfo_i.h" -#include "tao/ClientInterceptorAdapter.h" -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - +#include "tao/Invocation_Adapter.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#include "ace/ACE.h" - #if !defined (__ACE_INLINE__) #include "Object_KeyC.i" #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be/be_visitor_sequence/sequence_cs.cpp:56 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:59 + +// Arg traits specializations. +namespace TAO +{ +}; + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:66 + +#if !defined (_TAO_OBJECTKEY_CS_) +#define _TAO_OBJECTKEY_CS_ TAO::ObjectKey::ObjectKey (void) {} -TAO::ObjectKey::ObjectKey (CORBA::ULong max) +TAO::ObjectKey::ObjectKey ( + CORBA::ULong max + ) : TAO_Unbounded_Sequence< CORBA::Octet > @@ -67,7 +70,7 @@ TAO::ObjectKey::ObjectKey (CORBA::ULong max) TAO::ObjectKey::ObjectKey ( CORBA::ULong max, CORBA::ULong length, - CORBA::Octet* buffer, + CORBA::Octet * buffer, CORBA::Boolean release ) : TAO_Unbounded_Sequence< @@ -76,7 +79,9 @@ TAO::ObjectKey::ObjectKey ( (max, length, buffer, release) {} -TAO::ObjectKey::ObjectKey (const ObjectKey &seq) +TAO::ObjectKey::ObjectKey ( + const ObjectKey &seq + ) : TAO_Unbounded_Sequence< CORBA::Octet > @@ -86,11 +91,7 @@ TAO::ObjectKey::ObjectKey (const ObjectKey &seq) TAO::ObjectKey::~ObjectKey (void) {} -void TAO::ObjectKey::_tao_any_destructor (void *_tao_void_pointer) -{ - ObjectKey *tmp = ACE_static_cast (ObjectKey*, _tao_void_pointer); - delete tmp; -} +// Hand crafted. void TAO::ObjectKey::encode_sequence_to_string (char * &str, @@ -118,13 +119,13 @@ TAO::ObjectKey::encode_sequence_to_string (char * &str, // here. #undef byte u_char byte = seq[i]; - if (isprint (byte) && byte != '\\') + if (is_legal (byte)) { *cp++ = (char) byte; continue; } - *cp++ = '\\'; + *cp++ = '%'; *cp++ = ACE::nibble2hex ((byte >> 4) & 0x0f); *cp++ = ACE::nibble2hex (byte & 0x0f); } @@ -132,6 +133,22 @@ TAO::ObjectKey::encode_sequence_to_string (char * &str, *cp = '\0'; } +int TAO::ObjectKey::is_legal (u_char & c) +{ + if (isalnum(c)) + { + return 1; + } + else + { + return ( c == ';' || c == '/' ||c == ':' || c == '?' || + c == '@' || c == '&' ||c == '=' || c == '+' || + c == '$' || c == ',' ||c == '_' || c == '.' || + c == '!' || c == '~' ||c == '*' || c == '\'' || + c == '-' || c == '(' || c == ')' ); + } +} + void TAO::ObjectKey::decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> &seq, const char *str) @@ -156,7 +173,7 @@ TAO::ObjectKey::decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> cp < eos && i < seq.length (); i++) { - if (*cp == '\\') + if (*cp == '%') { // This is an escaped non-printable, // so we decode the hex values into @@ -174,155 +191,13 @@ TAO::ObjectKey::decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> seq.length (i); } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class - TAO_FixedSeq_Var_T< - TAO::ObjectKey, - CORBA::Octet - >; - -template class TAO_Seq_Var_Base_T<TAO::ObjectKey, - CORBA::Octet>; - -template class - TAO_Seq_Out_T< - TAO::ObjectKey, - TAO::ObjectKey_var, - CORBA::Octet - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO_FixedSeq_Var_T< \ - TAO::ObjectKey, \ - CORBA::Octet \ - > - -# pragma instantiate \ - TAO_Seq_Out_T< \ - TAO::ObjectKey, \ - TAO::ObjectKey_var, \ - CORBA::Octet \ - > - -#pragma instantiate TAO_Seq_Var_Base_T<TAO::ObjectKey, - CORBA::Octet>; - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* end #if !defined */ // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:284 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:95 -static const CORBA::Long _oc_TAO_ObjectKey[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 22, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x54414f2f), - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63744b65), - ACE_NTOHL (0x793a312e), - ACE_NTOHL (0x30000000), // repository ID = IDL:TAO/ObjectKey:1.0 - 10, - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63744b65), - ACE_NTOHL (0x79000000), // name = ObjectKey - CORBA::tk_sequence, // typecode kind - 12, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - CORBA::tk_octet, - - 0U, - -}; - -static CORBA::TypeCode _tc_TAO_tc_TAO_ObjectKey ( - CORBA::tk_alias, - sizeof (_oc_TAO_ObjectKey), - (char *) &_oc_TAO_ObjectKey, - 0, - sizeof (TAO::ObjectKey) - ); - -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (TAO) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_ObjectKey, - &_tc_TAO_tc_TAO_ObjectKey - ) -TAO_NAMESPACE_END - -// TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 - -// Copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - const TAO::ObjectKey &_tao_elem - ) -{ - TAO::Any_Dual_Impl_T<TAO::ObjectKey>::insert_copy ( - _tao_any, - TAO::ObjectKey::_tao_any_destructor, - TAO::_tc_ObjectKey, - _tao_elem - ); -} - -// Non-copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - TAO::ObjectKey *_tao_elem - ) -{ - TAO::Any_Dual_Impl_T<TAO::ObjectKey>::insert ( - _tao_any, - TAO::ObjectKey::_tao_any_destructor, - TAO::_tc_ObjectKey, - _tao_elem - ); -} - -// Extraction to non-const pointer (deprecated). -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - TAO::ObjectKey *&_tao_elem - ) -{ - return _tao_any >>= ACE_const_cast ( - const TAO::ObjectKey *&, - _tao_elem - ); -} - -// Extraction to const pointer. -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - const TAO::ObjectKey *&_tao_elem - ) -{ - return - TAO::Any_Dual_Impl_T<TAO::ObjectKey>::extract ( - _tao_any, - TAO::ObjectKey::_tao_any_destructor, - TAO::_tc_ObjectKey, - _tao_elem - ); -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<TAO::ObjectKey>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<TAO::ObjectKey> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -// TAO_IDL - Generated from -// be/be_visitor_sequence/cdr_op_cs.cpp:98 +#if !defined _TAO_CDR_OP_TAO_ObjectKey_CPP_ +#define _TAO_CDR_OP_TAO_ObjectKey_CPP_ CORBA::Boolean operator<< ( TAO_OutputCDR &strm, @@ -330,27 +205,27 @@ CORBA::Boolean operator<< ( ) { 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<CORBA::Octet> *oseq = + TAO_Unbounded_Sequence<CORBA::Octet> *oseq = ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (TAO::ObjectKey *)&_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; } @@ -360,7 +235,7 @@ CORBA::Boolean operator>> ( ) { CORBA::ULong _tao_seq_len; - + if (strm >> _tao_seq_len) { // Add a check to the length of the sequence @@ -370,18 +245,18 @@ CORBA::Boolean operator>> ( { 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) + 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)) @@ -391,7 +266,7 @@ CORBA::Boolean operator>> ( strm.orb_core ()->resource_factory ()-> input_cdr_allocator_type_locked () == 1) { - TAO_Unbounded_Sequence<CORBA::Octet> *oseq = + TAO_Unbounded_Sequence<CORBA::Octet> *oseq = ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence); oseq->replace (_tao_seq_len, strm.start ()); oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len); @@ -402,9 +277,60 @@ CORBA::Boolean operator>> ( 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_TAO_ObjectKey_CPP_ */ + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1703 + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + + template class + TAO_FixedSeq_Var_T< + TAO::ObjectKey, + CORBA::Octet + >; + + template class + TAO_Seq_Var_Base_T< + TAO::ObjectKey, + CORBA::Octet + >; + + template class + TAO_Seq_Out_T< + TAO::ObjectKey, + TAO::ObjectKey_var, + CORBA::Octet + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# pragma instantiate \ + TAO_FixedSeq_Var_T< \ + TAO::ObjectKey, \ + CORBA::Octet \ + > + +# pragma instantiate \ + TAO_Seq_Var_Base_T< \ + TAO::ObjectKey, \ + CORBA::Octet \ + > + +# pragma instantiate \ + TAO_Seq_Out_T< \ + TAO::ObjectKey, \ + TAO::ObjectKey_var, \ + CORBA::Octet \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/Object_KeyC.h b/TAO/tao/Object_KeyC.h index 044bb42b81b..0e434e43177 100644 --- a/TAO/tao/Object_KeyC.h +++ b/TAO/tao/Object_KeyC.h @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be/be_codegen.cpp:151 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151 #ifndef _TAO_IDL_ORIG_OBJECT_KEYC_H_ #define _TAO_IDL_ORIG_OBJECT_KEYC_H_ @@ -39,10 +39,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/TAO_Export.h" +#include "tao/Sequence_T.h" #include "tao/Seq_Var_T.h" #include "tao/Seq_Out_T.h" -#include "tao/Sequence_T.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -68,23 +67,26 @@ #endif /* __BORLANDC__ */ // TAO_IDL - Generated from -// be/be_visitor_module/module_ch.cpp:48 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48 -TAO_NAMESPACE TAO +namespace TAO { - + // TAO_IDL - Generated from - // be/be_visitor_sequence/sequence_ch.cpp:75 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101 +#if !defined (_TAO_OBJECTKEY_CH_) +#define _TAO_OBJECTKEY_CH_ + class ObjectKey; - + typedef TAO_FixedSeq_Var_T< ObjectKey, CORBA::Octet > ObjectKey_var; - + typedef TAO_Seq_Out_T< ObjectKey, @@ -92,7 +94,7 @@ TAO_NAMESPACE TAO CORBA::Octet > ObjectKey_out; - + class TAO_Export ObjectKey : public TAO_Unbounded_Sequence< @@ -105,14 +107,12 @@ TAO_NAMESPACE TAO ObjectKey ( CORBA::ULong max, CORBA::ULong length, - CORBA::Octet* buffer, + CORBA::Octet* buffer, CORBA::Boolean release = 0 ); ObjectKey (const ObjectKey &); ~ObjectKey (void); - - static void _tao_any_destructor (void *); - + typedef ObjectKey_var _var_type; #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) @@ -123,6 +123,8 @@ TAO_NAMESPACE TAO : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {} #endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */ + // Hand crafted. + static void encode_sequence_to_string ( char * &str, const TAO_Unbounded_Sequence<CORBA::Octet> &seq @@ -131,35 +133,31 @@ TAO_NAMESPACE TAO TAO_Unbounded_Sequence<CORBA::Octet> &seq, const char *str ); - + static int is_legal (u_char & c); }; - // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:44 - - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectKey; +#endif /* end #if !defined */ // TAO_IDL - Generated from -// be/be_visitor_module/module_ch.cpp:67 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:66 -} -TAO_NAMESPACE_CLOSE // module TAO +} // module TAO // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_ch.cpp:52 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:48 -TAO_Export void operator<<= (CORBA::Any &, const TAO::ObjectKey &); // copying version -TAO_Export void operator<<= (CORBA::Any &, TAO::ObjectKey*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::ObjectKey *&); // deprecated -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO::ObjectKey *&); +// Traits specializations. +namespace TAO +{ +}; // TAO_IDL - Generated from -// be/be_visitor_root/cdr_op.cpp:48 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48 #ifndef __ACE_INLINE__ // TAO_IDL - Generated from -// be/be_visitor_sequence/cdr_op_ch.cpp:57 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:70 #if !defined _TAO_CDR_OP_TAO_ObjectKey_H_ #define _TAO_CDR_OP_TAO_ObjectKey_H_ @@ -176,12 +174,12 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_TAO_ObjectKey_H_ */ // TAO_IDL - Generated from -// be/be_visitor_root/cdr_op.cpp:64 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64 #endif /* __ACE_INLINE__ */ // TAO_IDL - Generated from -// be/be_codegen.cpp:1018 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "Object_KeyC.i" @@ -197,3 +195,4 @@ TAO_Export CORBA::Boolean operator>> ( #include /**/ "ace/post.h" #endif /* ifndef */ + diff --git a/TAO/tao/Object_KeyC.i b/TAO/tao/Object_KeyC.i index 38d6c1a11b3..74b18b2e74c 100644 --- a/TAO/tao/Object_KeyC.i +++ b/TAO/tao/Object_KeyC.i @@ -27,7 +27,7 @@ // TAO_IDL - Generated from -// be/be_visitor_sequence/cdr_op_ci.cpp:84 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:81 #if !defined _TAO_CDR_OP_TAO_ObjectKey_I_ #define _TAO_CDR_OP_TAO_ObjectKey_I_ diff --git a/TAO/tao/Objref_VarOut_T.cpp b/TAO/tao/Objref_VarOut_T.cpp index d38e596ce4a..1449d935ff6 100644 --- a/TAO/tao/Objref_VarOut_T.cpp +++ b/TAO/tao/Objref_VarOut_T.cpp @@ -13,40 +13,6 @@ ACE_RCSID (tao, Objref_VarOut_T, "$Id$") -// @@@ (JP) This needs to be here temporarily until we regenerate the -// hand-crafted files. - -template<typename T> -T * -TAO::Objref_Traits<T>::tao_duplicate (T * p) -{ - return T::_duplicate (p); -} - -template<typename T> -void -TAO::Objref_Traits<T>::tao_release (T * p) -{ - CORBA::release (p); -} - -template<typename T> -T * -TAO::Objref_Traits<T>::tao_nil (void) -{ - return T::_nil (); -} - -template<typename T> -CORBA::Boolean -TAO::Objref_Traits<T>::tao_marshal (T * p, - TAO_OutputCDR & cdr) -{ - return p->marshal (cdr); -} - -// ================================================================= - template <typename T> TAO_Objref_Var_T<T>::TAO_Objref_Var_T (void) : ptr_ (TAO::Objref_Traits<T>::tao_nil ()) diff --git a/TAO/tao/OctetSeq.pidl b/TAO/tao/OctetSeq.pidl index dafe79c3a23..85ffa91d8c0 100644 --- a/TAO/tao/OctetSeq.pidl +++ b/TAO/tao/OctetSeq.pidl @@ -8,7 +8,7 @@ // The command used to generate code is: // // tao_idl -// -o orig -Gp -Gd -Ge 1 +// -o orig -Sa -Ge 1 -GT // -Wb,export_macro=TAO_Export // -Wb,export_include="tao/corbafwd.h" // -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/OctetSeqC.cpp b/TAO/tao/OctetSeqC.cpp index e39a15c03d7..4f5c1292dea 100644 --- a/TAO/tao/OctetSeqC.cpp +++ b/TAO/tao/OctetSeqC.cpp @@ -26,13 +26,12 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be/be_codegen.cpp:351 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:301 + #include "OctetSeqC.h" #include "ORB_Core.h" - - #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ @@ -41,8 +40,16 @@ #include "OctetSeqC.i" #endif /* !defined INLINE */ +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:59 + +// Arg traits specializations. +namespace TAO +{ +}; + // TAO_IDL - Generated from -// be/be_visitor_sequence/sequence_cs.cpp:72 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:66 #if !defined (_CORBA_OCTETSEQ_CS_) #define _CORBA_OCTETSEQ_CS_ @@ -87,62 +94,15 @@ void CORBA::OctetSeq::_tao_any_destructor ( void * _tao_void_pointer ) { - OctetSeq * tmp = - ACE_static_cast ( - OctetSeq *, - _tao_void_pointer - ); - delete tmp; + OctetSeq * _tao_tmp_pointer = + ACE_static_cast (OctetSeq *, _tao_void_pointer); + delete _tao_tmp_pointer; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class - TAO_FixedSeq_Var_T< - CORBA::OctetSeq, - CORBA::Octet - >; - -template class - TAO_Seq_Var_Base_T< - CORBA::OctetSeq, - CORBA::Octet - >; - -template class - TAO_Seq_Out_T< - CORBA::OctetSeq, - CORBA::OctetSeq_var, - CORBA::Octet - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO_FixedSeq_Var_T< \ - OctetSeq, \ - CORBA::Octet \ - > - -# pragma instantiate \ - TAO_Seq_Var_Base_T< \ - OctetSeq, \ - CORBA::Octet \ - > - -# pragma instantiate \ - TAO_Seq_Out_T< \ - OctetSeq, \ - OctetSeq_var, \ - CORBA::Octet \ - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - #endif /* end #if !defined */ // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:284 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_CORBA_OctetSeq[] = { @@ -177,17 +137,14 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_OctetSeq ( sizeof (CORBA::OctetSeq) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_OctetSeq, - &_tc_TAO_tc_CORBA_OctetSeq - ) -TAO_NAMESPACE_END +namespace CORBA +{ + ::CORBA::TypeCode_ptr _tc_OctetSeq = + &_tc_TAO_tc_CORBA_OctetSeq; +} // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -244,15 +201,8 @@ CORBA::Boolean operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<CORBA::OctetSeq>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::OctetSeq> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - // TAO_IDL - Generated from -// be/be_visitor_sequence/cdr_op_cs.cpp:105 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:95 #if !defined _TAO_CDR_OP_CORBA_OctetSeq_CPP_ #define _TAO_CDR_OP_CORBA_OctetSeq_CPP_ @@ -345,3 +295,60 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_OctetSeq_CPP_ */ +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1703 + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + + template class + TAO_FixedSeq_Var_T< + CORBA::OctetSeq, + CORBA::Octet + >; + + template class + TAO_Seq_Var_Base_T< + CORBA::OctetSeq, + CORBA::Octet + >; + + template class + TAO_Seq_Out_T< + CORBA::OctetSeq, + CORBA::OctetSeq_var, + CORBA::Octet + >; + + template class + TAO::Any_Dual_Impl_T< + CORBA::OctetSeq + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# pragma instantiate \ + TAO_FixedSeq_Var_T< \ + CORBA::OctetSeq, \ + CORBA::Octet \ + > + +# pragma instantiate \ + TAO_Seq_Var_Base_T< \ + CORBA::OctetSeq, \ + CORBA::Octet \ + > + +# pragma instantiate \ + TAO_Seq_Out_T< \ + CORBA::OctetSeq, \ + CORBA::OctetSeq_var, \ + CORBA::Octet \ + > + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + CORBA::OctetSeq \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/OctetSeqC.h b/TAO/tao/OctetSeqC.h index 3f94608a4de..ce4f27c1654 100644 --- a/TAO/tao/OctetSeqC.h +++ b/TAO/tao/OctetSeqC.h @@ -26,21 +26,22 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be/be_codegen.cpp:151 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151 + +#ifndef _TAO_IDL_ORIG_OCTETSEQC_H_ +#define _TAO_IDL_ORIG_OCTETSEQC_H_ -#ifndef _TAO_IDL_ORIG__OCTETSEQC_H_ -#define _TAO_IDL_ORIG__OCTETSEQC_H_ #include /**/ "ace/pre.h" + #include "tao/corbafwd.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Sequence_T.h" #include "tao/Seq_Var_T.h" #include "tao/Seq_Out_T.h" -#include "tao/Sequence.h" - #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -66,13 +67,13 @@ #endif /* __BORLANDC__ */ // TAO_IDL - Generated from -// be/be_visitor_module/module_ch.cpp:48 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48 -TAO_NAMESPACE CORBA +namespace CORBA { // TAO_IDL - Generated from - // be/be_visitor_sequence/sequence_ch.cpp:100 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_CORBA_OCTETSEQ_CH_) #define _CORBA_OCTETSEQ_CH_ @@ -128,18 +129,25 @@ TAO_NAMESPACE CORBA #endif /* end #if !defined */ // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:44 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_OctetSeq; // TAO_IDL - Generated from -// be/be_visitor_module/module_ch.cpp:67 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:66 + +} // module CORBA -} -TAO_NAMESPACE_CLOSE // module CORBA +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:48 + +// Traits specializations. +namespace TAO +{ +}; // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_ch.cpp:52 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52 TAO_Export void operator<<= (CORBA::Any &, const CORBA::OctetSeq &); // copying version TAO_Export void operator<<= (CORBA::Any &, CORBA::OctetSeq*); // noncopying version @@ -147,12 +155,12 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OctetSeq *&); TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::OctetSeq *&); // TAO_IDL - Generated from -// be/be_visitor_root/cdr_op.cpp:48 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48 #ifndef __ACE_INLINE__ // TAO_IDL - Generated from -// be/be_visitor_sequence/cdr_op_ch.cpp:70 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:70 #if !defined _TAO_CDR_OP_CORBA_OctetSeq_H_ #define _TAO_CDR_OP_CORBA_OctetSeq_H_ @@ -169,12 +177,12 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_OctetSeq_H_ */ // TAO_IDL - Generated from -// be/be_visitor_root/cdr_op.cpp:64 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64 #endif /* __ACE_INLINE__ */ // TAO_IDL - Generated from -// be/be_codegen.cpp:1055 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "OctetSeqC.i" diff --git a/TAO/tao/OctetSeqC.i b/TAO/tao/OctetSeqC.i index b9c03e3c99e..c1b2b0c585b 100644 --- a/TAO/tao/OctetSeqC.i +++ b/TAO/tao/OctetSeqC.i @@ -27,7 +27,7 @@ // TAO_IDL - Generated from -// be/be_visitor_sequence/cdr_op_ci.cpp:81 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:81 #if !defined _TAO_CDR_OP_CORBA_OctetSeq_I_ #define _TAO_CDR_OP_CORBA_OctetSeq_I_ diff --git a/TAO/tao/PI_Forward.pidl b/TAO/tao/PI_Forward.pidl index aee3389a241..81574a21c6f 100644 --- a/TAO/tao/PI_Forward.pidl +++ b/TAO/tao/PI_Forward.pidl @@ -12,7 +12,7 @@ * using the following command: * * tao_idl.exe - * -o orig -Gp -Gd -Ge 1 + * -o orig -Gp -Gd -Ge 1 -GT * -Wb,export_macro=TAO_Export * -Wb,export_include=tao/TAO_Export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/PI_ForwardC.cpp b/TAO/tao/PI_ForwardC.cpp index 929808c426f..cd4c2322044 100644 --- a/TAO/tao/PI_ForwardC.cpp +++ b/TAO/tao/PI_ForwardC.cpp @@ -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:314 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:301 #include "PI_ForwardC.h" @@ -40,6 +40,14 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:59 + +// Arg traits specializations. +namespace TAO +{ +}; + +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_PortableInterceptor_ServerId[] = @@ -74,14 +82,11 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ServerId ( sizeof (PortableInterceptor::ServerId) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (PortableInterceptor) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_ServerId, - &_tc_TAO_tc_PortableInterceptor_ServerId - ) -TAO_NAMESPACE_END +namespace PortableInterceptor +{ + ::CORBA::TypeCode_ptr _tc_ServerId = + &_tc_TAO_tc_PortableInterceptor_ServerId; +} // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -116,14 +121,11 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBId ( sizeof (PortableInterceptor::ORBId) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (PortableInterceptor) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_ORBId, - &_tc_TAO_tc_PortableInterceptor_ORBId - ) -TAO_NAMESPACE_END +namespace PortableInterceptor +{ + ::CORBA::TypeCode_ptr _tc_ORBId = + &_tc_TAO_tc_PortableInterceptor_ORBId; +} // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -182,14 +184,11 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_AdapterName ( sizeof (PortableInterceptor::AdapterName) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (PortableInterceptor) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_AdapterName, - &_tc_TAO_tc_PortableInterceptor_AdapterName - ) -TAO_NAMESPACE_END +namespace PortableInterceptor +{ + ::CORBA::TypeCode_ptr _tc_AdapterName = + &_tc_TAO_tc_PortableInterceptor_AdapterName; +} // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -248,12 +247,18 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ObjectId ( sizeof (PortableInterceptor::ObjectId) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (PortableInterceptor) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_ObjectId, - &_tc_TAO_tc_PortableInterceptor_ObjectId - ) -TAO_NAMESPACE_END +namespace PortableInterceptor +{ + ::CORBA::TypeCode_ptr _tc_ObjectId = + &_tc_TAO_tc_PortableInterceptor_ObjectId; +} + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1703 + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PI_ForwardC.h b/TAO/tao/PI_ForwardC.h index 9ec4add1ee0..7108f15471e 100644 --- a/TAO/tao/PI_ForwardC.h +++ b/TAO/tao/PI_ForwardC.h @@ -68,7 +68,7 @@ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48 -TAO_NAMESPACE PortableInterceptor +namespace PortableInterceptor { // TAO_IDL - Generated from @@ -120,10 +120,17 @@ TAO_NAMESPACE PortableInterceptor TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectId; // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:66 -} -TAO_NAMESPACE_CLOSE // module PortableInterceptor +} // module PortableInterceptor + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:48 + +// Traits specializations. +namespace TAO +{ +}; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48 @@ -136,7 +143,7 @@ TAO_NAMESPACE_CLOSE // module PortableInterceptor #endif /* __ACE_INLINE__ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "PI_ForwardC.i" diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp index ca3321ad921..f2fbd91d1a1 100644 --- a/TAO/tao/PolicyC.cpp +++ b/TAO/tao/PolicyC.cpp @@ -15,24 +15,30 @@ // 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 -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:301 #include "PolicyC.h" #include "tao/Stub.h" -#include "tao/Invocation.h" -#include "tao/PortableInterceptor.h" - -#if TAO_HAS_INTERCEPTORS == 1 -#include "tao/RequestInfo_Util.h" -#include "tao/ClientRequestInfo_i.h" -#include "tao/ClientInterceptorAdapter.h" -#endif /* TAO_HAS_INTERCEPTORS == 1 */ +#include "tao/Invocation_Adapter.h" +#include "tao/Object_T.h" +#include "tao/Any_Impl_T.h" +#include "tao/Any_Dual_Impl_T.h" +#include "tao/Any_Basic_Impl_T.h" +#include "tao/Basic_Arguments.h" +#include "tao/Object_Argument_T.h" +#include "tao/Var_Size_Argument_T.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig @@ -43,26 +49,123 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:59 + +// Arg traits specializations. +namespace TAO +{ + +#if !defined (_CORBA_POLICY__ARG_TRAITS_CS_) +#define _CORBA_POLICY__ARG_TRAITS_CS_ + + ACE_TEMPLATE_SPECIALIZATION + class TAO_Export Arg_Traits<CORBA::Policy> + : public + Object_Arg_Traits_T< + CORBA::Policy_ptr, + CORBA::Policy_var, + CORBA::Policy_out, + TAO::Objref_Traits<CORBA::Policy> + > + { + }; + +#endif /* end #if !defined */ + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:262 + +#if !defined (__TAO_SEQ_CORBA_POLICY___ARG_TRAITS_CS_) +#define __TAO_SEQ_CORBA_POLICY___ARG_TRAITS_CS_ + + ACE_TEMPLATE_SPECIALIZATION + class TAO_Export Arg_Traits<CORBA::PolicyList> + : public + Var_Size_Arg_Traits_T< + CORBA::PolicyList, + CORBA::PolicyList_var, + CORBA::PolicyList_out + > + { + }; + +#endif /* end #if !defined */ + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:262 + +#if !defined (__TAO_SEQ_CORBA_POLICYTYPE___ARG_TRAITS_CS_) +#define __TAO_SEQ_CORBA_POLICYTYPE___ARG_TRAITS_CS_ + + ACE_TEMPLATE_SPECIALIZATION + class TAO_Export Arg_Traits<CORBA::PolicyTypeSeq> + : public + Var_Size_Arg_Traits_T< + CORBA::PolicyTypeSeq, + CORBA::PolicyTypeSeq_var, + CORBA::PolicyTypeSeq_out + > + { + }; + +#endif /* end #if !defined */ + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:390 + +#if !defined (_CORBA_SETOVERRIDETYPE__ARG_TRAITS_CS_) +#define _CORBA_SETOVERRIDETYPE__ARG_TRAITS_CS_ + + ACE_TEMPLATE_SPECIALIZATION + class TAO_Export Arg_Traits<CORBA::SetOverrideType> + : public + Basic_Arg_Traits_T< + CORBA::SetOverrideType + > + { + }; + +#endif /* end #if !defined */ + +#if !defined (_CORBA_POLICY__ARG_TRAITS_CS_) +#define _CORBA_POLICY__ARG_TRAITS_CS_ + + ACE_TEMPLATE_SPECIALIZATION + class TAO_Export Arg_Traits<CORBA::Policy> + : public + Object_Arg_Traits_T< + CORBA::Policy_ptr, + CORBA::Policy_var, + CORBA::Policy_out, + TAO::Objref_Traits<CORBA::Policy> + > + { + }; + +#endif /* end #if !defined */ +}; + +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_CORBA_PolicyErrorCode[] = { TAO_ENCAP_BYTE_ORDER, // byte order 38, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f506f), - ACE_NTOHL (0x6c696379), - ACE_NTOHL (0x4572726f), - ACE_NTOHL (0x72436f64), - ACE_NTOHL (0x653a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f506f), + ACE_NTOHL (0x6c696379), + ACE_NTOHL (0x4572726f), + ACE_NTOHL (0x72436f64), + ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CORBA/PolicyErrorCode:1.0 16, - ACE_NTOHL (0x506f6c69), - ACE_NTOHL (0x63794572), - ACE_NTOHL (0x726f7243), + ACE_NTOHL (0x506f6c69), + ACE_NTOHL (0x63794572), + ACE_NTOHL (0x726f7243), ACE_NTOHL (0x6f646500), // name = PolicyErrorCode CORBA::tk_short, @@ -76,16 +179,13 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyErrorCode ( sizeof (CORBA::PolicyErrorCode) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_PolicyErrorCode, - &_tc_TAO_tc_CORBA_PolicyErrorCode - ) -TAO_NAMESPACE_END +namespace CORBA +{ + ::CORBA::TypeCode_ptr _tc_PolicyErrorCode = + &_tc_TAO_tc_CORBA_PolicyErrorCode; +} -// TAO_IDL - Generated from +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63 CORBA::PolicyError::PolicyError (void) @@ -119,8 +219,9 @@ CORBA::PolicyError::operator= (const ::CORBA::PolicyError &_tao_excp) void CORBA::PolicyError::_tao_any_destructor (void *_tao_void_pointer) { - PolicyError *tmp = ACE_static_cast (PolicyError*, _tao_void_pointer); - delete tmp; + PolicyError *_tao_tmp_pointer = + ACE_static_cast (PolicyError*, _tao_void_pointer); + delete _tao_tmp_pointer; } CORBA::PolicyError * @@ -169,7 +270,7 @@ void CORBA::PolicyError::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -182,7 +283,7 @@ void CORBA::PolicyError::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -193,7 +294,8 @@ void CORBA::PolicyError::_tao_decode ( CORBA::PolicyError::PolicyError ( CORBA::PolicyErrorCode _tao_reason - ) : CORBA::UserException ( + ) + : CORBA::UserException ( "IDL:omg.org/CORBA/PolicyError:1.0", "PolicyError" ) @@ -214,41 +316,41 @@ static const CORBA::Long _oc_CORBA_PolicyError[] = { TAO_ENCAP_BYTE_ORDER, // byte order 34, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f506f), - ACE_NTOHL (0x6c696379), - ACE_NTOHL (0x4572726f), - ACE_NTOHL (0x723a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f506f), + ACE_NTOHL (0x6c696379), + ACE_NTOHL (0x4572726f), + ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CORBA/PolicyError:1.0 12, - ACE_NTOHL (0x506f6c69), - ACE_NTOHL (0x63794572), + ACE_NTOHL (0x506f6c69), + ACE_NTOHL (0x63794572), ACE_NTOHL (0x726f7200), // name = PolicyError 1, // member count 7, - ACE_NTOHL (0x72656173), + ACE_NTOHL (0x72656173), ACE_NTOHL (0x6f6e0000), // name = reason CORBA::tk_alias, // typecode kind for typedefs 72, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 38, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f506f), - ACE_NTOHL (0x6c696379), - ACE_NTOHL (0x4572726f), - ACE_NTOHL (0x72436f64), - ACE_NTOHL (0x653a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f506f), + ACE_NTOHL (0x6c696379), + ACE_NTOHL (0x4572726f), + ACE_NTOHL (0x72436f64), + ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CORBA/PolicyErrorCode:1.0 16, - ACE_NTOHL (0x506f6c69), - ACE_NTOHL (0x63794572), - ACE_NTOHL (0x726f7243), + ACE_NTOHL (0x506f6c69), + ACE_NTOHL (0x63794572), + ACE_NTOHL (0x726f7243), ACE_NTOHL (0x6f646500), // name = PolicyErrorCode CORBA::tk_short, @@ -263,32 +365,34 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyError ( sizeof (CORBA::PolicyError) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_PolicyError, - &_tc_TAO_tc_CORBA_PolicyError - ) -TAO_NAMESPACE_END +namespace CORBA +{ + ::CORBA::TypeCode_ptr _tc_PolicyError = + &_tc_TAO_tc_CORBA_PolicyError; +} -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50 +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:66 + +#if !defined (_CORBA_INVALIDPOLICIES__TAO_SEQ_CORBA_USHORT__CS_) +#define _CORBA_INVALIDPOLICIES__TAO_SEQ_CORBA_USHORT__CS_ -CORBA::InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort (void) +CORBA::InvalidPolicies::_tao_seq_CORBA_UShort_::_tao_seq_CORBA_UShort_ (void) {} -CORBA::InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort (CORBA::ULong max) +CORBA::InvalidPolicies::_tao_seq_CORBA_UShort_::_tao_seq_CORBA_UShort_ ( + CORBA::ULong max + ) : TAO_Unbounded_Sequence< CORBA::UShort > (max) {} -CORBA::InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort ( +CORBA::InvalidPolicies::_tao_seq_CORBA_UShort_::_tao_seq_CORBA_UShort_ ( CORBA::ULong max, CORBA::ULong length, - CORBA::UShort* buffer, + CORBA::UShort * buffer, CORBA::Boolean release ) : TAO_Unbounded_Sequence< @@ -297,23 +401,30 @@ CORBA::InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort ( (max, length, buffer, release) {} -CORBA::InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort (const _tao_seq_UShort &seq) +CORBA::InvalidPolicies::_tao_seq_CORBA_UShort_::_tao_seq_CORBA_UShort_ ( + const _tao_seq_CORBA_UShort_ &seq + ) : TAO_Unbounded_Sequence< CORBA::UShort > (seq) {} -CORBA::InvalidPolicies::_tao_seq_UShort::~_tao_seq_UShort (void) +CORBA::InvalidPolicies::_tao_seq_CORBA_UShort_::~_tao_seq_CORBA_UShort_ (void) {} -void CORBA::InvalidPolicies::_tao_seq_UShort::_tao_any_destructor (void *_tao_void_pointer) +void CORBA::InvalidPolicies::_tao_seq_CORBA_UShort_::_tao_any_destructor ( + void * _tao_void_pointer + ) { - _tao_seq_UShort *tmp = ACE_static_cast (_tao_seq_UShort*, _tao_void_pointer); - delete tmp; + _tao_seq_CORBA_UShort_ * _tao_tmp_pointer = + ACE_static_cast (_tao_seq_CORBA_UShort_ *, _tao_void_pointer); + delete _tao_tmp_pointer; } -// TAO_IDL - Generated from +#endif /* end #if !defined */ + +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63 CORBA::InvalidPolicies::InvalidPolicies (void) @@ -347,8 +458,9 @@ CORBA::InvalidPolicies::operator= (const ::CORBA::InvalidPolicies &_tao_excp) void CORBA::InvalidPolicies::_tao_any_destructor (void *_tao_void_pointer) { - InvalidPolicies *tmp = ACE_static_cast (InvalidPolicies*, _tao_void_pointer); - delete tmp; + InvalidPolicies *_tao_tmp_pointer = + ACE_static_cast (InvalidPolicies*, _tao_void_pointer); + delete _tao_tmp_pointer; } CORBA::InvalidPolicies * @@ -397,7 +509,7 @@ void CORBA::InvalidPolicies::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -410,7 +522,7 @@ void CORBA::InvalidPolicies::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -420,8 +532,9 @@ void CORBA::InvalidPolicies::_tao_decode ( // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ctor.cpp:66 CORBA::InvalidPolicies::InvalidPolicies ( - const CORBA::InvalidPolicies::_tao_seq_UShort & _tao_indices - ) : CORBA::UserException ( + const CORBA::InvalidPolicies::_tao_seq_CORBA_UShort_ & _tao_indices + ) + : CORBA::UserException ( "IDL:omg.org/CORBA/InvalidPolicies:1.0", "InvalidPolicies" ) @@ -442,24 +555,24 @@ static const CORBA::Long _oc_CORBA_InvalidPolicies[] = { TAO_ENCAP_BYTE_ORDER, // byte order 38, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f496e), - ACE_NTOHL (0x76616c69), - ACE_NTOHL (0x64506f6c), - ACE_NTOHL (0x69636965), - ACE_NTOHL (0x733a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f496e), + ACE_NTOHL (0x76616c69), + ACE_NTOHL (0x64506f6c), + ACE_NTOHL (0x69636965), + ACE_NTOHL (0x733a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CORBA/InvalidPolicies:1.0 16, - ACE_NTOHL (0x496e7661), - ACE_NTOHL (0x6c696450), - ACE_NTOHL (0x6f6c6963), + ACE_NTOHL (0x496e7661), + ACE_NTOHL (0x6c696450), + ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x69657300), // name = InvalidPolicies 1, // member count 8, - ACE_NTOHL (0x696e6469), + ACE_NTOHL (0x696e6469), ACE_NTOHL (0x63657300), // name = indices CORBA::tk_sequence, // typecode kind 12, // encapsulation length @@ -478,26 +591,29 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_InvalidPolicies ( sizeof (CORBA::InvalidPolicies) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_InvalidPolicies, - &_tc_TAO_tc_CORBA_InvalidPolicies - ) -TAO_NAMESPACE_END +namespace CORBA +{ + ::CORBA::TypeCode_ptr _tc_InvalidPolicies = + &_tc_TAO_tc_CORBA_InvalidPolicies; +} -// ======================================================= -// Hand-crafted +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60 + +// Traits specializations for CORBA::Policy. CORBA::Policy_ptr -TAO::Objref_Traits<CORBA::Policy>::tao_duplicate (CORBA::Policy_ptr p) +TAO::Objref_Traits<CORBA::Policy>::tao_duplicate ( + CORBA::Policy_ptr p + ) { return CORBA::Policy::_duplicate (p); } void -TAO::Objref_Traits<CORBA::Policy>::tao_release (CORBA::Policy_ptr p) +TAO::Objref_Traits<CORBA::Policy>::tao_release ( + CORBA::Policy_ptr p + ) { CORBA::release (p); } @@ -509,965 +625,180 @@ TAO::Objref_Traits<CORBA::Policy>::tao_nil (void) } CORBA::Boolean -TAO::Objref_Traits<CORBA::Policy>::tao_marshal (CORBA::Policy_ptr p, - TAO_OutputCDR & cdr) +TAO::Objref_Traits<CORBA::Policy>::tao_marshal ( + CORBA::Policy_ptr p, + TAO_OutputCDR & cdr + ) { return p->marshal (cdr); } -// ================================================================= - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61 - -int CORBA::Policy::_tao_class_id = 0; - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class - TAO_Objref_Var_T< - CORBA::Policy, - CORBA::tao_Policy_life - >; - -template class -TAO_Objref_Out_T< - CORBA::Policy, - CORBA::tao_Policy_life - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate \ - TAO_Objref_Var_T< \ - CORBA::Policy, \ - CORBA::tao_Policy_life \ - > - -# pragma instantiate \ - TAO_Objref_Out_T< \ - CORBA::Policy, \ - CORBA::tao_Policy_life \ - > -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_cs.cpp:56 - -#if (TAO_HAS_INTERCEPTORS == 1) - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76 - -class TAO_ClientRequestInfo_CORBA_Policy_policy_type_get : public TAO_ClientRequestInfo_i -{ -public: - TAO_ClientRequestInfo_CORBA_Policy_policy_type_get ( - TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - - virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - void result (::CORBA::PolicyType result); - - private: - TAO_ClientRequestInfo_CORBA_Policy_policy_type_get (const TAO_ClientRequestInfo_CORBA_Policy_policy_type_get &); - void operator= (const TAO_ClientRequestInfo_CORBA_Policy_policy_type_get &); - - ::CORBA::PolicyType _result; - }; - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376 - - TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::TAO_ClientRequestInfo_CORBA_Policy_policy_type_get ( - TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target - ACE_ENV_ARG_DECL_NOT_USED - ) - : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) -{} - -Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - // Generate the argument list on demand. - Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - - return parameter_list; -} - -Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - // Generate the exception list on demand. - Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - - return exception_list; -} - -CORBA::Any * -TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::result (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - // Generate the result on demand. - CORBA::Boolean tk_void_any = 0; - CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - - CORBA::Any_var safe_result_any = result_any; - - (*result_any) <<= this->_result; - return safe_result_any._retn (); -} - -void -TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::result (CORBA::PolicyType result) -{ - // Update the result. - this->_result = result; -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76 - -class TAO_ClientRequestInfo_CORBA_Policy_copy : public TAO_ClientRequestInfo_i -{ -public: - TAO_ClientRequestInfo_CORBA_Policy_copy ( - TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - - virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - void result (::CORBA::Policy_ptr result); - - private: - TAO_ClientRequestInfo_CORBA_Policy_copy (const TAO_ClientRequestInfo_CORBA_Policy_copy &); - void operator= (const TAO_ClientRequestInfo_CORBA_Policy_copy &); - - ::CORBA::Policy_ptr _result; - }; - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376 - - TAO_ClientRequestInfo_CORBA_Policy_copy::TAO_ClientRequestInfo_CORBA_Policy_copy ( - TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target - ACE_ENV_ARG_DECL_NOT_USED - ) - : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) -{} - -Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Policy_copy::arguments (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - // Generate the argument list on demand. - Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - - return parameter_list; -} - -Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Policy_copy::exceptions (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - // Generate the exception list on demand. - Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - - return exception_list; -} - -CORBA::Any * -TAO_ClientRequestInfo_CORBA_Policy_copy::result (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - // Generate the result on demand. - CORBA::Boolean tk_void_any = 0; - CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - - CORBA::Any_var safe_result_any = result_any; +// Function pointer for collocation factory initialization. +TAO::Collocation_Proxy_Broker * +(*CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer) ( + CORBA::Object_ptr obj + ) = 0; - (*result_any) <<= this->_result; - return safe_result_any._retn (); -} +// Hand crafted. -void -TAO_ClientRequestInfo_CORBA_Policy_copy::result (::CORBA::Policy_ptr result) +// **************************************************************** +CORBA::Boolean +CORBA::Policy::_tao_encode (TAO_OutputCDR &) { - // Update the result. - this->_result = result; + return 0; } -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:76 - -class TAO_ClientRequestInfo_CORBA_Policy_destroy : public TAO_ClientRequestInfo_i -{ -public: - TAO_ClientRequestInfo_CORBA_Policy_destroy ( - TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target - ACE_ENV_ARG_DECL_WITH_DEFAULTS); - - virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); - - private: - TAO_ClientRequestInfo_CORBA_Policy_destroy (const TAO_ClientRequestInfo_CORBA_Policy_destroy &); - void operator= (const TAO_ClientRequestInfo_CORBA_Policy_destroy &); - }; - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376 - - TAO_ClientRequestInfo_CORBA_Policy_destroy::TAO_ClientRequestInfo_CORBA_Policy_destroy ( - TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target - ACE_ENV_ARG_DECL_NOT_USED - ) - : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target) -{} - -Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_Policy_destroy::arguments (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) +CORBA::Boolean +CORBA::Policy::_tao_decode (TAO_InputCDR &) { - // Generate the argument list on demand. - Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - - return parameter_list; + return 0; } -Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_Policy_destroy::exceptions (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) +TAO_Cached_Policy_Type +CORBA::Policy::_tao_cached_type (void) const { - // Generate the exception list on demand. - Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - - return exception_list; + return TAO_CACHED_POLICY_UNCACHED; } -CORBA::Any * -TAO_ClientRequestInfo_CORBA_Policy_destroy::result (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) +TAO_Policy_Scope +CORBA::Policy::_tao_scope (void) const { - // Generate the result on demand. - CORBA::Boolean tk_void_any = 1; - CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - - return result_any; + return TAO_POLICY_DEFAULT_SCOPE; } - - - -#endif /* TAO_HAS_INTERCEPTORS */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31 - -/////////////////////////////////////////////////////////////////////// -// Base & Remote Proxy Implementation. -// - -CORBA::_TAO_Policy_Proxy_Impl::_TAO_Policy_Proxy_Impl (void) -{} - -CORBA::_TAO_Policy_Remote_Proxy_Impl::_TAO_Policy_Remote_Proxy_Impl (void) -{} - -// Remote Implementation of the IDL interface methods +// **************************************************************** // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:78 -CORBA::PolicyType CORBA::_TAO_Policy_Remote_Proxy_Impl::policy_type ( - CORBA::Object *_collocated_tao_target_ - ACE_ENV_ARG_DECL +CORBA::PolicyType CORBA::Policy::policy_type ( + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { - CORBA::PolicyType _tao_retval = 0; - TAO_Stub *istub = _collocated_tao_target_->_stubobj (); - - if (istub == 0) + if (!this->is_evaluated ()) { - ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval); + ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - - TAO_GIOP_Twoway_Invocation _tao_call ( - istub, - "_get_policy_type", - 16, - 0, - istub->orb_core () - ); - - int _invoke_status; - -#if (TAO_HAS_INTERCEPTORS == 1) - TAO_ClientRequestInterceptor_Adapter _tao_vfr ( - istub->orb_core ()->client_request_interceptors (), - &_tao_call, - _invoke_status - ); - -#endif /* TAO_HAS_INTERCEPTORS */ - - for (;;) + + if (this->the_TAO_Policy_Proxy_Broker_ == 0) { - _invoke_status = TAO_INVOKE_EXCEPTION; - -#if TAO_HAS_INTERCEPTORS == 1 - TAO_ClientRequestInfo_CORBA_Policy_policy_type_get _tao_ri ( - &_tao_call, - _collocated_tao_target_ - ACE_ENV_ARG_PARAMETER + CORBA_Policy_setup_collocation ( + this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated () ); - ACE_CHECK_RETURN (_tao_retval); - -#endif /* TAO_HAS_INTERCEPTORS */ - - CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; - TAO_INTERCEPTOR (_tao_ri.response_expected (1)); - -#if TAO_HAS_INTERCEPTORS == 1 - - ACE_TRY - { - _tao_vfr.send_request ( - &_tao_ri - ACE_ENV_ARG_PARAMETER - ); - ACE_TRY_CHECK; - - if (_invoke_status == TAO_INVOKE_RESTART) - { - _tao_call.restart_flag (1); - } - else - { - -#endif /* TAO_HAS_INTERCEPTORS */ - - _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); - - _tao_call.prepare_header ( - ACE_static_cast (CORBA::Octet, _tao_response_flag) - ACE_ENV_ARG_PARAMETER - ); - TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); - - - _invoke_status = - _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); - - if (_invoke_status == TAO_INVOKE_EXCEPTION) - { - TAO_INTERCEPTOR_THROW_RETURN ( - CORBA::UNKNOWN ( - CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES - ), - _tao_retval - ); - } - else if (_invoke_status == TAO_INVOKE_RESTART) - { - _tao_call.restart_flag (1); - TAO_INTERCEPTOR ( - _tao_ri.reply_status (_invoke_status); - _tao_vfr.receive_other ( - &_tao_ri - ACE_ENV_ARG_PARAMETER - ); - ACE_TRY_CHECK; - ) - } - else - { - - TAO_InputCDR &_tao_in = _tao_call.inp_stream (); - _tao_call.transport()->assign_translators (&_tao_in,0); - - if (!( - (_tao_in >> _tao_retval) - )) - { - TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); - - - } - -#if TAO_HAS_INTERCEPTORS == 1 - CORBA::PolicyType _tao_retval_info = - _tao_retval; - _tao_ri.result (_tao_retval_info); - - _tao_ri.reply_status (_invoke_status); - _tao_vfr.receive_reply ( - &_tao_ri - ACE_ENV_ARG_PARAMETER - ); - ACE_TRY_CHECK; - -#endif /* TAO_HAS_INTERCEPTORS */ - } - -#if TAO_HAS_INTERCEPTORS == 1 - } - } - ACE_CATCHANY - { - _tao_ri.exception (&ACE_ANY_EXCEPTION); - _tao_vfr.receive_exception ( - &_tao_ri - ACE_ENV_ARG_PARAMETER - ); - ACE_TRY_CHECK; - - const PortableInterceptor::ReplyStatus _tao_status = - _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION - || _tao_status == PortableInterceptor::USER_EXCEPTION) - { - ACE_RE_THROW; - } - } - -# if defined (ACE_HAS_EXCEPTIONS) \ - && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS) - ACE_CATCHALL - { - CORBA::UNKNOWN ex; - - _tao_ri.exception (&ex); - _tao_vfr.receive_exception ( - &_tao_ri - ACE_ENV_ARG_PARAMETER - ); - ACE_TRY_CHECK; - - const PortableInterceptor::ReplyStatus _tao_status = - _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION) - ACE_TRY_THROW (ex); - } -# endif /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */ - - ACE_ENDTRY; - ACE_CHECK_RETURN (_tao_retval); - - const PortableInterceptor::ReplyStatus _tao_status = - _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (_tao_retval); - - if (_tao_status != PortableInterceptor::LOCATION_FORWARD - && _tao_status != PortableInterceptor::TRANSPORT_RETRY) - -#endif /* TAO_HAS_INTERCEPTORS */ - - if (_invoke_status != TAO_INVOKE_RESTART) - break; } - -return _tao_retval; + + TAO::Arg_Traits<CORBA::PolicyType>::ret_val _tao_retval; + + TAO::Argument *_tao_signature [] = + { + &_tao_retval + }; + + TAO::Invocation_Adapter _tao_call ( + this, + _tao_signature, + 1, + "_get_policy_type", + 16, + this->the_TAO_Policy_Proxy_Broker_ + ); + + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (_tao_retval.excp ()); + + return _tao_retval.retn (); } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:78 -::CORBA::Policy_ptr CORBA::_TAO_Policy_Remote_Proxy_Impl::copy ( - CORBA::Object *_collocated_tao_target_ - ACE_ENV_ARG_DECL +::CORBA::Policy_ptr CORBA::Policy::copy ( + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { - CORBA::Policy_var _tao_retval (CORBA::Policy::_nil ()); - TAO_Stub *istub = _collocated_tao_target_->_stubobj (); - - if (istub == 0) + if (!this->is_evaluated ()) { - ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ()); + ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - - TAO_GIOP_Twoway_Invocation _tao_call ( - istub, - "copy", - 4, - 0, - istub->orb_core () - ); - - int _invoke_status; - -#if (TAO_HAS_INTERCEPTORS == 1) - TAO_ClientRequestInterceptor_Adapter _tao_vfr ( - istub->orb_core ()->client_request_interceptors (), - &_tao_call, - _invoke_status - ); - -#endif /* TAO_HAS_INTERCEPTORS */ - - for (;;) + + if (this->the_TAO_Policy_Proxy_Broker_ == 0) { - _invoke_status = TAO_INVOKE_EXCEPTION; - -#if TAO_HAS_INTERCEPTORS == 1 - TAO_ClientRequestInfo_CORBA_Policy_copy _tao_ri ( - &_tao_call, - _collocated_tao_target_ - ACE_ENV_ARG_PARAMETER + CORBA_Policy_setup_collocation ( + this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated () ); - ACE_CHECK_RETURN (_tao_retval._retn ()); - -#endif /* TAO_HAS_INTERCEPTORS */ - - CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; - TAO_INTERCEPTOR (_tao_ri.response_expected (1)); - -#if TAO_HAS_INTERCEPTORS == 1 - - ACE_TRY - { - _tao_vfr.send_request ( - &_tao_ri - ACE_ENV_ARG_PARAMETER - ); - ACE_TRY_CHECK; - - if (_invoke_status == TAO_INVOKE_RESTART) - { - _tao_call.restart_flag (1); - } - else - { - -#endif /* TAO_HAS_INTERCEPTORS */ - - _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ()); - - _tao_call.prepare_header ( - ACE_static_cast (CORBA::Octet, _tao_response_flag) - ACE_ENV_ARG_PARAMETER - ); - TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ()); - - - _invoke_status = - _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ()); - - if (_invoke_status == TAO_INVOKE_EXCEPTION) - { - TAO_INTERCEPTOR_THROW_RETURN ( - CORBA::UNKNOWN ( - CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES - ), - 0 - ); - } - else if (_invoke_status == TAO_INVOKE_RESTART) - { - _tao_call.restart_flag (1); - TAO_INTERCEPTOR ( - _tao_ri.reply_status (_invoke_status); - _tao_vfr.receive_other ( - &_tao_ri - ACE_ENV_ARG_PARAMETER - ); - ACE_TRY_CHECK; - ) - } - else - { - - TAO_InputCDR &_tao_in = _tao_call.inp_stream (); - _tao_call.transport()->assign_translators (&_tao_in,0); - - if (!( - (_tao_in >> _tao_retval.inout ()) - )) - { - TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ()); - - - } - -#if TAO_HAS_INTERCEPTORS == 1 - ::CORBA::Policy_ptr _tao_retval_info = - _tao_retval._retn (); - _tao_ri.result (_tao_retval_info); - _tao_retval = _tao_retval_info; - - _tao_ri.reply_status (_invoke_status); - _tao_vfr.receive_reply ( - &_tao_ri - ACE_ENV_ARG_PARAMETER - ); - ACE_TRY_CHECK; - -#endif /* TAO_HAS_INTERCEPTORS */ - } - -#if TAO_HAS_INTERCEPTORS == 1 - } - } - ACE_CATCHANY - { - _tao_ri.exception (&ACE_ANY_EXCEPTION); - _tao_vfr.receive_exception ( - &_tao_ri - ACE_ENV_ARG_PARAMETER - ); - ACE_TRY_CHECK; - - const PortableInterceptor::ReplyStatus _tao_status = - _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION - || _tao_status == PortableInterceptor::USER_EXCEPTION) - { - ACE_RE_THROW; - } - } - -# if defined (ACE_HAS_EXCEPTIONS) \ - && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS) - ACE_CATCHALL - { - CORBA::UNKNOWN ex; - - _tao_ri.exception (&ex); - _tao_vfr.receive_exception ( - &_tao_ri - ACE_ENV_ARG_PARAMETER - ); - ACE_TRY_CHECK; - - const PortableInterceptor::ReplyStatus _tao_status = - _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION) - ACE_TRY_THROW (ex); - } -# endif /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */ - - ACE_ENDTRY; - ACE_CHECK_RETURN (_tao_retval._retn ()); - - const PortableInterceptor::ReplyStatus _tao_status = - _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (_tao_retval._retn ()); - - if (_tao_status != PortableInterceptor::LOCATION_FORWARD - && _tao_status != PortableInterceptor::TRANSPORT_RETRY) - -#endif /* TAO_HAS_INTERCEPTORS */ - - if (_invoke_status != TAO_INVOKE_RESTART) - break; } - -return _tao_retval._retn (); + + TAO::Arg_Traits<CORBA::Policy>::ret_val _tao_retval; + + TAO::Argument *_tao_signature [] = + { + &_tao_retval + }; + + TAO::Invocation_Adapter _tao_call ( + this, + _tao_signature, + 1, + "copy", + 4, + this->the_TAO_Policy_Proxy_Broker_ + ); + + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (_tao_retval.excp ()); + + return _tao_retval.retn (); } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/remote_proxy_impl_cs.cpp:63 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:78 -void CORBA::_TAO_Policy_Remote_Proxy_Impl::destroy ( - CORBA::Object *_collocated_tao_target_ - ACE_ENV_ARG_DECL +void CORBA::Policy::destroy ( + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { - TAO_Stub *istub = _collocated_tao_target_->_stubobj (); - - if (istub == 0) + if (!this->is_evaluated ()) { - ACE_THROW (CORBA::INTERNAL ()); + ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this); } - - TAO_GIOP_Twoway_Invocation _tao_call ( - istub, - "destroy", - 7, - 0, - istub->orb_core () - ); - - int _invoke_status; - -#if (TAO_HAS_INTERCEPTORS == 1) - TAO_ClientRequestInterceptor_Adapter _tao_vfr ( - istub->orb_core ()->client_request_interceptors (), - &_tao_call, - _invoke_status - ); - -#endif /* TAO_HAS_INTERCEPTORS */ - - for (;;) + + if (this->the_TAO_Policy_Proxy_Broker_ == 0) { - _invoke_status = TAO_INVOKE_EXCEPTION; - -#if TAO_HAS_INTERCEPTORS == 1 - TAO_ClientRequestInfo_CORBA_Policy_destroy _tao_ri ( - &_tao_call, - _collocated_tao_target_ - ACE_ENV_ARG_PARAMETER + CORBA_Policy_setup_collocation ( + this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated () ); - ACE_CHECK; - -#endif /* TAO_HAS_INTERCEPTORS */ - - CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; - TAO_INTERCEPTOR (_tao_ri.response_expected (1)); - -#if TAO_HAS_INTERCEPTORS == 1 - - ACE_TRY - { - _tao_vfr.send_request ( - &_tao_ri - ACE_ENV_ARG_PARAMETER - ); - ACE_TRY_CHECK; - - if (_invoke_status == TAO_INVOKE_RESTART) - { - _tao_call.restart_flag (1); - } - else - { - -#endif /* TAO_HAS_INTERCEPTORS */ - - _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK; - - _tao_call.prepare_header ( - ACE_static_cast (CORBA::Octet, _tao_response_flag) - ACE_ENV_ARG_PARAMETER - ); - TAO_INTERCEPTOR_CHECK; - - - _invoke_status = - _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); - TAO_INTERCEPTOR_CHECK; - - if (_invoke_status == TAO_INVOKE_EXCEPTION) - { - TAO_INTERCEPTOR_THROW ( - CORBA::UNKNOWN ( - CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES - ) - ); - } - else if (_invoke_status == TAO_INVOKE_RESTART) - { - _tao_call.restart_flag (1); - TAO_INTERCEPTOR ( - _tao_ri.reply_status (_invoke_status); - _tao_vfr.receive_other ( - &_tao_ri - ACE_ENV_ARG_PARAMETER - ); - ACE_TRY_CHECK; - ) - } - else - { -#if TAO_HAS_INTERCEPTORS == 1 - - _tao_ri.reply_status (_invoke_status); - _tao_vfr.receive_reply ( - &_tao_ri - ACE_ENV_ARG_PARAMETER - ); - ACE_TRY_CHECK; - -#endif /* TAO_HAS_INTERCEPTORS */ - } - -#if TAO_HAS_INTERCEPTORS == 1 - } - } - ACE_CATCHANY - { - _tao_ri.exception (&ACE_ANY_EXCEPTION); - _tao_vfr.receive_exception ( - &_tao_ri - ACE_ENV_ARG_PARAMETER - ); - ACE_TRY_CHECK; - - const PortableInterceptor::ReplyStatus _tao_status = - _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION - || _tao_status == PortableInterceptor::USER_EXCEPTION) - { - ACE_RE_THROW; - } - } - -# if defined (ACE_HAS_EXCEPTIONS) \ - && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS) - ACE_CATCHALL - { - CORBA::UNKNOWN ex; - - _tao_ri.exception (&ex); - _tao_vfr.receive_exception ( - &_tao_ri - ACE_ENV_ARG_PARAMETER - ); - ACE_TRY_CHECK; - - const PortableInterceptor::ReplyStatus _tao_status = - _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION) - ACE_TRY_THROW (ex); - } -# endif /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */ - - ACE_ENDTRY; - ACE_CHECK; - - const PortableInterceptor::ReplyStatus _tao_status = - _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - - if (_tao_status != PortableInterceptor::LOCATION_FORWARD - && _tao_status != PortableInterceptor::TRANSPORT_RETRY) - -#endif /* TAO_HAS_INTERCEPTORS */ - - if (_invoke_status != TAO_INVOKE_RESTART) - break; } + + TAO::Arg_Traits<void>::ret_val _tao_retval; + + TAO::Argument *_tao_signature [] = + { + &_tao_retval + }; + + TAO::Invocation_Adapter _tao_call ( + this, + _tao_signature, + 1, + "destroy", + 7, + this->the_TAO_Policy_Proxy_Broker_ + ); + + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); + ACE_CHECK; } -// -// End Base & Remote Proxy Implemeentation. -/////////////////////////////////////////////////////////////////////// - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_cs.cpp:31 - -/////////////////////////////////////////////////////////////////////// -// Remote & Base Proxy Broker Implementation -// - -CORBA::_TAO_Policy_Proxy_Broker::_TAO_Policy_Proxy_Broker (void) -{ -} - -CORBA::_TAO_Policy_Proxy_Broker::~_TAO_Policy_Proxy_Broker (void) -{ -} - -CORBA::_TAO_Policy_Proxy_Broker * (*CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer) ( - CORBA::Object_ptr obj - ) = 0; - -// Factory Member function Implementation. -CORBA::_TAO_Policy_Remote_Proxy_Broker * -CORBA::_TAO_Policy_Remote_Proxy_Broker::the_TAO_Policy_Remote_Proxy_Broker (void) -{ - static ::CORBA::_TAO_Policy_Remote_Proxy_Broker remote_proxy_broker; - return &remote_proxy_broker; -} - -CORBA::_TAO_Policy_Remote_Proxy_Broker::_TAO_Policy_Remote_Proxy_Broker (void) -{ -} - -CORBA::_TAO_Policy_Remote_Proxy_Broker::~_TAO_Policy_Remote_Proxy_Broker (void) -{ -} - -CORBA::_TAO_Policy_Proxy_Impl& -CORBA::_TAO_Policy_Remote_Proxy_Broker::select_proxy ( - ::CORBA::Policy * - ACE_ENV_ARG_DECL_NOT_USED - ) -{ - return this->remote_proxy_impl_; -} - -// -// End Remote & Base Proxy Broker Implementation -/////////////////////////////////////////////////////////////////////// - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 - CORBA::Policy::Policy (int collocated) + : the_TAO_Policy_Proxy_Broker_ (0) { this->CORBA_Policy_setup_collocation (collocated); } @@ -1476,118 +807,36 @@ void CORBA::Policy::CORBA_Policy_setup_collocation (int collocated) { if (collocated) - this->the_TAO_Policy_Proxy_Broker_ = - ::CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer (this); - else - this->the_TAO_Policy_Proxy_Broker_ = - ::CORBA::_TAO_Policy_Remote_Proxy_Broker::the_TAO_Policy_Remote_Proxy_Broker (); + { + this->the_TAO_Policy_Proxy_Broker_ = + ::CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer (this); + } } CORBA::Policy::~Policy (void) {} -void +void CORBA::Policy::_tao_any_destructor (void *_tao_void_pointer) { - Policy *tmp = ACE_static_cast (Policy *, _tao_void_pointer); - CORBA::release (tmp); + Policy *_tao_tmp_pointer = + ACE_static_cast (Policy *, _tao_void_pointer); + CORBA::release (_tao_tmp_pointer); } CORBA::Policy_ptr CORBA::Policy::_narrow ( - CORBA::Object_ptr obj + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL ) { - if (CORBA::is_nil (obj)) - { - return Policy::_nil (); - } - - if (! obj->_is_local ()) - { - CORBA::Boolean is_a = - obj->_is_a ( - "IDL:omg.org/CORBA/Policy:1.0" - ACE_ENV_ARG_PARAMETER - ); - ACE_CHECK_RETURN (Policy::_nil ()); - - if (is_a == 0) - { - return Policy::_nil (); - } - } - - return Policy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); -} - -CORBA::Policy_ptr -CORBA::Policy::_unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED - ) -{ - if (CORBA::is_nil (obj)) - { - return Policy::_nil (); - } - - if (! obj->_is_local ()) - { - TAO_Stub* stub = obj->_stubobj (); - - if (stub != 0) - { - stub->_incr_refcnt (); - } - - Policy_ptr default_proxy = Policy::_nil (); - - if ( - !CORBA::is_nil (stub->servant_orb_var ().ptr ()) && - stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () && - obj->_is_collocated () && - CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer != 0 - ) - { - ACE_NEW_RETURN ( - default_proxy, - ::CORBA::Policy ( - stub, - 1, - obj->_servant () - ), - Policy::_nil () - ); - } - - if (CORBA::is_nil (default_proxy)) - { - ACE_NEW_RETURN ( - default_proxy, - ::CORBA::Policy ( - stub, - 0, - obj->_servant () - ), - Policy::_nil () - ); - } - - return default_proxy; - } - else - return - ACE_reinterpret_cast ( - Policy_ptr, - obj->_tao_QueryInterface ( - ACE_reinterpret_cast ( - ptrdiff_t, - &Policy::_tao_class_id - ) - ) - ); + return + TAO::Narrow_Utils<Policy>::narrow ( + _tao_objref, + "IDL:omg.org/CORBA/Policy:1.0", + CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer + ACE_ENV_ARG_PARAMETER + ); } CORBA::Policy_ptr @@ -1597,7 +846,7 @@ CORBA::Policy::_duplicate (Policy_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -1629,37 +878,6 @@ CORBA::Policy::_is_a ( } } -void *CORBA::Policy::_tao_QueryInterface (ptrdiff_t type) -{ - void *retv = 0; - - if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &ACE_NESTED_CLASS (::CORBA, Policy)::_tao_class_id) - ) - { - retv = ACE_reinterpret_cast (void*, this); - } - else if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &CORBA::Object::_tao_class_id) - ) - { - retv = - ACE_reinterpret_cast ( - void *, - ACE_static_cast (CORBA::Object_ptr, this) - ); - } - - if (retv != 0) - { - this->_add_ref (); - } - - return retv; -} - const char* CORBA::Policy::_interface_repository_id (void) const { return "IDL:omg.org/CORBA/Policy:1.0"; @@ -1671,92 +889,6 @@ CORBA::Policy::marshal (TAO_OutputCDR &cdr) return (cdr << this); } -// **************************************************************** -CORBA::Boolean -CORBA::Policy::_tao_encode (TAO_OutputCDR &) -{ - return 0; -} - -CORBA::Boolean -CORBA::Policy::_tao_decode (TAO_InputCDR &) -{ - return 0; -} - -TAO_Cached_Policy_Type -CORBA::Policy::_tao_cached_type (void) const -{ - return TAO_CACHED_POLICY_UNCACHED; -} - -TAO_Policy_Scope -CORBA::Policy::_tao_scope (void) const -{ - return TAO_POLICY_DEFAULT_SCOPE; -} -// **************************************************************** - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80 - -CORBA::PolicyType CORBA::Policy::policy_type ( - ACE_ENV_SINGLE_ARG_DECL - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - _TAO_Policy_Proxy_Impl &proxy = - this->the_TAO_Policy_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - - return proxy.policy_type ( - this - ACE_ENV_ARG_PARAMETER - ); -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80 - -::CORBA::Policy_ptr CORBA::Policy::copy ( - ACE_ENV_SINGLE_ARG_DECL - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - _TAO_Policy_Proxy_Impl &proxy = - this->the_TAO_Policy_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - - return proxy.copy ( - this - ACE_ENV_ARG_PARAMETER - ); -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80 - -void CORBA::Policy::destroy ( - ACE_ENV_SINGLE_ARG_DECL - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - _TAO_Policy_Proxy_Impl &proxy = - this->the_TAO_Policy_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - proxy.destroy ( - this - ACE_ENV_ARG_PARAMETER - ); -} - // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -1764,16 +896,16 @@ static const CORBA::Long _oc_CORBA_Policy[] = { TAO_ENCAP_BYTE_ORDER, // byte order 29, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f506f), - ACE_NTOHL (0x6c696379), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f506f), + ACE_NTOHL (0x6c696379), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Policy:1.0 7, - ACE_NTOHL (0x506f6c69), + ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63790000), // name = Policy }; @@ -1785,46 +917,53 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Policy ( sizeof (CORBA::Policy) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_Policy, - &_tc_TAO_tc_CORBA_Policy - ) -TAO_NAMESPACE_END +namespace CORBA +{ + ::CORBA::TypeCode_ptr _tc_Policy = + &_tc_TAO_tc_CORBA_Policy; +} // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60 -int CORBA::PolicyManager::_tao_class_id = 0; +// Traits specializations for CORBA::PolicyManager. -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class - TAO_Objref_Var_T< - CORBA::PolicyManager, - CORBA::tao_PolicyManager_life - >; - template class - TAO_Objref_Out_T< - CORBA::PolicyManager, - CORBA::tao_PolicyManager_life - >; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate \ - TAO_Objref_Var_T< \ - CORBA::PolicyManager, \ - CORBA::tao_PolicyManager_life \ - > -# pragma instantiate \ - TAO_Objref_Out_T< \ - CORBA::PolicyManager, \ - CORBA::tao_PolicyManager_life \ - > -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +CORBA::PolicyManager_ptr +TAO::Objref_Traits<CORBA::PolicyManager>::tao_duplicate ( + CORBA::PolicyManager_ptr p + ) +{ + return CORBA::PolicyManager::_duplicate (p); +} -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 +void +TAO::Objref_Traits<CORBA::PolicyManager>::tao_release ( + CORBA::PolicyManager_ptr p + ) +{ + CORBA::release (p); +} + +CORBA::PolicyManager_ptr +TAO::Objref_Traits<CORBA::PolicyManager>::tao_nil (void) +{ + return CORBA::PolicyManager::_nil (); +} + +CORBA::Boolean +TAO::Objref_Traits<CORBA::PolicyManager>::tao_marshal ( + CORBA::PolicyManager_ptr p, + TAO_OutputCDR & cdr + ) +{ + return p->marshal (cdr); +} + +// Function pointer for collocation factory initialization. +TAO::Collocation_Proxy_Broker * +(*CORBA__TAO_PolicyManager_Proxy_Broker_Factory_function_pointer) ( + CORBA::Object_ptr obj + ) = 0; CORBA::PolicyManager::PolicyManager (void) {} @@ -1832,43 +971,29 @@ CORBA::PolicyManager::PolicyManager (void) CORBA::PolicyManager::~PolicyManager (void) {} -void +void CORBA::PolicyManager::_tao_any_destructor (void *_tao_void_pointer) { - PolicyManager *tmp = ACE_static_cast (PolicyManager *, _tao_void_pointer); - CORBA::release (tmp); + PolicyManager *_tao_tmp_pointer = + ACE_static_cast (PolicyManager *, _tao_void_pointer); + CORBA::release (_tao_tmp_pointer); } CORBA::PolicyManager_ptr CORBA::PolicyManager::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) -{ - return PolicyManager::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); -} - -CORBA::PolicyManager_ptr -CORBA::PolicyManager::_unchecked_narrow ( - CORBA::Object_ptr obj + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { - if (CORBA::is_nil (obj)) + if (CORBA::is_nil (_tao_objref)) { return PolicyManager::_nil (); } - - return - ACE_reinterpret_cast ( - PolicyManager_ptr, - obj->_tao_QueryInterface ( - ACE_reinterpret_cast ( - ptrdiff_t, - &PolicyManager::_tao_class_id - ) - ) - ); + + PolicyManager_ptr proxy = + dynamic_cast<PolicyManager_ptr> (_tao_objref); +; + return PolicyManager::_duplicate (proxy); } CORBA::PolicyManager_ptr @@ -1878,39 +1003,37 @@ CORBA::PolicyManager::_duplicate (PolicyManager_ptr obj) { obj->_add_ref (); } - + return obj; } -void *CORBA::PolicyManager::_tao_QueryInterface (ptrdiff_t type) +CORBA::Boolean +CORBA::PolicyManager::_is_a ( + const char *value + ACE_ENV_ARG_DECL_NOT_USED + ) { - void *retv = 0; - - if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &ACE_NESTED_CLASS (::CORBA, PolicyManager)::_tao_class_id) - ) - { - retv = ACE_reinterpret_cast (void*, this); - } - else if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &CORBA::Object::_tao_class_id) - ) + if ( + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/PolicyManager:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/LocalObject:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/Object:1.0" + ) + ) { - retv = - ACE_reinterpret_cast ( - void *, - ACE_static_cast (CORBA::Object_ptr, this) - ); + return 1; // success using local knowledge } - - if (retv != 0) + else { - this->_add_ref (); + return 0; } - - return retv; } const char* CORBA::PolicyManager::_interface_repository_id (void) const @@ -1931,19 +1054,19 @@ static const CORBA::Long _oc_CORBA_PolicyManager[] = { TAO_ENCAP_BYTE_ORDER, // byte order 36, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f506f), - ACE_NTOHL (0x6c696379), - ACE_NTOHL (0x4d616e61), - ACE_NTOHL (0x6765723a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f506f), + ACE_NTOHL (0x6c696379), + ACE_NTOHL (0x4d616e61), + ACE_NTOHL (0x6765723a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/PolicyManager:1.0 14, - ACE_NTOHL (0x506f6c69), - ACE_NTOHL (0x63794d61), - ACE_NTOHL (0x6e616765), + ACE_NTOHL (0x506f6c69), + ACE_NTOHL (0x63794d61), + ACE_NTOHL (0x6e616765), ACE_NTOHL (0x72000000), // name = PolicyManager }; @@ -1955,46 +1078,53 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyManager ( sizeof (CORBA::PolicyManager) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_PolicyManager, - &_tc_TAO_tc_CORBA_PolicyManager - ) -TAO_NAMESPACE_END +namespace CORBA +{ + ::CORBA::TypeCode_ptr _tc_PolicyManager = + &_tc_TAO_tc_CORBA_PolicyManager; +} // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60 -int CORBA::PolicyCurrent::_tao_class_id = 0; +// Traits specializations for CORBA::PolicyCurrent. -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class - TAO_Objref_Var_T< - CORBA::PolicyCurrent, - CORBA::tao_PolicyCurrent_life - >; - template class - TAO_Objref_Out_T< - CORBA::PolicyCurrent, - CORBA::tao_PolicyCurrent_life - >; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate \ - TAO_Objref_Var_T< \ - CORBA::PolicyCurrent, \ - CORBA::tao_PolicyCurrent_life \ - > -# pragma instantiate \ - TAO_Objref_Out_T< \ - CORBA::PolicyCurrent, \ - CORBA::tao_PolicyCurrent_life \ - > -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +CORBA::PolicyCurrent_ptr +TAO::Objref_Traits<CORBA::PolicyCurrent>::tao_duplicate ( + CORBA::PolicyCurrent_ptr p + ) +{ + return CORBA::PolicyCurrent::_duplicate (p); +} -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 +void +TAO::Objref_Traits<CORBA::PolicyCurrent>::tao_release ( + CORBA::PolicyCurrent_ptr p + ) +{ + CORBA::release (p); +} + +CORBA::PolicyCurrent_ptr +TAO::Objref_Traits<CORBA::PolicyCurrent>::tao_nil (void) +{ + return CORBA::PolicyCurrent::_nil (); +} + +CORBA::Boolean +TAO::Objref_Traits<CORBA::PolicyCurrent>::tao_marshal ( + CORBA::PolicyCurrent_ptr p, + TAO_OutputCDR & cdr + ) +{ + return p->marshal (cdr); +} + +// Function pointer for collocation factory initialization. +TAO::Collocation_Proxy_Broker * +(*CORBA__TAO_PolicyCurrent_Proxy_Broker_Factory_function_pointer) ( + CORBA::Object_ptr obj + ) = 0; CORBA::PolicyCurrent::PolicyCurrent (void) {} @@ -2002,43 +1132,29 @@ CORBA::PolicyCurrent::PolicyCurrent (void) CORBA::PolicyCurrent::~PolicyCurrent (void) {} -void +void CORBA::PolicyCurrent::_tao_any_destructor (void *_tao_void_pointer) { - PolicyCurrent *tmp = ACE_static_cast (PolicyCurrent *, _tao_void_pointer); - CORBA::release (tmp); + PolicyCurrent *_tao_tmp_pointer = + ACE_static_cast (PolicyCurrent *, _tao_void_pointer); + CORBA::release (_tao_tmp_pointer); } CORBA::PolicyCurrent_ptr CORBA::PolicyCurrent::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) -{ - return PolicyCurrent::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); -} - -CORBA::PolicyCurrent_ptr -CORBA::PolicyCurrent::_unchecked_narrow ( - CORBA::Object_ptr obj + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { - if (CORBA::is_nil (obj)) + if (CORBA::is_nil (_tao_objref)) { return PolicyCurrent::_nil (); } + + PolicyCurrent_ptr proxy = + dynamic_cast<PolicyCurrent_ptr> (_tao_objref); - return - ACE_reinterpret_cast ( - PolicyCurrent_ptr, - obj->_tao_QueryInterface ( - ACE_reinterpret_cast ( - ptrdiff_t, - &PolicyCurrent::_tao_class_id - ) - ) - ); + return PolicyCurrent::_duplicate (proxy); } CORBA::PolicyCurrent_ptr @@ -2048,67 +1164,45 @@ CORBA::PolicyCurrent::_duplicate (PolicyCurrent_ptr obj) { obj->_add_ref (); } - + return obj; } -void *CORBA::PolicyCurrent::_tao_QueryInterface (ptrdiff_t type) +CORBA::Boolean +CORBA::PolicyCurrent::_is_a ( + const char *value + ACE_ENV_ARG_DECL_NOT_USED + ) { - void *retv = 0; - - if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &ACE_NESTED_CLASS (::CORBA, PolicyCurrent)::_tao_class_id) - ) - { - retv = ACE_reinterpret_cast (void*, this); - } - else if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &ACE_NESTED_CLASS (::CORBA, PolicyManager)::_tao_class_id) - ) - { - retv = - ACE_reinterpret_cast ( - void *, - ACE_static_cast ( - CORBA::PolicyManager_ptr, - this - ) - ); - } - else if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &::CORBA::Current::_tao_class_id) - ) - { - retv = - ACE_reinterpret_cast ( - void *, - ACE_static_cast ( - CORBA::Current_ptr, - this - ) - ); - } - else if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &CORBA::Object::_tao_class_id) - ) + if ( + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/PolicyManager:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/Current:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/PolicyCurrent:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/LocalObject:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/Object:1.0" + ) + ) { - retv = - ACE_reinterpret_cast ( - void *, - ACE_static_cast (CORBA::Object_ptr, this) - ); + return 1; // success using local knowledge } - - if (retv != 0) + else { - this->_add_ref (); + return 0; } - - return retv; } const char* CORBA::PolicyCurrent::_interface_repository_id (void) const @@ -2129,19 +1223,19 @@ static const CORBA::Long _oc_CORBA_PolicyCurrent[] = { TAO_ENCAP_BYTE_ORDER, // byte order 36, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f506f), - ACE_NTOHL (0x6c696379), - ACE_NTOHL (0x43757272), - ACE_NTOHL (0x656e743a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f506f), + ACE_NTOHL (0x6c696379), + ACE_NTOHL (0x43757272), + ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/PolicyCurrent:1.0 14, - ACE_NTOHL (0x506f6c69), - ACE_NTOHL (0x63794375), - ACE_NTOHL (0x7272656e), + ACE_NTOHL (0x506f6c69), + ACE_NTOHL (0x63794375), + ACE_NTOHL (0x7272656e), ACE_NTOHL (0x74000000), // name = PolicyCurrent }; @@ -2153,17 +1247,41 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyCurrent ( sizeof (CORBA::PolicyCurrent) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_PolicyCurrent, - &_tc_TAO_tc_CORBA_PolicyCurrent - ) -TAO_NAMESPACE_END +namespace CORBA +{ + ::CORBA::TypeCode_ptr _tc_PolicyCurrent = + &_tc_TAO_tc_CORBA_PolicyCurrent; +} -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54 +// 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<CORBA::PolicyError>::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<<= ( @@ -2220,15 +1338,35 @@ CORBA::Boolean operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<CORBA::PolicyError>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::PolicyError \> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:50 -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54 +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::Any_Dual_Impl_T<CORBA::InvalidPolicies>::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<<= ( @@ -2285,15 +1423,8 @@ CORBA::Boolean operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<CORBA::InvalidPolicies>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::InvalidPolicies \> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50 // Copying insertion. void @@ -2347,17 +1478,8 @@ TAO::Any_Impl_T<CORBA::Policy>::to_object ( return 1; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<CORBA::Policy,CORBA::Policy_var, CORBA::tao_Policy_life>; - template class TAO::Any_Impl_T<CORBA::Policy>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<CORBA::Policy, CORBA::Policy_var, CORBA::tao_Policy_life> -# pragma instantiate TAO::Any_Impl_T<CORBA::Policy> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50 // Copying insertion. void @@ -2401,17 +1523,32 @@ operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<CORBA::PolicyManager,CORBA::PolicyManager_var, CORBA::tao_PolicyManager_life>; - template class TAO::Any_Impl_T<CORBA::PolicyManager>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<CORBA::PolicyManager, CORBA::PolicyManager_var, CORBA::tao_PolicyManager_life> -# pragma instantiate TAO::Any_Impl_T<CORBA::PolicyManager> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::Any_Impl_T<CORBA::PolicyManager>::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<CORBA::PolicyManager>::marshal_value (TAO_OutputCDR &) +{ + return 0; +} + +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::Any_Impl_T<CORBA::PolicyManager>::demarshal_value (TAO_InputCDR &) +{ + return 0; +} // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50 // Copying insertion. void @@ -2455,44 +1592,59 @@ operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<CORBA::PolicyCurrent,CORBA::PolicyCurrent_var, CORBA::tao_PolicyCurrent_life>; - template class TAO::Any_Impl_T<CORBA::PolicyCurrent>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<CORBA::PolicyCurrent, CORBA::PolicyCurrent_var, CORBA::tao_PolicyCurrent_life> -# pragma instantiate TAO::Any_Impl_T<CORBA::PolicyCurrent> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::Any_Impl_T<CORBA::PolicyCurrent>::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<CORBA::PolicyCurrent>::marshal_value (TAO_OutputCDR &) +{ + return 0; +} + +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::Any_Impl_T<CORBA::PolicyCurrent>::demarshal_value (TAO_InputCDR &) +{ + return 0; +} // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:95 -#if !defined _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_UShort_CPP_ -#define _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_UShort_CPP_ +#if !defined _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_CORBA_UShort__CPP_ +#define _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_CORBA_UShort__CPP_ CORBA::Boolean operator<< ( TAO_OutputCDR &strm, - const CORBA::InvalidPolicies::_tao_seq_UShort &_tao_sequence + const CORBA::InvalidPolicies::_tao_seq_CORBA_UShort_ &_tao_sequence ) { CORBA::ULong _tao_seq_len = _tao_sequence.length (); - + if (strm << _tao_seq_len) { // Encode all elements. return strm.write_ushort_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); } - + return 0; } CORBA::Boolean operator>> ( TAO_InputCDR &strm, - CORBA::InvalidPolicies::_tao_seq_UShort &_tao_sequence + CORBA::InvalidPolicies::_tao_seq_CORBA_UShort_ &_tao_sequence ) { CORBA::ULong _tao_seq_len; - + if (strm >> _tao_seq_len) { // Add a check to the length of the sequence @@ -2502,24 +1654,25 @@ CORBA::Boolean operator>> ( { 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) + if (0 >= _tao_seq_len) { return 1; } - + // Retrieve all the elements. return strm.read_ushort_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); + } - + return 0; } -#endif /* _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_UShort_CPP_ */ +#endif /* _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_CORBA_UShort__CPP_ */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63 @@ -2538,28 +1691,307 @@ CORBA::Boolean operator>> ( CORBA::Policy_ptr &_tao_objref ) { - ACE_TRY_NEW_ENV - { - CORBA::Object_var obj; + CORBA::Object_var obj; + + if ((strm >> obj.inout ()) == 0) + { + return 0; + } + + typedef ::CORBA::Policy RHS_SCOPED_NAME; + + // Narrow to the right type. + _tao_objref = + TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( + obj.in (), + CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer + ); + + return 1; +} - if ((strm >> obj.inout ()) == 0) - { - return 0; - } +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1703 + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + +#if !defined (_CORBA_POLICY__ARG_TRAITS_TMPLINST_CS_) +#define _CORBA_POLICY__ARG_TRAITS_TMPLINST_CS_ + + template class TAO::Arg_Traits<CORBA::Policy>; + + template class + TAO::Object_Arg_Traits_T< + CORBA::Policy_ptr, + CORBA::Policy_var, + CORBA::Policy_out + >; + +#endif /* end #if !defined */ + + template class + TAO::Ret_Object_Argument_T< + CORBA::Policy_ptr, + CORBA::Policy_var + >; + + template class + TAO_Objref_Var_T< + CORBA::Policy, + TAO::Objref_Traits<CORBA::Policy> + >; + + template class + TAO_Objref_Out_T< + CORBA::Policy, + TAO::Objref_Traits<CORBA::Policy> + >; + + template class + TAO::Any_Impl_T< + CORBA::Policy + >; + +#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_) +#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_ + + template class TAO::Arg_Traits<CORBA::PolicyList>; + + template class + TAO::Var_Size_Arg_Traits< + CORBA::PolicyList, + CORBA::PolicyList_var, + CORBA::PolicyList_out + >; + +#endif /* end #if !defined */ + +#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_) +#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_ + + template class TAO::Arg_Traits<CORBA::PolicyTypeSeq>; + + template class + TAO::Var_Size_Arg_Traits< + CORBA::PolicyTypeSeq, + CORBA::PolicyTypeSeq_var, + CORBA::PolicyTypeSeq_out + >; + +#endif /* end #if !defined */ + +#if !defined (_CORBA_SETOVERRIDETYPE__ARG_TRAITS_TMPLINST_CS_) +#define _CORBA_SETOVERRIDETYPE__ARG_TRAITS_TMPLINST_CS_ + + template class TAO::Arg_Traits<CORBA::SetOverrideType>; + + template class TAO::Basic_Arg_Traits_T<CORBA::SetOverrideType>; + +#endif /* end #if !defined */ + + template class + TAO::Any_Basic_Impl_T< + CORBA::SetOverrideType + >; + + template class + TAO::Any_Dual_Impl_T< + CORBA::PolicyError + >; + + template class + TAO::Any_Dual_Impl_T< + CORBA::InvalidPolicies + >; + + template class + TAO::Ret_Var_Size_Argument_T< + CORBA::sequence, + CORBA::sequence_var + >; + + template class + TAO::In_Var_Size_Argument_T< + CORBA::sequence + >; + + template class + TAO::In_Var_Size_Argument_T< + CORBA::sequence + >; + + template class + TAO::In_Basic_Argument_T< + CORBA::SetOverrideType + >; + + template class + TAO_Objref_Var_T< + CORBA::PolicyManager, + TAO::Objref_Traits<CORBA::PolicyManager> + >; + + template class + TAO_Objref_Out_T< + CORBA::PolicyManager, + TAO::Objref_Traits<CORBA::PolicyManager> + >; + + template class + TAO::Any_Impl_T< + CORBA::PolicyManager + >; + + template class + TAO_Objref_Var_T< + CORBA::PolicyCurrent, + TAO::Objref_Traits<CORBA::PolicyCurrent> + >; + + template class + TAO_Objref_Out_T< + CORBA::PolicyCurrent, + TAO::Objref_Traits<CORBA::PolicyCurrent> + >; + + template class + TAO::Any_Impl_T< + CORBA::PolicyCurrent + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +#if !defined (_CORBA_POLICY__ARG_TRAITS_TMPLINST_CS_) +#define _CORBA_POLICY__ARG_TRAITS_TMPLINST_CS_ + +# pragma instantiate TAO::Arg_Traits<CORBA::Policy> + +# pragma instantiate \ + TAO::Object_Arg_Traits_T< \ + CORBA::Policy_ptr, \ + CORBA::Policy_var, \ + CORBA::Policy_out \ + > + +#endif /* end #if !defined */ + +# pragma instantiate \ + TAO_Objref_Var_T< \ + CORBA::Policy, \ + TAO::Objref_Traits<CORBA::Policy> \ + > + +# pragma instantiate \ + TAO_Objref_Out_T< \ + CORBA::Policy, \ + TAO::Objref_Traits<CORBA::Policy> \ + > + +# pragma instantiate \ + TAO::Any_Impl_T< \ + CORBA::Policy \ + > + +#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_) +#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_ + +# pragma instantiate TAO::Arg_Traits<CORBA::PolicyList> + +# pragma instantiate \ + TAO::Var_Size_Arg_Traits< \ + CORBA::PolicyList, \ + CORBA::PolicyList_var, \ + CORBA::PolicyList_out \ + > + +#endif /* end #if !defined */ + +#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_) +#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_ + +# pragma instantiate TAO::Arg_Traits<CORBA::PolicyTypeSeq> + +# pragma instantiate \ + TAO::Var_Size_Arg_Traits< \ + CORBA::PolicyTypeSeq, \ + CORBA::PolicyTypeSeq_var, \ + CORBA::PolicyTypeSeq_out \ + > + +#endif /* end #if !defined */ + +#if !defined (_CORBA_SETOVERRIDETYPE__ARG_TRAITS_TMPLINST_CS_) +#define _CORBA_SETOVERRIDETYPE__ARG_TRAITS_TMPLINST_CS_ + +# pragma instantiate TAO::Arg_Traits<CORBA::SetOverrideType> + +# pragma instantiate TAO::Basic_Arg_Traits_T<CORBA::SetOverrideType> + +#endif /* end #if !defined */ + +# pragma instantiate \ + TAO::Any_Basic_Impl_T< \ + CORBA::SetOverrideType \ + > + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + CORBA::PolicyError \ + > + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + CORBA::InvalidPolicies \ + > + +# pragma instantiate \ + TAO::In_Var_Size_Argument_T< \ + CORBA::sequence \ + > + +# pragma instantiate \ + TAO::In_Var_Size_Argument_T< \ + CORBA::sequence \ + > + +# pragma instantiate \ + TAO::In_Basic_Argument_T< \ + CORBA::SetOverrideType \ + > + +# pragma instantiate \ + TAO_Objref_Var_T< \ + CORBA::PolicyManager, \ + TAO::Objref_Traits<CORBA::PolicyManager> \ + > + +# pragma instantiate \ + TAO_Objref_Out_T< \ + CORBA::PolicyManager, \ + TAO::Objref_Traits<CORBA::PolicyManager> \ + > + +# pragma instantiate \ + TAO::Any_Impl_T< \ + CORBA::PolicyManager \ + > + +# pragma instantiate \ + TAO_Objref_Var_T< \ + CORBA::PolicyCurrent, \ + TAO::Objref_Traits<CORBA::PolicyCurrent> \ + > + +# pragma instantiate \ + TAO_Objref_Out_T< \ + CORBA::PolicyCurrent, \ + TAO::Objref_Traits<CORBA::PolicyCurrent> \ + > + +# pragma instantiate \ + TAO::Any_Impl_T< \ + CORBA::PolicyCurrent \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - // Narrow to the right type. - _tao_objref = - CORBA::Policy::_unchecked_narrow ( - obj.in () - ACE_ENV_ARG_PARAMETER - ); - ACE_TRY_CHECK; - return 1; - } - ACE_CATCHANY - { - // do nothing - } - ACE_ENDTRY; - return 0; -} diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h index c291af14607..9c6b482c8ca 100644 --- a/TAO/tao/PolicyC.h +++ b/TAO/tao/PolicyC.h @@ -15,6 +15,12 @@ // 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 @@ -26,6 +32,7 @@ #define _TAO_IDL_ORIG_POLICYC_H_ #include /**/ "ace/pre.h" + #include "CurrentC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -33,8 +40,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "Policy_ForwardC.h" -#include "Remote_Object_Proxy_Impl.h" -#include "tao/Any_Impl_T.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -59,67 +64,77 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #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<typename T> class Narrow_Utils; +} + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48 -TAO_NAMESPACE CORBA +namespace CORBA { - + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333 - + typedef CORBA::Short PolicyErrorCode; typedef CORBA::Short_out PolicyErrorCode_out; - + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyErrorCode; - + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - + const CORBA::PolicyErrorCode BAD_POLICY = 0; - + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - + const CORBA::PolicyErrorCode UNSUPPORTED_POLICY = 1; - + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - + const CORBA::PolicyErrorCode BAD_POLICY_TYPE = 2; - + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - + const CORBA::PolicyErrorCode BAD_POLICY_VALUE = 3; - + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - + const CORBA::PolicyErrorCode UNSUPPORTED_POLICY_VALUE = 4; - + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_CORBA_POLICYERROR_CH_) #define _CORBA_POLICYERROR_CH_ - + class TAO_Export PolicyError : public CORBA::UserException { public: - + CORBA::PolicyErrorCode reason; PolicyError (void); PolicyError (const PolicyError &); ~PolicyError (void); PolicyError &operator= (const PolicyError &); - + static void _tao_any_destructor (void *); - + static PolicyError *_downcast (CORBA::Exception *); static CORBA::Exception *_alloc (void); @@ -129,85 +144,90 @@ TAO_NAMESPACE CORBA virtual void _tao_encode ( TAO_OutputCDR & - ACE_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & - ACE_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ctor.cpp:66 - + PolicyError ( ACE_NESTED_CLASS (CORBA, PolicyErrorCode) _tao_reason ); - + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\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 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyError; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_CORBA_INVALIDPOLICIES_CH_) #define _CORBA_INVALIDPOLICIES_CH_ - + class TAO_Export InvalidPolicies : public CORBA::UserException { public: - - - + + + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101 - class TAO_Export _tao_seq_UShort +#if !defined (_CORBA_INVALIDPOLICIES__TAO_SEQ_CORBA_USHORT__CH_) +#define _CORBA_INVALIDPOLICIES__TAO_SEQ_CORBA_USHORT__CH_ + + class TAO_Export _tao_seq_CORBA_UShort_ : public TAO_Unbounded_Sequence< CORBA::UShort > { public: - _tao_seq_UShort (void); - _tao_seq_UShort (CORBA::ULong max); - _tao_seq_UShort ( + _tao_seq_CORBA_UShort_ (void); + _tao_seq_CORBA_UShort_ (CORBA::ULong max); + _tao_seq_CORBA_UShort_ ( CORBA::ULong max, CORBA::ULong length, - CORBA::UShort* buffer, + CORBA::UShort* buffer, CORBA::Boolean release = 0 ); - _tao_seq_UShort (const _tao_seq_UShort &); - ~_tao_seq_UShort (void); - + _tao_seq_CORBA_UShort_ (const _tao_seq_CORBA_UShort_ &); + ~_tao_seq_CORBA_UShort_ (void); + static void _tao_any_destructor (void *); - - + + }; +#endif /* end #if !defined */ + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_field/field_ch.cpp:447 - - typedef _tao_seq_UShort _indices_seq; - _tao_seq_UShort indices; + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_field/field_ch.cpp:453 + + typedef _tao_seq_CORBA_UShort_ _indices_seq; + _tao_seq_CORBA_UShort_ indices; InvalidPolicies (void); InvalidPolicies (const InvalidPolicies &); ~InvalidPolicies (void); InvalidPolicies &operator= (const InvalidPolicies &); - + static void _tao_any_destructor (void *); - + static InvalidPolicies *_downcast (CORBA::Exception *); static CORBA::Exception *_alloc (void); @@ -217,150 +237,129 @@ TAO_NAMESPACE CORBA virtual void _tao_encode ( TAO_OutputCDR & - ACE_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & - ACE_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ctor.cpp:66 - + InvalidPolicies ( - const _tao_seq_UShort & _tao_indices + const _tao_seq_CORBA_UShort_ & _tao_indices ); - + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\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 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567 - -#if !defined (_CORBA_POLICY__ODDS_N_ENDS_CH_) -#define _CORBA_POLICY__ODDS_N_ENDS_CH_ + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601 +#if !defined (_CORBA_POLICY__VAR_OUT_CH_) +#define _CORBA_POLICY__VAR_OUT_CH_ + class Policy; typedef Policy *Policy_ptr; - struct tao_Policy_life; - typedef TAO_Objref_Var_T<Policy, tao_Policy_life> Policy_var; - typedef TAO_Objref_Out_T<Policy, tao_Policy_life> Policy_out; - - struct TAO_Export tao_Policy_life - { - static Policy_ptr tao_duplicate (Policy_ptr); - static void tao_release (Policy_ptr); - static Policy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( - Policy_ptr, - TAO_OutputCDR & - ); - }; - - struct TAO_Export tao_Policy_cast - { - static Policy_ptr tao_narrow ( - CORBA::Object_ptr - ACE_ENV_ARG_DECL - ); - static CORBA::Object_ptr tao_upcast (void *); - }; + + typedef + TAO_Objref_Var_T< + Policy + > + Policy_var; + + typedef + TAO_Objref_Out_T< + Policy + > + Policy_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53 #if !defined (_CORBA_POLICY_CH_) #define _CORBA_POLICY_CH_ - class _TAO_Policy_Proxy_Impl; - class _TAO_Policy_Remote_Proxy_Impl; - class _TAO_Policy_Proxy_Broker; - class _TAO_Policy_Remote_Proxy_Broker; - class TAO_Export Policy : public virtual CORBA::Object { public: + friend class TAO::Narrow_Utils<Policy>; typedef Policy_ptr _ptr_type; typedef Policy_var _var_type; - static int _tao_class_id; - + // The static operations. static Policy_ptr _duplicate (Policy_ptr obj); - + static Policy_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - - static Policy_ptr _unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); - + static Policy_ptr _nil (void) { return (Policy_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::PolicyType policy_type ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::Policy_ptr copy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual void destroy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:185 + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - - virtual void *_tao_QueryInterface (ptrdiff_t type); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); + // Hand crafted. + // **************************************************************** virtual CORBA::Boolean _tao_encode (TAO_OutputCDR &); virtual CORBA::Boolean _tao_decode (TAO_InputCDR &); @@ -369,267 +368,92 @@ TAO_NAMESPACE CORBA // **************************************************************** private: - _TAO_Policy_Proxy_Broker *the_TAO_Policy_Proxy_Broker_; - + TAO::Collocation_Proxy_Broker *the_TAO_Policy_Proxy_Broker_; + protected: Policy (int collocated = 0); - + // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void CORBA_Policy_setup_collocation (int collocated); - + + Policy (IOP::IOR *ior, + TAO_ORB_Core *orb_core = 0); + Policy ( - TAO_Stub *objref, + TAO_Stub *objref, CORBA::Boolean _tao_collocated = 0, - TAO_Abstract_ServantBase *servant = 0 + TAO_Abstract_ServantBase *servant = 0, + TAO_ORB_Core *orb_core = 0 ); virtual ~Policy (void); - - friend class _TAO_Policy_Remote_Proxy_Impl; - friend class _TAO_Policy_ThruPOA_Proxy_Impl; - friend class _TAO_Policy_Direct_Proxy_Impl; - + private: Policy (const Policy &); void operator= (const Policy &); }; - // The Proxy Implementations are used by each interface to - // perform a call. Each different implementation encapsulates - // an invocation logic. - - - /////////////////////////////////////////////////////////////////////// - // Base Proxy Impl. Declaration - // - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_impl_ch.cpp:35 - - class TAO_Export _TAO_Policy_Proxy_Impl - : public virtual TAO_Object_Proxy_Impl - { - public: - virtual ~_TAO_Policy_Proxy_Impl (void) {} - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24 - - virtual CORBA::PolicyType policy_type ( - CORBA::Object *_collocated_tao_target_ - ACE_ENV_ARG_DECL - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24 - - virtual ::CORBA::Policy_ptr copy ( - CORBA::Object *_collocated_tao_target_ - ACE_ENV_ARG_DECL - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24 - - virtual void destroy ( - CORBA::Object *_collocated_tao_target_ - ACE_ENV_ARG_DECL - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - protected: - _TAO_Policy_Proxy_Impl (void); - }; - - // - // End Base Proxy Impl. Declaration - /////////////////////////////////////////////////////////////////////// - - - /////////////////////////////////////////////////////////////////////// - // Remote Proxy Impl. Declaration - // - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_ch.cpp:37 - - class TAO_Export _TAO_Policy_Remote_Proxy_Impl - : public virtual _TAO_Policy_Proxy_Impl, - public virtual TAO_Remote_Object_Proxy_Impl - { - public: - _TAO_Policy_Remote_Proxy_Impl (void); - - virtual ~_TAO_Policy_Remote_Proxy_Impl (void) {} - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - - virtual CORBA::PolicyType policy_type ( - CORBA::Object *_collocated_tao_target_ - ACE_ENV_ARG_DECL - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - - virtual ::CORBA::Policy_ptr copy ( - CORBA::Object *_collocated_tao_target_ - ACE_ENV_ARG_DECL - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - - virtual void destroy ( - CORBA::Object *_collocated_tao_target_ - ACE_ENV_ARG_DECL - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - }; - - // - // End Remote Proxy Impl. Declaration - /////////////////////////////////////////////////////////////////////// - - // The Proxy Brokers are used by each interface to get - // the right proxy for performing a call. In the new - // collocation scheme, the proxy to be used can vary on - // a call by call basis. - - /////////////////////////////////////////////////////////////////////// - // Base Proxy Broker Declaration - // - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/base_proxy_broker_ch.cpp:35 - - class TAO_Export _TAO_Policy_Proxy_Broker - { - public: - virtual ~_TAO_Policy_Proxy_Broker (void); - virtual _TAO_Policy_Proxy_Impl &select_proxy ( - Policy *object - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) = 0; - - protected: - _TAO_Policy_Proxy_Broker (void); - - }; - - // - // End Base Proxy Broker Declaration - /////////////////////////////////////////////////////////////////////// - - - /////////////////////////////////////////////////////////////////////// - // Remote Proxy Broker Declaration - // - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_broker_ch.cpp:40 - - class TAO_Export _TAO_Policy_Remote_Proxy_Broker - : public virtual _TAO_Policy_Proxy_Broker - { - public: - _TAO_Policy_Remote_Proxy_Broker (void); - - virtual ~_TAO_Policy_Remote_Proxy_Broker (void); - - virtual _TAO_Policy_Proxy_Impl &select_proxy ( - Policy *object - ACE_ENV_ARG_DECL - ); - - private: - _TAO_Policy_Remote_Proxy_Impl remote_proxy_impl_; - - public: - // This member function is used to get an handle to the unique instance - // of the Remote Proxy Broker that is available for a given - // interface. - static _TAO_Policy_Remote_Proxy_Broker *the_TAO_Policy_Remote_Proxy_Broker (void); - }; - - // - // End Remote Proxy Broker Declaration - /////////////////////////////////////////////////////////////////////// - #endif /* end #if !defined */ - + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Policy; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567 - -#if !defined (_CORBA_POLICYMANAGER__ODDS_N_ENDS_CH_) -#define _CORBA_POLICYMANAGER__ODDS_N_ENDS_CH_ + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601 +#if !defined (_CORBA_POLICYMANAGER__VAR_OUT_CH_) +#define _CORBA_POLICYMANAGER__VAR_OUT_CH_ + class PolicyManager; typedef PolicyManager *PolicyManager_ptr; - typedef TAO_Objref_Var_T<PolicyManager> PolicyManager_var; - typedef TAO_Objref_Out_T<PolicyManager> PolicyManager_out; + + typedef + TAO_Objref_Var_T< + PolicyManager + > + PolicyManager_var; + + typedef + TAO_Objref_Out_T< + PolicyManager + > + PolicyManager_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53 #if !defined (_CORBA_POLICYMANAGER_CH_) #define _CORBA_POLICYMANAGER_CH_ - + class TAO_Export PolicyManager : public virtual CORBA::Object { public: typedef PolicyManager_ptr _ptr_type; typedef PolicyManager_var _var_type; - static int _tao_class_id; - + // The static operations. static PolicyManager_ptr _duplicate (PolicyManager_ptr obj); - + static PolicyManager_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - - static PolicyManager_ptr _unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); - + static PolicyManager_ptr _nil (void) { return (PolicyManager_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::PolicyList * get_policy_overrides ( const CORBA::PolicyTypeSeq & ts ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -637,10 +461,10 @@ TAO_NAMESPACE CORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + virtual void set_policy_overrides ( const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add @@ -650,50 +474,63 @@ TAO_NAMESPACE CORBA CORBA::SystemException , CORBA::InvalidPolicies )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - - virtual void *_tao_QueryInterface (ptrdiff_t type); - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:185 + + 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: PolicyManager (void); virtual ~PolicyManager (void); - + private: PolicyManager (const PolicyManager &); void operator= (const PolicyManager &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyManager; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567 - -#if !defined (_CORBA_POLICYCURRENT__ODDS_N_ENDS_CH_) -#define _CORBA_POLICYCURRENT__ODDS_N_ENDS_CH_ + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601 +#if !defined (_CORBA_POLICYCURRENT__VAR_OUT_CH_) +#define _CORBA_POLICYCURRENT__VAR_OUT_CH_ + class PolicyCurrent; typedef PolicyCurrent *PolicyCurrent_ptr; - typedef TAO_Objref_Var_T<PolicyCurrent> PolicyCurrent_var; - typedef TAO_Objref_Out_T<PolicyCurrent> PolicyCurrent_out; + + typedef + TAO_Objref_Var_T< + PolicyCurrent + > + PolicyCurrent_var; + + typedef + TAO_Objref_Out_T< + PolicyCurrent + > + PolicyCurrent_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53 #if !defined (_CORBA_POLICYCURRENT_CH_) #define _CORBA_POLICYCURRENT_CH_ - + class TAO_Export PolicyCurrent : public virtual CORBA::PolicyManager, public virtual CORBA::Current @@ -701,70 +538,74 @@ TAO_NAMESPACE CORBA public: typedef PolicyCurrent_ptr _ptr_type; typedef PolicyCurrent_var _var_type; - static int _tao_class_id; - + // The static operations. static PolicyCurrent_ptr _duplicate (PolicyCurrent_ptr obj); - + static PolicyCurrent_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - - static PolicyCurrent_ptr _unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); - + static PolicyCurrent_ptr _nil (void) { return (PolicyCurrent_ptr)0; } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - - virtual void *_tao_QueryInterface (ptrdiff_t type); - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:185 + + 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: PolicyCurrent (void); virtual ~PolicyCurrent (void); - + private: PolicyCurrent (const PolicyCurrent &); void operator= (const PolicyCurrent &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyCurrent; // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:66 -} -TAO_NAMESPACE_CLOSE // module CORBA +} // module CORBA // Proxy Broker Factory function pointer declarations. // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:80 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:121 extern TAO_Export -CORBA::_TAO_Policy_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ); // TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:48 + +// Traits specializations. +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::PolicyError &); // copying version @@ -819,21 +660,21 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::InvalidPolic TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::InvalidPolicies &); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:70 -#if !defined _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_UShort_H_ -#define _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_UShort_H_ +#if !defined _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_CORBA_UShort__H_ +#define _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_CORBA_UShort__H_ TAO_Export CORBA::Boolean operator<< ( TAO_OutputCDR &, - const CORBA::InvalidPolicies::_tao_seq_UShort & + const CORBA::InvalidPolicies::_tao_seq_CORBA_UShort_ & ); TAO_Export CORBA::Boolean operator>> ( TAO_InputCDR &, - CORBA::InvalidPolicies::_tao_seq_UShort & + CORBA::InvalidPolicies::_tao_seq_CORBA_UShort_ & ); -#endif /* _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_UShort_H_ */ +#endif /* _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_CORBA_UShort__H_ */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55 @@ -847,7 +688,7 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Policy_ptr &); #endif /* __ACE_INLINE__ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "PolicyC.i" @@ -863,3 +704,4 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Policy_ptr &); #include /**/ "ace/post.h" #endif /* ifndef */ + diff --git a/TAO/tao/PolicyC.i b/TAO/tao/PolicyC.i index 0eff6cd5326..b7b5b707430 100644 --- a/TAO/tao/PolicyC.i +++ b/TAO/tao/PolicyC.i @@ -15,13 +15,19 @@ // 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 -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63 #if !defined (_CORBA_POLICY___CI_) #define _CORBA_POLICY___CI_ @@ -30,81 +36,42 @@ ACE_INLINE CORBA::Policy::Policy ( TAO_Stub *objref, CORBA::Boolean _tao_collocated, - TAO_Abstract_ServantBase *servant + TAO_Abstract_ServantBase *servant, + TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant) + : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant, oc), + the_TAO_Policy_Proxy_Broker_ (0) + { this->CORBA_Policy_setup_collocation (_tao_collocated); } +ACE_INLINE +CORBA::Policy::Policy ( + IOP::IOR *ior, + TAO_ORB_Core *oc + ) + : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + the_TAO_Policy_Proxy_Broker_ (0) + +{ +} + #endif /* end #if !defined */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63 #if !defined (_CORBA_POLICYMANAGER___CI_) #define _CORBA_POLICYMANAGER___CI_ -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<CORBA::PolicyManager>::to_object ( - CORBA::Object_ptr &_tao_elem - ) const -{ - _tao_elem = CORBA::Object::_duplicate (this->value_); - return 1; -} - -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<CORBA::PolicyManager>::marshal_value (TAO_OutputCDR &) -{ - return 0; -} - -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<CORBA::PolicyManager>::demarshal_value (TAO_InputCDR &) -{ - return 0; -} - #endif /* end #if !defined */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63 #if !defined (_CORBA_POLICYCURRENT___CI_) #define _CORBA_POLICYCURRENT___CI_ -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<CORBA::PolicyCurrent>::to_object ( - CORBA::Object_ptr &_tao_elem - ) const -{ - _tao_elem = CORBA::Object::_duplicate (this->value_); - return 1; -} - -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<CORBA::PolicyCurrent>::marshal_value (TAO_OutputCDR &) -{ - return 0; -} - -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<CORBA::PolicyCurrent>::demarshal_value (TAO_InputCDR &) -{ - return 0; -} #endif /* end #if !defined */ @@ -158,22 +125,22 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:81 -#if !defined _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_UShort_I_ -#define _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_UShort_I_ +#if !defined _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_CORBA_UShort__I_ +#define _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_CORBA_UShort__I_ CORBA::Boolean TAO_Export operator<< ( TAO_OutputCDR &, - const CORBA::InvalidPolicies::_tao_seq_UShort & + const CORBA::InvalidPolicies::_tao_seq_CORBA_UShort_ & ); CORBA::Boolean TAO_Export operator>> ( TAO_InputCDR &, - CORBA::InvalidPolicies::_tao_seq_UShort & + CORBA::InvalidPolicies::_tao_seq_CORBA_UShort_ & ); -#endif /* _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_UShort_I_ */ +#endif /* _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_CORBA_UShort__I_ */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:71 @@ -236,3 +203,4 @@ TAO_Export CORBA::Boolean operator>> ( TAO_InputCDR &, CORBA::Policy_ptr & ); + diff --git a/TAO/tao/Policy_Forward.pidl b/TAO/tao/Policy_Forward.pidl index 84069d295fa..cecf57db3e4 100644 --- a/TAO/tao/Policy_Forward.pidl +++ b/TAO/tao/Policy_Forward.pidl @@ -15,7 +15,7 @@ * command used for this is: * * tao_idl.exe - * -o orig -Gp -Gd -Ge 1 + * -o orig -Ge 1 -GT * -Wb,export_macro=TAO_Export * -Wb,export_include="tao/corbafwd.h" * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/Policy_ForwardC.cpp b/TAO/tao/Policy_ForwardC.cpp index aeca2e5b43d..a9546db1acc 100644 --- a/TAO/tao/Policy_ForwardC.cpp +++ b/TAO/tao/Policy_ForwardC.cpp @@ -15,18 +15,23 @@ // 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 -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:301 #include "Policy_ForwardC.h" #include "tao/Any_Basic_Impl_T.h" #include "tao/Any_Dual_Impl_T.h" -#include "tao/Stub.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig @@ -37,24 +42,32 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:59 + +// Arg traits specializations. +namespace TAO +{ +}; + +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_CORBA_PolicyType[] = { 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, @@ -68,22 +81,24 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyType ( sizeof (CORBA::PolicyType) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_PolicyType, - &_tc_TAO_tc_CORBA_PolicyType - ) -TAO_NAMESPACE_END +namespace CORBA +{ + ::CORBA::TypeCode_ptr _tc_PolicyType = + &_tc_TAO_tc_CORBA_PolicyType; +} -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50 +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:66 + +#if !defined (_CORBA_POLICYLIST_CS_) +#define _CORBA_POLICYLIST_CS_ CORBA::PolicyList::PolicyList (void) {} -CORBA::PolicyList::PolicyList (CORBA::ULong max) +CORBA::PolicyList::PolicyList ( + CORBA::ULong max + ) : TAO_Unbounded_Object_Sequence< CORBA::Policy, CORBA::Policy_var @@ -94,7 +109,7 @@ CORBA::PolicyList::PolicyList (CORBA::ULong max) CORBA::PolicyList::PolicyList ( CORBA::ULong max, CORBA::ULong length, - CORBA::Policy_ptr* buffer, + CORBA::Policy_ptr * buffer, CORBA::Boolean release ) : TAO_Unbounded_Object_Sequence< @@ -104,7 +119,9 @@ CORBA::PolicyList::PolicyList ( (max, length, buffer, release) {} -CORBA::PolicyList::PolicyList (const PolicyList &seq) +CORBA::PolicyList::PolicyList ( + const PolicyList &seq + ) : TAO_Unbounded_Object_Sequence< CORBA::Policy, CORBA::Policy_var @@ -115,376 +132,297 @@ CORBA::PolicyList::PolicyList (const PolicyList &seq) CORBA::PolicyList::~PolicyList (void) {} -void CORBA::PolicyList::_tao_any_destructor (void *_tao_void_pointer) +void CORBA::PolicyList::_tao_any_destructor ( + void * _tao_void_pointer + ) { - PolicyList *tmp = ACE_static_cast (PolicyList*, _tao_void_pointer); - delete tmp; + PolicyList * _tao_tmp_pointer = + ACE_static_cast (PolicyList *, _tao_void_pointer); + delete _tao_tmp_pointer; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) +#endif /* end #if !defined */ -template class - TAO_MngSeq_Var_T< - CORBA::PolicyList, - TAO_Object_Manager< - CORBA::Policy, - CORBA::Policy_var, - CORBA::tao_Policy_life - > - >; - -template class - TAO_MngSeq_Out_T< - CORBA::PolicyList, - CORBA::PolicyList_var, - TAO_Object_Manager< - CORBA::Policy, - CORBA::Policy_var, - CORBA::tao_Policy_life - > - >; - -template class TAO_Seq_Var_Base_T<CORBA::PolicyList, - TAO_Object_Manager<CORBA::Policy, - TAO_Objref_Var_T<CORBA::Policy, - CORBA::tao_Policy_life>, - CORBA::tao_Policy_life> >; - -template class TAO_Unbounded_Object_Sequence<CORBA::Policy, - TAO_Objref_Var_T<CORBA::Policy, CORBA::tao_Policy_life>, - CORBA::tao_Policy_life, - CORBA::tao_Policy_cast>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 -# pragma instantiate \ - TAO_MngSeq_Var_T< \ - CORBA::PolicyList, \ - TAO_Object_Manager< \ - CORBA::Policy, \ - CORBA::Policy_var, \ - CORBA::tao_Policy_life \ - > \ - > +static const CORBA::Long _oc_CORBA_PolicyList[] = +{ + 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 (0x4c697374), + ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/PolicyList:1.0 + 11, + ACE_NTOHL (0x506f6c69), + ACE_NTOHL (0x63794c69), + ACE_NTOHL (0x73740000), // name = PolicyList + CORBA::tk_sequence, // typecode kind + 68, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + CORBA::tk_objref, // typecode kind + 52, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + 29, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f506f), + ACE_NTOHL (0x6c696379), + ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Policy:1.0 + 7, + ACE_NTOHL (0x506f6c69), + ACE_NTOHL (0x63790000), // name = Policy + + 0U, -# pragma instantiate TAO_Unbounded_Object_Sequence<CORBA::Policy, - TAO_Objref_Var_T<CORBA::Policy, CORBA::tao_Policy_life>, - CORBA::tao_Policy_life, - CORBA::tao_Policy_cast> +}; -# pragma instantiate TAO_Seq_Var_Base_T<CORBA::PolicyList, - TAO_Object_Manager<CORBA::Policy, - TAO_Objref_Var_T<CORBA::Policy, - CORBA::tao_Policy_life>, - CORBA::tao_Policy_life> > -# pragma instantiate \ - TAO_Seq_Out_T< \ - CORBA::PolicyList, \ - CORBA::PolicyList_var, \ - TAO_Object_Manager< \ - CORBA::Policy, \ - CORBA::Policy_var, \ - CORBA::tao_Policy_life \ - > \ - > +static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyList ( + CORBA::tk_alias, + sizeof (_oc_CORBA_PolicyList), + (char *) &_oc_CORBA_PolicyList, + 0, + sizeof (CORBA::PolicyList) + ); -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 - - static const CORBA::Long _oc_CORBA_PolicyList[] = - { - 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 (0x4c697374), - ACE_NTOHL (0x3a312e30), - ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/PolicyList:1.0 - 11, - ACE_NTOHL (0x506f6c69), - ACE_NTOHL (0x63794c69), - ACE_NTOHL (0x73740000), // name = PolicyList - CORBA::tk_sequence, // typecode kind - 68, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - CORBA::tk_objref, // typecode kind - 52, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - 29, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f506f), - ACE_NTOHL (0x6c696379), - ACE_NTOHL (0x3a312e30), - ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Policy:1.0 - 7, - ACE_NTOHL (0x506f6c69), - ACE_NTOHL (0x63790000), // name = Policy - - 0U, +namespace CORBA +{ + ::CORBA::TypeCode_ptr _tc_PolicyList = + &_tc_TAO_tc_CORBA_PolicyList; +} -}; +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:66 - static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyList ( - CORBA::tk_alias, - sizeof (_oc_CORBA_PolicyList), - (char *) &_oc_CORBA_PolicyList, - 0, - sizeof (CORBA::PolicyList) - ); +#if !defined (_CORBA_POLICYTYPESEQ_CS_) +#define _CORBA_POLICYTYPESEQ_CS_ - TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) - TAO_NAMESPACE_BEGIN (CORBA) - TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_PolicyList, - &_tc_TAO_tc_CORBA_PolicyList - ) - TAO_NAMESPACE_END - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50 - - CORBA::PolicyTypeSeq::PolicyTypeSeq (void) - {} - - CORBA::PolicyTypeSeq::PolicyTypeSeq (CORBA::ULong max) - : TAO_Unbounded_Sequence< - CORBA::PolicyType - > - (max) - {} - - CORBA::PolicyTypeSeq::PolicyTypeSeq ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::ULong* buffer, - CORBA::Boolean release - ) - : TAO_Unbounded_Sequence< - CORBA::PolicyType - > - (max, length, buffer, release) - {} - - CORBA::PolicyTypeSeq::PolicyTypeSeq (const PolicyTypeSeq &seq) - : TAO_Unbounded_Sequence< - CORBA::PolicyType - > - (seq) - {} - - CORBA::PolicyTypeSeq::~PolicyTypeSeq (void) - {} - - void CORBA::PolicyTypeSeq::_tao_any_destructor (void *_tao_void_pointer) - { - PolicyTypeSeq *tmp = ACE_static_cast (PolicyTypeSeq*, _tao_void_pointer); - delete tmp; - } +CORBA::PolicyTypeSeq::PolicyTypeSeq (void) +{} -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) +CORBA::PolicyTypeSeq::PolicyTypeSeq ( + CORBA::ULong max + ) + : TAO_Unbounded_Sequence< + CORBA::PolicyType + > + (max) +{} - template class - TAO_FixedSeq_Var_T< - CORBA::PolicyTypeSeq, +CORBA::PolicyTypeSeq::PolicyTypeSeq ( + CORBA::ULong max, + CORBA::ULong length, + CORBA::ULong * buffer, + CORBA::Boolean release + ) + : TAO_Unbounded_Sequence< CORBA::PolicyType - >; + > + (max, length, buffer, release) +{} - template class - TAO_Seq_Out_T< - CORBA::PolicyTypeSeq, - CORBA::PolicyTypeSeq_var, +CORBA::PolicyTypeSeq::PolicyTypeSeq ( + const PolicyTypeSeq &seq + ) + : TAO_Unbounded_Sequence< CORBA::PolicyType - >; + > + (seq) +{} -template class TAO_Seq_Var_Base_T<CORBA::PolicyTypeSeq, - CORBA::PolicyType>; +CORBA::PolicyTypeSeq::~PolicyTypeSeq (void) +{} -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +void CORBA::PolicyTypeSeq::_tao_any_destructor ( + void * _tao_void_pointer + ) +{ + PolicyTypeSeq * _tao_tmp_pointer = + ACE_static_cast (PolicyTypeSeq *, _tao_void_pointer); + delete _tao_tmp_pointer; +} -# pragma instantiate \ - TAO_FixedSeq_Var_T< \ - PolicyTypeSeq, \ - CORBA::PolicyType \ - > +#endif /* end #if !defined */ -# pragma instantiate \ - TAO_Seq_Out_T< \ - PolicyTypeSeq, \ - PolicyTypeSeq_var, \ - CORBA::PolicyType \ - > +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 -#pragms instantiate TAO_Seq_Var_Base_T<CORBA::PolicyTypeSeq, - CORBA::PolicyType> - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 - - static const CORBA::Long _oc_CORBA_PolicyTypeSeq[] = - { - TAO_ENCAP_BYTE_ORDER, // byte order - 36, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f506f), - ACE_NTOHL (0x6c696379), - ACE_NTOHL (0x54797065), - ACE_NTOHL (0x5365713a), - ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/PolicyTypeSeq:1.0 - 14, - ACE_NTOHL (0x506f6c69), - ACE_NTOHL (0x63795479), - ACE_NTOHL (0x70655365), - ACE_NTOHL (0x71000000), // name = PolicyTypeSeq - CORBA::tk_sequence, // typecode kind - 80, // encapsulation length +static const CORBA::Long _oc_CORBA_PolicyTypeSeq[] = +{ + TAO_ENCAP_BYTE_ORDER, // byte order + 36, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f506f), + ACE_NTOHL (0x6c696379), + ACE_NTOHL (0x54797065), + ACE_NTOHL (0x5365713a), + ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/PolicyTypeSeq:1.0 + 14, + ACE_NTOHL (0x506f6c69), + ACE_NTOHL (0x63795479), + ACE_NTOHL (0x70655365), + ACE_NTOHL (0x71000000), // name = PolicyTypeSeq + CORBA::tk_sequence, // typecode kind + 80, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + CORBA::tk_alias, // typecode kind for typedefs + 64, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order - 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 (0x0), // repository ID = IDL:omg.org/CORBA/PolicyType:1.0 - 11, - ACE_NTOHL (0x506f6c69), - ACE_NTOHL (0x63795479), - ACE_NTOHL (0x70650000), // name = PolicyType - CORBA::tk_ulong, - - - 0U, + 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 (0x0), // repository ID = IDL:omg.org/CORBA/PolicyType:1.0 + 11, + ACE_NTOHL (0x506f6c69), + ACE_NTOHL (0x63795479), + ACE_NTOHL (0x70650000), // name = PolicyType + CORBA::tk_ulong, + + + 0U, }; - static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyTypeSeq ( - CORBA::tk_alias, - sizeof (_oc_CORBA_PolicyTypeSeq), - (char *) &_oc_CORBA_PolicyTypeSeq, - 0, - sizeof (CORBA::PolicyTypeSeq) - ); +static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyTypeSeq ( + CORBA::tk_alias, + sizeof (_oc_CORBA_PolicyTypeSeq), + (char *) &_oc_CORBA_PolicyTypeSeq, + 0, + sizeof (CORBA::PolicyTypeSeq) + ); - TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) - TAO_NAMESPACE_BEGIN (CORBA) - TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_PolicyTypeSeq, - &_tc_TAO_tc_CORBA_PolicyTypeSeq - ) - TAO_NAMESPACE_END +namespace CORBA +{ + ::CORBA::TypeCode_ptr _tc_PolicyTypeSeq = + &_tc_TAO_tc_CORBA_PolicyTypeSeq; +} - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 - static const CORBA::Long _oc_CORBA_SetOverrideType[] = - { - TAO_ENCAP_BYTE_ORDER, // byte order - 38, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f5365), - ACE_NTOHL (0x744f7665), - ACE_NTOHL (0x72726964), - ACE_NTOHL (0x65547970), - ACE_NTOHL (0x653a312e), - ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CORBA/SetOverrideType:1.0 - 16, - ACE_NTOHL (0x5365744f), - ACE_NTOHL (0x76657272), - ACE_NTOHL (0x69646554), - ACE_NTOHL (0x79706500), // name = SetOverrideType - 2, // member count - 13, - ACE_NTOHL (0x5345545f), - ACE_NTOHL (0x4f564552), - ACE_NTOHL (0x52494445), - ACE_NTOHL (0x0), // name = SET_OVERRIDE - 13, - ACE_NTOHL (0x4144445f), - ACE_NTOHL (0x4f564552), - ACE_NTOHL (0x52494445), - ACE_NTOHL (0x0), // name = ADD_OVERRIDE - }; - - static CORBA::TypeCode _tc_TAO_tc_CORBA_SetOverrideType ( - CORBA::tk_enum, - sizeof (_oc_CORBA_SetOverrideType), - (char *) &_oc_CORBA_SetOverrideType, - 0, - sizeof (CORBA::SetOverrideType) +static const CORBA::Long _oc_CORBA_SetOverrideType[] = +{ + TAO_ENCAP_BYTE_ORDER, // byte order + 38, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f5365), + ACE_NTOHL (0x744f7665), + ACE_NTOHL (0x72726964), + ACE_NTOHL (0x65547970), + ACE_NTOHL (0x653a312e), + ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CORBA/SetOverrideType:1.0 + 16, + ACE_NTOHL (0x5365744f), + ACE_NTOHL (0x76657272), + ACE_NTOHL (0x69646554), + ACE_NTOHL (0x79706500), // name = SetOverrideType + 2, // member count + 13, + ACE_NTOHL (0x5345545f), + ACE_NTOHL (0x4f564552), + ACE_NTOHL (0x52494445), + ACE_NTOHL (0x0), // name = SET_OVERRIDE + 13, + ACE_NTOHL (0x4144445f), + ACE_NTOHL (0x4f564552), + ACE_NTOHL (0x52494445), + ACE_NTOHL (0x0), // name = ADD_OVERRIDE + }; + +static CORBA::TypeCode _tc_TAO_tc_CORBA_SetOverrideType ( + CORBA::tk_enum, + sizeof (_oc_CORBA_SetOverrideType), + (char *) &_oc_CORBA_SetOverrideType, + 0, + sizeof (CORBA::SetOverrideType) + ); + +namespace CORBA +{ + ::CORBA::TypeCode_ptr _tc_SetOverrideType = + &_tc_TAO_tc_CORBA_SetOverrideType; +} + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54 + +// Copying insertion. +void operator<<= ( + CORBA::Any &_tao_any, + const CORBA::PolicyList &_tao_elem + ) +{ + TAO::Any_Dual_Impl_T<CORBA::PolicyList>::insert_copy ( + _tao_any, + CORBA::PolicyList::_tao_any_destructor, + CORBA::_tc_PolicyList, + _tao_elem ); +} - TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) - TAO_NAMESPACE_BEGIN (CORBA) - TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_SetOverrideType, - &_tc_TAO_tc_CORBA_SetOverrideType - ) - TAO_NAMESPACE_END - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54 - - // Copying insertion. - void operator<<= ( - CORBA::Any &_tao_any, - const CORBA::PolicyList &_tao_elem - ) - { - TAO::Any_Dual_Impl_T<CORBA::PolicyList>::insert_copy ( - _tao_any, - CORBA::PolicyList::_tao_any_destructor, - CORBA::_tc_PolicyList, - _tao_elem - ); - } - - // Non-copying insertion. - void operator<<= ( - CORBA::Any &_tao_any, - CORBA::PolicyList *_tao_elem - ) - { - TAO::Any_Dual_Impl_T<CORBA::PolicyList>::insert ( +// Non-copying insertion. +void operator<<= ( + CORBA::Any &_tao_any, + CORBA::PolicyList *_tao_elem + ) +{ + TAO::Any_Dual_Impl_T<CORBA::PolicyList>::insert ( + _tao_any, + CORBA::PolicyList::_tao_any_destructor, + CORBA::_tc_PolicyList, + _tao_elem + ); +} + +// Extraction to non-const pointer (deprecated). +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + CORBA::PolicyList *&_tao_elem + ) +{ + return _tao_any >>= ACE_const_cast ( + const CORBA::PolicyList *&, + _tao_elem + ); +} + +// Extraction to const pointer. +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + const CORBA::PolicyList *&_tao_elem + ) +{ + return + TAO::Any_Dual_Impl_T<CORBA::PolicyList>::extract ( _tao_any, CORBA::PolicyList::_tao_any_destructor, CORBA::_tc_PolicyList, _tao_elem ); - } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<CORBA::PolicyList>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::PolicyList> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +} -// TAO_IDL - Generated from +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. @@ -542,166 +480,339 @@ CORBA::Boolean operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<CORBA::PolicyTypeSeq>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::PolicyTypeSeq> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_cs.cpp:52 - - void operator<<= ( - CORBA::Any &_tao_any, - CORBA::SetOverrideType _tao_elem - ) - { - TAO::Any_Basic_Impl_T<CORBA::SetOverrideType>::insert ( +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_cs.cpp:52 + +void operator<<= ( + CORBA::Any &_tao_any, + CORBA::SetOverrideType _tao_elem + ) +{ + TAO::Any_Basic_Impl_T<CORBA::SetOverrideType>::insert ( + _tao_any, + CORBA::_tc_SetOverrideType, + _tao_elem + ); +} + +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + CORBA::SetOverrideType &_tao_elem + ) +{ + return + TAO::Any_Basic_Impl_T<CORBA::SetOverrideType>::extract ( _tao_any, CORBA::_tc_SetOverrideType, - _tao_elem + _tao_elem ); - } - - CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - CORBA::SetOverrideType &_tao_elem - ) - { - return - TAO::Any_Basic_Impl_T<CORBA::SetOverrideType>::extract ( - _tao_any, - CORBA::_tc_SetOverrideType, - _tao_elem - ); - } - - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Basic_Impl_T<CORBA::SetOverrideType>; - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - # pragma instantiate TAO::Any_Basic_Impl_T<CORBA::SetOverrideType \> - #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93 - - CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, - const CORBA::PolicyList &_tao_sequence - ) - { - CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - CORBA::Boolean _tao_marshal_flag = 1; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = - TAO::Objref_Traits<CORBA::Policy>::tao_marshal ( - _tao_sequence[i].in (), - strm - ); - } - - return _tao_marshal_flag; - } - - return 0; - } - - CORBA::Boolean operator>> ( - TAO_InputCDR &strm, - CORBA::PolicyList &_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. - CORBA::Boolean _tao_marshal_flag = 1; - - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) - { - _tao_marshal_flag = (strm >> _tao_sequence[i].out ()); - } - - return _tao_marshal_flag; - } - - return 0; - } - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93 - - CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, - const CORBA::PolicyTypeSeq &_tao_sequence - ) - { - CORBA::ULong _tao_seq_len = _tao_sequence.length (); - - if (strm << _tao_seq_len) - { - // Encode all elements. - return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - } - - return 0; - } - - CORBA::Boolean operator>> ( - TAO_InputCDR &strm, - CORBA::PolicyTypeSeq &_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. - return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - } - - return 0; - } +} + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:95 + +#if !defined _TAO_CDR_OP_CORBA_PolicyList_CPP_ +#define _TAO_CDR_OP_CORBA_PolicyList_CPP_ + +CORBA::Boolean operator<< ( + TAO_OutputCDR &strm, + const CORBA::PolicyList &_tao_sequence + ) +{ + CORBA::ULong _tao_seq_len = _tao_sequence.length (); + + if (strm << _tao_seq_len) + { + // Encode all elements. + CORBA::Boolean _tao_marshal_flag = 1; + + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) + { + _tao_marshal_flag = + TAO::Objref_Traits<CORBA::Policy>::tao_marshal ( + _tao_sequence[i].in (), strm + ); + } + + return _tao_marshal_flag; + } + + return 0; +} + +CORBA::Boolean operator>> ( + TAO_InputCDR &strm, + CORBA::PolicyList &_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. + CORBA::Boolean _tao_marshal_flag = 1; + + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) + { + _tao_marshal_flag = (strm >> _tao_sequence[i].out ()); + } + + return _tao_marshal_flag; + + } + + return 0; +} + +#endif /* _TAO_CDR_OP_CORBA_PolicyList_CPP_ */ + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:95 + +#if !defined _TAO_CDR_OP_CORBA_PolicyTypeSeq_CPP_ +#define _TAO_CDR_OP_CORBA_PolicyTypeSeq_CPP_ + +CORBA::Boolean operator<< ( + TAO_OutputCDR &strm, + const CORBA::PolicyTypeSeq &_tao_sequence + ) +{ + CORBA::ULong _tao_seq_len = _tao_sequence.length (); + + if (strm << _tao_seq_len) + { + // Encode all elements. + return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); + } + + return 0; +} + +CORBA::Boolean operator>> ( + TAO_InputCDR &strm, + CORBA::PolicyTypeSeq &_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. + return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); + + } + + return 0; +} + +#endif /* _TAO_CDR_OP_CORBA_PolicyTypeSeq_CPP_ */ + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1703 + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + + template class TAO::Objref_Traits<CORBA::Policy>; + + template class + TAO::Any_Impl_T< + CORBA::Policy + >; + + template class + TAO_Object_Manager< + CORBA::Policy, + CORBA::Policy_va, + >; + + template class + TAO_MngSeq_Var_T< + CORBA::PolicyList, + TAO_Object_Manager< + CORBA::Policy, + CORBA::Policy_var + > + >; + + template class + TAO_Seq_Var_Base_T< + CORBA::PolicyList, + TAO_Object_Manager< + CORBA::Policy, + CORBA::Policy_var + > + >; + + template class + TAO_MngSeq_Out_T< + CORBA::PolicyList, + CORBA::PolicyList_var, + TAO_Object_Manager< + CORBA::Policy, + CORBA::Policy_var + > + >; + +#if !defined (_CORBA_POLICYLIST_CS_) +#define _CORBA_POLICYLIST_CS_ + + template class + TAO_Unbounded_Object_Sequence< + CORBA::Policy, + CORBA::Policy_var + >; + +#endif /* end #if !defined */ + + template class + TAO::Any_Dual_Impl_T< + CORBA::PolicyList + >; + + template class + TAO_FixedSeq_Var_T< + CORBA::PolicyTypeSeq, + CORBA::PolicyType + >; + + template class + TAO_Seq_Var_Base_T< + CORBA::PolicyTypeSeq, + CORBA::PolicyType + >; + + template class + TAO_Seq_Out_T< + CORBA::PolicyTypeSeq, + CORBA::PolicyTypeSeq_var, + CORBA::PolicyType + >; + + template class + TAO::Any_Dual_Impl_T< + CORBA::PolicyTypeSeq + >; + + template class + TAO::Any_Basic_Impl_T< + CORBA::SetOverrideType + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# pragma instantiate TAO::Objref_Traits<CORBA::Policy> + +# pragma instantiate \ + TAO::Any_Impl_T< \ + CORBA::Policy \ + > + +# pragma instantiate \ + TAO_MngSeq_Var_T< \ + CORBA::PolicyList, \ + TAO_Object_Manager< \ + CORBA::Policy, \ + CORBA::Policy_var \ + > \ + > + +# pragma instantiate \ + TAO_Seq_Var_Base_T< \ + CORBA::PolicyList, \ + TAO_Object_Manager< \ + CORBA::Policy, \ + CORBA::Policy_var \ + > \ + > + +# pragma instantiate \ + TAO_MngSeq_Out_T< \ + CORBA::PolicyList, \ + CORBA::PolicyList_var, \ + TAO_Object_Manager< \ + CORBA::Policy, \ + CORBA::Policy_var \ + > \ + > + +#if !defined (_CORBA_POLICYLIST_CS_) +#define _CORBA_POLICYLIST_CS_ + +# pragma instantiate \ + TAO_Unbounded_Object_Sequence< \ + CORBA::Policy, \ + CORBA::Policy_var \ + > + +#endif /* end #if !defined */ + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + CORBA::PolicyList \ + > + +# pragma instantiate \ + TAO_FixedSeq_Var_T< \ + CORBA::PolicyTypeSeq, \ + CORBA::PolicyType \ + > + +# pragma instantiate \ + TAO_Seq_Var_Base_T< \ + CORBA::PolicyTypeSeq, \ + CORBA::PolicyType \ + > + +# pragma instantiate \ + TAO_Seq_Out_T< \ + CORBA::PolicyTypeSeq, \ + CORBA::PolicyTypeSeq_var, \ + CORBA::PolicyType \ + > + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + CORBA::PolicyTypeSeq \ + > + +# pragma instantiate \ + TAO::Any_Basic_Impl_T< \ + CORBA::SetOverrideType \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/Policy_ForwardC.h b/TAO/tao/Policy_ForwardC.h index 2f918b43608..c79bf70423b 100644 --- a/TAO/tao/Policy_ForwardC.h +++ b/TAO/tao/Policy_ForwardC.h @@ -15,6 +15,12 @@ // 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 @@ -26,6 +32,7 @@ #define _TAO_IDL_ORIG_POLICY_FORWARDC_H_ #include /**/ "ace/pre.h" + #include "tao/Sequence.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -33,7 +40,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/CDR.h" -#include "tao/Objref_VarOut_T.h" #include "tao/Seq_Var_T.h" #include "tao/Seq_Out_T.h" @@ -63,64 +69,77 @@ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48 -TAO_NAMESPACE CORBA +namespace CORBA { - + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333 - + typedef CORBA::ULong PolicyType; typedef CORBA::ULong_out PolicyType_out; - + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyType; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:566 - -#if !defined (_CORBA_POLICY__ODDS_N_ENDS_CH_) -#define _CORBA_POLICY__ODDS_N_ENDS_CH_ + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601 +#if !defined (_CORBA_POLICY__VAR_OUT_CH_) +#define _CORBA_POLICY__VAR_OUT_CH_ + class Policy; typedef Policy *Policy_ptr; - typedef TAO_Objref_Var_T<Policy> Policy_var; - typedef TAO_Objref_Out_T<Policy> Policy_out; + + typedef + TAO_Objref_Var_T< + Policy + > + Policy_var; + + typedef + TAO_Objref_Out_T< + Policy + > + Policy_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101 +#if !defined (_CORBA_POLICYLIST_CH_) +#define _CORBA_POLICYLIST_CH_ + class PolicyList; - + typedef TAO_MngSeq_Var_T< PolicyList, TAO_Object_Manager< - CORBA::Policy, - CORBA::Policy_var + Policy, + Policy_var > > PolicyList_var; - + typedef TAO_MngSeq_Out_T< PolicyList, PolicyList_var, TAO_Object_Manager< - CORBA::Policy, - CORBA::Policy_var + Policy, + Policy_var > > PolicyList_out; - + class TAO_Export PolicyList : public TAO_Unbounded_Object_Sequence< - CORBA::Policy, - CORBA::Policy_var + Policy, + Policy_var > { public: @@ -129,46 +148,51 @@ TAO_NAMESPACE CORBA PolicyList ( CORBA::ULong max, CORBA::ULong length, - Policy_ptr* buffer, + Policy_ptr* buffer, CORBA::Boolean release = 0 ); PolicyList (const PolicyList &); ~PolicyList (void); - + static void _tao_any_destructor (void *); - + typedef PolicyList_var _var_type; }; +#endif /* end #if !defined */ + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyList; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101 +#if !defined (_CORBA_POLICYTYPESEQ_CH_) +#define _CORBA_POLICYTYPESEQ_CH_ + class PolicyTypeSeq; - + typedef TAO_FixedSeq_Var_T< PolicyTypeSeq, - CORBA::PolicyType + PolicyType > PolicyTypeSeq_var; - + typedef TAO_Seq_Out_T< PolicyTypeSeq, PolicyTypeSeq_var, - CORBA::PolicyType + PolicyType > PolicyTypeSeq_out; - + class TAO_Export PolicyTypeSeq : public TAO_Unbounded_Sequence< - CORBA::PolicyType + PolicyType > { public: @@ -177,62 +201,73 @@ TAO_NAMESPACE CORBA PolicyTypeSeq ( CORBA::ULong max, CORBA::ULong length, - CORBA::ULong* buffer, + CORBA::ULong* buffer, CORBA::Boolean release = 0 ); PolicyTypeSeq (const PolicyTypeSeq &); ~PolicyTypeSeq (void); - + static void _tao_any_destructor (void *); - + typedef PolicyTypeSeq_var _var_type; }; +#endif /* end #if !defined */ + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyTypeSeq; - + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57 - + enum SetOverrideType { SET_OVERRIDE, ADD_OVERRIDE }; - + typedef SetOverrideType &SetOverrideType_out; - + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_SetOverrideType; // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:66 -} -TAO_NAMESPACE_CLOSE // module CORBA +} // module CORBA -// ===================================================== -// Hand-crafted +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:48 +// Traits specializations. namespace TAO { + +#if !defined (_CORBA_POLICY__TRAITS_CH_) +#define _CORBA_POLICY__TRAITS_CH_ + ACE_TEMPLATE_SPECIALIZATION struct TAO_Export Objref_Traits<CORBA::Policy> { - static CORBA::Policy_ptr tao_duplicate (CORBA::Policy_ptr); - static void tao_release (CORBA::Policy_ptr); + static CORBA::Policy_ptr tao_duplicate ( + CORBA::Policy_ptr + ); + static void tao_release ( + CORBA::Policy_ptr + ); static CORBA::Policy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal (CORBA::Policy_ptr, - TAO_OutputCDR &); + static CORBA::Boolean tao_marshal ( + CORBA::Policy_ptr p, + TAO_OutputCDR & cdr + ); }; -} - -// ========================================================== +#endif /* end #if !defined */ +}; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/any_op_ch.cpp:65 @@ -276,7 +311,7 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Policy_ptr &); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:70 #if !defined _TAO_CDR_OP_CORBA_PolicyList_H_ #define _TAO_CDR_OP_CORBA_PolicyList_H_ @@ -293,7 +328,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_PolicyList_H_ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:70 #if !defined _TAO_CDR_OP_CORBA_PolicyTypeSeq_H_ #define _TAO_CDR_OP_CORBA_PolicyTypeSeq_H_ @@ -321,7 +356,7 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::SetOverrideType &); #endif /* __ACE_INLINE__ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "Policy_ForwardC.i" @@ -337,3 +372,4 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::SetOverrideType &); #include /**/ "ace/post.h" #endif /* ifndef */ + diff --git a/TAO/tao/Policy_ForwardC.i b/TAO/tao/Policy_ForwardC.i index 2a094345f0a..36653f93841 100644 --- a/TAO/tao/Policy_ForwardC.i +++ b/TAO/tao/Policy_ForwardC.i @@ -15,6 +15,12 @@ // 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 @@ -34,7 +40,7 @@ TAO_Export CORBA::Boolean operator>> ( ); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:81 #if !defined _TAO_CDR_OP_CORBA_PolicyList_I_ #define _TAO_CDR_OP_CORBA_PolicyList_I_ @@ -52,7 +58,7 @@ CORBA::Boolean TAO_Export operator>> ( #endif /* _TAO_CDR_OP_CORBA_PolicyList_I_ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:81 #if !defined _TAO_CDR_OP_CORBA_PolicyTypeSeq_I_ #define _TAO_CDR_OP_CORBA_PolicyTypeSeq_I_ diff --git a/TAO/tao/Pollable.pidl b/TAO/tao/Pollable.pidl index c5fc4162c13..eaaf015a9a6 100644 --- a/TAO/tao/Pollable.pidl +++ b/TAO/tao/Pollable.pidl @@ -11,7 +11,7 @@ * The command used to generate code from this file is: * * tao_idl - * -o orig -Gp -Gd -Ge 1 + * -o orig -St -Gp -Gd -Ge 1 -GT * -Wb,export_macro=TAO_Export * -Wb,export_include="tao/corbafwd.h" * -Wb,pre_include="ace/pre.h" @@ -39,28 +39,32 @@ module CORBA { local interface PollableSet; - local interface Pollable { - boolean is_ready(in unsigned long timeout); - PollableSet create_pollable_set( ); + local interface Pollable + { + boolean is_ready (in unsigned long timeout); + PollableSet create_pollable_set (); }; - local interface DIIPollable : Pollable { }; + local interface DIIPollable : Pollable + { + }; - local interface PollableSet { - exception NoPossiblePollable { }; - exception UnknownPollable { }; + local interface PollableSet + { + exception NoPossiblePollable {}; + exception UnknownPollable {}; - DIIPollable create_dii_pollable(); + DIIPollable create_dii_pollable (); - void add_pollable(in Pollable potential ); + void add_pollable (in Pollable potential); - Pollable poll(in unsigned long timeout) - raises( NoPossiblePollable ); + Pollable poll (in unsigned long timeout) + raises (NoPossiblePollable); - void remove(in Pollable potential ) - raises( UnknownPollable ); + void remove (in Pollable potential) + raises (UnknownPollable); - unsigned short number_left( ); + unsigned short number_left (); }; }; diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp index d9e262f26c1..97b7ccf770f 100644 --- a/TAO/tao/PollableC.cpp +++ b/TAO/tao/PollableC.cpp @@ -15,27 +15,26 @@ // 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 -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:301 #include "PollableC.h" - -#if (TAO_HAS_AMI_POLLER == 1) - #include "tao/Stub.h" -#include "tao/Invocation.h" -#include "tao/PortableInterceptor.h" - -#if TAO_HAS_INTERCEPTORS == 1 -#include "tao/RequestInfo_Util.h" -#include "tao/ClientRequestInfo_i.h" -#include "tao/ClientInterceptorAdapter.h" -#endif /* TAO_HAS_INTERCEPTORS == 1 */ +#include "tao/Invocation_Adapter.h" +#include "tao/Basic_Arguments.h" +#include "tao/Object_Argument_T.h" +#include "tao/Special_Basic_Arguments.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig @@ -46,12 +45,88 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:59 + +// Arg traits specializations. +namespace TAO +{ + +#if !defined (_CORBA_POLLABLESET__ARG_TRAITS_CS_) +#define _CORBA_POLLABLESET__ARG_TRAITS_CS_ + + ACE_TEMPLATE_SPECIALIZATION + class TAO_Export Arg_Traits<CORBA::PollableSet> + : public + Object_Arg_Traits_T< + CORBA::PollableSet_ptr, + CORBA::PollableSet_var, + CORBA::PollableSet_out, + TAO::Objref_Traits<CORBA::PollableSet> + > + { + }; + +#endif /* end #if !defined */ + +#if !defined (_CORBA_POLLABLE__ARG_TRAITS_CS_) +#define _CORBA_POLLABLE__ARG_TRAITS_CS_ + + ACE_TEMPLATE_SPECIALIZATION + class TAO_Export Arg_Traits<CORBA::Pollable> + : public + Object_Arg_Traits_T< + CORBA::Pollable_ptr, + CORBA::Pollable_var, + CORBA::Pollable_out, + TAO::Objref_Traits<CORBA::Pollable> + > + { + }; + +#endif /* end #if !defined */ + +#if !defined (_CORBA_DIIPOLLABLE__ARG_TRAITS_CS_) +#define _CORBA_DIIPOLLABLE__ARG_TRAITS_CS_ + + ACE_TEMPLATE_SPECIALIZATION + class TAO_Export Arg_Traits<CORBA::DIIPollable> + : public + Object_Arg_Traits_T< + CORBA::DIIPollable_ptr, + CORBA::DIIPollable_var, + CORBA::DIIPollable_out, + TAO::Objref_Traits<CORBA::DIIPollable> + > + { + }; + +#endif /* end #if !defined */ + +#if !defined (_CORBA_POLLABLESET__ARG_TRAITS_CS_) +#define _CORBA_POLLABLESET__ARG_TRAITS_CS_ + + ACE_TEMPLATE_SPECIALIZATION + class TAO_Export Arg_Traits<CORBA::PollableSet> + : public + Object_Arg_Traits_T< + CORBA::PollableSet_ptr, + CORBA::PollableSet_var, + CORBA::PollableSet_out, + TAO::Objref_Traits<CORBA::PollableSet> + > + { + }; + +#endif /* end #if !defined */ +}; + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60 -int CORBA::Pollable::_tao_class_id = 0; +// Traits specializations for CORBA::Pollable. CORBA::Pollable_ptr -CORBA::tao_Pollable_life::tao_duplicate ( +TAO::Objref_Traits<CORBA::Pollable>::tao_duplicate ( CORBA::Pollable_ptr p ) { @@ -59,7 +134,7 @@ CORBA::tao_Pollable_life::tao_duplicate ( } void -CORBA::tao_Pollable_life::tao_release ( +TAO::Objref_Traits<CORBA::Pollable>::tao_release ( CORBA::Pollable_ptr p ) { @@ -67,67 +142,25 @@ CORBA::tao_Pollable_life::tao_release ( } CORBA::Pollable_ptr -CORBA::tao_Pollable_life::tao_nil ( - void - ) +TAO::Objref_Traits<CORBA::Pollable>::tao_nil (void) { return CORBA::Pollable::_nil (); } CORBA::Boolean -CORBA::tao_Pollable_life::tao_marshal ( +TAO::Objref_Traits<CORBA::Pollable>::tao_marshal ( CORBA::Pollable_ptr p, - TAO_OutputCDR &cdr + TAO_OutputCDR & cdr ) { return p->marshal (cdr); } -CORBA::Pollable_ptr -CORBA::tao_Pollable_cast::tao_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return CORBA::Pollable::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object * -CORBA::tao_Pollable_cast::tao_upcast ( - void *src - ) -{ - CORBA::Pollable **tmp = - ACE_static_cast (CORBA::Pollable **, src); - return *tmp; -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class - TAO_Objref_Var_T< - CORBA::Pollable, - CORBA::tao_Pollable_life - >; - template class - TAO_Objref_Out_T< - CORBA::Pollable, - CORBA::tao_Pollable_life - >; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate \ - TAO_Objref_Var_T< \ - CORBA::Pollable, \ - CORBA::tao_Pollable_life \ - > -# pragma instantiate \ - TAO_Objref_Out_T< \ - CORBA::Pollable, \ - CORBA::tao_Pollable_life \ - > -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 +// Function pointer for collocation factory initialization. +TAO::Collocation_Proxy_Broker * +(*CORBA__TAO_Pollable_Proxy_Broker_Factory_function_pointer) ( + CORBA::Object_ptr obj + ) = 0; CORBA::Pollable::Pollable (void) {} @@ -137,34 +170,19 @@ CORBA::Pollable::~Pollable (void) CORBA::Pollable_ptr CORBA::Pollable::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) -{ - return Pollable::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); -} - -CORBA::Pollable_ptr -CORBA::Pollable::_unchecked_narrow ( - CORBA::Object_ptr obj + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { - if (CORBA::is_nil (obj)) + if (CORBA::is_nil (_tao_objref)) { return Pollable::_nil (); } - return - ACE_reinterpret_cast ( - Pollable_ptr, - obj->_tao_QueryInterface ( - ACE_reinterpret_cast ( - ptrdiff_t, - &Pollable::_tao_class_id - ) - ) - ); + Pollable_ptr proxy = + dynamic_cast<Pollable_ptr> (_tao_objref); + + return Pollable::_duplicate (proxy); } CORBA::Pollable_ptr @@ -178,35 +196,33 @@ CORBA::Pollable::_duplicate (Pollable_ptr obj) return obj; } -void *CORBA::Pollable::_tao_QueryInterface (ptrdiff_t type) +CORBA::Boolean +CORBA::Pollable::_is_a ( + const char *value + ACE_ENV_ARG_DECL + ) { - void *retv = 0; - - if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &ACE_NESTED_CLASS (::CORBA, Pollable)::_tao_class_id) - ) - { - retv = ACE_reinterpret_cast (void*, this); - } - else if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &CORBA::Object::_tao_class_id) - ) + if ( + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/Pollable:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/LocalObject:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/Object:1.0" + ) + ) { - retv = - ACE_reinterpret_cast ( - void *, - ACE_static_cast (CORBA::Object_ptr, this) - ); + return 1; // success using local knowledge } - - if (retv != 0) + else { - this->_add_ref (); + return 0; } - - return retv; } const char* CORBA::Pollable::_interface_repository_id (void) const @@ -221,12 +237,12 @@ CORBA::Pollable::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60 -int CORBA::DIIPollable::_tao_class_id = 0; +// Traits specializations for CORBA::DIIPollable. CORBA::DIIPollable_ptr -CORBA::tao_DIIPollable_life::tao_duplicate ( +TAO::Objref_Traits<CORBA::DIIPollable>::tao_duplicate ( CORBA::DIIPollable_ptr p ) { @@ -234,7 +250,7 @@ CORBA::tao_DIIPollable_life::tao_duplicate ( } void -CORBA::tao_DIIPollable_life::tao_release ( +TAO::Objref_Traits<CORBA::DIIPollable>::tao_release ( CORBA::DIIPollable_ptr p ) { @@ -242,67 +258,25 @@ CORBA::tao_DIIPollable_life::tao_release ( } CORBA::DIIPollable_ptr -CORBA::tao_DIIPollable_life::tao_nil ( - void - ) +TAO::Objref_Traits<CORBA::DIIPollable>::tao_nil (void) { return CORBA::DIIPollable::_nil (); } CORBA::Boolean -CORBA::tao_DIIPollable_life::tao_marshal ( +TAO::Objref_Traits<CORBA::DIIPollable>::tao_marshal ( CORBA::DIIPollable_ptr p, - TAO_OutputCDR &cdr + TAO_OutputCDR & cdr ) { return p->marshal (cdr); } -CORBA::DIIPollable_ptr -CORBA::tao_DIIPollable_cast::tao_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return CORBA::DIIPollable::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object * -CORBA::tao_DIIPollable_cast::tao_upcast ( - void *src - ) -{ - CORBA::DIIPollable **tmp = - ACE_static_cast (CORBA::DIIPollable **, src); - return *tmp; -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class - TAO_Objref_Var_T< - CORBA::DIIPollable, - CORBA::tao_DIIPollable_life - >; - template class - TAO_Objref_Out_T< - CORBA::DIIPollable, - CORBA::tao_DIIPollable_life - >; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate \ - TAO_Objref_Var_T< \ - CORBA::DIIPollable, \ - CORBA::tao_DIIPollable_life \ - > -# pragma instantiate \ - TAO_Objref_Out_T< \ - CORBA::DIIPollable, \ - CORBA::tao_DIIPollable_life \ - > -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 +// Function pointer for collocation factory initialization. +TAO::Collocation_Proxy_Broker * +(*CORBA__TAO_DIIPollable_Proxy_Broker_Factory_function_pointer) ( + CORBA::Object_ptr obj + ) = 0; CORBA::DIIPollable::DIIPollable (void) {} @@ -312,34 +286,19 @@ CORBA::DIIPollable::~DIIPollable (void) CORBA::DIIPollable_ptr CORBA::DIIPollable::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) -{ - return DIIPollable::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); -} - -CORBA::DIIPollable_ptr -CORBA::DIIPollable::_unchecked_narrow ( - CORBA::Object_ptr obj + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { - if (CORBA::is_nil (obj)) + if (CORBA::is_nil (_tao_objref)) { return DIIPollable::_nil (); } - return - ACE_reinterpret_cast ( - DIIPollable_ptr, - obj->_tao_QueryInterface ( - ACE_reinterpret_cast ( - ptrdiff_t, - &DIIPollable::_tao_class_id - ) - ) - ); + DIIPollable_ptr proxy = + dynamic_cast<DIIPollable_ptr> (_tao_objref); + + return DIIPollable::_duplicate (proxy); } CORBA::DIIPollable_ptr @@ -353,49 +312,37 @@ CORBA::DIIPollable::_duplicate (DIIPollable_ptr obj) return obj; } -void *CORBA::DIIPollable::_tao_QueryInterface (ptrdiff_t type) +CORBA::Boolean +CORBA::DIIPollable::_is_a ( + const char *value + ACE_ENV_ARG_DECL + ) { - void *retv = 0; - - if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &ACE_NESTED_CLASS (::CORBA, DIIPollable)::_tao_class_id) - ) - { - retv = ACE_reinterpret_cast (void*, this); - } - else if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &ACE_NESTED_CLASS (::CORBA, Pollable)::_tao_class_id) - ) - { - retv = - ACE_reinterpret_cast ( - void *, - ACE_static_cast ( - CORBA::Pollable_ptr, - this - ) - ); - } - else if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &CORBA::Object::_tao_class_id) - ) + if ( + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/Pollable:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/DIIPollable:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/LocalObject:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/Object:1.0" + ) + ) { - retv = - ACE_reinterpret_cast ( - void *, - ACE_static_cast (CORBA::Object_ptr, this) - ); + return 1; // success using local knowledge } - - if (retv != 0) + else { - this->_add_ref (); + return 0; } - - return retv; } const char* CORBA::DIIPollable::_interface_repository_id (void) const @@ -410,12 +357,12 @@ CORBA::DIIPollable::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60 -int CORBA::PollableSet::_tao_class_id = 0; +// Traits specializations for CORBA::PollableSet. CORBA::PollableSet_ptr -CORBA::tao_PollableSet_life::tao_duplicate ( +TAO::Objref_Traits<CORBA::PollableSet>::tao_duplicate ( CORBA::PollableSet_ptr p ) { @@ -423,7 +370,7 @@ CORBA::tao_PollableSet_life::tao_duplicate ( } void -CORBA::tao_PollableSet_life::tao_release ( +TAO::Objref_Traits<CORBA::PollableSet>::tao_release ( CORBA::PollableSet_ptr p ) { @@ -431,158 +378,25 @@ CORBA::tao_PollableSet_life::tao_release ( } CORBA::PollableSet_ptr -CORBA::tao_PollableSet_life::tao_nil ( - void - ) +TAO::Objref_Traits<CORBA::PollableSet>::tao_nil (void) { return CORBA::PollableSet::_nil (); } CORBA::Boolean -CORBA::tao_PollableSet_life::tao_marshal ( +TAO::Objref_Traits<CORBA::PollableSet>::tao_marshal ( CORBA::PollableSet_ptr p, - TAO_OutputCDR &cdr + TAO_OutputCDR & cdr ) { return p->marshal (cdr); } -CORBA::PollableSet_ptr -CORBA::tao_PollableSet_cast::tao_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return CORBA::PollableSet::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object * -CORBA::tao_PollableSet_cast::tao_upcast ( - void *src - ) -{ - CORBA::PollableSet **tmp = - ACE_static_cast (CORBA::PollableSet **, src); - return *tmp; -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class - TAO_Objref_Var_T< - CORBA::PollableSet, - CORBA::tao_PollableSet_life - >; - template class - TAO_Objref_Out_T< - CORBA::PollableSet, - CORBA::tao_PollableSet_life - >; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate \ - TAO_Objref_Var_T< \ - CORBA::PollableSet, \ - CORBA::tao_PollableSet_life \ - > -# pragma instantiate \ - TAO_Objref_Out_T< \ - CORBA::PollableSet, \ - CORBA::tao_PollableSet_life \ - > -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 - -CORBA::PollableSet::PollableSet (void) -{} - -CORBA::PollableSet::~PollableSet (void) -{} - -CORBA::PollableSet_ptr -CORBA::PollableSet::_narrow ( +// Function pointer for collocation factory initialization. +TAO::Collocation_Proxy_Broker * +(*CORBA__TAO_PollableSet_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) -{ - return PollableSet::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); -} - -CORBA::PollableSet_ptr -CORBA::PollableSet::_unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED - ) -{ - if (CORBA::is_nil (obj)) - { - return PollableSet::_nil (); - } - - return - ACE_reinterpret_cast ( - PollableSet_ptr, - obj->_tao_QueryInterface ( - ACE_reinterpret_cast ( - ptrdiff_t, - &PollableSet::_tao_class_id - ) - ) - ); -} - -CORBA::PollableSet_ptr -CORBA::PollableSet::_duplicate (PollableSet_ptr obj) -{ - if (! CORBA::is_nil (obj)) - { - obj->_add_ref (); - } - - return obj; -} - -void *CORBA::PollableSet::_tao_QueryInterface (ptrdiff_t type) -{ - void *retv = 0; - - if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &ACE_NESTED_CLASS (::CORBA, PollableSet)::_tao_class_id) - ) - { - retv = ACE_reinterpret_cast (void*, this); - } - else if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &CORBA::Object::_tao_class_id) - ) - { - retv = - ACE_reinterpret_cast ( - void *, - ACE_static_cast (CORBA::Object_ptr, this) - ); - } - - if (retv != 0) - { - this->_add_ref (); - } - - return retv; -} - -const char* CORBA::PollableSet::_interface_repository_id (void) const -{ - return "IDL:omg.org/CORBA/PollableSet:1.0"; -} - -CORBA::Boolean -CORBA::PollableSet::marshal (TAO_OutputCDR &) -{ - return 0; -} + ) = 0; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63 @@ -753,6 +567,271 @@ void CORBA::PollableSet::UnknownPollable::_tao_decode ( } -#endif /* TAO_HAS_AMI_POLLER == 1 */ +CORBA::PollableSet::PollableSet (void) +{} + +CORBA::PollableSet::~PollableSet (void) +{} + +CORBA::PollableSet_ptr +CORBA::PollableSet::_narrow ( + CORBA::Object_ptr _tao_objref + ACE_ENV_ARG_DECL_NOT_USED + ) +{ + if (CORBA::is_nil (_tao_objref)) + { + return PollableSet::_nil (); + } + + PollableSet_ptr proxy = + dynamic_cast<PollableSet_ptr> (_tao_objref); + + return PollableSet::_duplicate (proxy); +} + +CORBA::PollableSet_ptr +CORBA::PollableSet::_duplicate (PollableSet_ptr obj) +{ + if (! CORBA::is_nil (obj)) + { + obj->_add_ref (); + } + + return obj; +} + +CORBA::Boolean +CORBA::PollableSet::_is_a ( + const char *value + ACE_ENV_ARG_DECL + ) +{ + if ( + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/PollableSet:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/LocalObject:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/Object:1.0" + ) + ) + { + return 1; // success using local knowledge + } + else + { + return 0; + } +} + +const char* CORBA::PollableSet::_interface_repository_id (void) const +{ + return "IDL:omg.org/CORBA/PollableSet:1.0"; +} + +CORBA::Boolean +CORBA::PollableSet::marshal (TAO_OutputCDR &) +{ + return 0; +} + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1703 + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + +#if !defined (_CORBA_POLLABLESET__ARG_TRAITS_TMPLINST_CS_) +#define _CORBA_POLLABLESET__ARG_TRAITS_TMPLINST_CS_ + + template class TAO::Arg_Traits<CORBA::PollableSet>; + + template class + TAO::Object_Arg_Traits_T< + CORBA::PollableSet_ptr, + CORBA::PollableSet_var, + CORBA::PollableSet_out + >; + +#endif /* end #if !defined */ + + template class + TAO::Ret_Object_Argument_T< + CORBA::DIIPollable_ptr, + CORBA::DIIPollable_var + >; + + template class + TAO::In_Object_Argument_T< + CORBA::Pollable_ptr + >; + + template class + TAO::Ret_Object_Argument_T< + CORBA::Pollable_ptr, + CORBA::Pollable_var + >; + + template class + TAO_Objref_Var_T< + CORBA::PollableSet, + TAO::Objref_Traits<CORBA::PollableSet> + >; + + template class + TAO_Objref_Out_T< + CORBA::PollableSet, + TAO::Objref_Traits<CORBA::PollableSet> + >; + +#if !defined (_CORBA_POLLABLE__ARG_TRAITS_TMPLINST_CS_) +#define _CORBA_POLLABLE__ARG_TRAITS_TMPLINST_CS_ + + template class TAO::Arg_Traits<CORBA::Pollable>; + + template class + TAO::Object_Arg_Traits_T< + CORBA::Pollable_ptr, + CORBA::Pollable_var, + CORBA::Pollable_out + >; + +#endif /* end #if !defined */ + + template class + TAO::Ret_Object_Argument_T< + CORBA::PollableSet_ptr, + CORBA::PollableSet_var + >; + + template class + TAO_Objref_Var_T< + CORBA::Pollable, + TAO::Objref_Traits<CORBA::Pollable> + >; + + template class + TAO_Objref_Out_T< + CORBA::Pollable, + TAO::Objref_Traits<CORBA::Pollable> + >; + +#if !defined (_CORBA_DIIPOLLABLE__ARG_TRAITS_TMPLINST_CS_) +#define _CORBA_DIIPOLLABLE__ARG_TRAITS_TMPLINST_CS_ + + template class TAO::Arg_Traits<CORBA::DIIPollable>; + + template class + TAO::Object_Arg_Traits_T< + CORBA::DIIPollable_ptr, + CORBA::DIIPollable_var, + CORBA::DIIPollable_out + >; + +#endif /* end #if !defined */ + + template class + TAO_Objref_Var_T< + CORBA::DIIPollable, + TAO::Objref_Traits<CORBA::DIIPollable> + >; + + template class + TAO_Objref_Out_T< + CORBA::DIIPollable, + TAO::Objref_Traits<CORBA::DIIPollable> + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +#if !defined (_CORBA_POLLABLESET__ARG_TRAITS_TMPLINST_CS_) +#define _CORBA_POLLABLESET__ARG_TRAITS_TMPLINST_CS_ + +# pragma instantiate TAO::Arg_Traits<CORBA::PollableSet> + +# pragma instantiate \ + TAO::Object_Arg_Traits_T< \ + CORBA::PollableSet_ptr, \ + CORBA::PollableSet_var, \ + CORBA::PollableSet_out \ + > + +#endif /* end #if !defined */ + +# pragma instantiate \ + TAO::In_Object_Argument_T< \ + CORBA::Pollable_ptr \ + > + +# pragma instantiate \ + TAO_Objref_Var_T< \ + CORBA::PollableSet, \ + TAO::Objref_Traits<CORBA::PollableSet> \ + > + +# pragma instantiate \ + TAO_Objref_Out_T< \ + CORBA::PollableSet, \ + TAO::Objref_Traits<CORBA::PollableSet> \ + > + +#if !defined (_CORBA_POLLABLE__ARG_TRAITS_TMPLINST_CS_) +#define _CORBA_POLLABLE__ARG_TRAITS_TMPLINST_CS_ + +# pragma instantiate TAO::Arg_Traits<CORBA::Pollable> + +# pragma instantiate \ + TAO::Object_Arg_Traits_T< \ + CORBA::Pollable_ptr, \ + CORBA::Pollable_var, \ + CORBA::Pollable_out \ + > + +#endif /* end #if !defined */ + +# pragma instantiate \ + TAO_Objref_Var_T< \ + CORBA::Pollable, \ + TAO::Objref_Traits<CORBA::Pollable> \ + > + +# pragma instantiate \ + TAO_Objref_Out_T< \ + CORBA::Pollable, \ + TAO::Objref_Traits<CORBA::Pollable> \ + > + +#if !defined (_CORBA_DIIPOLLABLE__ARG_TRAITS_TMPLINST_CS_) +#define _CORBA_DIIPOLLABLE__ARG_TRAITS_TMPLINST_CS_ + +# pragma instantiate TAO::Arg_Traits<CORBA::DIIPollable> + +# pragma instantiate \ + TAO::Object_Arg_Traits_T< \ + CORBA::DIIPollable_ptr, \ + CORBA::DIIPollable_var, \ + CORBA::DIIPollable_out \ + > + +#endif /* end #if !defined */ + +# pragma instantiate \ + TAO_Objref_Var_T< \ + CORBA::DIIPollable, \ + TAO::Objref_Traits<CORBA::DIIPollable> \ + > + +# pragma instantiate \ + TAO_Objref_Out_T< \ + CORBA::DIIPollable, \ + TAO::Objref_Traits<CORBA::DIIPollable> \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PollableC.h b/TAO/tao/PollableC.h index d6fecb1b55b..842f4eb9423 100644 --- a/TAO/tao/PollableC.h +++ b/TAO/tao/PollableC.h @@ -15,6 +15,12 @@ // 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 @@ -26,9 +32,8 @@ #define _TAO_IDL_ORIG_POLLABLEC_H_ #include /**/ "ace/pre.h" -#include "Exception.h" -#if (TAO_HAS_AMI_POLLER == 1) +#include "Exception.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -59,82 +64,70 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #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<typename T> class Narrow_Utils; +} + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48 -TAO_NAMESPACE CORBA +namespace CORBA { // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601 -#if !defined (_CORBA_POLLABLESET__ODDS_N_ENDS_CH_) -#define _CORBA_POLLABLESET__ODDS_N_ENDS_CH_ +#if !defined (_CORBA_POLLABLESET__VAR_OUT_CH_) +#define _CORBA_POLLABLESET__VAR_OUT_CH_ class PollableSet; typedef PollableSet *PollableSet_ptr; - struct tao_PollableSet_life; - typedef TAO_Objref_Var_T<PollableSet, tao_PollableSet_life> PollableSet_var; - typedef TAO_Objref_Out_T<PollableSet, tao_PollableSet_life> PollableSet_out; - struct TAO_Export tao_PollableSet_life - { - static PollableSet_ptr tao_duplicate (PollableSet_ptr); - static void tao_release (PollableSet_ptr); - static PollableSet_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( - PollableSet_ptr, - TAO_OutputCDR & - ); - }; + typedef + TAO_Objref_Var_T< + PollableSet + > + PollableSet_var; - struct TAO_Export tao_PollableSet_cast - { - static PollableSet_ptr tao_narrow ( - CORBA::Object_ptr - ACE_ENV_ARG_DECL - ); - static CORBA::Object_ptr tao_upcast (void *); - }; + typedef + TAO_Objref_Out_T< + PollableSet + > + PollableSet_out; #endif /* end #if !defined */ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601 -#if !defined (_CORBA_POLLABLE__ODDS_N_ENDS_CH_) -#define _CORBA_POLLABLE__ODDS_N_ENDS_CH_ +#if !defined (_CORBA_POLLABLE__VAR_OUT_CH_) +#define _CORBA_POLLABLE__VAR_OUT_CH_ class Pollable; typedef Pollable *Pollable_ptr; - struct tao_Pollable_life; - typedef TAO_Objref_Var_T<Pollable, tao_Pollable_life> Pollable_var; - typedef TAO_Objref_Out_T<Pollable, tao_Pollable_life> Pollable_out; - struct TAO_Export tao_Pollable_life - { - static Pollable_ptr tao_duplicate (Pollable_ptr); - static void tao_release (Pollable_ptr); - static Pollable_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( - Pollable_ptr, - TAO_OutputCDR & - ); - }; + typedef + TAO_Objref_Var_T< + Pollable + > + Pollable_var; - struct TAO_Export tao_Pollable_cast - { - static Pollable_ptr tao_narrow ( - CORBA::Object_ptr - ACE_ENV_ARG_DECL - ); - static CORBA::Object_ptr tao_upcast (void *); - }; + typedef + TAO_Objref_Out_T< + Pollable + > + Pollable_out; #endif /* end #if !defined */ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53 #if !defined (_CORBA_POLLABLE_CH_) #define _CORBA_POLLABLE_CH_ @@ -145,7 +138,6 @@ TAO_NAMESPACE CORBA public: typedef Pollable_ptr _ptr_type; typedef Pollable_var _var_type; - static int _tao_class_id; // The static operations. static Pollable_ptr _duplicate (Pollable_ptr obj); @@ -155,11 +147,6 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - static Pollable_ptr _unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); - static Pollable_ptr _nil (void) { return (Pollable_ptr)0; @@ -189,9 +176,12 @@ TAO_NAMESPACE CORBA )) = 0; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:185 - virtual void *_tao_QueryInterface (ptrdiff_t type); + 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); @@ -208,41 +198,30 @@ TAO_NAMESPACE CORBA #endif /* end #if !defined */ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601 -#if !defined (_CORBA_DIIPOLLABLE__ODDS_N_ENDS_CH_) -#define _CORBA_DIIPOLLABLE__ODDS_N_ENDS_CH_ +#if !defined (_CORBA_DIIPOLLABLE__VAR_OUT_CH_) +#define _CORBA_DIIPOLLABLE__VAR_OUT_CH_ class DIIPollable; typedef DIIPollable *DIIPollable_ptr; - struct tao_DIIPollable_life; - typedef TAO_Objref_Var_T<DIIPollable, tao_DIIPollable_life> DIIPollable_var; - typedef TAO_Objref_Out_T<DIIPollable, tao_DIIPollable_life> DIIPollable_out; - struct TAO_Export tao_DIIPollable_life - { - static DIIPollable_ptr tao_duplicate (DIIPollable_ptr); - static void tao_release (DIIPollable_ptr); - static DIIPollable_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( - DIIPollable_ptr, - TAO_OutputCDR & - ); - }; + typedef + TAO_Objref_Var_T< + DIIPollable + > + DIIPollable_var; - struct TAO_Export tao_DIIPollable_cast - { - static DIIPollable_ptr tao_narrow ( - CORBA::Object_ptr - ACE_ENV_ARG_DECL - ); - static CORBA::Object_ptr tao_upcast (void *); - }; + typedef + TAO_Objref_Out_T< + DIIPollable + > + DIIPollable_out; #endif /* end #if !defined */ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53 #if !defined (_CORBA_DIIPOLLABLE_CH_) #define _CORBA_DIIPOLLABLE_CH_ @@ -253,7 +232,6 @@ TAO_NAMESPACE CORBA public: typedef DIIPollable_ptr _ptr_type; typedef DIIPollable_var _var_type; - static int _tao_class_id; // The static operations. static DIIPollable_ptr _duplicate (DIIPollable_ptr obj); @@ -263,11 +241,6 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - static DIIPollable_ptr _unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); - static DIIPollable_ptr _nil (void) { return (DIIPollable_ptr)0; @@ -276,9 +249,12 @@ TAO_NAMESPACE CORBA // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:185 - virtual void *_tao_QueryInterface (ptrdiff_t type); + 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); @@ -295,7 +271,7 @@ TAO_NAMESPACE CORBA #endif /* end #if !defined */ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53 #if !defined (_CORBA_POLLABLESET_CH_) #define _CORBA_POLLABLESET_CH_ @@ -306,7 +282,6 @@ TAO_NAMESPACE CORBA public: typedef PollableSet_ptr _ptr_type; typedef PollableSet_var _var_type; - static int _tao_class_id; // The static operations. static PollableSet_ptr _duplicate (PollableSet_ptr obj); @@ -316,11 +291,6 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - static PollableSet_ptr _unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); - static PollableSet_ptr _nil (void) { return (PollableSet_ptr)0; @@ -353,12 +323,12 @@ TAO_NAMESPACE CORBA virtual void _tao_encode ( TAO_OutputCDR & - ACE_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL ) const; virtual void _tao_decode ( TAO_InputCDR & - ACE_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL ); // TAO_IDL - Generated from @@ -392,12 +362,12 @@ TAO_NAMESPACE CORBA virtual void _tao_encode ( TAO_OutputCDR & - ACE_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL ) const; virtual void _tao_decode ( TAO_InputCDR & - ACE_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL ); // TAO_IDL - Generated from @@ -462,9 +432,12 @@ TAO_NAMESPACE CORBA )) = 0; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:185 - virtual void *_tao_QueryInterface (ptrdiff_t type); + 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); @@ -481,10 +454,17 @@ TAO_NAMESPACE CORBA #endif /* end #if !defined */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:66 -} -TAO_NAMESPACE_CLOSE // module CORBA +} // module CORBA + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:48 + +// Traits specializations. +namespace TAO +{ +}; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48 @@ -497,7 +477,7 @@ TAO_NAMESPACE_CLOSE // module CORBA #endif /* __ACE_INLINE__ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "PollableC.i" @@ -511,8 +491,6 @@ TAO_NAMESPACE_CLOSE // module CORBA #pragma option pop #endif /* __BORLANDC__ */ -#endif /* TAO_HAS_AMI_POLLER == 1 */ - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/PollableC.i b/TAO/tao/PollableC.i index 042e3d1523b..b8797227eb2 100644 --- a/TAO/tao/PollableC.i +++ b/TAO/tao/PollableC.i @@ -15,13 +15,19 @@ // 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 -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63 #if !defined (_CORBA_POLLABLE___CI_) #define _CORBA_POLLABLE___CI_ @@ -29,7 +35,7 @@ #endif /* end #if !defined */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63 #if !defined (_CORBA_DIIPOLLABLE___CI_) #define _CORBA_DIIPOLLABLE___CI_ @@ -37,7 +43,7 @@ #endif /* end #if !defined */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63 #if !defined (_CORBA_POLLABLESET___CI_) #define _CORBA_POLLABLESET___CI_ diff --git a/TAO/tao/PortableInterceptor.pidl b/TAO/tao/PortableInterceptor.pidl index 16dcfb474b0..e4701926666 100644 --- a/TAO/tao/PortableInterceptor.pidl +++ b/TAO/tao/PortableInterceptor.pidl @@ -22,7 +22,7 @@ * The command used to generate code is: * * tao_idl - * -o orig -Gp -Gd -Ge 1 + * -o orig -Gp -Gd -Ge 1 -GT * -Wb,export_macro=TAO_Export * -Wb,export_include="tao/corbafwd.h" * -Wb,pre_include="ace/pre.h" @@ -47,12 +47,14 @@ module PortableInterceptor { typeprefix PortableInterceptor "omg.org"; - local interface Interceptor { + local interface Interceptor + { readonly attribute string name; void destroy (); }; - exception ForwardRequest { + exception ForwardRequest + { Object forward; boolean permanent; }; @@ -72,12 +74,14 @@ module PortableInterceptor { exception InvalidSlot {}; - local interface Current : CORBA::Current { + local interface Current : CORBA::Current + { any get_slot (in SlotId id) raises (InvalidSlot); void set_slot (in SlotId id, in any data) raises (InvalidSlot); }; - local interface RequestInfo { + local interface RequestInfo + { readonly attribute unsigned long request_id; readonly attribute string operation; readonly attribute Dynamic::ParameterList arguments; @@ -94,7 +98,8 @@ module PortableInterceptor { IOP::ServiceContext get_reply_service_context (in IOP::ServiceId id); }; - local interface ClientRequestInfo : RequestInfo { + local interface ClientRequestInfo : RequestInfo + { readonly attribute Object target; readonly attribute Object effective_target; readonly attribute IOP::TaggedProfile effective_profile; @@ -108,7 +113,8 @@ module PortableInterceptor { in boolean replace); }; - local interface ServerRequestInfo : RequestInfo { + local interface ServerRequestInfo : RequestInfo + { readonly attribute any sending_exception; readonly attribute ServerId server_id; readonly attribute ORBId orb_id; @@ -124,7 +130,8 @@ module PortableInterceptor { in boolean replace); }; - local interface ClientRequestInterceptor : Interceptor { + local interface ClientRequestInterceptor : Interceptor + { void send_request (in ClientRequestInfo ri) raises (ForwardRequest); void send_poll (in ClientRequestInfo ri); void receive_reply (in ClientRequestInfo ri); @@ -132,7 +139,8 @@ module PortableInterceptor { void receive_other (in ClientRequestInfo ri) raises (ForwardRequest); }; - local interface ServerRequestInterceptor : Interceptor { + local interface ServerRequestInterceptor : Interceptor + { void receive_request_service_contexts (in ServerRequestInfo ri) raises (ForwardRequest); void receive_request (in ServerRequestInfo ri) raises (ForwardRequest); void send_reply (in ServerRequestInfo ri); @@ -148,11 +156,15 @@ module PortableInterceptor { local interface IORInterceptor; - local interface ORBInitInfo { + local interface ORBInitInfo + { typedef string ObjectId; - exception DuplicateName { + + exception DuplicateName + { string name; }; + exception InvalidName {}; readonly attribute CORBA::StringSeq arguments; @@ -161,7 +173,8 @@ module PortableInterceptor { void register_initial_reference (in ObjectId id, in Object obj) raises (InvalidName); - Object resolve_initial_references (in ObjectId id) raises (InvalidName); + Object resolve_initial_references (in ObjectId id) + raises (InvalidName); void add_client_request_interceptor ( in ClientRequestInterceptor interceptor) raises (DuplicateName); @@ -176,7 +189,8 @@ module PortableInterceptor { in PolicyFactory policy_factory); }; - local interface ORBInitializer { + local interface ORBInitializer + { void pre_init (in ORBInitInfo info); void post_init (in ORBInitInfo info); }; diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp index b7e8e1d0c7b..68991b1930c 100644 --- a/TAO/tao/PortableInterceptorC.cpp +++ b/TAO/tao/PortableInterceptorC.cpp @@ -26,20 +26,20 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:344 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:301 #include "PortableInterceptorC.h" #include "tao/Stub.h" -#include "tao/Invocation.h" -#include "tao/PortableInterceptor.h" - -#if TAO_HAS_INTERCEPTORS == 1 -#include "tao/RequestInfo_Util.h" -#include "tao/ClientRequestInfo_i.h" -#include "tao/ClientInterceptorAdapter.h" -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - +#include "tao/Invocation_Adapter.h" +#include "tao/Any_Impl_T.h" +#include "tao/Any_Dual_Impl_T.h" +#include "tao/Any_Basic_Impl_T.h" +#include "tao/Basic_Arguments.h" +#include "tao/Object_Argument_T.h" +#include "tao/Special_Basic_Arguments.h" +#include "tao/UB_String_Arguments.h" +#include "tao/Var_Size_Argument_T.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig @@ -50,36 +50,490 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:63 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:59 -int PortableInterceptor::Interceptor::_tao_class_id = 0; +// Arg traits specializations. +namespace TAO +{ + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:262 -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class - TAO_Objref_Var_T< - PortableInterceptor::Interceptor, - PortableInterceptor::tao_Interceptor_life - >; - template class - TAO_Objref_Out_T< - PortableInterceptor::Interceptor, - PortableInterceptor::tao_Interceptor_life - >; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate \ - TAO_Objref_Var_T< \ - PortableInterceptor::Interceptor, \ - PortableInterceptor::tao_Interceptor_life \ - > -# pragma instantiate \ - TAO_Objref_Out_T< \ - PortableInterceptor::Interceptor, \ - PortableInterceptor::tao_Interceptor_life \ - > -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#if !defined (__TAO_SEQ_CORBA_OCTET___ARG_TRAITS_CS_) +#define __TAO_SEQ_CORBA_OCTET___ARG_TRAITS_CS_ + + ACE_TEMPLATE_SPECIALIZATION + class TAO_Export Arg_Traits<CORBA::OctetSeq> + : public + Var_Size_Arg_Traits_T< + CORBA::OctetSeq, + CORBA::OctetSeq_var, + CORBA::OctetSeq_out + > + { + }; -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:245 +#endif /* end #if !defined */ + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:262 + +#if !defined (__TAO_SEQ_CORBA_STRING___ARG_TRAITS_CS_) +#define __TAO_SEQ_CORBA_STRING___ARG_TRAITS_CS_ + + ACE_TEMPLATE_SPECIALIZATION + class TAO_Export Arg_Traits<CORBA::StringSeq> + : public + Var_Size_Arg_Traits_T< + CORBA::StringSeq, + CORBA::StringSeq_var, + CORBA::StringSeq_out + > + { + }; + +#endif /* end #if !defined */ + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:262 + +#if !defined (__TAO_SEQ_CORBA_STRING___ARG_TRAITS_CS_) +#define __TAO_SEQ_CORBA_STRING___ARG_TRAITS_CS_ + + ACE_TEMPLATE_SPECIALIZATION + class TAO_Export Arg_Traits<PortableInterceptor::AdapterName> + : public + Var_Size_Arg_Traits_T< + PortableInterceptor::AdapterName, + PortableInterceptor::AdapterName_var, + PortableInterceptor::AdapterName_out + > + { + }; + +#endif /* end #if !defined */ + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:262 + +#if !defined (__TAO_SEQ_CORBA_OCTET___ARG_TRAITS_CS_) +#define __TAO_SEQ_CORBA_OCTET___ARG_TRAITS_CS_ + + ACE_TEMPLATE_SPECIALIZATION + class TAO_Export Arg_Traits<PortableInterceptor::ObjectId> + : public + Var_Size_Arg_Traits_T< + PortableInterceptor::ObjectId, + PortableInterceptor::ObjectId_var, + PortableInterceptor::ObjectId_out + > + { + }; + +#endif /* end #if !defined */ + +#if !defined (_CORBA_POLICY__ARG_TRAITS_CS_) +#define _CORBA_POLICY__ARG_TRAITS_CS_ + + ACE_TEMPLATE_SPECIALIZATION + class TAO_Export Arg_Traits<CORBA::Policy> + : public + Object_Arg_Traits_T< + CORBA::Policy_ptr, + CORBA::Policy_var, + CORBA::Policy_out, + TAO::Objref_Traits<CORBA::Policy> + > + { + }; + +#endif /* end #if !defined */ + +#if !defined (_CORBA_POLICY__ARG_TRAITS_CS_) +#define _CORBA_POLICY__ARG_TRAITS_CS_ + + ACE_TEMPLATE_SPECIALIZATION + class TAO_Export Arg_Traits<CORBA::Policy> + : public + Object_Arg_Traits_T< + CORBA::Policy_ptr, + CORBA::Policy_var, + CORBA::Policy_out, + TAO::Objref_Traits<CORBA::Policy> + > + { + }; + +#endif /* end #if !defined */ + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:262 + +#if !defined (__TAO_SEQ_DYNAMIC_PARAMETER___ARG_TRAITS_CS_) +#define __TAO_SEQ_DYNAMIC_PARAMETER___ARG_TRAITS_CS_ + + ACE_TEMPLATE_SPECIALIZATION + class TAO_Export Arg_Traits<Dynamic::ParameterList> + : public + Var_Size_Arg_Traits_T< + Dynamic::ParameterList, + Dynamic::ParameterList_var, + Dynamic::ParameterList_out + > + { + }; + +#endif /* end #if !defined */ + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:262 + +#if !defined (__TAO_SEQ_CORBA_STRING___ARG_TRAITS_CS_) +#define __TAO_SEQ_CORBA_STRING___ARG_TRAITS_CS_ + + ACE_TEMPLATE_SPECIALIZATION + class TAO_Export Arg_Traits<Dynamic::ContextList> + : public + Var_Size_Arg_Traits_T< + Dynamic::ContextList, + Dynamic::ContextList_var, + Dynamic::ContextList_out + > + { + }; + +#endif /* end #if !defined */ + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:262 + +#if !defined (__TAO_SEQ_DYNAMIC_TYPECODE___ARG_TRAITS_CS_) +#define __TAO_SEQ_DYNAMIC_TYPECODE___ARG_TRAITS_CS_ + + ACE_TEMPLATE_SPECIALIZATION + class TAO_Export Arg_Traits<Dynamic::ExceptionList> + : public + Var_Size_Arg_Traits_T< + Dynamic::ExceptionList, + Dynamic::ExceptionList_var, + Dynamic::ExceptionList_out + > + { + }; + +#endif /* end #if !defined */ + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:262 + +#if !defined (__TAO_SEQ_CORBA_STRING___ARG_TRAITS_CS_) +#define __TAO_SEQ_CORBA_STRING___ARG_TRAITS_CS_ + + ACE_TEMPLATE_SPECIALIZATION + class TAO_Export Arg_Traits<Dynamic::RequestContext> + : public + Var_Size_Arg_Traits_T< + Dynamic::RequestContext, + Dynamic::RequestContext_var, + Dynamic::RequestContext_out + > + { + }; + +#endif /* end #if !defined */ + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:428 + +#if !defined (_IOP_TAGGEDPROFILE__ARG_TRAITS_CS_) +#define _IOP_TAGGEDPROFILE__ARG_TRAITS_CS_ + + ACE_TEMPLATE_SPECIALIZATION + class TAO_Export Arg_Traits<IOP::TaggedProfile> + : public + Var_Size_Arg_Traits_T< + IOP::TaggedProfile, + IOP::TaggedProfile_var, + IOP::TaggedProfile_out + > + { + }; + +#endif /* end #if !defined */ + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:262 + +#if !defined (__TAO_SEQ_CORBA_OCTET___ARG_TRAITS_CS_) +#define __TAO_SEQ_CORBA_OCTET___ARG_TRAITS_CS_ + + ACE_TEMPLATE_SPECIALIZATION + class TAO_Export Arg_Traits<CORBA::OctetSeq> + : public + Var_Size_Arg_Traits_T< + CORBA::OctetSeq, + CORBA::OctetSeq_var, + CORBA::OctetSeq_out + > + { + }; + +#endif /* end #if !defined */ + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:428 + +#if !defined (_IOP_TAGGEDCOMPONENT__ARG_TRAITS_CS_) +#define _IOP_TAGGEDCOMPONENT__ARG_TRAITS_CS_ + + ACE_TEMPLATE_SPECIALIZATION + class TAO_Export Arg_Traits<IOP::TaggedComponent> + : public + Var_Size_Arg_Traits_T< + IOP::TaggedComponent, + IOP::TaggedComponent_var, + IOP::TaggedComponent_out + > + { + }; + +#endif /* end #if !defined */ + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:262 + +#if !defined (__TAO_SEQ_CORBA_OCTET___ARG_TRAITS_CS_) +#define __TAO_SEQ_CORBA_OCTET___ARG_TRAITS_CS_ + + ACE_TEMPLATE_SPECIALIZATION + class TAO_Export Arg_Traits<CORBA::OctetSeq> + : public + Var_Size_Arg_Traits_T< + CORBA::OctetSeq, + CORBA::OctetSeq_var, + CORBA::OctetSeq_out + > + { + }; + +#endif /* end #if !defined */ + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:262 + +#if !defined (__TAO_SEQ_IOP_TAGGEDCOMPONENT___ARG_TRAITS_CS_) +#define __TAO_SEQ_IOP_TAGGEDCOMPONENT___ARG_TRAITS_CS_ + + ACE_TEMPLATE_SPECIALIZATION + class TAO_Export Arg_Traits<IOP::TaggedComponentSeq> + : public + Var_Size_Arg_Traits_T< + IOP::TaggedComponentSeq, + IOP::TaggedComponentSeq_var, + IOP::TaggedComponentSeq_out + > + { + }; + +#endif /* end #if !defined */ + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:428 + +#if !defined (_IOP_SERVICECONTEXT__ARG_TRAITS_CS_) +#define _IOP_SERVICECONTEXT__ARG_TRAITS_CS_ + + ACE_TEMPLATE_SPECIALIZATION + class TAO_Export Arg_Traits<IOP::ServiceContext> + : public + Var_Size_Arg_Traits_T< + IOP::ServiceContext, + IOP::ServiceContext_var, + IOP::ServiceContext_out + > + { + }; + +#endif /* end #if !defined */ + +#if !defined (_IOP_CODECFACTORY__ARG_TRAITS_CS_) +#define _IOP_CODECFACTORY__ARG_TRAITS_CS_ + + ACE_TEMPLATE_SPECIALIZATION + class TAO_Export Arg_Traits<IOP::CodecFactory> + : public + Object_Arg_Traits_T< + IOP::CodecFactory_ptr, + IOP::CodecFactory_var, + IOP::CodecFactory_out, + TAO::Objref_Traits<IOP::CodecFactory> + > + { + }; + +#endif /* end #if !defined */ + +#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__ARG_TRAITS_CS_) +#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__ARG_TRAITS_CS_ + + ACE_TEMPLATE_SPECIALIZATION + class TAO_Export Arg_Traits<PortableInterceptor::ClientRequestInfo> + : public + Object_Arg_Traits_T< + PortableInterceptor::ClientRequestInfo_ptr, + PortableInterceptor::ClientRequestInfo_var, + PortableInterceptor::ClientRequestInfo_out, + TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo> + > + { + }; + +#endif /* end #if !defined */ + +#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__ARG_TRAITS_CS_) +#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__ARG_TRAITS_CS_ + + ACE_TEMPLATE_SPECIALIZATION + class TAO_Export Arg_Traits<PortableInterceptor::ServerRequestInfo> + : public + Object_Arg_Traits_T< + PortableInterceptor::ServerRequestInfo_ptr, + PortableInterceptor::ServerRequestInfo_var, + PortableInterceptor::ServerRequestInfo_out, + TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo> + > + { + }; + +#endif /* end #if !defined */ + +#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__ARG_TRAITS_CS_) +#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__ARG_TRAITS_CS_ + + ACE_TEMPLATE_SPECIALIZATION + class TAO_Export Arg_Traits<PortableInterceptor::ClientRequestInterceptor> + : public + Object_Arg_Traits_T< + PortableInterceptor::ClientRequestInterceptor_ptr, + PortableInterceptor::ClientRequestInterceptor_var, + PortableInterceptor::ClientRequestInterceptor_out, + TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor> + > + { + }; + +#endif /* end #if !defined */ + +#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__ARG_TRAITS_CS_) +#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__ARG_TRAITS_CS_ + + ACE_TEMPLATE_SPECIALIZATION + class TAO_Export Arg_Traits<PortableInterceptor::ServerRequestInterceptor> + : public + Object_Arg_Traits_T< + PortableInterceptor::ServerRequestInterceptor_ptr, + PortableInterceptor::ServerRequestInterceptor_var, + PortableInterceptor::ServerRequestInterceptor_out, + TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor> + > + { + }; + +#endif /* end #if !defined */ + +#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__ARG_TRAITS_CS_) +#define _PORTABLEINTERCEPTOR_POLICYFACTORY__ARG_TRAITS_CS_ + + ACE_TEMPLATE_SPECIALIZATION + class TAO_Export Arg_Traits<PortableInterceptor::PolicyFactory> + : public + Object_Arg_Traits_T< + PortableInterceptor::PolicyFactory_ptr, + PortableInterceptor::PolicyFactory_var, + PortableInterceptor::PolicyFactory_out, + TAO::Objref_Traits<PortableInterceptor::PolicyFactory> + > + { + }; + +#endif /* end #if !defined */ + +#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__ARG_TRAITS_CS_) +#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__ARG_TRAITS_CS_ + + ACE_TEMPLATE_SPECIALIZATION + class TAO_Export Arg_Traits<PortableInterceptor::IORInterceptor> + : public + Object_Arg_Traits_T< + PortableInterceptor::IORInterceptor_ptr, + PortableInterceptor::IORInterceptor_var, + PortableInterceptor::IORInterceptor_out, + TAO::Objref_Traits<PortableInterceptor::IORInterceptor> + > + { + }; + +#endif /* end #if !defined */ + +#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__ARG_TRAITS_CS_) +#define _PORTABLEINTERCEPTOR_ORBINITINFO__ARG_TRAITS_CS_ + + ACE_TEMPLATE_SPECIALIZATION + class TAO_Export Arg_Traits<PortableInterceptor::ORBInitInfo> + : public + Object_Arg_Traits_T< + PortableInterceptor::ORBInitInfo_ptr, + PortableInterceptor::ORBInitInfo_var, + PortableInterceptor::ORBInitInfo_out, + TAO::Objref_Traits<PortableInterceptor::ORBInitInfo> + > + { + }; + +#endif /* end #if !defined */ +}; + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60 + +// Traits specializations for PortableInterceptor::Interceptor. + +PortableInterceptor::Interceptor_ptr +TAO::Objref_Traits<PortableInterceptor::Interceptor>::tao_duplicate ( + PortableInterceptor::Interceptor_ptr p + ) +{ + return PortableInterceptor::Interceptor::_duplicate (p); +} + +void +TAO::Objref_Traits<PortableInterceptor::Interceptor>::tao_release ( + PortableInterceptor::Interceptor_ptr p + ) +{ + CORBA::release (p); +} + +PortableInterceptor::Interceptor_ptr +TAO::Objref_Traits<PortableInterceptor::Interceptor>::tao_nil (void) +{ + return PortableInterceptor::Interceptor::_nil (); +} + +CORBA::Boolean +TAO::Objref_Traits<PortableInterceptor::Interceptor>::tao_marshal ( + PortableInterceptor::Interceptor_ptr p, + TAO_OutputCDR & cdr + ) +{ + return p->marshal (cdr); +} + +// Function pointer for collocation factory initialization. +TAO::Collocation_Proxy_Broker * +(*PortableInterceptor__TAO_Interceptor_Proxy_Broker_Factory_function_pointer) ( + CORBA::Object_ptr obj + ) = 0; PortableInterceptor::Interceptor::Interceptor (void) {} @@ -90,40 +544,26 @@ PortableInterceptor::Interceptor::~Interceptor (void) void PortableInterceptor::Interceptor::_tao_any_destructor (void *_tao_void_pointer) { - Interceptor *tmp = ACE_static_cast (Interceptor *, _tao_void_pointer); - CORBA::release (tmp); + Interceptor *_tao_tmp_pointer = + ACE_static_cast (Interceptor *, _tao_void_pointer); + CORBA::release (_tao_tmp_pointer); } PortableInterceptor::Interceptor_ptr PortableInterceptor::Interceptor::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) -{ - return Interceptor::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); -} - -PortableInterceptor::Interceptor_ptr -PortableInterceptor::Interceptor::_unchecked_narrow ( - CORBA::Object_ptr obj + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { - if (CORBA::is_nil (obj)) + if (CORBA::is_nil (_tao_objref)) { return Interceptor::_nil (); } - return - ACE_reinterpret_cast ( - Interceptor_ptr, - obj->_tao_QueryInterface ( - ACE_reinterpret_cast ( - ptrdiff_t, - &Interceptor::_tao_class_id - ) - ) - ); + Interceptor_ptr proxy = + dynamic_cast<Interceptor_ptr> (_tao_objref); + + return Interceptor::_duplicate (proxy); } PortableInterceptor::Interceptor_ptr @@ -137,35 +577,33 @@ PortableInterceptor::Interceptor::_duplicate (Interceptor_ptr obj) return obj; } -void *PortableInterceptor::Interceptor::_tao_QueryInterface (ptrdiff_t type) +CORBA::Boolean +PortableInterceptor::Interceptor::_is_a ( + const char *value + ACE_ENV_ARG_DECL_NOT_USED + ) { - void *retv = 0; - - if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &ACE_NESTED_CLASS (::PortableInterceptor, Interceptor)::_tao_class_id) - ) - { - retv = ACE_reinterpret_cast (void*, this); - } - else if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &CORBA::Object::_tao_class_id) - ) + if ( + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/PortableInterceptor/Interceptor:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/LocalObject:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/Object:1.0" + ) + ) { - retv = - ACE_reinterpret_cast ( - void *, - ACE_static_cast (CORBA::Object_ptr, this) - ); + return 1; // success using local knowledge } - - if (retv != 0) + else { - this->_add_ref (); + return 0; } - - return retv; } const char* PortableInterceptor::Interceptor::_interface_repository_id (void) const @@ -212,14 +650,11 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_Interceptor ( sizeof (PortableInterceptor::Interceptor) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (PortableInterceptor) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_Interceptor, - &_tc_TAO_tc_PortableInterceptor_Interceptor - ) -TAO_NAMESPACE_END +namespace PortableInterceptor +{ + ::CORBA::TypeCode_ptr _tc_Interceptor = + &_tc_TAO_tc_PortableInterceptor_Interceptor; +} // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63 @@ -257,8 +692,9 @@ PortableInterceptor::ForwardRequest::operator= (const ::PortableInterceptor::For void PortableInterceptor::ForwardRequest::_tao_any_destructor (void *_tao_void_pointer) { - ForwardRequest *tmp = ACE_static_cast (ForwardRequest*, _tao_void_pointer); - delete tmp; + ForwardRequest *_tao_tmp_pointer = + ACE_static_cast (ForwardRequest*, _tao_void_pointer); + delete _tao_tmp_pointer; } PortableInterceptor::ForwardRequest * @@ -332,7 +768,8 @@ void PortableInterceptor::ForwardRequest::_tao_decode ( PortableInterceptor::ForwardRequest::ForwardRequest ( const CORBA::Object_ptr _tao_forward, CORBA::Boolean _tao_permanent - ) : CORBA::UserException ( + ) + : CORBA::UserException ( "IDL:omg.org/PortableInterceptor/ForwardRequest:1.0", "ForwardRequest" ) @@ -408,14 +845,11 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ForwardRequest ( sizeof (PortableInterceptor::ForwardRequest) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (PortableInterceptor) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_ForwardRequest, - &_tc_TAO_tc_PortableInterceptor_ForwardRequest - ) -TAO_NAMESPACE_END +namespace PortableInterceptor +{ + ::CORBA::TypeCode_ptr _tc_ForwardRequest = + &_tc_TAO_tc_PortableInterceptor_ForwardRequest; +} // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -452,14 +886,11 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ReplyStatus ( sizeof (PortableInterceptor::ReplyStatus) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (PortableInterceptor) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_ReplyStatus, - &_tc_TAO_tc_PortableInterceptor_ReplyStatus - ) -TAO_NAMESPACE_END +namespace PortableInterceptor +{ + ::CORBA::TypeCode_ptr _tc_ReplyStatus = + &_tc_TAO_tc_PortableInterceptor_ReplyStatus; +} // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -494,14 +925,11 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_SlotId ( sizeof (PortableInterceptor::SlotId) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (PortableInterceptor) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_SlotId, - &_tc_TAO_tc_PortableInterceptor_SlotId - ) -TAO_NAMESPACE_END +namespace PortableInterceptor +{ + ::CORBA::TypeCode_ptr _tc_SlotId = + &_tc_TAO_tc_PortableInterceptor_SlotId; +} // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63 @@ -535,8 +963,9 @@ PortableInterceptor::InvalidSlot::operator= (const ::PortableInterceptor::Invali void PortableInterceptor::InvalidSlot::_tao_any_destructor (void *_tao_void_pointer) { - InvalidSlot *tmp = ACE_static_cast (InvalidSlot*, _tao_void_pointer); - delete tmp; + InvalidSlot *_tao_tmp_pointer = + ACE_static_cast (InvalidSlot*, _tao_void_pointer); + delete _tao_tmp_pointer; } PortableInterceptor::InvalidSlot * @@ -642,46 +1071,53 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_InvalidSlot ( sizeof (PortableInterceptor::InvalidSlot) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (PortableInterceptor) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_InvalidSlot, - &_tc_TAO_tc_PortableInterceptor_InvalidSlot - ) -TAO_NAMESPACE_END +namespace PortableInterceptor +{ + ::CORBA::TypeCode_ptr _tc_InvalidSlot = + &_tc_TAO_tc_PortableInterceptor_InvalidSlot; +} // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:63 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60 -int PortableInterceptor::Current::_tao_class_id = 0; +// Traits specializations for PortableInterceptor::Current. -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class - TAO_Objref_Var_T< - PortableInterceptor::Current, - PortableInterceptor::tao_Current_life - >; - template class - TAO_Objref_Out_T< - PortableInterceptor::Current, - PortableInterceptor::tao_Current_life - >; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate \ - TAO_Objref_Var_T< \ - PortableInterceptor::Current, \ - PortableInterceptor::tao_Current_life \ - > -# pragma instantiate \ - TAO_Objref_Out_T< \ - PortableInterceptor::Current, \ - PortableInterceptor::tao_Current_life \ - > -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +PortableInterceptor::Current_ptr +TAO::Objref_Traits<PortableInterceptor::Current>::tao_duplicate ( + PortableInterceptor::Current_ptr p + ) +{ + return PortableInterceptor::Current::_duplicate (p); +} -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:245 +void +TAO::Objref_Traits<PortableInterceptor::Current>::tao_release ( + PortableInterceptor::Current_ptr p + ) +{ + CORBA::release (p); +} + +PortableInterceptor::Current_ptr +TAO::Objref_Traits<PortableInterceptor::Current>::tao_nil (void) +{ + return PortableInterceptor::Current::_nil (); +} + +CORBA::Boolean +TAO::Objref_Traits<PortableInterceptor::Current>::tao_marshal ( + PortableInterceptor::Current_ptr p, + TAO_OutputCDR & cdr + ) +{ + return p->marshal (cdr); +} + +// Function pointer for collocation factory initialization. +TAO::Collocation_Proxy_Broker * +(*PortableInterceptor__TAO_Current_Proxy_Broker_Factory_function_pointer) ( + CORBA::Object_ptr obj + ) = 0; PortableInterceptor::Current::Current (void) {} @@ -692,40 +1128,26 @@ PortableInterceptor::Current::~Current (void) void PortableInterceptor::Current::_tao_any_destructor (void *_tao_void_pointer) { - Current *tmp = ACE_static_cast (Current *, _tao_void_pointer); - CORBA::release (tmp); + Current *_tao_tmp_pointer = + ACE_static_cast (Current *, _tao_void_pointer); + CORBA::release (_tao_tmp_pointer); } PortableInterceptor::Current_ptr PortableInterceptor::Current::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) -{ - return Current::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); -} - -PortableInterceptor::Current_ptr -PortableInterceptor::Current::_unchecked_narrow ( - CORBA::Object_ptr obj + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { - if (CORBA::is_nil (obj)) + if (CORBA::is_nil (_tao_objref)) { return Current::_nil (); } - return - ACE_reinterpret_cast ( - Current_ptr, - obj->_tao_QueryInterface ( - ACE_reinterpret_cast ( - ptrdiff_t, - &Current::_tao_class_id - ) - ) - ); + Current_ptr proxy = + dynamic_cast<Current_ptr> (_tao_objref); +; + return Current::_duplicate (proxy); } PortableInterceptor::Current_ptr @@ -739,49 +1161,37 @@ PortableInterceptor::Current::_duplicate (Current_ptr obj) return obj; } -void *PortableInterceptor::Current::_tao_QueryInterface (ptrdiff_t type) +CORBA::Boolean +PortableInterceptor::Current::_is_a ( + const char *value + ACE_ENV_ARG_DECL_NOT_USED + ) { - void *retv = 0; - - if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &ACE_NESTED_CLASS (::PortableInterceptor, Current)::_tao_class_id) - ) + if ( + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/Current:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/PortableInterceptor/Current:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/LocalObject:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/Object:1.0" + ) + ) { - retv = ACE_reinterpret_cast (void*, this); + return 1; // success using local knowledge } - else if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &::CORBA::Current::_tao_class_id) - ) - { - retv = - ACE_reinterpret_cast ( - void *, - ACE_static_cast ( - CORBA::Current_ptr, - this - ) - ); - } - else if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &CORBA::Object::_tao_class_id) - ) - { - retv = - ACE_reinterpret_cast ( - void *, - ACE_static_cast (CORBA::Object_ptr, this) - ); - } - - if (retv != 0) + else { - this->_add_ref (); + return 0; } - - return retv; } const char* PortableInterceptor::Current::_interface_repository_id (void) const @@ -826,46 +1236,53 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_Current ( sizeof (PortableInterceptor::Current) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (PortableInterceptor) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_Current, - &_tc_TAO_tc_PortableInterceptor_Current - ) -TAO_NAMESPACE_END +namespace PortableInterceptor +{ + ::CORBA::TypeCode_ptr _tc_Current = + &_tc_TAO_tc_PortableInterceptor_Current; +} // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:63 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60 -int PortableInterceptor::RequestInfo::_tao_class_id = 0; +// Traits specializations for PortableInterceptor::RequestInfo. -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class - TAO_Objref_Var_T< - PortableInterceptor::RequestInfo, - PortableInterceptor::tao_RequestInfo_life - >; - template class - TAO_Objref_Out_T< - PortableInterceptor::RequestInfo, - PortableInterceptor::tao_RequestInfo_life - >; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate \ - TAO_Objref_Var_T< \ - PortableInterceptor::RequestInfo, \ - PortableInterceptor::tao_RequestInfo_life \ - > -# pragma instantiate \ - TAO_Objref_Out_T< \ - PortableInterceptor::RequestInfo, \ - PortableInterceptor::tao_RequestInfo_life \ - > -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +PortableInterceptor::RequestInfo_ptr +TAO::Objref_Traits<PortableInterceptor::RequestInfo>::tao_duplicate ( + PortableInterceptor::RequestInfo_ptr p + ) +{ + return PortableInterceptor::RequestInfo::_duplicate (p); +} -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:245 +void +TAO::Objref_Traits<PortableInterceptor::RequestInfo>::tao_release ( + PortableInterceptor::RequestInfo_ptr p + ) +{ + CORBA::release (p); +} + +PortableInterceptor::RequestInfo_ptr +TAO::Objref_Traits<PortableInterceptor::RequestInfo>::tao_nil (void) +{ + return PortableInterceptor::RequestInfo::_nil (); +} + +CORBA::Boolean +TAO::Objref_Traits<PortableInterceptor::RequestInfo>::tao_marshal ( + PortableInterceptor::RequestInfo_ptr p, + TAO_OutputCDR & cdr + ) +{ + return p->marshal (cdr); +} + +// Function pointer for collocation factory initialization. +TAO::Collocation_Proxy_Broker * +(*PortableInterceptor__TAO_RequestInfo_Proxy_Broker_Factory_function_pointer) ( + CORBA::Object_ptr obj + ) = 0; PortableInterceptor::RequestInfo::RequestInfo (void) {} @@ -876,40 +1293,26 @@ PortableInterceptor::RequestInfo::~RequestInfo (void) void PortableInterceptor::RequestInfo::_tao_any_destructor (void *_tao_void_pointer) { - RequestInfo *tmp = ACE_static_cast (RequestInfo *, _tao_void_pointer); - CORBA::release (tmp); + RequestInfo *_tao_tmp_pointer = + ACE_static_cast (RequestInfo *, _tao_void_pointer); + CORBA::release (_tao_tmp_pointer); } PortableInterceptor::RequestInfo_ptr PortableInterceptor::RequestInfo::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) -{ - return RequestInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); -} - -PortableInterceptor::RequestInfo_ptr -PortableInterceptor::RequestInfo::_unchecked_narrow ( - CORBA::Object_ptr obj + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { - if (CORBA::is_nil (obj)) + if (CORBA::is_nil (_tao_objref)) { return RequestInfo::_nil (); } - return - ACE_reinterpret_cast ( - RequestInfo_ptr, - obj->_tao_QueryInterface ( - ACE_reinterpret_cast ( - ptrdiff_t, - &RequestInfo::_tao_class_id - ) - ) - ); + RequestInfo_ptr proxy = + dynamic_cast<RequestInfo_ptr> (_tao_objref); + + return RequestInfo::_duplicate (proxy); } PortableInterceptor::RequestInfo_ptr @@ -923,35 +1326,33 @@ PortableInterceptor::RequestInfo::_duplicate (RequestInfo_ptr obj) return obj; } -void *PortableInterceptor::RequestInfo::_tao_QueryInterface (ptrdiff_t type) +CORBA::Boolean +PortableInterceptor::RequestInfo::_is_a ( + const char *value + ACE_ENV_ARG_DECL_NOT_USED + ) { - void *retv = 0; - - if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &ACE_NESTED_CLASS (::PortableInterceptor, RequestInfo)::_tao_class_id) - ) - { - retv = ACE_reinterpret_cast (void*, this); - } - else if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &CORBA::Object::_tao_class_id) - ) + if ( + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/PortableInterceptor/RequestInfo:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/LocalObject:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/Object:1.0" + ) + ) { - retv = - ACE_reinterpret_cast ( - void *, - ACE_static_cast (CORBA::Object_ptr, this) - ); + return 1; // success using local knowledge } - - if (retv != 0) + else { - this->_add_ref (); + return 0; } - - return retv; } const char* PortableInterceptor::RequestInfo::_interface_repository_id (void) const @@ -998,46 +1399,53 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_RequestInfo ( sizeof (PortableInterceptor::RequestInfo) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (PortableInterceptor) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_RequestInfo, - &_tc_TAO_tc_PortableInterceptor_RequestInfo - ) -TAO_NAMESPACE_END +namespace PortableInterceptor +{ + ::CORBA::TypeCode_ptr _tc_RequestInfo = + &_tc_TAO_tc_PortableInterceptor_RequestInfo; +} // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:63 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60 -int PortableInterceptor::ClientRequestInfo::_tao_class_id = 0; +// Traits specializations for PortableInterceptor::ClientRequestInfo. -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class - TAO_Objref_Var_T< - PortableInterceptor::ClientRequestInfo, - PortableInterceptor::tao_ClientRequestInfo_life - >; - template class - TAO_Objref_Out_T< - PortableInterceptor::ClientRequestInfo, - PortableInterceptor::tao_ClientRequestInfo_life - >; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate \ - TAO_Objref_Var_T< \ - PortableInterceptor::ClientRequestInfo, \ - PortableInterceptor::tao_ClientRequestInfo_life \ - > -# pragma instantiate \ - TAO_Objref_Out_T< \ - PortableInterceptor::ClientRequestInfo, \ - PortableInterceptor::tao_ClientRequestInfo_life \ - > -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +PortableInterceptor::ClientRequestInfo_ptr +TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::tao_duplicate ( + PortableInterceptor::ClientRequestInfo_ptr p + ) +{ + return PortableInterceptor::ClientRequestInfo::_duplicate (p); +} -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:245 +void +TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::tao_release ( + PortableInterceptor::ClientRequestInfo_ptr p + ) +{ + CORBA::release (p); +} + +PortableInterceptor::ClientRequestInfo_ptr +TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::tao_nil (void) +{ + return PortableInterceptor::ClientRequestInfo::_nil (); +} + +CORBA::Boolean +TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo>::tao_marshal ( + PortableInterceptor::ClientRequestInfo_ptr p, + TAO_OutputCDR & cdr + ) +{ + return p->marshal (cdr); +} + +// Function pointer for collocation factory initialization. +TAO::Collocation_Proxy_Broker * +(*PortableInterceptor__TAO_ClientRequestInfo_Proxy_Broker_Factory_function_pointer) ( + CORBA::Object_ptr obj + ) = 0; PortableInterceptor::ClientRequestInfo::ClientRequestInfo (void) {} @@ -1048,40 +1456,26 @@ PortableInterceptor::ClientRequestInfo::~ClientRequestInfo (void) void PortableInterceptor::ClientRequestInfo::_tao_any_destructor (void *_tao_void_pointer) { - ClientRequestInfo *tmp = ACE_static_cast (ClientRequestInfo *, _tao_void_pointer); - CORBA::release (tmp); + ClientRequestInfo *_tao_tmp_pointer = + ACE_static_cast (ClientRequestInfo *, _tao_void_pointer); + CORBA::release (_tao_tmp_pointer); } PortableInterceptor::ClientRequestInfo_ptr PortableInterceptor::ClientRequestInfo::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) -{ - return ClientRequestInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); -} - -PortableInterceptor::ClientRequestInfo_ptr -PortableInterceptor::ClientRequestInfo::_unchecked_narrow ( - CORBA::Object_ptr obj + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { - if (CORBA::is_nil (obj)) + if (CORBA::is_nil (_tao_objref)) { return ClientRequestInfo::_nil (); } - return - ACE_reinterpret_cast ( - ClientRequestInfo_ptr, - obj->_tao_QueryInterface ( - ACE_reinterpret_cast ( - ptrdiff_t, - &ClientRequestInfo::_tao_class_id - ) - ) - ); + ClientRequestInfo_ptr proxy = + dynamic_cast<ClientRequestInfo_ptr> (_tao_objref); + + return ClientRequestInfo::_duplicate (proxy); } PortableInterceptor::ClientRequestInfo_ptr @@ -1095,49 +1489,37 @@ PortableInterceptor::ClientRequestInfo::_duplicate (ClientRequestInfo_ptr obj) return obj; } -void *PortableInterceptor::ClientRequestInfo::_tao_QueryInterface (ptrdiff_t type) +CORBA::Boolean +PortableInterceptor::ClientRequestInfo::_is_a ( + const char *value + ACE_ENV_ARG_DECL_NOT_USED + ) { - void *retv = 0; - - if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &ACE_NESTED_CLASS (::PortableInterceptor, ClientRequestInfo)::_tao_class_id) - ) + if ( + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/PortableInterceptor/RequestInfo:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/PortableInterceptor/ClientRequestInfo:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/LocalObject:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/Object:1.0" + ) + ) { - retv = ACE_reinterpret_cast (void*, this); + return 1; // success using local knowledge } - else if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &ACE_NESTED_CLASS (::PortableInterceptor, RequestInfo)::_tao_class_id) - ) - { - retv = - ACE_reinterpret_cast ( - void *, - ACE_static_cast ( - PortableInterceptor::RequestInfo_ptr, - this - ) - ); - } - else if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &CORBA::Object::_tao_class_id) - ) - { - retv = - ACE_reinterpret_cast ( - void *, - ACE_static_cast (CORBA::Object_ptr, this) - ); - } - - if (retv != 0) + else { - this->_add_ref (); + return 0; } - - return retv; } const char* PortableInterceptor::ClientRequestInfo::_interface_repository_id (void) const @@ -1188,46 +1570,53 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ClientRequestInfo ( sizeof (PortableInterceptor::ClientRequestInfo) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (PortableInterceptor) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_ClientRequestInfo, - &_tc_TAO_tc_PortableInterceptor_ClientRequestInfo - ) -TAO_NAMESPACE_END +namespace PortableInterceptor +{ + ::CORBA::TypeCode_ptr _tc_ClientRequestInfo = + &_tc_TAO_tc_PortableInterceptor_ClientRequestInfo; +} // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:63 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60 -int PortableInterceptor::ServerRequestInfo::_tao_class_id = 0; +// Traits specializations for PortableInterceptor::ServerRequestInfo. -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class - TAO_Objref_Var_T< - PortableInterceptor::ServerRequestInfo, - PortableInterceptor::tao_ServerRequestInfo_life - >; - template class - TAO_Objref_Out_T< - PortableInterceptor::ServerRequestInfo, - PortableInterceptor::tao_ServerRequestInfo_life - >; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate \ - TAO_Objref_Var_T< \ - PortableInterceptor::ServerRequestInfo, \ - PortableInterceptor::tao_ServerRequestInfo_life \ - > -# pragma instantiate \ - TAO_Objref_Out_T< \ - PortableInterceptor::ServerRequestInfo, \ - PortableInterceptor::tao_ServerRequestInfo_life \ - > -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +PortableInterceptor::ServerRequestInfo_ptr +TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::tao_duplicate ( + PortableInterceptor::ServerRequestInfo_ptr p + ) +{ + return PortableInterceptor::ServerRequestInfo::_duplicate (p); +} -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:245 +void +TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::tao_release ( + PortableInterceptor::ServerRequestInfo_ptr p + ) +{ + CORBA::release (p); +} + +PortableInterceptor::ServerRequestInfo_ptr +TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::tao_nil (void) +{ + return PortableInterceptor::ServerRequestInfo::_nil (); +} + +CORBA::Boolean +TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo>::tao_marshal ( + PortableInterceptor::ServerRequestInfo_ptr p, + TAO_OutputCDR & cdr + ) +{ + return p->marshal (cdr); +} + +// Function pointer for collocation factory initialization. +TAO::Collocation_Proxy_Broker * +(*PortableInterceptor__TAO_ServerRequestInfo_Proxy_Broker_Factory_function_pointer) ( + CORBA::Object_ptr obj + ) = 0; PortableInterceptor::ServerRequestInfo::ServerRequestInfo (void) {} @@ -1238,40 +1627,26 @@ PortableInterceptor::ServerRequestInfo::~ServerRequestInfo (void) void PortableInterceptor::ServerRequestInfo::_tao_any_destructor (void *_tao_void_pointer) { - ServerRequestInfo *tmp = ACE_static_cast (ServerRequestInfo *, _tao_void_pointer); - CORBA::release (tmp); + ServerRequestInfo *_tao_tmp_pointer = + ACE_static_cast (ServerRequestInfo *, _tao_void_pointer); + CORBA::release (_tao_tmp_pointer); } PortableInterceptor::ServerRequestInfo_ptr PortableInterceptor::ServerRequestInfo::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) -{ - return ServerRequestInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); -} - -PortableInterceptor::ServerRequestInfo_ptr -PortableInterceptor::ServerRequestInfo::_unchecked_narrow ( - CORBA::Object_ptr obj + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { - if (CORBA::is_nil (obj)) + if (CORBA::is_nil (_tao_objref)) { return ServerRequestInfo::_nil (); } - return - ACE_reinterpret_cast ( - ServerRequestInfo_ptr, - obj->_tao_QueryInterface ( - ACE_reinterpret_cast ( - ptrdiff_t, - &ServerRequestInfo::_tao_class_id - ) - ) - ); + ServerRequestInfo_ptr proxy = + dynamic_cast<ServerRequestInfo_ptr> (_tao_objref); + + return ServerRequestInfo::_duplicate (proxy); } PortableInterceptor::ServerRequestInfo_ptr @@ -1285,49 +1660,37 @@ PortableInterceptor::ServerRequestInfo::_duplicate (ServerRequestInfo_ptr obj) return obj; } -void *PortableInterceptor::ServerRequestInfo::_tao_QueryInterface (ptrdiff_t type) +CORBA::Boolean +PortableInterceptor::ServerRequestInfo::_is_a ( + const char *value + ACE_ENV_ARG_DECL_NOT_USED + ) { - void *retv = 0; - - if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &ACE_NESTED_CLASS (::PortableInterceptor, ServerRequestInfo)::_tao_class_id) - ) + if ( + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/PortableInterceptor/RequestInfo:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/PortableInterceptor/ServerRequestInfo:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/LocalObject:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/Object:1.0" + ) + ) { - retv = ACE_reinterpret_cast (void*, this); + return 1; // success using local knowledge } - else if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &ACE_NESTED_CLASS (::PortableInterceptor, RequestInfo)::_tao_class_id) - ) - { - retv = - ACE_reinterpret_cast ( - void *, - ACE_static_cast ( - PortableInterceptor::RequestInfo_ptr, - this - ) - ); - } - else if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &CORBA::Object::_tao_class_id) - ) - { - retv = - ACE_reinterpret_cast ( - void *, - ACE_static_cast (CORBA::Object_ptr, this) - ); - } - - if (retv != 0) + else { - this->_add_ref (); + return 0; } - - return retv; } const char* PortableInterceptor::ServerRequestInfo::_interface_repository_id (void) const @@ -1378,46 +1741,53 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ServerRequestInfo ( sizeof (PortableInterceptor::ServerRequestInfo) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (PortableInterceptor) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_ServerRequestInfo, - &_tc_TAO_tc_PortableInterceptor_ServerRequestInfo - ) -TAO_NAMESPACE_END +namespace PortableInterceptor +{ + ::CORBA::TypeCode_ptr _tc_ServerRequestInfo = + &_tc_TAO_tc_PortableInterceptor_ServerRequestInfo; +} // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:63 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60 -int PortableInterceptor::ClientRequestInterceptor::_tao_class_id = 0; +// Traits specializations for PortableInterceptor::ClientRequestInterceptor. -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class - TAO_Objref_Var_T< - PortableInterceptor::ClientRequestInterceptor, - PortableInterceptor::tao_ClientRequestInterceptor_life - >; - template class - TAO_Objref_Out_T< - PortableInterceptor::ClientRequestInterceptor, - PortableInterceptor::tao_ClientRequestInterceptor_life - >; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate \ - TAO_Objref_Var_T< \ - PortableInterceptor::ClientRequestInterceptor, \ - PortableInterceptor::tao_ClientRequestInterceptor_life \ - > -# pragma instantiate \ - TAO_Objref_Out_T< \ - PortableInterceptor::ClientRequestInterceptor, \ - PortableInterceptor::tao_ClientRequestInterceptor_life \ - > -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +PortableInterceptor::ClientRequestInterceptor_ptr +TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::tao_duplicate ( + PortableInterceptor::ClientRequestInterceptor_ptr p + ) +{ + return PortableInterceptor::ClientRequestInterceptor::_duplicate (p); +} -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:245 +void +TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::tao_release ( + PortableInterceptor::ClientRequestInterceptor_ptr p + ) +{ + CORBA::release (p); +} + +PortableInterceptor::ClientRequestInterceptor_ptr +TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::tao_nil (void) +{ + return PortableInterceptor::ClientRequestInterceptor::_nil (); +} + +CORBA::Boolean +TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor>::tao_marshal ( + PortableInterceptor::ClientRequestInterceptor_ptr p, + TAO_OutputCDR & cdr + ) +{ + return p->marshal (cdr); +} + +// Function pointer for collocation factory initialization. +TAO::Collocation_Proxy_Broker * +(*PortableInterceptor__TAO_ClientRequestInterceptor_Proxy_Broker_Factory_function_pointer) ( + CORBA::Object_ptr obj + ) = 0; PortableInterceptor::ClientRequestInterceptor::ClientRequestInterceptor (void) {} @@ -1428,40 +1798,27 @@ PortableInterceptor::ClientRequestInterceptor::~ClientRequestInterceptor (void) void PortableInterceptor::ClientRequestInterceptor::_tao_any_destructor (void *_tao_void_pointer) { - ClientRequestInterceptor *tmp = ACE_static_cast (ClientRequestInterceptor *, _tao_void_pointer); - CORBA::release (tmp); + ClientRequestInterceptor *_tao_tmp_pointer = + ACE_static_cast (ClientRequestInterceptor *, _tao_void_pointer); + CORBA::release (_tao_tmp_pointer); } PortableInterceptor::ClientRequestInterceptor_ptr PortableInterceptor::ClientRequestInterceptor::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) -{ - return ClientRequestInterceptor::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); -} - -PortableInterceptor::ClientRequestInterceptor_ptr -PortableInterceptor::ClientRequestInterceptor::_unchecked_narrow ( - CORBA::Object_ptr obj + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { - if (CORBA::is_nil (obj)) + if (CORBA::is_nil (_tao_objref)) { return ClientRequestInterceptor::_nil (); } - return - ACE_reinterpret_cast ( - ClientRequestInterceptor_ptr, - obj->_tao_QueryInterface ( - ACE_reinterpret_cast ( - ptrdiff_t, - &ClientRequestInterceptor::_tao_class_id - ) - ) - ); + ClientRequestInterceptor_ptr proxy = + dynamic_cast<ClientRequestInterceptor_ptr> (_tao_objref); + +; + return ClientRequestInterceptor::_duplicate (proxy); } PortableInterceptor::ClientRequestInterceptor_ptr @@ -1475,49 +1832,37 @@ PortableInterceptor::ClientRequestInterceptor::_duplicate (ClientRequestIntercep return obj; } -void *PortableInterceptor::ClientRequestInterceptor::_tao_QueryInterface (ptrdiff_t type) +CORBA::Boolean +PortableInterceptor::ClientRequestInterceptor::_is_a ( + const char *value + ACE_ENV_ARG_DECL_NOT_USED + ) { - void *retv = 0; - - if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &ACE_NESTED_CLASS (::PortableInterceptor, ClientRequestInterceptor)::_tao_class_id) - ) + if ( + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/PortableInterceptor/Interceptor:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/PortableInterceptor/ClientRequestInterceptor:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/LocalObject:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/Object:1.0" + ) + ) { - retv = ACE_reinterpret_cast (void*, this); + return 1; // success using local knowledge } - else if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &ACE_NESTED_CLASS (::PortableInterceptor, Interceptor)::_tao_class_id) - ) - { - retv = - ACE_reinterpret_cast ( - void *, - ACE_static_cast ( - PortableInterceptor::Interceptor_ptr, - this - ) - ); - } - else if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &CORBA::Object::_tao_class_id) - ) - { - retv = - ACE_reinterpret_cast ( - void *, - ACE_static_cast (CORBA::Object_ptr, this) - ); - } - - if (retv != 0) + else { - this->_add_ref (); + return 0; } - - return retv; } const char* PortableInterceptor::ClientRequestInterceptor::_interface_repository_id (void) const @@ -1572,46 +1917,53 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ClientRequestInterceptor ( sizeof (PortableInterceptor::ClientRequestInterceptor) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (PortableInterceptor) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_ClientRequestInterceptor, - &_tc_TAO_tc_PortableInterceptor_ClientRequestInterceptor - ) -TAO_NAMESPACE_END +namespace PortableInterceptor +{ + ::CORBA::TypeCode_ptr _tc_ClientRequestInterceptor = + &_tc_TAO_tc_PortableInterceptor_ClientRequestInterceptor; +} // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:63 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60 -int PortableInterceptor::ServerRequestInterceptor::_tao_class_id = 0; +// Traits specializations for PortableInterceptor::ServerRequestInterceptor. -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class - TAO_Objref_Var_T< - PortableInterceptor::ServerRequestInterceptor, - PortableInterceptor::tao_ServerRequestInterceptor_life - >; - template class - TAO_Objref_Out_T< - PortableInterceptor::ServerRequestInterceptor, - PortableInterceptor::tao_ServerRequestInterceptor_life - >; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate \ - TAO_Objref_Var_T< \ - PortableInterceptor::ServerRequestInterceptor, \ - PortableInterceptor::tao_ServerRequestInterceptor_life \ - > -# pragma instantiate \ - TAO_Objref_Out_T< \ - PortableInterceptor::ServerRequestInterceptor, \ - PortableInterceptor::tao_ServerRequestInterceptor_life \ - > -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +PortableInterceptor::ServerRequestInterceptor_ptr +TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::tao_duplicate ( + PortableInterceptor::ServerRequestInterceptor_ptr p + ) +{ + return PortableInterceptor::ServerRequestInterceptor::_duplicate (p); +} -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:245 +void +TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::tao_release ( + PortableInterceptor::ServerRequestInterceptor_ptr p + ) +{ + CORBA::release (p); +} + +PortableInterceptor::ServerRequestInterceptor_ptr +TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::tao_nil (void) +{ + return PortableInterceptor::ServerRequestInterceptor::_nil (); +} + +CORBA::Boolean +TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::tao_marshal ( + PortableInterceptor::ServerRequestInterceptor_ptr p, + TAO_OutputCDR & cdr + ) +{ + return p->marshal (cdr); +} + +// Function pointer for collocation factory initialization. +TAO::Collocation_Proxy_Broker * +(*PortableInterceptor__TAO_ServerRequestInterceptor_Proxy_Broker_Factory_function_pointer) ( + CORBA::Object_ptr obj + ) = 0; PortableInterceptor::ServerRequestInterceptor::ServerRequestInterceptor (void) {} @@ -1622,40 +1974,26 @@ PortableInterceptor::ServerRequestInterceptor::~ServerRequestInterceptor (void) void PortableInterceptor::ServerRequestInterceptor::_tao_any_destructor (void *_tao_void_pointer) { - ServerRequestInterceptor *tmp = ACE_static_cast (ServerRequestInterceptor *, _tao_void_pointer); - CORBA::release (tmp); + ServerRequestInterceptor *_tao_tmp_pointer = + ACE_static_cast (ServerRequestInterceptor *, _tao_void_pointer); + CORBA::release (_tao_tmp_pointer); } PortableInterceptor::ServerRequestInterceptor_ptr PortableInterceptor::ServerRequestInterceptor::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) -{ - return ServerRequestInterceptor::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); -} - -PortableInterceptor::ServerRequestInterceptor_ptr -PortableInterceptor::ServerRequestInterceptor::_unchecked_narrow ( - CORBA::Object_ptr obj + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { - if (CORBA::is_nil (obj)) + if (CORBA::is_nil (_tao_objref)) { return ServerRequestInterceptor::_nil (); } - return - ACE_reinterpret_cast ( - ServerRequestInterceptor_ptr, - obj->_tao_QueryInterface ( - ACE_reinterpret_cast ( - ptrdiff_t, - &ServerRequestInterceptor::_tao_class_id - ) - ) - ); + ServerRequestInterceptor_ptr proxy = + dynamic_cast<ServerRequestInterceptor_ptr> (_tao_objref); + + return ServerRequestInterceptor::_duplicate (proxy); } PortableInterceptor::ServerRequestInterceptor_ptr @@ -1669,49 +2007,37 @@ PortableInterceptor::ServerRequestInterceptor::_duplicate (ServerRequestIntercep return obj; } -void *PortableInterceptor::ServerRequestInterceptor::_tao_QueryInterface (ptrdiff_t type) +CORBA::Boolean +PortableInterceptor::ServerRequestInterceptor::_is_a ( + const char *value + ACE_ENV_ARG_DECL_NOT_USED + ) { - void *retv = 0; - - if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &ACE_NESTED_CLASS (::PortableInterceptor, ServerRequestInterceptor)::_tao_class_id) - ) - { - retv = ACE_reinterpret_cast (void*, this); - } - else if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &ACE_NESTED_CLASS (::PortableInterceptor, Interceptor)::_tao_class_id) - ) - { - retv = - ACE_reinterpret_cast ( - void *, - ACE_static_cast ( - PortableInterceptor::Interceptor_ptr, - this - ) - ); - } - else if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &CORBA::Object::_tao_class_id) - ) + if ( + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/PortableInterceptor/Interceptor:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/PortableInterceptor/ServerRequestInterceptor:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/LocalObject:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/Object:1.0" + ) + ) { - retv = - ACE_reinterpret_cast ( - void *, - ACE_static_cast (CORBA::Object_ptr, this) - ); + return 1; // success using local knowledge } - - if (retv != 0) + else { - this->_add_ref (); + return 0; } - - return retv; } const char* PortableInterceptor::ServerRequestInterceptor::_interface_repository_id (void) const @@ -1766,46 +2092,53 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ServerRequestInterceptor ( sizeof (PortableInterceptor::ServerRequestInterceptor) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (PortableInterceptor) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_ServerRequestInterceptor, - &_tc_TAO_tc_PortableInterceptor_ServerRequestInterceptor - ) -TAO_NAMESPACE_END +namespace PortableInterceptor +{ + ::CORBA::TypeCode_ptr _tc_ServerRequestInterceptor = + &_tc_TAO_tc_PortableInterceptor_ServerRequestInterceptor; +} // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:63 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60 -int PortableInterceptor::PolicyFactory::_tao_class_id = 0; +// Traits specializations for PortableInterceptor::PolicyFactory. -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class - TAO_Objref_Var_T< - PortableInterceptor::PolicyFactory, - PortableInterceptor::tao_PolicyFactory_life - >; - template class - TAO_Objref_Out_T< - PortableInterceptor::PolicyFactory, - PortableInterceptor::tao_PolicyFactory_life - >; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate \ - TAO_Objref_Var_T< \ - PortableInterceptor::PolicyFactory, \ - PortableInterceptor::tao_PolicyFactory_life \ - > -# pragma instantiate \ - TAO_Objref_Out_T< \ - PortableInterceptor::PolicyFactory, \ - PortableInterceptor::tao_PolicyFactory_life \ - > -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +PortableInterceptor::PolicyFactory_ptr +TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::tao_duplicate ( + PortableInterceptor::PolicyFactory_ptr p + ) +{ + return PortableInterceptor::PolicyFactory::_duplicate (p); +} -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:245 +void +TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::tao_release ( + PortableInterceptor::PolicyFactory_ptr p + ) +{ + CORBA::release (p); +} + +PortableInterceptor::PolicyFactory_ptr +TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::tao_nil (void) +{ + return PortableInterceptor::PolicyFactory::_nil (); +} + +CORBA::Boolean +TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::tao_marshal ( + PortableInterceptor::PolicyFactory_ptr p, + TAO_OutputCDR & cdr + ) +{ + return p->marshal (cdr); +} + +// Function pointer for collocation factory initialization. +TAO::Collocation_Proxy_Broker * +(*PortableInterceptor__TAO_PolicyFactory_Proxy_Broker_Factory_function_pointer) ( + CORBA::Object_ptr obj + ) = 0; PortableInterceptor::PolicyFactory::PolicyFactory (void) {} @@ -1816,40 +2149,26 @@ PortableInterceptor::PolicyFactory::~PolicyFactory (void) void PortableInterceptor::PolicyFactory::_tao_any_destructor (void *_tao_void_pointer) { - PolicyFactory *tmp = ACE_static_cast (PolicyFactory *, _tao_void_pointer); - CORBA::release (tmp); + PolicyFactory *_tao_tmp_pointer = + ACE_static_cast (PolicyFactory *, _tao_void_pointer); + CORBA::release (_tao_tmp_pointer); } PortableInterceptor::PolicyFactory_ptr PortableInterceptor::PolicyFactory::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) -{ - return PolicyFactory::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); -} - -PortableInterceptor::PolicyFactory_ptr -PortableInterceptor::PolicyFactory::_unchecked_narrow ( - CORBA::Object_ptr obj + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { - if (CORBA::is_nil (obj)) + if (CORBA::is_nil (_tao_objref)) { return PolicyFactory::_nil (); } - return - ACE_reinterpret_cast ( - PolicyFactory_ptr, - obj->_tao_QueryInterface ( - ACE_reinterpret_cast ( - ptrdiff_t, - &PolicyFactory::_tao_class_id - ) - ) - ); + PolicyFactory_ptr proxy = + dynamic_cast<PolicyFactory_ptr> (_tao_objref); + + return PolicyFactory::_duplicate (proxy); } PortableInterceptor::PolicyFactory_ptr @@ -1875,35 +2194,33 @@ PortableInterceptor::PolicyFactory::_create_policy (CORBA::PolicyType CORBA::Policy::_nil ()); } -void *PortableInterceptor::PolicyFactory::_tao_QueryInterface (ptrdiff_t type) +CORBA::Boolean +PortableInterceptor::PolicyFactory::_is_a ( + const char *value + ACE_ENV_ARG_DECL_NOT_USED + ) { - void *retv = 0; - - if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &ACE_NESTED_CLASS (::PortableInterceptor, PolicyFactory)::_tao_class_id) - ) - { - retv = ACE_reinterpret_cast (void*, this); - } - else if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &CORBA::Object::_tao_class_id) - ) + if ( + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/PortableInterceptor/PolicyFactory:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/LocalObject:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/Object:1.0" + ) + ) { - retv = - ACE_reinterpret_cast ( - void *, - ACE_static_cast (CORBA::Object_ptr, this) - ); + return 1; // success using local knowledge } - - if (retv != 0) + else { - this->_add_ref (); + return 0; } - - return retv; } const char* PortableInterceptor::PolicyFactory::_interface_repository_id (void) const @@ -1952,145 +2269,54 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_PolicyFactory ( sizeof (PortableInterceptor::PolicyFactory) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (PortableInterceptor) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_PolicyFactory, - &_tc_TAO_tc_PortableInterceptor_PolicyFactory - ) -TAO_NAMESPACE_END +namespace PortableInterceptor +{ + ::CORBA::TypeCode_ptr _tc_PolicyFactory = + &_tc_TAO_tc_PortableInterceptor_PolicyFactory; +} // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:63 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60 -int PortableInterceptor::ORBInitInfo::_tao_class_id = 0; - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class - TAO_Objref_Var_T< - PortableInterceptor::ORBInitInfo, - PortableInterceptor::tao_ORBInitInfo_life - >; - template class - TAO_Objref_Out_T< - PortableInterceptor::ORBInitInfo, - PortableInterceptor::tao_ORBInitInfo_life - >; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate \ - TAO_Objref_Var_T< \ - PortableInterceptor::ORBInitInfo, \ - PortableInterceptor::tao_ORBInitInfo_life \ - > -# pragma instantiate \ - TAO_Objref_Out_T< \ - PortableInterceptor::ORBInitInfo, \ - PortableInterceptor::tao_ORBInitInfo_life \ - > -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:245 - -PortableInterceptor::ORBInitInfo::ORBInitInfo (void) -{} - -PortableInterceptor::ORBInitInfo::~ORBInitInfo (void) -{} - -void -PortableInterceptor::ORBInitInfo::_tao_any_destructor (void *_tao_void_pointer) -{ - ORBInitInfo *tmp = ACE_static_cast (ORBInitInfo *, _tao_void_pointer); - CORBA::release (tmp); -} +// Traits specializations for PortableInterceptor::ORBInitInfo. PortableInterceptor::ORBInitInfo_ptr -PortableInterceptor::ORBInitInfo::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL +TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::tao_duplicate ( + PortableInterceptor::ORBInitInfo_ptr p ) { - return ORBInitInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); + return PortableInterceptor::ORBInitInfo::_duplicate (p); } -PortableInterceptor::ORBInitInfo_ptr -PortableInterceptor::ORBInitInfo::_unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED +void +TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::tao_release ( + PortableInterceptor::ORBInitInfo_ptr p ) { - if (CORBA::is_nil (obj)) - { - return ORBInitInfo::_nil (); - } - - return - ACE_reinterpret_cast ( - ORBInitInfo_ptr, - obj->_tao_QueryInterface ( - ACE_reinterpret_cast ( - ptrdiff_t, - &ORBInitInfo::_tao_class_id - ) - ) - ); + CORBA::release (p); } PortableInterceptor::ORBInitInfo_ptr -PortableInterceptor::ORBInitInfo::_duplicate (ORBInitInfo_ptr obj) -{ - if (! CORBA::is_nil (obj)) - { - obj->_add_ref (); - } - - return obj; -} - -void *PortableInterceptor::ORBInitInfo::_tao_QueryInterface (ptrdiff_t type) -{ - void *retv = 0; - - if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &ACE_NESTED_CLASS (::PortableInterceptor, ORBInitInfo)::_tao_class_id) - ) - { - retv = ACE_reinterpret_cast (void*, this); - } - else if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &CORBA::Object::_tao_class_id) - ) - { - retv = - ACE_reinterpret_cast ( - void *, - ACE_static_cast (CORBA::Object_ptr, this) - ); - } - - if (retv != 0) - { - this->_add_ref (); - } - - return retv; -} - -const char* PortableInterceptor::ORBInitInfo::_interface_repository_id (void) const +TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::tao_nil (void) { - return "IDL:omg.org/PortableInterceptor/ORBInitInfo:1.0"; + return PortableInterceptor::ORBInitInfo::_nil (); } CORBA::Boolean -PortableInterceptor::ORBInitInfo::marshal (TAO_OutputCDR &) +TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::tao_marshal ( + PortableInterceptor::ORBInitInfo_ptr p, + TAO_OutputCDR & cdr + ) { - return 0; + return p->marshal (cdr); } +// Function pointer for collocation factory initialization. +TAO::Collocation_Proxy_Broker * +(*PortableInterceptor__TAO_ORBInitInfo_Proxy_Broker_Factory_function_pointer) ( + CORBA::Object_ptr obj + ) = 0; + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -2166,8 +2392,9 @@ PortableInterceptor::ORBInitInfo::DuplicateName::operator= (const ::PortableInte void PortableInterceptor::ORBInitInfo::DuplicateName::_tao_any_destructor (void *_tao_void_pointer) { - DuplicateName *tmp = ACE_static_cast (DuplicateName*, _tao_void_pointer); - delete tmp; + DuplicateName *_tao_tmp_pointer = + ACE_static_cast (DuplicateName*, _tao_void_pointer); + delete _tao_tmp_pointer; } PortableInterceptor::ORBInitInfo::DuplicateName * @@ -2230,7 +2457,8 @@ void PortableInterceptor::ORBInitInfo::DuplicateName::_tao_decode ( PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName ( const char * _tao_name - ) : CORBA::UserException ( + ) + : CORBA::UserException ( "IDL:omg.org/PortableInterceptor/ORBInitInfo/DuplicateName:1.0", "DuplicateName" ) @@ -2323,8 +2551,9 @@ PortableInterceptor::ORBInitInfo::InvalidName::operator= (const ::PortableInterc void PortableInterceptor::ORBInitInfo::InvalidName::_tao_any_destructor (void *_tao_void_pointer) { - InvalidName *tmp = ACE_static_cast (InvalidName*, _tao_void_pointer); - delete tmp; + InvalidName *_tao_tmp_pointer = + ACE_static_cast (InvalidName*, _tao_void_pointer); + delete _tao_tmp_pointer; } PortableInterceptor::ORBInitInfo::InvalidName * @@ -2426,6 +2655,88 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitInfo_InvalidName ( ::CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::_tc_InvalidName = &_tc_TAO_tc_PortableInterceptor_ORBInitInfo_InvalidName; +PortableInterceptor::ORBInitInfo::ORBInitInfo (void) +{} + +PortableInterceptor::ORBInitInfo::~ORBInitInfo (void) +{} + +void +PortableInterceptor::ORBInitInfo::_tao_any_destructor (void *_tao_void_pointer) +{ + ORBInitInfo *_tao_tmp_pointer = + ACE_static_cast (ORBInitInfo *, _tao_void_pointer); + CORBA::release (_tao_tmp_pointer); +} + +PortableInterceptor::ORBInitInfo_ptr +PortableInterceptor::ORBInitInfo::_narrow ( + CORBA::Object_ptr _tao_objref + ACE_ENV_ARG_DECL_NOT_USED + ) +{ + if (CORBA::is_nil (_tao_objref)) + { + return ORBInitInfo::_nil (); + } + + ORBInitInfo_ptr proxy = + dynamic_cast<ORBInitInfo_ptr> (_tao_objref); + + return ORBInitInfo::_duplicate (proxy); +} + +PortableInterceptor::ORBInitInfo_ptr +PortableInterceptor::ORBInitInfo::_duplicate (ORBInitInfo_ptr obj) +{ + if (! CORBA::is_nil (obj)) + { + obj->_add_ref (); + } + + return obj; +} + +CORBA::Boolean +PortableInterceptor::ORBInitInfo::_is_a ( + const char *value + ACE_ENV_ARG_DECL_NOT_USED + ) +{ + if ( + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/PortableInterceptor/ORBInitInfo:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/LocalObject:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/Object:1.0" + ) + ) + { + return 1; // success using local knowledge + } + else + { + return 0; + } +} + +const char* PortableInterceptor::ORBInitInfo::_interface_repository_id (void) const +{ + return "IDL:omg.org/PortableInterceptor/ORBInitInfo:1.0"; +} + +CORBA::Boolean +PortableInterceptor::ORBInitInfo::marshal (TAO_OutputCDR &) +{ + return 0; +} + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -2459,46 +2770,53 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitInfo ( sizeof (PortableInterceptor::ORBInitInfo) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (PortableInterceptor) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_ORBInitInfo, - &_tc_TAO_tc_PortableInterceptor_ORBInitInfo - ) -TAO_NAMESPACE_END +namespace PortableInterceptor +{ + ::CORBA::TypeCode_ptr _tc_ORBInitInfo = + &_tc_TAO_tc_PortableInterceptor_ORBInitInfo; +} // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:63 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60 -int PortableInterceptor::ORBInitializer::_tao_class_id = 0; +// Traits specializations for PortableInterceptor::ORBInitializer. -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class - TAO_Objref_Var_T< - PortableInterceptor::ORBInitializer, - PortableInterceptor::tao_ORBInitializer_life - >; - template class - TAO_Objref_Out_T< - PortableInterceptor::ORBInitializer, - PortableInterceptor::tao_ORBInitializer_life - >; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate \ - TAO_Objref_Var_T< \ - PortableInterceptor::ORBInitializer, \ - PortableInterceptor::tao_ORBInitializer_life \ - > -# pragma instantiate \ - TAO_Objref_Out_T< \ - PortableInterceptor::ORBInitializer, \ - PortableInterceptor::tao_ORBInitializer_life \ - > -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +PortableInterceptor::ORBInitializer_ptr +TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::tao_duplicate ( + PortableInterceptor::ORBInitializer_ptr p + ) +{ + return PortableInterceptor::ORBInitializer::_duplicate (p); +} -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:245 +void +TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::tao_release ( + PortableInterceptor::ORBInitializer_ptr p + ) +{ + CORBA::release (p); +} + +PortableInterceptor::ORBInitializer_ptr +TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::tao_nil (void) +{ + return PortableInterceptor::ORBInitializer::_nil (); +} + +CORBA::Boolean +TAO::Objref_Traits<PortableInterceptor::ORBInitializer>::tao_marshal ( + PortableInterceptor::ORBInitializer_ptr p, + TAO_OutputCDR & cdr + ) +{ + return p->marshal (cdr); +} + +// Function pointer for collocation factory initialization. +TAO::Collocation_Proxy_Broker * +(*PortableInterceptor__TAO_ORBInitializer_Proxy_Broker_Factory_function_pointer) ( + CORBA::Object_ptr obj + ) = 0; PortableInterceptor::ORBInitializer::ORBInitializer (void) {} @@ -2509,40 +2827,26 @@ PortableInterceptor::ORBInitializer::~ORBInitializer (void) void PortableInterceptor::ORBInitializer::_tao_any_destructor (void *_tao_void_pointer) { - ORBInitializer *tmp = ACE_static_cast (ORBInitializer *, _tao_void_pointer); - CORBA::release (tmp); + ORBInitializer *_tao_tmp_pointer = + ACE_static_cast (ORBInitializer *, _tao_void_pointer); + CORBA::release (_tao_tmp_pointer); } PortableInterceptor::ORBInitializer_ptr PortableInterceptor::ORBInitializer::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) -{ - return ORBInitializer::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); -} - -PortableInterceptor::ORBInitializer_ptr -PortableInterceptor::ORBInitializer::_unchecked_narrow ( - CORBA::Object_ptr obj + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { - if (CORBA::is_nil (obj)) + if (CORBA::is_nil (_tao_objref)) { return ORBInitializer::_nil (); } - return - ACE_reinterpret_cast ( - ORBInitializer_ptr, - obj->_tao_QueryInterface ( - ACE_reinterpret_cast ( - ptrdiff_t, - &ORBInitializer::_tao_class_id - ) - ) - ); + ORBInitializer_ptr proxy = + dynamic_cast<ORBInitializer_ptr> (_tao_objref); + + return ORBInitializer::_duplicate (proxy); } PortableInterceptor::ORBInitializer_ptr @@ -2556,35 +2860,33 @@ PortableInterceptor::ORBInitializer::_duplicate (ORBInitializer_ptr obj) return obj; } -void *PortableInterceptor::ORBInitializer::_tao_QueryInterface (ptrdiff_t type) +CORBA::Boolean +PortableInterceptor::ORBInitializer::_is_a ( + const char *value + ACE_ENV_ARG_DECL_NOT_USED + ) { - void *retv = 0; - - if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &ACE_NESTED_CLASS (::PortableInterceptor, ORBInitializer)::_tao_class_id) - ) + if ( + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/PortableInterceptor/ORBInitializer:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/LocalObject:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/Object:1.0" + ) + ) { - retv = ACE_reinterpret_cast (void*, this); + return 1; // success using local knowledge } - else if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &CORBA::Object::_tao_class_id) - ) - { - retv = - ACE_reinterpret_cast ( - void *, - ACE_static_cast (CORBA::Object_ptr, this) - ); - } - - if (retv != 0) + else { - this->_add_ref (); + return 0; } - - return retv; } const char* PortableInterceptor::ORBInitializer::_interface_repository_id (void) const @@ -2633,14 +2935,11 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitializer ( sizeof (PortableInterceptor::ORBInitializer) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (PortableInterceptor) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_ORBInitializer, - &_tc_TAO_tc_PortableInterceptor_ORBInitializer - ) -TAO_NAMESPACE_END +namespace PortableInterceptor +{ + ::CORBA::TypeCode_ptr _tc_ORBInitializer = + &_tc_TAO_tc_PortableInterceptor_ORBInitializer; +} // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50 @@ -2687,16 +2986,60 @@ operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Impl_T<PortableInterceptor::Interceptor>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Impl_T<PortableInterceptor::Interceptor> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::Any_Impl_T<PortableInterceptor::Interceptor>::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<PortableInterceptor::Interceptor>::marshal_value (TAO_OutputCDR &) +{ + return 0; +} + +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::Any_Impl_T<PortableInterceptor::Interceptor>::demarshal_value (TAO_InputCDR &) +{ + return 0; +} // 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<PortableInterceptor::ForwardRequest>::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, @@ -2752,16 +3095,36 @@ CORBA::Boolean operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<PortableInterceptor::ForwardRequest>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<PortableInterceptor::ForwardRequest \> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - // 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<PortableInterceptor::InvalidSlot>::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, @@ -2817,13 +3180,6 @@ CORBA::Boolean operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<PortableInterceptor::InvalidSlot>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<PortableInterceptor::InvalidSlot \> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50 @@ -2869,12 +3225,29 @@ operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Impl_T<PortableInterceptor::Current>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Impl_T<PortableInterceptor::Current> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::Any_Impl_T<PortableInterceptor::Current>::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<PortableInterceptor::Current>::marshal_value (TAO_OutputCDR &) +{ + return 0; +} + +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::Any_Impl_T<PortableInterceptor::Current>::demarshal_value (TAO_InputCDR &) +{ + return 0; +} // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50 @@ -2921,12 +3294,29 @@ operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Impl_T<PortableInterceptor::RequestInfo>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Impl_T<PortableInterceptor::RequestInfo> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::Any_Impl_T<PortableInterceptor::RequestInfo>::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<PortableInterceptor::RequestInfo>::marshal_value (TAO_OutputCDR &) +{ + return 0; +} + +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::Any_Impl_T<PortableInterceptor::RequestInfo>::demarshal_value (TAO_InputCDR &) +{ + return 0; +} // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50 @@ -2973,12 +3363,29 @@ operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>::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<PortableInterceptor::ClientRequestInfo>::marshal_value (TAO_OutputCDR &) +{ + return 0; +} + +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>::demarshal_value (TAO_InputCDR &) +{ + return 0; +} // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50 @@ -3025,12 +3432,29 @@ operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::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<PortableInterceptor::ServerRequestInfo>::marshal_value (TAO_OutputCDR &) +{ + return 0; +} + +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::demarshal_value (TAO_InputCDR &) +{ + return 0; +} // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50 @@ -3077,12 +3501,29 @@ operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::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<PortableInterceptor::ClientRequestInterceptor>::marshal_value (TAO_OutputCDR &) +{ + return 0; +} + +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::demarshal_value (TAO_InputCDR &) +{ + return 0; +} // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50 @@ -3129,12 +3570,29 @@ operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::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<PortableInterceptor::ServerRequestInterceptor>::marshal_value (TAO_OutputCDR &) +{ + return 0; +} + +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::demarshal_value (TAO_InputCDR &) +{ + return 0; +} // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50 @@ -3181,12 +3639,29 @@ operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Impl_T<PortableInterceptor::PolicyFactory> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::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<PortableInterceptor::PolicyFactory>::marshal_value (TAO_OutputCDR &) +{ + return 0; +} + +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::demarshal_value (TAO_InputCDR &) +{ + return 0; +} // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50 @@ -3233,12 +3708,29 @@ operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>::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<PortableInterceptor::ORBInitInfo>::marshal_value (TAO_OutputCDR &) +{ + return 0; +} + +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>::demarshal_value (TAO_InputCDR &) +{ + return 0; +} // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50 @@ -3285,10 +3777,1110 @@ operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>; +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>::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<PortableInterceptor::ORBInitializer>::marshal_value (TAO_OutputCDR &) +{ + return 0; +} + +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>::demarshal_value (TAO_InputCDR &) +{ + return 0; +} + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1703 + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + +#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_) +#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_ + + template class TAO::Arg_Traits<CORBA::OctetSeq>; + + template class + TAO::Var_Size_Arg_Traits< + CORBA::OctetSeq, + CORBA::OctetSeq_var, + CORBA::OctetSeq_out + >; + +#endif /* end #if !defined */ + +#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_) +#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_ + + template class TAO::Arg_Traits<CORBA::StringSeq>; + + template class + TAO::Var_Size_Arg_Traits< + CORBA::StringSeq, + CORBA::StringSeq_var, + CORBA::StringSeq_out + >; + +#endif /* end #if !defined */ + +#if !defined (_CORBA_POLICY__ARG_TRAITS_TMPLINST_CS_) +#define _CORBA_POLICY__ARG_TRAITS_TMPLINST_CS_ + + template class TAO::Arg_Traits<CORBA::Policy>; + + template class + TAO::Object_Arg_Traits_T< + CORBA::Policy_ptr, + CORBA::Policy_var, + CORBA::Policy_out + >; + +#endif /* end #if !defined */ + + template class + TAO::Any_Basic_Impl_T< + CORBA::SetOverrideType + >; + + template class + TAO::Any_Dual_Impl_T< + CORBA::PolicyError + >; + + template class + TAO::Any_Dual_Impl_T< + CORBA::InvalidPolicies + >; + + template class + TAO::Any_Basic_Impl_T< + CORBA::TCKind + >; + + template class + TAO::Any_Basic_Impl_T< + CORBA::exception_type + >; + + template class + TAO::Any_Basic_Impl_T< + CORBA::ParameterMode + >; + +#if !defined (_DYNAMIC_SEQUENCE__ARG_TRAITS_TMPLINST_CS_) +#define _DYNAMIC_SEQUENCE__ARG_TRAITS_TMPLINST_CS_ + + template class TAO::Arg_Traits<Dynamic::ParameterList>; + + template class + TAO::Var_Size_Arg_Traits< + Dynamic::ParameterList, + Dynamic::ParameterList_var, + Dynamic::ParameterList_out + >; + +#endif /* end #if !defined */ + +#if !defined (_DYNAMIC_SEQUENCE__ARG_TRAITS_TMPLINST_CS_) +#define _DYNAMIC_SEQUENCE__ARG_TRAITS_TMPLINST_CS_ + + template class TAO::Arg_Traits<Dynamic::ExceptionList>; + + template class + TAO::Var_Size_Arg_Traits< + Dynamic::ExceptionList, + Dynamic::ExceptionList_var, + Dynamic::ExceptionList_out + >; + +#endif /* end #if !defined */ + +#if !defined (_IOP_TAGGEDPROFILE__ARG_TRAITS_TMPLINST_CS_) +#define _IOP_TAGGEDPROFILE__ARG_TRAITS_TMPLINST_CS_ + + template class TAO::Arg_Traits<IOP::TaggedProfile>; + + template class + TAO::Var_Size_Arg_Traits< + IOP::TaggedProfile, + IOP::TaggedProfile_var, + IOP::TaggedProfile_out + >; + +#endif /* end #if !defined */ + +#if !defined (_IOP_TAGGEDCOMPONENT__ARG_TRAITS_TMPLINST_CS_) +#define _IOP_TAGGEDCOMPONENT__ARG_TRAITS_TMPLINST_CS_ + + template class TAO::Arg_Traits<IOP::TaggedComponent>; + + template class + TAO::Var_Size_Arg_Traits< + IOP::TaggedComponent, + IOP::TaggedComponent_var, + IOP::TaggedComponent_out + >; + +#endif /* end #if !defined */ + +#if !defined (_IOP_SEQUENCE__ARG_TRAITS_TMPLINST_CS_) +#define _IOP_SEQUENCE__ARG_TRAITS_TMPLINST_CS_ + + template class TAO::Arg_Traits<IOP::TaggedComponentSeq>; + + template class + TAO::Var_Size_Arg_Traits< + IOP::TaggedComponentSeq, + IOP::TaggedComponentSeq_var, + IOP::TaggedComponentSeq_out + >; + +#endif /* end #if !defined */ + +#if !defined (_IOP_SERVICECONTEXT__ARG_TRAITS_TMPLINST_CS_) +#define _IOP_SERVICECONTEXT__ARG_TRAITS_TMPLINST_CS_ + + template class TAO::Arg_Traits<IOP::ServiceContext>; + + template class + TAO::Var_Size_Arg_Traits< + IOP::ServiceContext, + IOP::ServiceContext_var, + IOP::ServiceContext_out + >; + +#endif /* end #if !defined */ + + template class + TAO::Any_Dual_Impl_T< + IOP::Codec::InvalidTypeForEncoding + >; + + template class + TAO::Any_Dual_Impl_T< + IOP::Codec::FormatMismatch + >; + + template class + TAO::Any_Dual_Impl_T< + IOP::Codec::TypeMismatch + >; + +#if !defined (_IOP_CODECFACTORY__ARG_TRAITS_TMPLINST_CS_) +#define _IOP_CODECFACTORY__ARG_TRAITS_TMPLINST_CS_ + + template class TAO::Arg_Traits<IOP::CodecFactory>; + + template class + TAO::Object_Arg_Traits_T< + IOP::CodecFactory_ptr, + IOP::CodecFactory_var, + IOP::CodecFactory_out + >; + +#endif /* end #if !defined */ + + template class + TAO::Any_Dual_Impl_T< + IOP::CodecFactory::UnknownEncoding + >; + + template class + TAO_Objref_Var_T< + PortableInterceptor::Interceptor, + TAO::Objref_Traits<PortableInterceptor::Interceptor> + >; + + template class + TAO_Objref_Out_T< + PortableInterceptor::Interceptor, + TAO::Objref_Traits<PortableInterceptor::Interceptor> + >; + + template class + TAO::Any_Impl_T< + PortableInterceptor::Interceptor + >; + + template class + TAO::Any_Dual_Impl_T< + PortableInterceptor::ForwardRequest + >; + + template class + TAO::Any_Dual_Impl_T< + PortableInterceptor::InvalidSlot + >; + + template class + TAO_Objref_Var_T< + PortableInterceptor::Current, + TAO::Objref_Traits<PortableInterceptor::Current> + >; + + template class + TAO_Objref_Out_T< + PortableInterceptor::Current, + TAO::Objref_Traits<PortableInterceptor::Current> + >; + + template class + TAO::Any_Impl_T< + PortableInterceptor::Current + >; + + template class + TAO::Ret_Var_Size_Argument_T< + IOP::ServiceContext, + IOP::ServiceContext_var + >; + + template class + TAO_Objref_Var_T< + PortableInterceptor::RequestInfo, + TAO::Objref_Traits<PortableInterceptor::RequestInfo> + >; + + template class + TAO_Objref_Out_T< + PortableInterceptor::RequestInfo, + TAO::Objref_Traits<PortableInterceptor::RequestInfo> + >; + + template class + TAO::Any_Impl_T< + PortableInterceptor::RequestInfo + >; + +#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__ARG_TRAITS_TMPLINST_CS_) +#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__ARG_TRAITS_TMPLINST_CS_ + + template class TAO::Arg_Traits<PortableInterceptor::ClientRequestInfo>; + + template class + TAO::Object_Arg_Traits_T< + PortableInterceptor::ClientRequestInfo_ptr, + PortableInterceptor::ClientRequestInfo_var, + PortableInterceptor::ClientRequestInfo_out + >; + +#endif /* end #if !defined */ + + template class + TAO::Ret_Var_Size_Argument_T< + IOP::TaggedComponent, + IOP::TaggedComponent_var + >; + + template class + TAO::Ret_Var_Size_Argument_T< + IOP::sequence, + IOP::sequence_var + >; + + template class + TAO::Ret_Object_Argument_T< + CORBA::Policy_ptr, + CORBA::Policy_var + >; + + template class + TAO::In_Var_Size_Argument_T< + IOP::ServiceContext + >; + + template class + TAO_Objref_Var_T< + PortableInterceptor::ClientRequestInfo, + TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo> + >; + + template class + TAO_Objref_Out_T< + PortableInterceptor::ClientRequestInfo, + TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo> + >; + + template class + TAO::Any_Impl_T< + PortableInterceptor::ClientRequestInfo + >; + +#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__ARG_TRAITS_TMPLINST_CS_) +#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__ARG_TRAITS_TMPLINST_CS_ + + template class TAO::Arg_Traits<PortableInterceptor::ServerRequestInfo>; + + template class + TAO::Object_Arg_Traits_T< + PortableInterceptor::ServerRequestInfo_ptr, + PortableInterceptor::ServerRequestInfo_var, + PortableInterceptor::ServerRequestInfo_out + >; + +#endif /* end #if !defined */ + + template class + TAO_Objref_Var_T< + PortableInterceptor::ServerRequestInfo, + TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo> + >; + + template class + TAO_Objref_Out_T< + PortableInterceptor::ServerRequestInfo, + TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo> + >; + + template class + TAO::Any_Impl_T< + PortableInterceptor::ServerRequestInfo + >; + +#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__ARG_TRAITS_TMPLINST_CS_) +#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__ARG_TRAITS_TMPLINST_CS_ + + template class TAO::Arg_Traits<PortableInterceptor::ClientRequestInterceptor>; + + template class + TAO::Object_Arg_Traits_T< + PortableInterceptor::ClientRequestInterceptor_ptr, + PortableInterceptor::ClientRequestInterceptor_var, + PortableInterceptor::ClientRequestInterceptor_out + >; + +#endif /* end #if !defined */ + + template class + TAO::In_Object_Argument_T< + PortableInterceptor::ClientRequestInfo_ptr + >; + + template class + TAO_Objref_Var_T< + PortableInterceptor::ClientRequestInterceptor, + TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor> + >; + + template class + TAO_Objref_Out_T< + PortableInterceptor::ClientRequestInterceptor, + TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor> + >; + + template class + TAO::Any_Impl_T< + PortableInterceptor::ClientRequestInterceptor + >; + +#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__ARG_TRAITS_TMPLINST_CS_) +#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__ARG_TRAITS_TMPLINST_CS_ + + template class TAO::Arg_Traits<PortableInterceptor::ServerRequestInterceptor>; + + template class + TAO::Object_Arg_Traits_T< + PortableInterceptor::ServerRequestInterceptor_ptr, + PortableInterceptor::ServerRequestInterceptor_var, + PortableInterceptor::ServerRequestInterceptor_out + >; + +#endif /* end #if !defined */ + + template class + TAO::In_Object_Argument_T< + PortableInterceptor::ServerRequestInfo_ptr + >; + + template class + TAO_Objref_Var_T< + PortableInterceptor::ServerRequestInterceptor, + TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor> + >; + + template class + TAO_Objref_Out_T< + PortableInterceptor::ServerRequestInterceptor, + TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor> + >; + + template class + TAO::Any_Impl_T< + PortableInterceptor::ServerRequestInterceptor + >; + +#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__ARG_TRAITS_TMPLINST_CS_) +#define _PORTABLEINTERCEPTOR_POLICYFACTORY__ARG_TRAITS_TMPLINST_CS_ + + template class TAO::Arg_Traits<PortableInterceptor::PolicyFactory>; + + template class + TAO::Object_Arg_Traits_T< + PortableInterceptor::PolicyFactory_ptr, + PortableInterceptor::PolicyFactory_var, + PortableInterceptor::PolicyFactory_out + >; + +#endif /* end #if !defined */ + + template class + TAO_Objref_Var_T< + PortableInterceptor::PolicyFactory, + TAO::Objref_Traits<PortableInterceptor::PolicyFactory> + >; + + template class + TAO_Objref_Out_T< + PortableInterceptor::PolicyFactory, + TAO::Objref_Traits<PortableInterceptor::PolicyFactory> + >; + + template class + TAO::Any_Impl_T< + PortableInterceptor::PolicyFactory + >; + +#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__ARG_TRAITS_TMPLINST_CS_) +#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__ARG_TRAITS_TMPLINST_CS_ + + template class TAO::Arg_Traits<PortableInterceptor::IORInterceptor>; + + template class + TAO::Object_Arg_Traits_T< + PortableInterceptor::IORInterceptor_ptr, + PortableInterceptor::IORInterceptor_var, + PortableInterceptor::IORInterceptor_out + >; + +#endif /* end #if !defined */ + + template class TAO::Objref_Traits<PortableInterceptor::IORInterceptor>; + + template class + TAO::Any_Impl_T< + PortableInterceptor::IORInterceptor + >; + +#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__ARG_TRAITS_TMPLINST_CS_) +#define _PORTABLEINTERCEPTOR_ORBINITINFO__ARG_TRAITS_TMPLINST_CS_ + + template class TAO::Arg_Traits<PortableInterceptor::ORBInitInfo>; + + template class + TAO::Object_Arg_Traits_T< + PortableInterceptor::ORBInitInfo_ptr, + PortableInterceptor::ORBInitInfo_var, + PortableInterceptor::ORBInitInfo_out + >; + +#endif /* end #if !defined */ + + template class + TAO::Any_Dual_Impl_T< + PortableInterceptor::ORBInitInfo::DuplicateName + >; + + template class + TAO::Any_Dual_Impl_T< + PortableInterceptor::ORBInitInfo::InvalidName + >; + + template class + TAO::In_Object_Argument_T< + PortableInterceptor::ClientRequestInterceptor_ptr + >; + + template class + TAO::In_Object_Argument_T< + PortableInterceptor::ServerRequestInterceptor_ptr + >; + + template class + TAO::In_Object_Argument_T< + PortableInterceptor::IORInterceptor_ptr + >; + + template class + TAO::In_Object_Argument_T< + PortableInterceptor::PolicyFactory_ptr + >; + + template class + TAO_Objref_Var_T< + PortableInterceptor::ORBInitInfo, + TAO::Objref_Traits<PortableInterceptor::ORBInitInfo> + >; + + template class + TAO_Objref_Out_T< + PortableInterceptor::ORBInitInfo, + TAO::Objref_Traits<PortableInterceptor::ORBInitInfo> + >; + + template class + TAO::Any_Impl_T< + PortableInterceptor::ORBInitInfo + >; + + template class + TAO::In_Object_Argument_T< + PortableInterceptor::ORBInitInfo_ptr + >; + + template class + TAO_Objref_Var_T< + PortableInterceptor::ORBInitializer, + TAO::Objref_Traits<PortableInterceptor::ORBInitializer> + >; + + template class + TAO_Objref_Out_T< + PortableInterceptor::ORBInitializer, + TAO::Objref_Traits<PortableInterceptor::ORBInitializer> + >; + + template class + TAO::Any_Impl_T< + PortableInterceptor::ORBInitializer + >; + #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ORBInitializer> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_) +#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_ + +# pragma instantiate TAO::Arg_Traits<CORBA::OctetSeq> + +# pragma instantiate \ + TAO::Var_Size_Arg_Traits< \ + CORBA::OctetSeq, \ + CORBA::OctetSeq_var, \ + CORBA::OctetSeq_out \ + > + +#endif /* end #if !defined */ + +#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_) +#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_ + +# pragma instantiate TAO::Arg_Traits<CORBA::StringSeq> + +# pragma instantiate \ + TAO::Var_Size_Arg_Traits< \ + CORBA::StringSeq, \ + CORBA::StringSeq_var, \ + CORBA::StringSeq_out \ + > + +#endif /* end #if !defined */ + +#if !defined (_CORBA_POLICY__ARG_TRAITS_TMPLINST_CS_) +#define _CORBA_POLICY__ARG_TRAITS_TMPLINST_CS_ + +# pragma instantiate TAO::Arg_Traits<CORBA::Policy> + +# pragma instantiate \ + TAO::Object_Arg_Traits_T< \ + CORBA::Policy_ptr, \ + CORBA::Policy_var, \ + CORBA::Policy_out \ + > + +#endif /* end #if !defined */ + +# pragma instantiate \ + TAO::Any_Basic_Impl_T< \ + CORBA::SetOverrideType \ + > + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + CORBA::PolicyError \ + > + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + CORBA::InvalidPolicies \ + > + +# pragma instantiate \ + TAO::Any_Basic_Impl_T< \ + CORBA::TCKind \ + > + +# pragma instantiate \ + TAO::Any_Basic_Impl_T< \ + CORBA::exception_type \ + > + +# pragma instantiate \ + TAO::Any_Basic_Impl_T< \ + CORBA::ParameterMode \ + > + +#if !defined (_DYNAMIC_SEQUENCE__ARG_TRAITS_TMPLINST_CS_) +#define _DYNAMIC_SEQUENCE__ARG_TRAITS_TMPLINST_CS_ + +# pragma instantiate TAO::Arg_Traits<Dynamic::ParameterList> + +# pragma instantiate \ + TAO::Var_Size_Arg_Traits< \ + Dynamic::ParameterList, \ + Dynamic::ParameterList_var, \ + Dynamic::ParameterList_out \ + > + +#endif /* end #if !defined */ + +#if !defined (_DYNAMIC_SEQUENCE__ARG_TRAITS_TMPLINST_CS_) +#define _DYNAMIC_SEQUENCE__ARG_TRAITS_TMPLINST_CS_ + +# pragma instantiate TAO::Arg_Traits<Dynamic::ExceptionList> + +# pragma instantiate \ + TAO::Var_Size_Arg_Traits< \ + Dynamic::ExceptionList, \ + Dynamic::ExceptionList_var, \ + Dynamic::ExceptionList_out \ + > + +#endif /* end #if !defined */ + +#if !defined (_IOP_TAGGEDPROFILE__ARG_TRAITS_TMPLINST_CS_) +#define _IOP_TAGGEDPROFILE__ARG_TRAITS_TMPLINST_CS_ + +# pragma instantiate TAO::Arg_Traits<IOP::TaggedProfile> + +# pragma instantiate \ + TAO::Var_Size_Arg_Traits< \ + IOP::TaggedProfile, \ + IOP::TaggedProfile_var, \ + IOP::TaggedProfile_out \ + > + +#endif /* end #if !defined */ + +#if !defined (_IOP_TAGGEDCOMPONENT__ARG_TRAITS_TMPLINST_CS_) +#define _IOP_TAGGEDCOMPONENT__ARG_TRAITS_TMPLINST_CS_ + +# pragma instantiate TAO::Arg_Traits<IOP::TaggedComponent> + +# pragma instantiate \ + TAO::Var_Size_Arg_Traits< \ + IOP::TaggedComponent, \ + IOP::TaggedComponent_var, \ + IOP::TaggedComponent_out \ + > + +#endif /* end #if !defined */ + +#if !defined (_IOP_SEQUENCE__ARG_TRAITS_TMPLINST_CS_) +#define _IOP_SEQUENCE__ARG_TRAITS_TMPLINST_CS_ + +# pragma instantiate TAO::Arg_Traits<IOP::TaggedComponentSeq> + +# pragma instantiate \ + TAO::Var_Size_Arg_Traits< \ + IOP::TaggedComponentSeq, \ + IOP::TaggedComponentSeq_var, \ + IOP::TaggedComponentSeq_out \ + > + +#endif /* end #if !defined */ + +#if !defined (_IOP_SERVICECONTEXT__ARG_TRAITS_TMPLINST_CS_) +#define _IOP_SERVICECONTEXT__ARG_TRAITS_TMPLINST_CS_ + +# pragma instantiate TAO::Arg_Traits<IOP::ServiceContext> + +# pragma instantiate \ + TAO::Var_Size_Arg_Traits< \ + IOP::ServiceContext, \ + IOP::ServiceContext_var, \ + IOP::ServiceContext_out \ + > + +#endif /* end #if !defined */ + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + IOP::Codec::InvalidTypeForEncoding \ + > + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + IOP::Codec::FormatMismatch \ + > + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + IOP::Codec::TypeMismatch \ + > + +#if !defined (_IOP_CODECFACTORY__ARG_TRAITS_TMPLINST_CS_) +#define _IOP_CODECFACTORY__ARG_TRAITS_TMPLINST_CS_ + +# pragma instantiate TAO::Arg_Traits<IOP::CodecFactory> + +# pragma instantiate \ + TAO::Object_Arg_Traits_T< \ + IOP::CodecFactory_ptr, \ + IOP::CodecFactory_var, \ + IOP::CodecFactory_out \ + > + +#endif /* end #if !defined */ + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + IOP::CodecFactory::UnknownEncoding \ + > + +# pragma instantiate \ + TAO_Objref_Var_T< \ + PortableInterceptor::Interceptor, \ + TAO::Objref_Traits<PortableInterceptor::Interceptor> \ + > + +# pragma instantiate \ + TAO_Objref_Out_T< \ + PortableInterceptor::Interceptor, \ + TAO::Objref_Traits<PortableInterceptor::Interceptor> \ + > + +# pragma instantiate \ + TAO::Any_Impl_T< \ + PortableInterceptor::Interceptor \ + > + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + PortableInterceptor::ForwardRequest \ + > + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + PortableInterceptor::InvalidSlot \ + > + +# pragma instantiate \ + TAO_Objref_Var_T< \ + PortableInterceptor::Current, \ + TAO::Objref_Traits<PortableInterceptor::Current> \ + > + +# pragma instantiate \ + TAO_Objref_Out_T< \ + PortableInterceptor::Current, \ + TAO::Objref_Traits<PortableInterceptor::Current> \ + > + +# pragma instantiate \ + TAO::Any_Impl_T< \ + PortableInterceptor::Current \ + > + +# pragma instantiate \ + TAO_Objref_Var_T< \ + PortableInterceptor::RequestInfo, \ + TAO::Objref_Traits<PortableInterceptor::RequestInfo> \ + > + +# pragma instantiate \ + TAO_Objref_Out_T< \ + PortableInterceptor::RequestInfo, \ + TAO::Objref_Traits<PortableInterceptor::RequestInfo> \ + > + +# pragma instantiate \ + TAO::Any_Impl_T< \ + PortableInterceptor::RequestInfo \ + > + +#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__ARG_TRAITS_TMPLINST_CS_) +#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__ARG_TRAITS_TMPLINST_CS_ + +# pragma instantiate TAO::Arg_Traits<PortableInterceptor::ClientRequestInfo> + +# pragma instantiate \ + TAO::Object_Arg_Traits_T< \ + PortableInterceptor::ClientRequestInfo_ptr, \ + PortableInterceptor::ClientRequestInfo_var, \ + PortableInterceptor::ClientRequestInfo_out \ + > + +#endif /* end #if !defined */ + +# pragma instantiate \ + TAO::In_Var_Size_Argument_T< \ + IOP::ServiceContext \ + > + +# pragma instantiate \ + TAO_Objref_Var_T< \ + PortableInterceptor::ClientRequestInfo, \ + TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo> \ + > + +# pragma instantiate \ + TAO_Objref_Out_T< \ + PortableInterceptor::ClientRequestInfo, \ + TAO::Objref_Traits<PortableInterceptor::ClientRequestInfo> \ + > + +# pragma instantiate \ + TAO::Any_Impl_T< \ + PortableInterceptor::ClientRequestInfo \ + > + +#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__ARG_TRAITS_TMPLINST_CS_) +#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__ARG_TRAITS_TMPLINST_CS_ + +# pragma instantiate TAO::Arg_Traits<PortableInterceptor::ServerRequestInfo> + +# pragma instantiate \ + TAO::Object_Arg_Traits_T< \ + PortableInterceptor::ServerRequestInfo_ptr, \ + PortableInterceptor::ServerRequestInfo_var, \ + PortableInterceptor::ServerRequestInfo_out \ + > + +#endif /* end #if !defined */ + +# pragma instantiate \ + TAO_Objref_Var_T< \ + PortableInterceptor::ServerRequestInfo, \ + TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo> \ + > + +# pragma instantiate \ + TAO_Objref_Out_T< \ + PortableInterceptor::ServerRequestInfo, \ + TAO::Objref_Traits<PortableInterceptor::ServerRequestInfo> \ + > + +# pragma instantiate \ + TAO::Any_Impl_T< \ + PortableInterceptor::ServerRequestInfo \ + > + +#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__ARG_TRAITS_TMPLINST_CS_) +#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__ARG_TRAITS_TMPLINST_CS_ + +# pragma instantiate TAO::Arg_Traits<PortableInterceptor::ClientRequestInterceptor> + +# pragma instantiate \ + TAO::Object_Arg_Traits_T< \ + PortableInterceptor::ClientRequestInterceptor_ptr, \ + PortableInterceptor::ClientRequestInterceptor_var, \ + PortableInterceptor::ClientRequestInterceptor_out \ + > + +#endif /* end #if !defined */ + +# pragma instantiate \ + TAO::In_Object_Argument_T< \ + PortableInterceptor::ClientRequestInfo_ptr \ + > + +# pragma instantiate \ + TAO_Objref_Var_T< \ + PortableInterceptor::ClientRequestInterceptor, \ + TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor> \ + > + +# pragma instantiate \ + TAO_Objref_Out_T< \ + PortableInterceptor::ClientRequestInterceptor, \ + TAO::Objref_Traits<PortableInterceptor::ClientRequestInterceptor> \ + > + +# pragma instantiate \ + TAO::Any_Impl_T< \ + PortableInterceptor::ClientRequestInterceptor \ + > + +#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__ARG_TRAITS_TMPLINST_CS_) +#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__ARG_TRAITS_TMPLINST_CS_ + +# pragma instantiate TAO::Arg_Traits<PortableInterceptor::ServerRequestInterceptor> + +# pragma instantiate \ + TAO::Object_Arg_Traits_T< \ + PortableInterceptor::ServerRequestInterceptor_ptr, \ + PortableInterceptor::ServerRequestInterceptor_var, \ + PortableInterceptor::ServerRequestInterceptor_out \ + > + +#endif /* end #if !defined */ + +# pragma instantiate \ + TAO::In_Object_Argument_T< \ + PortableInterceptor::ServerRequestInfo_ptr \ + > + +# pragma instantiate \ + TAO_Objref_Var_T< \ + PortableInterceptor::ServerRequestInterceptor, \ + TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor> \ + > + +# pragma instantiate \ + TAO_Objref_Out_T< \ + PortableInterceptor::ServerRequestInterceptor, \ + TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor> \ + > + +# pragma instantiate \ + TAO::Any_Impl_T< \ + PortableInterceptor::ServerRequestInterceptor \ + > + +#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__ARG_TRAITS_TMPLINST_CS_) +#define _PORTABLEINTERCEPTOR_POLICYFACTORY__ARG_TRAITS_TMPLINST_CS_ + +# pragma instantiate TAO::Arg_Traits<PortableInterceptor::PolicyFactory> + +# pragma instantiate \ + TAO::Object_Arg_Traits_T< \ + PortableInterceptor::PolicyFactory_ptr, \ + PortableInterceptor::PolicyFactory_var, \ + PortableInterceptor::PolicyFactory_out \ + > + +#endif /* end #if !defined */ + +# pragma instantiate \ + TAO_Objref_Var_T< \ + PortableInterceptor::PolicyFactory, \ + TAO::Objref_Traits<PortableInterceptor::PolicyFactory> \ + > + +# pragma instantiate \ + TAO_Objref_Out_T< \ + PortableInterceptor::PolicyFactory, \ + TAO::Objref_Traits<PortableInterceptor::PolicyFactory> \ + > + +# pragma instantiate \ + TAO::Any_Impl_T< \ + PortableInterceptor::PolicyFactory \ + > + +#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__ARG_TRAITS_TMPLINST_CS_) +#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__ARG_TRAITS_TMPLINST_CS_ + +# pragma instantiate TAO::Arg_Traits<PortableInterceptor::IORInterceptor> + +# pragma instantiate \ + TAO::Object_Arg_Traits_T< \ + PortableInterceptor::IORInterceptor_ptr, \ + PortableInterceptor::IORInterceptor_var, \ + PortableInterceptor::IORInterceptor_out \ + > + +#endif /* end #if !defined */ + +# pragma instantiate TAO::Objref_Traits<PortableInterceptor::IORInterceptor> + +# pragma instantiate \ + TAO::Any_Impl_T< \ + PortableInterceptor::IORInterceptor \ + > + +#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__ARG_TRAITS_TMPLINST_CS_) +#define _PORTABLEINTERCEPTOR_ORBINITINFO__ARG_TRAITS_TMPLINST_CS_ + +# pragma instantiate TAO::Arg_Traits<PortableInterceptor::ORBInitInfo> + +# pragma instantiate \ + TAO::Object_Arg_Traits_T< \ + PortableInterceptor::ORBInitInfo_ptr, \ + PortableInterceptor::ORBInitInfo_var, \ + PortableInterceptor::ORBInitInfo_out \ + > + +#endif /* end #if !defined */ + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + PortableInterceptor::ORBInitInfo::DuplicateName \ + > + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + PortableInterceptor::ORBInitInfo::InvalidName \ + > + +# pragma instantiate \ + TAO::In_Object_Argument_T< \ + PortableInterceptor::ClientRequestInterceptor_ptr \ + > + +# pragma instantiate \ + TAO::In_Object_Argument_T< \ + PortableInterceptor::ServerRequestInterceptor_ptr \ + > + +# pragma instantiate \ + TAO::In_Object_Argument_T< \ + PortableInterceptor::IORInterceptor_ptr \ + > + +# pragma instantiate \ + TAO::In_Object_Argument_T< \ + PortableInterceptor::PolicyFactory_ptr \ + > + +# pragma instantiate \ + TAO_Objref_Var_T< \ + PortableInterceptor::ORBInitInfo, \ + TAO::Objref_Traits<PortableInterceptor::ORBInitInfo> \ + > + +# pragma instantiate \ + TAO_Objref_Out_T< \ + PortableInterceptor::ORBInitInfo, \ + TAO::Objref_Traits<PortableInterceptor::ORBInitInfo> \ + > + +# pragma instantiate \ + TAO::Any_Impl_T< \ + PortableInterceptor::ORBInitInfo \ + > + +# pragma instantiate \ + TAO::In_Object_Argument_T< \ + PortableInterceptor::ORBInitInfo_ptr \ + > + +# pragma instantiate \ + TAO_Objref_Var_T< \ + PortableInterceptor::ORBInitializer, \ + TAO::Objref_Traits<PortableInterceptor::ORBInitializer> \ + > + +# pragma instantiate \ + TAO_Objref_Out_T< \ + PortableInterceptor::ORBInitializer, \ + TAO::Objref_Traits<PortableInterceptor::ORBInitializer> \ + > + +# pragma instantiate \ + TAO::Any_Impl_T< \ + PortableInterceptor::ORBInitializer \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h index 5673d1bd375..c52d5568c50 100644 --- a/TAO/tao/PortableInterceptorC.h +++ b/TAO/tao/PortableInterceptorC.h @@ -32,6 +32,7 @@ #define _TAO_IDL_ORIG_PORTABLEINTERCEPTORC_H_ #include /**/ "ace/pre.h" + #include "PI_ForwardC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -66,17 +67,27 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #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<typename T> class Narrow_Utils; +} + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48 -TAO_NAMESPACE PortableInterceptor +namespace PortableInterceptor { // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:576 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601 -#if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR__ODDS_N_ENDS_CH_) -#define _PORTABLEINTERCEPTOR_INTERCEPTOR__ODDS_N_ENDS_CH_ +#if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR__VAR_OUT_CH_) +#define _PORTABLEINTERCEPTOR_INTERCEPTOR__VAR_OUT_CH_ class Interceptor; typedef Interceptor *Interceptor_ptr; @@ -92,7 +103,7 @@ TAO_NAMESPACE PortableInterceptor Interceptor > Interceptor_out; - + #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -107,7 +118,6 @@ TAO_NAMESPACE PortableInterceptor public: typedef Interceptor_ptr _ptr_type; typedef Interceptor_var _var_type; - static int _tao_class_id; // The static operations. static Interceptor_ptr _duplicate (Interceptor_ptr obj); @@ -117,11 +127,6 @@ TAO_NAMESPACE PortableInterceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - static Interceptor_ptr _unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); - static Interceptor_ptr _nil (void) { return (Interceptor_ptr)0; @@ -150,9 +155,12 @@ TAO_NAMESPACE PortableInterceptor )) = 0; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:210 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:185 - virtual void *_tao_QueryInterface (ptrdiff_t type); + 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); @@ -202,12 +210,12 @@ TAO_NAMESPACE PortableInterceptor virtual void _tao_encode ( TAO_OutputCDR & - ACE_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL ) const; virtual void _tao_decode ( TAO_InputCDR & - ACE_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL ); // TAO_IDL - Generated from @@ -232,7 +240,7 @@ TAO_NAMESPACE PortableInterceptor #endif /* end #if !defined */ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:343 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333 typedef CORBA::Short ReplyStatus; typedef CORBA::Short_out ReplyStatus_out; @@ -278,7 +286,7 @@ TAO_NAMESPACE PortableInterceptor const PortableInterceptor::ReplyStatus UNKNOWN = 6; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:343 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333 typedef CORBA::ULong SlotId; typedef CORBA::ULong_out SlotId_out; @@ -315,12 +323,12 @@ TAO_NAMESPACE PortableInterceptor virtual void _tao_encode ( TAO_OutputCDR & - ACE_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL ) const; virtual void _tao_decode ( TAO_InputCDR & - ACE_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL ); // TAO_IDL - Generated from @@ -337,10 +345,10 @@ TAO_NAMESPACE PortableInterceptor #endif /* end #if !defined */ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:576 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601 -#if !defined (_PORTABLEINTERCEPTOR_CURRENT__ODDS_N_ENDS_CH_) -#define _PORTABLEINTERCEPTOR_CURRENT__ODDS_N_ENDS_CH_ +#if !defined (_PORTABLEINTERCEPTOR_CURRENT__VAR_OUT_CH_) +#define _PORTABLEINTERCEPTOR_CURRENT__VAR_OUT_CH_ class Current; typedef Current *Current_ptr; @@ -356,7 +364,7 @@ TAO_NAMESPACE PortableInterceptor Current > Current_out; - + #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -371,7 +379,6 @@ TAO_NAMESPACE PortableInterceptor public: typedef Current_ptr _ptr_type; typedef Current_var _var_type; - static int _tao_class_id; // The static operations. static Current_ptr _duplicate (Current_ptr obj); @@ -381,11 +388,6 @@ TAO_NAMESPACE PortableInterceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - static Current_ptr _unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); - static Current_ptr _nil (void) { return (Current_ptr)0; @@ -419,9 +421,12 @@ TAO_NAMESPACE PortableInterceptor )) = 0; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:210 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:185 - virtual void *_tao_QueryInterface (ptrdiff_t type); + 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); @@ -443,10 +448,10 @@ TAO_NAMESPACE PortableInterceptor TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Current; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:576 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601 -#if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO__ODDS_N_ENDS_CH_) -#define _PORTABLEINTERCEPTOR_REQUESTINFO__ODDS_N_ENDS_CH_ +#if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO__VAR_OUT_CH_) +#define _PORTABLEINTERCEPTOR_REQUESTINFO__VAR_OUT_CH_ class RequestInfo; typedef RequestInfo *RequestInfo_ptr; @@ -462,7 +467,7 @@ TAO_NAMESPACE PortableInterceptor RequestInfo > RequestInfo_out; - + #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -477,7 +482,6 @@ TAO_NAMESPACE PortableInterceptor public: typedef RequestInfo_ptr _ptr_type; typedef RequestInfo_var _var_type; - static int _tao_class_id; // The static operations. static RequestInfo_ptr _duplicate (RequestInfo_ptr obj); @@ -487,11 +491,6 @@ TAO_NAMESPACE PortableInterceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - static RequestInfo_ptr _unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); - static RequestInfo_ptr _nil (void) { return (RequestInfo_ptr)0; @@ -644,9 +643,12 @@ TAO_NAMESPACE PortableInterceptor )) = 0; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:210 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:185 - virtual void *_tao_QueryInterface (ptrdiff_t type); + 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); @@ -668,10 +670,10 @@ TAO_NAMESPACE PortableInterceptor TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RequestInfo; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:576 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601 -#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__ODDS_N_ENDS_CH_) -#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__ODDS_N_ENDS_CH_ +#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__VAR_OUT_CH_) +#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__VAR_OUT_CH_ class ClientRequestInfo; typedef ClientRequestInfo *ClientRequestInfo_ptr; @@ -687,7 +689,7 @@ TAO_NAMESPACE PortableInterceptor ClientRequestInfo > ClientRequestInfo_out; - + #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -702,7 +704,6 @@ TAO_NAMESPACE PortableInterceptor public: typedef ClientRequestInfo_ptr _ptr_type; typedef ClientRequestInfo_var _var_type; - static int _tao_class_id; // The static operations. static ClientRequestInfo_ptr _duplicate (ClientRequestInfo_ptr obj); @@ -712,11 +713,6 @@ TAO_NAMESPACE PortableInterceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - static ClientRequestInfo_ptr _unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); - static ClientRequestInfo_ptr _nil (void) { return (ClientRequestInfo_ptr)0; @@ -820,9 +816,12 @@ TAO_NAMESPACE PortableInterceptor )) = 0; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:210 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:185 - virtual void *_tao_QueryInterface (ptrdiff_t type); + 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); @@ -844,10 +843,10 @@ TAO_NAMESPACE PortableInterceptor TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ClientRequestInfo; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:576 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601 -#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__ODDS_N_ENDS_CH_) -#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__ODDS_N_ENDS_CH_ +#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__VAR_OUT_CH_) +#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__VAR_OUT_CH_ class ServerRequestInfo; typedef ServerRequestInfo *ServerRequestInfo_ptr; @@ -863,7 +862,7 @@ TAO_NAMESPACE PortableInterceptor ServerRequestInfo > ServerRequestInfo_out; - + #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -878,7 +877,6 @@ TAO_NAMESPACE PortableInterceptor public: typedef ServerRequestInfo_ptr _ptr_type; typedef ServerRequestInfo_var _var_type; - static int _tao_class_id; // The static operations. static ServerRequestInfo_ptr _duplicate (ServerRequestInfo_ptr obj); @@ -888,11 +886,6 @@ TAO_NAMESPACE PortableInterceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - static ServerRequestInfo_ptr _unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); - static ServerRequestInfo_ptr _nil (void) { return (ServerRequestInfo_ptr)0; @@ -1018,9 +1011,12 @@ TAO_NAMESPACE PortableInterceptor )) = 0; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:210 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:185 - virtual void *_tao_QueryInterface (ptrdiff_t type); + 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); @@ -1042,10 +1038,10 @@ TAO_NAMESPACE PortableInterceptor TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerRequestInfo; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:576 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601 -#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__ODDS_N_ENDS_CH_) -#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__ODDS_N_ENDS_CH_ +#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__VAR_OUT_CH_) +#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__VAR_OUT_CH_ class ClientRequestInterceptor; typedef ClientRequestInterceptor *ClientRequestInterceptor_ptr; @@ -1061,7 +1057,7 @@ TAO_NAMESPACE PortableInterceptor ClientRequestInterceptor > ClientRequestInterceptor_out; - + #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -1076,7 +1072,6 @@ TAO_NAMESPACE PortableInterceptor public: typedef ClientRequestInterceptor_ptr _ptr_type; typedef ClientRequestInterceptor_var _var_type; - static int _tao_class_id; // The static operations. static ClientRequestInterceptor_ptr _duplicate (ClientRequestInterceptor_ptr obj); @@ -1086,11 +1081,6 @@ TAO_NAMESPACE PortableInterceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - static ClientRequestInterceptor_ptr _unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); - static ClientRequestInterceptor_ptr _nil (void) { return (ClientRequestInterceptor_ptr)0; @@ -1157,9 +1147,12 @@ TAO_NAMESPACE PortableInterceptor )) = 0; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:210 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:185 - virtual void *_tao_QueryInterface (ptrdiff_t type); + 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); @@ -1181,10 +1174,10 @@ TAO_NAMESPACE PortableInterceptor TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ClientRequestInterceptor; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:576 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601 -#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__ODDS_N_ENDS_CH_) -#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__ODDS_N_ENDS_CH_ +#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__VAR_OUT_CH_) +#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__VAR_OUT_CH_ class ServerRequestInterceptor; typedef ServerRequestInterceptor *ServerRequestInterceptor_ptr; @@ -1200,7 +1193,7 @@ TAO_NAMESPACE PortableInterceptor ServerRequestInterceptor > ServerRequestInterceptor_out; - + #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -1215,7 +1208,6 @@ TAO_NAMESPACE PortableInterceptor public: typedef ServerRequestInterceptor_ptr _ptr_type; typedef ServerRequestInterceptor_var _var_type; - static int _tao_class_id; // The static operations. static ServerRequestInterceptor_ptr _duplicate (ServerRequestInterceptor_ptr obj); @@ -1225,11 +1217,6 @@ TAO_NAMESPACE PortableInterceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - static ServerRequestInterceptor_ptr _unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); - static ServerRequestInterceptor_ptr _nil (void) { return (ServerRequestInterceptor_ptr)0; @@ -1297,9 +1284,12 @@ TAO_NAMESPACE PortableInterceptor )) = 0; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:210 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:185 - virtual void *_tao_QueryInterface (ptrdiff_t type); + 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); @@ -1321,10 +1311,10 @@ TAO_NAMESPACE PortableInterceptor TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerRequestInterceptor; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:576 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601 -#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__ODDS_N_ENDS_CH_) -#define _PORTABLEINTERCEPTOR_POLICYFACTORY__ODDS_N_ENDS_CH_ +#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__VAR_OUT_CH_) +#define _PORTABLEINTERCEPTOR_POLICYFACTORY__VAR_OUT_CH_ class PolicyFactory; typedef PolicyFactory *PolicyFactory_ptr; @@ -1340,7 +1330,7 @@ TAO_NAMESPACE PortableInterceptor PolicyFactory > PolicyFactory_out; - + #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -1355,7 +1345,6 @@ TAO_NAMESPACE PortableInterceptor public: typedef PolicyFactory_ptr _ptr_type; typedef PolicyFactory_var _var_type; - static int _tao_class_id; // The static operations. static PolicyFactory_ptr _duplicate (PolicyFactory_ptr obj); @@ -1365,11 +1354,6 @@ TAO_NAMESPACE PortableInterceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - static PolicyFactory_ptr _unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); - static PolicyFactory_ptr _nil (void) { return (PolicyFactory_ptr)0; @@ -1391,7 +1375,7 @@ TAO_NAMESPACE PortableInterceptor )) = 0; // Hand-crafted addition. - + virtual ::CORBA::Policy_ptr _create_policy ( CORBA::PolicyType type ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1402,9 +1386,12 @@ TAO_NAMESPACE PortableInterceptor )); // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:210 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:185 - virtual void *_tao_QueryInterface (ptrdiff_t type); + 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); @@ -1424,18 +1411,35 @@ TAO_NAMESPACE PortableInterceptor // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyFactory; + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601 - // The #if defined guard and the rest of the declarations and typedefs - // for IORInterceptor have been removed here so they will not conflict - // with the full definition in the TAO_IORInterceptor library. +#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_) +#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_ + class IORInterceptor; typedef IORInterceptor *IORInterceptor_ptr; + + typedef + TAO_Objref_Var_T< + IORInterceptor + > + IORInterceptor_var; + + typedef + TAO_Objref_Out_T< + IORInterceptor + > + IORInterceptor_out; +#endif /* end #if !defined */ + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:576 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601 -#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__ODDS_N_ENDS_CH_) -#define _PORTABLEINTERCEPTOR_ORBINITINFO__ODDS_N_ENDS_CH_ +#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__VAR_OUT_CH_) +#define _PORTABLEINTERCEPTOR_ORBINITINFO__VAR_OUT_CH_ class ORBInitInfo; typedef ORBInitInfo *ORBInitInfo_ptr; @@ -1451,7 +1455,7 @@ TAO_NAMESPACE PortableInterceptor ORBInitInfo > ORBInitInfo_out; - + #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -1466,7 +1470,6 @@ TAO_NAMESPACE PortableInterceptor public: typedef ORBInitInfo_ptr _ptr_type; typedef ORBInitInfo_var _var_type; - static int _tao_class_id; // The static operations. static ORBInitInfo_ptr _duplicate (ORBInitInfo_ptr obj); @@ -1476,11 +1479,6 @@ TAO_NAMESPACE PortableInterceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - static ORBInitInfo_ptr _unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); - static ORBInitInfo_ptr _nil (void) { return (ORBInitInfo_ptr)0; @@ -1489,7 +1487,7 @@ TAO_NAMESPACE PortableInterceptor static void _tao_any_destructor (void *); // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:377 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:367 typedef char * ObjectId; typedef CORBA::String_var ObjectId_var; @@ -1528,12 +1526,12 @@ TAO_NAMESPACE PortableInterceptor virtual void _tao_encode ( TAO_OutputCDR & - ACE_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL ) const; virtual void _tao_decode ( TAO_InputCDR & - ACE_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL ); // TAO_IDL - Generated from @@ -1583,12 +1581,12 @@ TAO_NAMESPACE PortableInterceptor virtual void _tao_encode ( TAO_OutputCDR & - ACE_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL ) const; virtual void _tao_decode ( TAO_InputCDR & - ACE_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL ); // TAO_IDL - Generated from @@ -1718,9 +1716,12 @@ TAO_NAMESPACE PortableInterceptor )) = 0; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:210 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:185 - virtual void *_tao_QueryInterface (ptrdiff_t type); + 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); @@ -1742,10 +1743,10 @@ TAO_NAMESPACE PortableInterceptor TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ORBInitInfo; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:576 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601 -#if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER__ODDS_N_ENDS_CH_) -#define _PORTABLEINTERCEPTOR_ORBINITIALIZER__ODDS_N_ENDS_CH_ +#if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER__VAR_OUT_CH_) +#define _PORTABLEINTERCEPTOR_ORBINITIALIZER__VAR_OUT_CH_ class ORBInitializer; typedef ORBInitializer *ORBInitializer_ptr; @@ -1761,7 +1762,7 @@ TAO_NAMESPACE PortableInterceptor ORBInitializer > ORBInitializer_out; - + #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -1776,7 +1777,6 @@ TAO_NAMESPACE PortableInterceptor public: typedef ORBInitializer_ptr _ptr_type; typedef ORBInitializer_var _var_type; - static int _tao_class_id; // The static operations. static ORBInitializer_ptr _duplicate (ORBInitializer_ptr obj); @@ -1786,11 +1786,6 @@ TAO_NAMESPACE PortableInterceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - static ORBInitializer_ptr _unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); - static ORBInitializer_ptr _nil (void) { return (ORBInitializer_ptr)0; @@ -1821,9 +1816,12 @@ TAO_NAMESPACE PortableInterceptor )) = 0; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:210 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:185 - virtual void *_tao_QueryInterface (ptrdiff_t type); + 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); @@ -1844,7 +1842,7 @@ TAO_NAMESPACE PortableInterceptor TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ORBInitializer; - /// Hand-crafted addition. + /// Hand-crafted addition. /// Register an ORBInitializer with the global ORBInitializer /// table. TAO_NAMESPACE_STORAGE_CLASS void register_orb_initializer ( @@ -1853,10 +1851,38 @@ TAO_NAMESPACE PortableInterceptor ); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:66 -} -TAO_NAMESPACE_CLOSE // module PortableInterceptor +} // module PortableInterceptor + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:48 + +// Traits specializations. +namespace TAO +{ + +#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_) +#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_ + + ACE_TEMPLATE_SPECIALIZATION + struct TAO_Export Objref_Traits<PortableInterceptor::IORInterceptor> + { + static PortableInterceptor::IORInterceptor_ptr tao_duplicate ( + PortableInterceptor::IORInterceptor_ptr + ); + static void tao_release ( + PortableInterceptor::IORInterceptor_ptr + ); + static PortableInterceptor::IORInterceptor_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( + PortableInterceptor::IORInterceptor_ptr p, + TAO_OutputCDR & cdr + ); + }; + +#endif /* end #if !defined */ +}; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52 @@ -1997,7 +2023,7 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::IORIn #endif /* __ACE_INLINE__ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1048 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "PortableInterceptorC.i" diff --git a/TAO/tao/PortableInterceptorC.i b/TAO/tao/PortableInterceptorC.i index afc8d7ec95b..9ee733bc43d 100644 --- a/TAO/tao/PortableInterceptorC.i +++ b/TAO/tao/PortableInterceptorC.i @@ -32,33 +32,6 @@ #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR___CI_) #define _PORTABLEINTERCEPTOR_INTERCEPTOR___CI_ -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<PortableInterceptor::Interceptor>::to_object ( - CORBA::Object_ptr &_tao_elem - ) const -{ - _tao_elem = CORBA::Object::_duplicate (this->value_); - return 1; -} - -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<PortableInterceptor::Interceptor>::marshal_value (TAO_OutputCDR &) -{ - return 0; -} - -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<PortableInterceptor::Interceptor>::demarshal_value (TAO_InputCDR &) -{ - return 0; -} - #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -67,33 +40,6 @@ TAO::Any_Impl_T<PortableInterceptor::Interceptor>::demarshal_value (TAO_InputCDR #if !defined (_PORTABLEINTERCEPTOR_CURRENT___CI_) #define _PORTABLEINTERCEPTOR_CURRENT___CI_ -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<PortableInterceptor::Current>::to_object ( - CORBA::Object_ptr &_tao_elem - ) const -{ - _tao_elem = CORBA::Object::_duplicate (this->value_); - return 1; -} - -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<PortableInterceptor::Current>::marshal_value (TAO_OutputCDR &) -{ - return 0; -} - -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<PortableInterceptor::Current>::demarshal_value (TAO_InputCDR &) -{ - return 0; -} - #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -102,33 +48,6 @@ TAO::Any_Impl_T<PortableInterceptor::Current>::demarshal_value (TAO_InputCDR &) #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO___CI_) #define _PORTABLEINTERCEPTOR_REQUESTINFO___CI_ -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<PortableInterceptor::RequestInfo>::to_object ( - CORBA::Object_ptr &_tao_elem - ) const -{ - _tao_elem = CORBA::Object::_duplicate (this->value_); - return 1; -} - -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<PortableInterceptor::RequestInfo>::marshal_value (TAO_OutputCDR &) -{ - return 0; -} - -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<PortableInterceptor::RequestInfo>::demarshal_value (TAO_InputCDR &) -{ - return 0; -} - #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -137,33 +56,6 @@ TAO::Any_Impl_T<PortableInterceptor::RequestInfo>::demarshal_value (TAO_InputCDR #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___CI_) #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___CI_ -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>::to_object ( - CORBA::Object_ptr &_tao_elem - ) const -{ - _tao_elem = CORBA::Object::_duplicate (this->value_); - return 1; -} - -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>::marshal_value (TAO_OutputCDR &) -{ - return 0; -} - -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>::demarshal_value (TAO_InputCDR &) -{ - return 0; -} - #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -172,33 +64,6 @@ TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>::demarshal_value (TAO_In #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO___CI_) #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO___CI_ -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::to_object ( - CORBA::Object_ptr &_tao_elem - ) const -{ - _tao_elem = CORBA::Object::_duplicate (this->value_); - return 1; -} - -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::marshal_value (TAO_OutputCDR &) -{ - return 0; -} - -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::demarshal_value (TAO_InputCDR &) -{ - return 0; -} - #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -207,33 +72,6 @@ TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::demarshal_value (TAO_In #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___CI_) #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___CI_ -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::to_object ( - CORBA::Object_ptr &_tao_elem - ) const -{ - _tao_elem = CORBA::Object::_duplicate (this->value_); - return 1; -} - -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::marshal_value (TAO_OutputCDR &) -{ - return 0; -} - -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::demarshal_value (TAO_InputCDR &) -{ - return 0; -} - #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -242,33 +80,6 @@ TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::demarshal_value #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___CI_) #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___CI_ -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::to_object ( - CORBA::Object_ptr &_tao_elem - ) const -{ - _tao_elem = CORBA::Object::_duplicate (this->value_); - return 1; -} - -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::marshal_value (TAO_OutputCDR &) -{ - return 0; -} - -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::demarshal_value (TAO_InputCDR &) -{ - return 0; -} - #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -277,33 +88,6 @@ TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::demarshal_value #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY___CI_) #define _PORTABLEINTERCEPTOR_POLICYFACTORY___CI_ -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::to_object ( - CORBA::Object_ptr &_tao_elem - ) const -{ - _tao_elem = CORBA::Object::_duplicate (this->value_); - return 1; -} - -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::marshal_value (TAO_OutputCDR &) -{ - return 0; -} - -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::demarshal_value (TAO_InputCDR &) -{ - return 0; -} - #endif /* end #if !defined */ template<> @@ -344,33 +128,6 @@ TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::InvalidName>::demarshal_v #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO___CI_) #define _PORTABLEINTERCEPTOR_ORBINITINFO___CI_ -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>::to_object ( - CORBA::Object_ptr &_tao_elem - ) const -{ - _tao_elem = CORBA::Object::_duplicate (this->value_); - return 1; -} - -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>::marshal_value (TAO_OutputCDR &) -{ - return 0; -} - -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>::demarshal_value (TAO_InputCDR &) -{ - return 0; -} - #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -379,33 +136,6 @@ TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>::demarshal_value (TAO_InputCDR #if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER___CI_) #define _PORTABLEINTERCEPTOR_ORBINITIALIZER___CI_ -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>::to_object ( - CORBA::Object_ptr &_tao_elem - ) const -{ - _tao_elem = CORBA::Object::_duplicate (this->value_); - return 1; -} - -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>::marshal_value (TAO_OutputCDR &) -{ - return 0; -} - -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>::demarshal_value (TAO_InputCDR &) -{ - return 0; -} - #endif /* end #if !defined */ // TAO_IDL - Generated from diff --git a/TAO/tao/Services.pidl b/TAO/tao/Services.pidl index 27a09a565b4..318c9a1286e 100644 --- a/TAO/tao/Services.pidl +++ b/TAO/tao/Services.pidl @@ -8,7 +8,7 @@ // The command used to generate code is: // // tao_idl -// -o orig -Gp -Gd -Ge 1 +// -o orig -Ge 1 -GT // -Wb,export_macro=TAO_Export // -Wb,export_include="tao/corbafwd.h" // -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/ServicesC.cpp b/TAO/tao/ServicesC.cpp index 27b4aded612..dfb2524d3f9 100644 --- a/TAO/tao/ServicesC.cpp +++ b/TAO/tao/ServicesC.cpp @@ -15,12 +15,18 @@ // 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 -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:301 #include "ServicesC.h" @@ -37,24 +43,32 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:59 + +// Arg traits specializations. +namespace TAO +{ +}; + +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_CORBA_ServiceType[] = { TAO_ENCAP_BYTE_ORDER, // byte order 34, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f5365), - ACE_NTOHL (0x72766963), - ACE_NTOHL (0x65547970), - ACE_NTOHL (0x653a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f5365), + ACE_NTOHL (0x72766963), + ACE_NTOHL (0x65547970), + ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CORBA/ServiceType:1.0 12, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x69636554), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x69636554), ACE_NTOHL (0x79706500), // name = ServiceType CORBA::tk_ushort, @@ -68,14 +82,11 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceType ( sizeof (CORBA::ServiceType) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_ServiceType, - &_tc_TAO_tc_CORBA_ServiceType - ) -TAO_NAMESPACE_END +namespace CORBA +{ + ::CORBA::TypeCode_ptr _tc_ServiceType = + &_tc_TAO_tc_CORBA_ServiceType; +} // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -84,19 +95,19 @@ static const CORBA::Long _oc_CORBA_ServiceOption[] = { TAO_ENCAP_BYTE_ORDER, // byte order 36, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f5365), - ACE_NTOHL (0x72766963), - ACE_NTOHL (0x654f7074), - ACE_NTOHL (0x696f6e3a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f5365), + ACE_NTOHL (0x72766963), + ACE_NTOHL (0x654f7074), + ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/ServiceOption:1.0 14, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x6963654f), - ACE_NTOHL (0x7074696f), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x6963654f), + ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e000000), // name = ServiceOption CORBA::tk_ulong, @@ -110,14 +121,11 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceOption ( sizeof (CORBA::ServiceOption) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_ServiceOption, - &_tc_TAO_tc_CORBA_ServiceOption - ) -TAO_NAMESPACE_END +namespace CORBA +{ + ::CORBA::TypeCode_ptr _tc_ServiceOption = + &_tc_TAO_tc_CORBA_ServiceOption; +} // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -126,21 +134,21 @@ static const CORBA::Long _oc_CORBA_ServiceDetailType[] = { TAO_ENCAP_BYTE_ORDER, // byte order 40, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f5365), - ACE_NTOHL (0x72766963), - ACE_NTOHL (0x65446574), - ACE_NTOHL (0x61696c54), - ACE_NTOHL (0x7970653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f5365), + ACE_NTOHL (0x72766963), + ACE_NTOHL (0x65446574), + ACE_NTOHL (0x61696c54), + ACE_NTOHL (0x7970653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0 18, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x69636544), - ACE_NTOHL (0x65746169), - ACE_NTOHL (0x6c547970), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x69636544), + ACE_NTOHL (0x65746169), + ACE_NTOHL (0x6c547970), ACE_NTOHL (0x65000000), // name = ServiceDetailType CORBA::tk_ulong, @@ -154,14 +162,11 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceDetailType ( sizeof (CORBA::ServiceDetailType) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_ServiceDetailType, - &_tc_TAO_tc_CORBA_ServiceDetailType - ) -TAO_NAMESPACE_END +namespace CORBA +{ + ::CORBA::TypeCode_ptr _tc_ServiceDetailType = + &_tc_TAO_tc_CORBA_ServiceDetailType; +} // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -170,70 +175,70 @@ static const CORBA::Long _oc_CORBA_ServiceDetail[] = { TAO_ENCAP_BYTE_ORDER, // byte order 36, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f5365), - ACE_NTOHL (0x72766963), - ACE_NTOHL (0x65446574), - ACE_NTOHL (0x61696c3a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f5365), + ACE_NTOHL (0x72766963), + ACE_NTOHL (0x65446574), + ACE_NTOHL (0x61696c3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/ServiceDetail:1.0 14, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x69636544), - ACE_NTOHL (0x65746169), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x69636544), + ACE_NTOHL (0x65746169), ACE_NTOHL (0x6c000000), // name = ServiceDetail 2, // member count 20, - ACE_NTOHL (0x73657276), - ACE_NTOHL (0x6963655f), - ACE_NTOHL (0x64657461), - ACE_NTOHL (0x696c5f74), + ACE_NTOHL (0x73657276), + ACE_NTOHL (0x6963655f), + ACE_NTOHL (0x64657461), + ACE_NTOHL (0x696c5f74), ACE_NTOHL (0x79706500), // name = service_detail_type CORBA::tk_alias, // typecode kind for typedefs 76, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 40, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f5365), - ACE_NTOHL (0x72766963), - ACE_NTOHL (0x65446574), - ACE_NTOHL (0x61696c54), - ACE_NTOHL (0x7970653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f5365), + ACE_NTOHL (0x72766963), + ACE_NTOHL (0x65446574), + ACE_NTOHL (0x61696c54), + ACE_NTOHL (0x7970653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0 18, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x69636544), - ACE_NTOHL (0x65746169), - ACE_NTOHL (0x6c547970), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x69636544), + ACE_NTOHL (0x65746169), + ACE_NTOHL (0x6c547970), ACE_NTOHL (0x65000000), // name = ServiceDetailType CORBA::tk_ulong, 15, - ACE_NTOHL (0x73657276), - ACE_NTOHL (0x6963655f), - ACE_NTOHL (0x64657461), + ACE_NTOHL (0x73657276), + ACE_NTOHL (0x6963655f), + ACE_NTOHL (0x64657461), ACE_NTOHL (0x696c0000), // name = service_detail CORBA::tk_alias, // typecode kind for typedefs 76, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 31, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f4f63), - ACE_NTOHL (0x74657453), - ACE_NTOHL (0x65713a31), + 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 (0x4f637465), + ACE_NTOHL (0x74536571), ACE_NTOHL (0x0), // name = OctetSeq CORBA::tk_sequence, // typecode kind 12, // encapsulation length @@ -253,90 +258,54 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceDetail ( sizeof (CORBA::ServiceDetail) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_ServiceDetail, - &_tc_TAO_tc_CORBA_ServiceDetail - ) -TAO_NAMESPACE_END +namespace CORBA +{ + ::CORBA::TypeCode_ptr _tc_ServiceDetail = + &_tc_TAO_tc_CORBA_ServiceDetail; +} -// TAO_IDL - Generated from +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 -void CORBA::ServiceDetail::_tao_any_destructor (void *_tao_void_pointer) +void +CORBA::ServiceDetail::_tao_any_destructor ( + void *_tao_void_pointer + ) { - ServiceDetail *tmp = ACE_static_cast (ServiceDetail*, _tao_void_pointer); - delete tmp; + ServiceDetail *_tao_tmp_pointer = + ACE_static_cast (ServiceDetail *, _tao_void_pointer); + delete _tao_tmp_pointer; } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274 - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class - TAO_Var_Var_T< - CORBA::ServiceDetail - >; - -template class TAO_Unbounded_Sequence<CORBA::ServiceDetail>; - -template class - TAO_Out_T< - CORBA::ServiceDetail, - CORBA::ServiceDetail_var - >; - -template class TAO_Var_Base_T<CORBA::ServiceDetail>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO_Var_Var_T< \ - CORBA::ServiceDetail \ - > -#pragma instantiate TAO_Unbounded_Sequence<CORBA::ServiceDetail> -#pragms instantiate TAO_Var_Base_T<CORBA::ServiceDetail> -# pragma instantiate \ - TAO_Out_T< \ - CORBA::ServiceDetail, \ - CORBA::ServiceDetail_var \ - > - - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_CORBA_ServiceInformation[] = { TAO_ENCAP_BYTE_ORDER, // byte order 41, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f5365), - ACE_NTOHL (0x72766963), - ACE_NTOHL (0x65496e66), - ACE_NTOHL (0x6f726d61), - ACE_NTOHL (0x74696f6e), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f5365), + ACE_NTOHL (0x72766963), + ACE_NTOHL (0x65496e66), + ACE_NTOHL (0x6f726d61), + ACE_NTOHL (0x74696f6e), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/ServiceInformation:1.0 19, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x69636549), - ACE_NTOHL (0x6e666f72), - ACE_NTOHL (0x6d617469), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x69636549), + ACE_NTOHL (0x6e666f72), + ACE_NTOHL (0x6d617469), ACE_NTOHL (0x6f6e0000), // name = ServiceInformation 2, // member count 16, - ACE_NTOHL (0x73657276), - ACE_NTOHL (0x6963655f), - ACE_NTOHL (0x6f707469), + ACE_NTOHL (0x73657276), + ACE_NTOHL (0x6963655f), + ACE_NTOHL (0x6f707469), ACE_NTOHL (0x6f6e7300), // name = service_options CORBA::tk_sequence, // typecode kind 84, // encapsulation length @@ -345,19 +314,19 @@ static const CORBA::Long _oc_CORBA_ServiceInformation[] = 68, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 36, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f5365), - ACE_NTOHL (0x72766963), - ACE_NTOHL (0x654f7074), - ACE_NTOHL (0x696f6e3a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f5365), + ACE_NTOHL (0x72766963), + ACE_NTOHL (0x654f7074), + ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/ServiceOption:1.0 14, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x6963654f), - ACE_NTOHL (0x7074696f), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x6963654f), + ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e000000), // name = ServiceOption CORBA::tk_ulong, @@ -365,9 +334,9 @@ static const CORBA::Long _oc_CORBA_ServiceInformation[] = 0U, 16, - ACE_NTOHL (0x73657276), - ACE_NTOHL (0x6963655f), - ACE_NTOHL (0x64657461), + ACE_NTOHL (0x73657276), + ACE_NTOHL (0x6963655f), + ACE_NTOHL (0x64657461), ACE_NTOHL (0x696c7300), // name = service_details CORBA::tk_sequence, // typecode kind 296, // encapsulation length @@ -376,70 +345,70 @@ static const CORBA::Long _oc_CORBA_ServiceInformation[] = 280, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 36, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f5365), - ACE_NTOHL (0x72766963), - ACE_NTOHL (0x65446574), - ACE_NTOHL (0x61696c3a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f5365), + ACE_NTOHL (0x72766963), + ACE_NTOHL (0x65446574), + ACE_NTOHL (0x61696c3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/ServiceDetail:1.0 14, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x69636544), - ACE_NTOHL (0x65746169), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x69636544), + ACE_NTOHL (0x65746169), ACE_NTOHL (0x6c000000), // name = ServiceDetail 2, // member count 20, - ACE_NTOHL (0x73657276), - ACE_NTOHL (0x6963655f), - ACE_NTOHL (0x64657461), - ACE_NTOHL (0x696c5f74), + ACE_NTOHL (0x73657276), + ACE_NTOHL (0x6963655f), + ACE_NTOHL (0x64657461), + ACE_NTOHL (0x696c5f74), ACE_NTOHL (0x79706500), // name = service_detail_type CORBA::tk_alias, // typecode kind for typedefs 76, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 40, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f5365), - ACE_NTOHL (0x72766963), - ACE_NTOHL (0x65446574), - ACE_NTOHL (0x61696c54), - ACE_NTOHL (0x7970653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f5365), + ACE_NTOHL (0x72766963), + ACE_NTOHL (0x65446574), + ACE_NTOHL (0x61696c54), + ACE_NTOHL (0x7970653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0 18, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x69636544), - ACE_NTOHL (0x65746169), - ACE_NTOHL (0x6c547970), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x69636544), + ACE_NTOHL (0x65746169), + ACE_NTOHL (0x6c547970), ACE_NTOHL (0x65000000), // name = ServiceDetailType CORBA::tk_ulong, 15, - ACE_NTOHL (0x73657276), - ACE_NTOHL (0x6963655f), - ACE_NTOHL (0x64657461), + ACE_NTOHL (0x73657276), + ACE_NTOHL (0x6963655f), + ACE_NTOHL (0x64657461), ACE_NTOHL (0x696c0000), // name = service_detail CORBA::tk_alias, // typecode kind for typedefs 76, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 31, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f4f63), - ACE_NTOHL (0x74657453), - ACE_NTOHL (0x65713a31), + 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 (0x4f637465), + ACE_NTOHL (0x74536571), ACE_NTOHL (0x0), // name = OctetSeq CORBA::tk_sequence, // typecode kind 12, // encapsulation length @@ -462,41 +431,47 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceInformation ( sizeof (CORBA::ServiceInformation) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_ServiceInformation, - &_tc_TAO_tc_CORBA_ServiceInformation - ) -TAO_NAMESPACE_END +namespace CORBA +{ + ::CORBA::TypeCode_ptr _tc_ServiceInformation = + &_tc_TAO_tc_CORBA_ServiceInformation; +} -// TAO_IDL - Generated from +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 -void CORBA::ServiceInformation::_tao_any_destructor (void *_tao_void_pointer) +void +CORBA::ServiceInformation::_tao_any_destructor ( + void *_tao_void_pointer + ) { - ServiceInformation *tmp = ACE_static_cast (ServiceInformation*, _tao_void_pointer); - delete tmp; + ServiceInformation *_tao_tmp_pointer = + ACE_static_cast (ServiceInformation *, _tao_void_pointer); + delete _tao_tmp_pointer; } -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50 +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:66 + +#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_CORBA_SERVICEOPTION__CS_) +#define _CORBA_SERVICEINFORMATION__TAO_SEQ_CORBA_SERVICEOPTION__CS_ -CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_seq_ServiceOption (void) +CORBA::ServiceInformation::_tao_seq_CORBA_ServiceOption_::_tao_seq_CORBA_ServiceOption_ (void) {} -CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_seq_ServiceOption (CORBA::ULong max) +CORBA::ServiceInformation::_tao_seq_CORBA_ServiceOption_::_tao_seq_CORBA_ServiceOption_ ( + CORBA::ULong max + ) : TAO_Unbounded_Sequence< CORBA::ServiceOption > (max) {} -CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_seq_ServiceOption ( +CORBA::ServiceInformation::_tao_seq_CORBA_ServiceOption_::_tao_seq_CORBA_ServiceOption_ ( CORBA::ULong max, CORBA::ULong length, - CORBA::ULong* buffer, + CORBA::ULong * buffer, CORBA::Boolean release ) : TAO_Unbounded_Sequence< @@ -505,39 +480,51 @@ CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_seq_ServiceOption ( (max, length, buffer, release) {} -CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_seq_ServiceOption (const _tao_seq_ServiceOption &seq) +CORBA::ServiceInformation::_tao_seq_CORBA_ServiceOption_::_tao_seq_CORBA_ServiceOption_ ( + const _tao_seq_CORBA_ServiceOption_ &seq + ) : TAO_Unbounded_Sequence< CORBA::ServiceOption > (seq) {} -CORBA::ServiceInformation::_tao_seq_ServiceOption::~_tao_seq_ServiceOption (void) +CORBA::ServiceInformation::_tao_seq_CORBA_ServiceOption_::~_tao_seq_CORBA_ServiceOption_ (void) {} -void CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_any_destructor (void *_tao_void_pointer) +void CORBA::ServiceInformation::_tao_seq_CORBA_ServiceOption_::_tao_any_destructor ( + void * _tao_void_pointer + ) { - _tao_seq_ServiceOption *tmp = ACE_static_cast (_tao_seq_ServiceOption*, _tao_void_pointer); - delete tmp; + _tao_seq_CORBA_ServiceOption_ * _tao_tmp_pointer = + ACE_static_cast (_tao_seq_CORBA_ServiceOption_ *, _tao_void_pointer); + delete _tao_tmp_pointer; } -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50 +#endif /* end #if !defined */ + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:66 -CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_seq_ServiceDetail (void) +#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_CORBA_SERVICEDETAIL__CS_) +#define _CORBA_SERVICEINFORMATION__TAO_SEQ_CORBA_SERVICEDETAIL__CS_ + +CORBA::ServiceInformation::_tao_seq_CORBA_ServiceDetail_::_tao_seq_CORBA_ServiceDetail_ (void) {} -CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_seq_ServiceDetail (CORBA::ULong max) +CORBA::ServiceInformation::_tao_seq_CORBA_ServiceDetail_::_tao_seq_CORBA_ServiceDetail_ ( + CORBA::ULong max + ) : TAO_Unbounded_Sequence< CORBA::ServiceDetail > (max) {} -CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_seq_ServiceDetail ( +CORBA::ServiceInformation::_tao_seq_CORBA_ServiceDetail_::_tao_seq_CORBA_ServiceDetail_ ( CORBA::ULong max, CORBA::ULong length, - CORBA::ServiceDetail* buffer, + CORBA::ServiceDetail * buffer, CORBA::Boolean release ) : TAO_Unbounded_Sequence< @@ -546,56 +533,30 @@ CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_seq_ServiceDetail ( (max, length, buffer, release) {} -CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_seq_ServiceDetail (const _tao_seq_ServiceDetail &seq) +CORBA::ServiceInformation::_tao_seq_CORBA_ServiceDetail_::_tao_seq_CORBA_ServiceDetail_ ( + const _tao_seq_CORBA_ServiceDetail_ &seq + ) : TAO_Unbounded_Sequence< CORBA::ServiceDetail > (seq) {} -CORBA::ServiceInformation::_tao_seq_ServiceDetail::~_tao_seq_ServiceDetail (void) +CORBA::ServiceInformation::_tao_seq_CORBA_ServiceDetail_::~_tao_seq_CORBA_ServiceDetail_ (void) {} -void CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_any_destructor (void *_tao_void_pointer) +void CORBA::ServiceInformation::_tao_seq_CORBA_ServiceDetail_::_tao_any_destructor ( + void * _tao_void_pointer + ) { - _tao_seq_ServiceDetail *tmp = ACE_static_cast (_tao_seq_ServiceDetail*, _tao_void_pointer); - delete tmp; + _tao_seq_CORBA_ServiceDetail_ * _tao_tmp_pointer = + ACE_static_cast (_tao_seq_CORBA_ServiceDetail_ *, _tao_void_pointer); + delete _tao_tmp_pointer; } -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274 - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class - TAO_Var_Var_T< - CORBA::ServiceInformation - >; - -template class TAO_Var_Base_T<CORBA::ServiceInformation>; - -template class - TAO_Out_T< - CORBA::ServiceInformation, - CORBA::ServiceInformation_var - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +#endif /* end #if !defined */ -# pragma instantiate \ - TAO_Var_Var_T< \ - CORBA::ServiceInformation \ - > -#pragma instantiate TAO_Var_Base_T<CORBA::ServiceInformation> -# pragma instantiate \ - TAO_Out_T< \ - CORBA::ServiceInformation, \ - CORBA::ServiceInformation_var \ - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -// TAO_IDL - Generated from +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -653,14 +614,7 @@ CORBA::Boolean operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<CORBA::ServiceDetail>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ServiceDetail> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -// TAO_IDL - Generated from +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -718,42 +672,35 @@ CORBA::Boolean operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<CORBA::ServiceInformation>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ServiceInformation> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:95 -#if !defined _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceOption_CPP_ -#define _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceOption_CPP_ +#if !defined _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceOption__CPP_ +#define _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceOption__CPP_ CORBA::Boolean operator<< ( TAO_OutputCDR &strm, - const CORBA::ServiceInformation::_tao_seq_ServiceOption &_tao_sequence + const CORBA::ServiceInformation::_tao_seq_CORBA_ServiceOption_ &_tao_sequence ) { CORBA::ULong _tao_seq_len = _tao_sequence.length (); - + if (strm << _tao_seq_len) { // Encode all elements. return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); } - + return 0; } CORBA::Boolean operator>> ( TAO_InputCDR &strm, - CORBA::ServiceInformation::_tao_seq_ServiceOption &_tao_sequence + CORBA::ServiceInformation::_tao_seq_CORBA_ServiceOption_ &_tao_sequence ) { CORBA::ULong _tao_seq_len; - + if (strm >> _tao_seq_len) { // Add a check to the length of the sequence @@ -763,61 +710,62 @@ CORBA::Boolean operator>> ( { 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) + if (0 >= _tao_seq_len) { return 1; } - + // Retrieve all the elements. return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); + } - + return 0; } -#endif /* _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceOption_CPP_ */ +#endif /* _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceOption__CPP_ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:95 -#if !defined _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceDetail_CPP_ -#define _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceDetail_CPP_ +#if !defined _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceDetail__CPP_ +#define _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceDetail__CPP_ CORBA::Boolean operator<< ( TAO_OutputCDR &strm, - const CORBA::ServiceInformation::_tao_seq_ServiceDetail &_tao_sequence + const CORBA::ServiceInformation::_tao_seq_CORBA_ServiceDetail_ &_tao_sequence ) { CORBA::ULong _tao_seq_len = _tao_sequence.length (); - + if (strm << _tao_seq_len) { // Encode all elements. CORBA::Boolean _tao_marshal_flag = 1; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = (strm << _tao_sequence[i]); } - + return _tao_marshal_flag; } - + return 0; } CORBA::Boolean operator>> ( TAO_InputCDR &strm, - CORBA::ServiceInformation::_tao_seq_ServiceDetail &_tao_sequence + CORBA::ServiceInformation::_tao_seq_CORBA_ServiceDetail_ &_tao_sequence ) { CORBA::ULong _tao_seq_len; - + if (strm >> _tao_seq_len) { // Add a check to the length of the sequence @@ -827,28 +775,183 @@ CORBA::Boolean operator>> ( { 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) + if (0 >= _tao_seq_len) { return 1; } - + // Retrieve all the elements. CORBA::Boolean _tao_marshal_flag = 1; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = (strm >> _tao_sequence[i]); } - + return _tao_marshal_flag; + } - + return 0; } -#endif /* _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceDetail_CPP_ */ +#endif /* _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceDetail__CPP_ */ + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1703 + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + + template class + TAO_Var_Var_T< + CORBA::ServiceDetail + >; + + template class + TAO_Var_Base_T< + CORBA::ServiceDetail + >; + + template class + TAO_Out_T< + CORBA::ServiceDetail, + CORBA::ServiceDetail_var + >; + + template class + TAO::Any_Dual_Impl_T< + CORBA::ServiceDetail + >; + +#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_CORBA_SERVICEOPTION__CS_) +#define _CORBA_SERVICEINFORMATION__TAO_SEQ_CORBA_SERVICEOPTION__CS_ + + template class + TAO_Unbounded_Sequence< + CORBA::ServiceOption + >; + +#endif /* end #if !defined */ + + template class + TAO::Any_Dual_Impl_T< + CORBA::ServiceInformation::_tao_seq_CORBA_ServiceOption_ + >; + +#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_CORBA_SERVICEDETAIL__CS_) +#define _CORBA_SERVICEINFORMATION__TAO_SEQ_CORBA_SERVICEDETAIL__CS_ + + template class + TAO_Unbounded_Sequence< + CORBA::ServiceDetail + >; + +#endif /* end #if !defined */ + + template class + TAO::Any_Dual_Impl_T< + CORBA::ServiceInformation::_tao_seq_CORBA_ServiceDetail_ + >; + + template class + TAO_Var_Var_T< + CORBA::ServiceInformation + >; + + template class + TAO_Var_Base_T< + CORBA::ServiceInformation + >; + + template class + TAO_Out_T< + CORBA::ServiceInformation, + CORBA::ServiceInformation_var + >; + + template class + TAO::Any_Dual_Impl_T< + CORBA::ServiceInformation + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# pragma instantiate \ + TAO_Var_Var_T< \ + CORBA::ServiceDetail \ + > + +# pragma instantiate \ + TAO_Var_Base_T< \ + CORBA::ServiceDetail \ + > + +# pragma instantiate \ + TAO_Out_T< \ + CORBA::ServiceDetail, \ + CORBA::ServiceDetail_var \ + > + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + CORBA::ServiceDetail \ + > + +#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_CORBA_SERVICEOPTION__CS_) +#define _CORBA_SERVICEINFORMATION__TAO_SEQ_CORBA_SERVICEOPTION__CS_ + +# pragma instantiate \ + TAO_Unbounded_Sequence< \ + CORBA::ServiceOption \ + > + +#endif /* end #if !defined */ + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + CORBA::ServiceInformation::_tao_seq_CORBA_ServiceOption_ \ + > + +#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_CORBA_SERVICEDETAIL__CS_) +#define _CORBA_SERVICEINFORMATION__TAO_SEQ_CORBA_SERVICEDETAIL__CS_ + +# pragma instantiate \ + TAO_Unbounded_Sequence< \ + CORBA::ServiceDetail \ + > + +#endif /* end #if !defined */ + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + CORBA::ServiceInformation::_tao_seq_CORBA_ServiceDetail_ \ + > + +# pragma instantiate \ + TAO_Var_Var_T< \ + CORBA::ServiceInformation \ + > + +# pragma instantiate \ + TAO_Var_Base_T< \ + CORBA::ServiceInformation \ + > + +# pragma instantiate \ + TAO_Out_T< \ + CORBA::ServiceInformation, \ + CORBA::ServiceInformation_var \ + > + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + CORBA::ServiceInformation \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/ServicesC.h b/TAO/tao/ServicesC.h index ac19eb51d77..58ca225460c 100644 --- a/TAO/tao/ServicesC.h +++ b/TAO/tao/ServicesC.h @@ -15,6 +15,12 @@ // 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 @@ -26,13 +32,14 @@ #define _TAO_IDL_ORIG_SERVICESC_H_ #include /**/ "ace/pre.h" + #include "tao/OctetSeqC.h" -#include "tao/CDR.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/CDR.h" #include "tao/VarOut_T.h" #if defined (TAO_EXPORT_MACRO) @@ -61,7 +68,7 @@ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48 -TAO_NAMESPACE CORBA +namespace CORBA { // TAO_IDL - Generated from @@ -103,7 +110,7 @@ TAO_NAMESPACE CORBA const CORBA::ServiceType Security = 1U; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:258 struct ServiceDetail; @@ -138,7 +145,7 @@ TAO_NAMESPACE CORBA TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceDetail; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:258 struct ServiceInformation; @@ -166,69 +173,79 @@ TAO_NAMESPACE CORBA // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101 + +#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_CORBA_SERVICEOPTION__CH_) +#define _CORBA_SERVICEINFORMATION__TAO_SEQ_CORBA_SERVICEOPTION__CH_ - class TAO_Export _tao_seq_ServiceOption + class TAO_Export _tao_seq_CORBA_ServiceOption_ : public TAO_Unbounded_Sequence< - CORBA::ServiceOption + ACE_NESTED_CLASS (CORBA, ServiceOption) > { public: - _tao_seq_ServiceOption (void); - _tao_seq_ServiceOption (CORBA::ULong max); - _tao_seq_ServiceOption ( + _tao_seq_CORBA_ServiceOption_ (void); + _tao_seq_CORBA_ServiceOption_ (CORBA::ULong max); + _tao_seq_CORBA_ServiceOption_ ( CORBA::ULong max, CORBA::ULong length, CORBA::ULong* buffer, CORBA::Boolean release = 0 ); - _tao_seq_ServiceOption (const _tao_seq_ServiceOption &); - ~_tao_seq_ServiceOption (void); + _tao_seq_CORBA_ServiceOption_ (const _tao_seq_CORBA_ServiceOption_ &); + ~_tao_seq_CORBA_ServiceOption_ (void); static void _tao_any_destructor (void *); }; + +#endif /* end #if !defined */ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_field/field_ch.cpp:447 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_field/field_ch.cpp:453 - typedef _tao_seq_ServiceOption _service_options_seq; - _tao_seq_ServiceOption service_options; + typedef _tao_seq_CORBA_ServiceOption_ _service_options_seq; + _tao_seq_CORBA_ServiceOption_ service_options; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101 + +#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_CORBA_SERVICEDETAIL__CH_) +#define _CORBA_SERVICEINFORMATION__TAO_SEQ_CORBA_SERVICEDETAIL__CH_ - class TAO_Export _tao_seq_ServiceDetail + class TAO_Export _tao_seq_CORBA_ServiceDetail_ : public TAO_Unbounded_Sequence< - CORBA::ServiceDetail + ACE_NESTED_CLASS (CORBA, ServiceDetail) > { public: - _tao_seq_ServiceDetail (void); - _tao_seq_ServiceDetail (CORBA::ULong max); - _tao_seq_ServiceDetail ( + _tao_seq_CORBA_ServiceDetail_ (void); + _tao_seq_CORBA_ServiceDetail_ (CORBA::ULong max); + _tao_seq_CORBA_ServiceDetail_ ( CORBA::ULong max, CORBA::ULong length, ACE_NESTED_CLASS (CORBA, ServiceDetail)* buffer, CORBA::Boolean release = 0 ); - _tao_seq_ServiceDetail (const _tao_seq_ServiceDetail &); - ~_tao_seq_ServiceDetail (void); + _tao_seq_CORBA_ServiceDetail_ (const _tao_seq_CORBA_ServiceDetail_ &); + ~_tao_seq_CORBA_ServiceDetail_ (void); static void _tao_any_destructor (void *); }; + +#endif /* end #if !defined */ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_field/field_ch.cpp:447 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_field/field_ch.cpp:453 - typedef _tao_seq_ServiceDetail _service_details_seq; - _tao_seq_ServiceDetail service_details; + typedef _tao_seq_CORBA_ServiceDetail_ _service_details_seq; + _tao_seq_CORBA_ServiceDetail_ service_details; }; // TAO_IDL - Generated from @@ -237,10 +254,17 @@ TAO_NAMESPACE CORBA TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceInformation; // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67 +// W:\ACE_wrappers\TAO\TAO_IDL\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 -} -TAO_NAMESPACE_CLOSE // module CORBA +// Traits specializations. +namespace TAO +{ +}; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52 @@ -264,50 +288,50 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ServiceI #ifndef __ACE_INLINE__ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:53 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ServiceDetail &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ServiceDetail &); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:53 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ServiceInformation &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ServiceInformation &); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:70 -#if !defined _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceOption_H_ -#define _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceOption_H_ +#if !defined _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceOption__H_ +#define _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceOption__H_ TAO_Export CORBA::Boolean operator<< ( TAO_OutputCDR &, - const CORBA::ServiceInformation::_tao_seq_ServiceOption & + const CORBA::ServiceInformation::_tao_seq_CORBA_ServiceOption_ & ); TAO_Export CORBA::Boolean operator>> ( TAO_InputCDR &, - CORBA::ServiceInformation::_tao_seq_ServiceOption & + CORBA::ServiceInformation::_tao_seq_CORBA_ServiceOption_ & ); -#endif /* _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceOption_H_ */ +#endif /* _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceOption__H_ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:70 -#if !defined _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceDetail_H_ -#define _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceDetail_H_ +#if !defined _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceDetail__H_ +#define _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceDetail__H_ TAO_Export CORBA::Boolean operator<< ( TAO_OutputCDR &, - const CORBA::ServiceInformation::_tao_seq_ServiceDetail & + const CORBA::ServiceInformation::_tao_seq_CORBA_ServiceDetail_ & ); TAO_Export CORBA::Boolean operator>> ( TAO_InputCDR &, - CORBA::ServiceInformation::_tao_seq_ServiceDetail & + CORBA::ServiceInformation::_tao_seq_CORBA_ServiceDetail_ & ); -#endif /* _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceDetail_H_ */ +#endif /* _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceDetail__H_ */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64 @@ -315,7 +339,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* __ACE_INLINE__ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "ServicesC.i" diff --git a/TAO/tao/ServicesC.i b/TAO/tao/ServicesC.i index 05f20d51f81..20dcb9ed7f7 100644 --- a/TAO/tao/ServicesC.i +++ b/TAO/tao/ServicesC.i @@ -15,13 +15,19 @@ // 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 -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:70 ACE_INLINE CORBA::Boolean operator<< ( @@ -29,17 +35,9 @@ CORBA::Boolean operator<< ( const CORBA::ServiceDetail &_tao_aggregate ) { - if ( + return (strm << _tao_aggregate.service_detail_type) && - (strm << _tao_aggregate.service_detail) - ) - { - return 1; - } - else - { - return 0; - } + (strm << _tao_aggregate.service_detail); } ACE_INLINE @@ -48,57 +46,49 @@ CORBA::Boolean operator>> ( CORBA::ServiceDetail &_tao_aggregate ) { - if ( + return (strm >> _tao_aggregate.service_detail_type) && - (strm >> _tao_aggregate.service_detail) - ) - { - return 1; - } - else - { - return 0; - } + (strm >> _tao_aggregate.service_detail); } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:81 -#if !defined _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceOption_I_ -#define _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceOption_I_ +#if !defined _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceOption__I_ +#define _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceOption__I_ CORBA::Boolean TAO_Export operator<< ( TAO_OutputCDR &, - const CORBA::ServiceInformation::_tao_seq_ServiceOption & + const CORBA::ServiceInformation::_tao_seq_CORBA_ServiceOption_ & ); CORBA::Boolean TAO_Export operator>> ( TAO_InputCDR &, - CORBA::ServiceInformation::_tao_seq_ServiceOption & + CORBA::ServiceInformation::_tao_seq_CORBA_ServiceOption_ & ); -#endif /* _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceOption_I_ */ +#endif /* _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceOption__I_ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:81 -#if !defined _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceDetail_I_ -#define _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceDetail_I_ +#if !defined _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceDetail__I_ +#define _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceDetail__I_ CORBA::Boolean TAO_Export operator<< ( TAO_OutputCDR &, - const CORBA::ServiceInformation::_tao_seq_ServiceDetail & + const CORBA::ServiceInformation::_tao_seq_CORBA_ServiceDetail_ & ); CORBA::Boolean TAO_Export operator>> ( TAO_InputCDR &, - CORBA::ServiceInformation::_tao_seq_ServiceDetail & + CORBA::ServiceInformation::_tao_seq_CORBA_ServiceDetail_ & ); -#endif /* _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceDetail_I_ */ +#endif /* _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceDetail__I_ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:70 ACE_INLINE CORBA::Boolean operator<< ( @@ -106,17 +96,9 @@ CORBA::Boolean operator<< ( const CORBA::ServiceInformation &_tao_aggregate ) { - if ( + return (strm << _tao_aggregate.service_options) && - (strm << _tao_aggregate.service_details) - ) - { - return 1; - } - else - { - return 0; - } + (strm << _tao_aggregate.service_details); } ACE_INLINE @@ -125,16 +107,8 @@ CORBA::Boolean operator>> ( CORBA::ServiceInformation &_tao_aggregate ) { - if ( + return (strm >> _tao_aggregate.service_options) && - (strm >> _tao_aggregate.service_details) - ) - { - return 1; - } - else - { - return 0; - } + (strm >> _tao_aggregate.service_details); } diff --git a/TAO/tao/StringSeq.pidl b/TAO/tao/StringSeq.pidl index bdcc17cda09..dbba774cd09 100644 --- a/TAO/tao/StringSeq.pidl +++ b/TAO/tao/StringSeq.pidl @@ -8,7 +8,7 @@ // The command used to generate code is: // // tao_idl -// -o orig -Gp -Gd -Ge 1 +// -o orig -Ge 1 -GT // -Wb,export_macro=TAO_Export // -Wb,export_include="tao/corbafwd.h" // -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/StringSeqC.cpp b/TAO/tao/StringSeqC.cpp index 0e0a6133d72..ad2295e2fe9 100644 --- a/TAO/tao/StringSeqC.cpp +++ b/TAO/tao/StringSeqC.cpp @@ -15,16 +15,23 @@ // 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 -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:301 #include "StringSeqC.h" #include "CDR.h" +#include "Any_Dual_Impl_T.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig @@ -34,15 +41,26 @@ #include "StringSeqC.i" #endif /* !defined INLINE */ -#include "Any_Dual_Impl_T.h" - // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:59 + +// Arg traits specializations. +namespace TAO +{ +}; + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:66 + +#if !defined (_CORBA_STRINGSEQ_CS_) +#define _CORBA_STRINGSEQ_CS_ CORBA::StringSeq::StringSeq (void) {} -CORBA::StringSeq::StringSeq (CORBA::ULong max) +CORBA::StringSeq::StringSeq ( + CORBA::ULong max + ) : TAO_Unbounded_String_Sequence (max) {} @@ -50,14 +68,16 @@ CORBA::StringSeq::StringSeq (CORBA::ULong max) CORBA::StringSeq::StringSeq ( CORBA::ULong max, CORBA::ULong length, - char ** buffer, + char * * buffer, CORBA::Boolean release ) : TAO_Unbounded_String_Sequence (max, length, buffer, release) {} -CORBA::StringSeq::StringSeq (const StringSeq &seq) +CORBA::StringSeq::StringSeq ( + const StringSeq &seq + ) : TAO_Unbounded_String_Sequence (seq) {} @@ -65,47 +85,16 @@ CORBA::StringSeq::StringSeq (const StringSeq &seq) CORBA::StringSeq::~StringSeq (void) {} -void CORBA::StringSeq::_tao_any_destructor (void *_tao_void_pointer) +void CORBA::StringSeq::_tao_any_destructor ( + void * _tao_void_pointer + ) { - StringSeq *tmp = ACE_static_cast (StringSeq*, _tao_void_pointer); - delete tmp; + StringSeq * _tao_tmp_pointer = + ACE_static_cast (StringSeq *, _tao_void_pointer); + delete _tao_tmp_pointer; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class - TAO_MngSeq_Var_T< - CORBA::StringSeq, - TAO_SeqElem_String_Manager - >; - -template class - TAO_MngSeq_Out_T< - CORBA::StringSeq, - CORBA::StringSeq_var, - TAO_SeqElem_String_Manager - >; - -template class TAO_Seq_Var_Base_T<CORBA::StringSeq, TAO_SeqElem_String_Manager>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO_MngSeq_Var_T< \ - CORBA::StringSeq, \ - TAO_SeqElem_String_Manager \ - > - -# pragma instantiate \ - TAO_Seq_Out_T< \ - CORBA::StringSeq, \ - CORBA::StringSeq_var, \ - TAO_SeqElem_String_Manager \ - > - -#pragma instantiate TAO_Seq_Var_Base_T<CORBA::StringSeq, - TAO_SeqElem_String_Manager> -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* end #if !defined */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -114,22 +103,22 @@ static const CORBA::Long _oc_CORBA_StringSeq[] = { TAO_ENCAP_BYTE_ORDER, // byte order 32, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f5374), - ACE_NTOHL (0x72696e67), - ACE_NTOHL (0x5365713a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f5374), + ACE_NTOHL (0x72696e67), + ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/StringSeq:1.0 10, - ACE_NTOHL (0x53747269), - ACE_NTOHL (0x6e675365), + ACE_NTOHL (0x53747269), + ACE_NTOHL (0x6e675365), ACE_NTOHL (0x71000000), // name = StringSeq CORBA::tk_sequence, // typecode kind 16, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 0U, @@ -143,22 +132,24 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_StringSeq ( sizeof (CORBA::StringSeq) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_StringSeq, - &_tc_TAO_tc_CORBA_StringSeq - ) -TAO_NAMESPACE_END +namespace CORBA +{ + ::CORBA::TypeCode_ptr _tc_StringSeq = + &_tc_TAO_tc_CORBA_StringSeq; +} -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50 +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:66 + +#if !defined (_CORBA_WSTRINGSEQ_CS_) +#define _CORBA_WSTRINGSEQ_CS_ CORBA::WStringSeq::WStringSeq (void) {} -CORBA::WStringSeq::WStringSeq (CORBA::ULong max) +CORBA::WStringSeq::WStringSeq ( + CORBA::ULong max + ) : TAO_Unbounded_WString_Sequence (max) {} @@ -166,14 +157,16 @@ CORBA::WStringSeq::WStringSeq (CORBA::ULong max) CORBA::WStringSeq::WStringSeq ( CORBA::ULong max, CORBA::ULong length, - CORBA::WChar ** buffer, + CORBA::WChar * * buffer, CORBA::Boolean release ) : TAO_Unbounded_WString_Sequence (max, length, buffer, release) {} -CORBA::WStringSeq::WStringSeq (const WStringSeq &seq) +CORBA::WStringSeq::WStringSeq ( + const WStringSeq &seq + ) : TAO_Unbounded_WString_Sequence (seq) {} @@ -181,45 +174,16 @@ CORBA::WStringSeq::WStringSeq (const WStringSeq &seq) CORBA::WStringSeq::~WStringSeq (void) {} -void CORBA::WStringSeq::_tao_any_destructor (void *_tao_void_pointer) +void CORBA::WStringSeq::_tao_any_destructor ( + void * _tao_void_pointer + ) { - WStringSeq *tmp = ACE_static_cast (WStringSeq*, _tao_void_pointer); - delete tmp; + WStringSeq * _tao_tmp_pointer = + ACE_static_cast (WStringSeq *, _tao_void_pointer); + delete _tao_tmp_pointer; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class - TAO_MngSeq_Var_T< - CORBA::WStringSeq, - TAO_SeqElem_WString_Manager - >; - -template class TAO_Seq_Var_Base_T<CORBA::WStringSeq, TAO_SeqElem_WString_Manager>; -template class - TAO_MngSeq_Out_T< - CORBA::WStringSeq, - CORBA::WStringSeq_var, - TAO_SeqElem_WString_Manager - >; - - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO_MngSeq_Var_T< \ - CORBA::WStringSeq, \ - TAO_SeqElem_WString_Manager \ - > -#pragma instantiate TAO_Seq_Var_Base_T<CORBA::WStringSeq, TAO_SeqElem_WString_Manager> -# pragma instantiate \ - TAO_Seq_Out_T< \ - CORBA::WStringSeq, \ - CORBA::WStringSeq_var, \ - TAO_SeqElem_WString_Manager \ - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* end #if !defined */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -228,23 +192,23 @@ static const CORBA::Long _oc_CORBA_WStringSeq[] = { TAO_ENCAP_BYTE_ORDER, // byte order 33, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f5753), - ACE_NTOHL (0x7472696e), - ACE_NTOHL (0x67536571), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f5753), + ACE_NTOHL (0x7472696e), + ACE_NTOHL (0x67536571), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/WStringSeq:1.0 11, - ACE_NTOHL (0x57537472), - ACE_NTOHL (0x696e6753), + ACE_NTOHL (0x57537472), + ACE_NTOHL (0x696e6753), ACE_NTOHL (0x65710000), // name = WStringSeq CORBA::tk_sequence, // typecode kind 16, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order - CORBA::tk_wstring, + CORBA::tk_wstring, 0U, // string length 0U, @@ -258,16 +222,13 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_WStringSeq ( sizeof (CORBA::WStringSeq) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_WStringSeq, - &_tc_TAO_tc_CORBA_WStringSeq - ) -TAO_NAMESPACE_END +namespace CORBA +{ + ::CORBA::TypeCode_ptr _tc_WStringSeq = + &_tc_TAO_tc_CORBA_WStringSeq; +} -// TAO_IDL - Generated from +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. @@ -325,14 +286,7 @@ CORBA::Boolean operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<CORBA::StringSeq>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::StringSeq> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -// TAO_IDL - Generated from +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. @@ -390,15 +344,11 @@ CORBA::Boolean operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<CORBA::WStringSeq>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::WStringSeq> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:95 + +#if !defined _TAO_CDR_OP_CORBA_StringSeq_CPP_ +#define _TAO_CDR_OP_CORBA_StringSeq_CPP_ CORBA::Boolean operator<< ( TAO_OutputCDR &strm, @@ -406,20 +356,20 @@ CORBA::Boolean operator<< ( ) { CORBA::ULong _tao_seq_len = _tao_sequence.length (); - + if (strm << _tao_seq_len) { // Encode all elements. CORBA::Boolean _tao_marshal_flag = 1; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = (strm << _tao_sequence[i].in ()); } - + return _tao_marshal_flag; } - + return 0; } @@ -429,7 +379,7 @@ CORBA::Boolean operator>> ( ) { CORBA::ULong _tao_seq_len; - + if (strm >> _tao_seq_len) { // Add a check to the length of the sequence @@ -439,32 +389,39 @@ CORBA::Boolean operator>> ( { 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) + if (0 >= _tao_seq_len) { return 1; } - + // Retrieve all the elements. CORBA::Boolean _tao_marshal_flag = 1; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = (strm >> _tao_sequence[i].out ()); - } - - return _tao_marshal_flag; - } - - return 0; + + } + + return _tao_marshal_flag; + + } + +return 0; } +#endif /* _TAO_CDR_OP_CORBA_StringSeq_CPP_ */ + // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:95 + +#if !defined _TAO_CDR_OP_CORBA_WStringSeq_CPP_ +#define _TAO_CDR_OP_CORBA_WStringSeq_CPP_ CORBA::Boolean operator<< ( TAO_OutputCDR &strm, @@ -472,20 +429,20 @@ CORBA::Boolean operator<< ( ) { CORBA::ULong _tao_seq_len = _tao_sequence.length (); - + if (strm << _tao_seq_len) { // Encode all elements. CORBA::Boolean _tao_marshal_flag = 1; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = (strm << _tao_sequence[i].in ()); } - + return _tao_marshal_flag; } - + return 0; } @@ -495,7 +452,7 @@ CORBA::Boolean operator>> ( ) { CORBA::ULong _tao_seq_len; - + if (strm >> _tao_seq_len) { // Add a check to the length of the sequence @@ -505,26 +462,136 @@ CORBA::Boolean operator>> ( { 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) + if (0 >= _tao_seq_len) { return 1; } - + // Retrieve all the elements. CORBA::Boolean _tao_marshal_flag = 1; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = (strm >> _tao_sequence[i].out ()); - } + + } + + return _tao_marshal_flag; + + } + +return 0; +} - return _tao_marshal_flag; - } +#endif /* _TAO_CDR_OP_CORBA_WStringSeq_CPP_ */ + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1703 + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + + template class + TAO_MngSeq_Var_T< + CORBA::StringSeq, + TAO_SeqElem_String_Manager + >; + + template class + TAO_Seq_Var_Base_T< + CORBA::StringSeq, + TAO_SeqElem_String_Manager + >; + + template class + TAO_MngSeq_Out_T< + CORBA::StringSeq, + CORBA::StringSeq_var, + TAO_SeqElem_String_Manager + >; + + template class + TAO::Any_Dual_Impl_T< + CORBA::StringSeq + >; + + template class + TAO_MngSeq_Var_T< + CORBA::WStringSeq, + TAO_SeqElem_WString_Manager + >; + + template class + TAO_Seq_Var_Base_T< + CORBA::WStringSeq, + TAO_SeqElem_WString_Manager + >; + + template class + TAO_MngSeq_Out_T< + CORBA::WStringSeq, + CORBA::WStringSeq_var, + TAO_SeqElem_WString_Manager + >; + + template class + TAO::Any_Dual_Impl_T< + CORBA::WStringSeq + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# pragma instantiate \ + TAO_MngSeq_Var_T< \ + CORBA::StringSeq, \ + TAO_SeqElem_String_Manager \ + > + +# pragma instantiate \ + TAO_Seq_Var_Base_T< \ + CORBA::StringSeq, \ + TAO_SeqElem_String_Manager \ + > + +# pragma instantiate \ + TAO_MngSeq_Out_T< \ + CORBA::StringSeq, \ + CORBA::StringSeq_var, \ + TAO_SeqElem_String_Manager \ + > + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + CORBA::StringSeq \ + > + +# pragma instantiate \ + TAO_MngSeq_Var_T< \ + CORBA::WStringSeq, \ + TAO_SeqElem_WString_Manager \ + > + +# pragma instantiate \ + TAO_Seq_Var_Base_T< \ + CORBA::WStringSeq, \ + TAO_SeqElem_WString_Manager \ + > + +# pragma instantiate \ + TAO_MngSeq_Out_T< \ + CORBA::WStringSeq, \ + CORBA::WStringSeq_var, \ + TAO_SeqElem_WString_Manager \ + > + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + CORBA::WStringSeq \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - return 0; -} diff --git a/TAO/tao/StringSeqC.h b/TAO/tao/StringSeqC.h index 4af79a8199f..d223e25ec23 100644 --- a/TAO/tao/StringSeqC.h +++ b/TAO/tao/StringSeqC.h @@ -15,6 +15,12 @@ // 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 @@ -62,21 +68,24 @@ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48 -TAO_NAMESPACE CORBA +namespace CORBA { - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101 +#if !defined (_CORBA_STRINGSEQ_CH_) +#define _CORBA_STRINGSEQ_CH_ + class StringSeq; - + typedef TAO_MngSeq_Var_T< StringSeq, TAO_SeqElem_String_Manager > StringSeq_var; - + typedef TAO_MngSeq_Out_T< StringSeq, @@ -84,7 +93,7 @@ TAO_NAMESPACE CORBA TAO_SeqElem_String_Manager > StringSeq_out; - + class TAO_Export StringSeq : public TAO_Unbounded_String_Sequence @@ -95,34 +104,39 @@ TAO_NAMESPACE CORBA StringSeq ( CORBA::ULong max, CORBA::ULong length, - char ** buffer, + char ** buffer, CORBA::Boolean release = 0 ); StringSeq (const StringSeq &); ~StringSeq (void); - + static void _tao_any_destructor (void *); - + typedef StringSeq_var _var_type; }; +#endif /* end #if !defined */ + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StringSeq; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101 +#if !defined (_CORBA_WSTRINGSEQ_CH_) +#define _CORBA_WSTRINGSEQ_CH_ + class WStringSeq; - + typedef TAO_MngSeq_Var_T< WStringSeq, TAO_SeqElem_WString_Manager > WStringSeq_var; - + typedef TAO_MngSeq_Out_T< WStringSeq, @@ -130,7 +144,7 @@ TAO_NAMESPACE CORBA TAO_SeqElem_WString_Manager > WStringSeq_out; - + class TAO_Export WStringSeq : public TAO_Unbounded_WString_Sequence @@ -141,27 +155,36 @@ TAO_NAMESPACE CORBA WStringSeq ( CORBA::ULong max, CORBA::ULong length, - CORBA::WChar ** buffer, + CORBA::WChar ** buffer, CORBA::Boolean release = 0 ); WStringSeq (const WStringSeq &); ~WStringSeq (void); - + static void _tao_any_destructor (void *); - + typedef WStringSeq_var _var_type; }; +#endif /* end #if !defined */ + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_WStringSeq; // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:66 -} -TAO_NAMESPACE_CLOSE // module CORBA +} // module CORBA + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:48 + +// Traits specializations. +namespace TAO +{ +}; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52 @@ -185,7 +208,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::WStringS #ifndef __ACE_INLINE__ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:70 #if !defined _TAO_CDR_OP_CORBA_StringSeq_H_ #define _TAO_CDR_OP_CORBA_StringSeq_H_ @@ -202,7 +225,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_StringSeq_H_ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:70 #if !defined _TAO_CDR_OP_CORBA_WStringSeq_H_ #define _TAO_CDR_OP_CORBA_WStringSeq_H_ @@ -224,7 +247,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* __ACE_INLINE__ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "StringSeqC.i" @@ -240,3 +263,4 @@ TAO_Export CORBA::Boolean operator>> ( #include /**/ "ace/post.h" #endif /* ifndef */ + diff --git a/TAO/tao/StringSeqC.i b/TAO/tao/StringSeqC.i index 6e55aadacaa..ba85b518ce7 100644 --- a/TAO/tao/StringSeqC.i +++ b/TAO/tao/StringSeqC.i @@ -15,13 +15,19 @@ // 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 -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:81 #if !defined _TAO_CDR_OP_CORBA_StringSeq_I_ #define _TAO_CDR_OP_CORBA_StringSeq_I_ @@ -39,7 +45,7 @@ CORBA::Boolean TAO_Export operator>> ( #endif /* _TAO_CDR_OP_CORBA_StringSeq_I_ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:81 #if !defined _TAO_CDR_OP_CORBA_WStringSeq_I_ #define _TAO_CDR_OP_CORBA_WStringSeq_I_ diff --git a/TAO/tao/TAO.pidl b/TAO/tao/TAO.pidl index e3022f7bfdb..e788952f914 100644 --- a/TAO/tao/TAO.pidl +++ b/TAO/tao/TAO.pidl @@ -15,7 +15,7 @@ * this is: * * tao_idl - * -o orig -Gp -Gd -Ge 1 + * -o orig -Gp -Gd -Ge 1 -GT * -Wb,export_macro=TAO_Export * -Wb,pre_include="ace/pre.h" * -Wb,post_include="ace/post.h" @@ -71,6 +71,7 @@ module TAO }; const CORBA::PolicyType BUFFERING_CONSTRAINT_POLICY_TYPE = 0x54410001; + local interface BufferingConstraintPolicy : CORBA::Policy { readonly attribute BufferingConstraint buffering_constraint; diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp index 1e8035abf82..a0dcc83a592 100644 --- a/TAO/tao/TAOC.cpp +++ b/TAO/tao/TAOC.cpp @@ -15,50 +15,84 @@ // 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 -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:301 #include "TAOC.h" +#include "tao/Any_Impl_T.h" +#include "tao/Any_Dual_Impl_T.h" +#include "tao/Any_Impl_T.h" +#include "tao/Any_Dual_Impl_T.h" +#include "tao/Basic_Arguments.h" +#include "tao/Fixed_Size_Argument_T.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#include "tao/Any_Impl_T.h" -#include "tao/Any_Dual_Impl_T.h" - #if !defined (__ACE_INLINE__) #include "TAOC.i" #endif /* !defined INLINE */ // TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:59 + +// Arg traits specializations. +namespace TAO +{ + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:428 + +#if !defined (_TAO_BUFFERINGCONSTRAINT__ARG_TRAITS_CS_) +#define _TAO_BUFFERINGCONSTRAINT__ARG_TRAITS_CS_ + + ACE_TEMPLATE_SPECIALIZATION + class TAO_Export Arg_Traits<TAO::BufferingConstraint> + : public + Fixed_Size_Arg_Traits_T< + TAO::BufferingConstraint + > + { + }; + +#endif /* end #if !defined */ +}; + +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 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, @@ -72,14 +106,11 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_BufferingConstraintMode ( sizeof (TAO::BufferingConstraintMode) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (TAO) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_BufferingConstraintMode, - &_tc_TAO_tc_TAO_BufferingConstraintMode - ) -TAO_NAMESPACE_END +namespace TAO +{ + ::CORBA::TypeCode_ptr _tc_BufferingConstraintMode = + &_tc_TAO_tc_TAO_BufferingConstraintMode; +} // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -88,81 +119,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, @@ -176,83 +207,66 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_BufferingConstraint ( sizeof (TAO::BufferingConstraint) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (TAO) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_BufferingConstraint, - &_tc_TAO_tc_TAO_BufferingConstraint - ) -TAO_NAMESPACE_END +namespace TAO +{ + ::CORBA::TypeCode_ptr _tc_BufferingConstraint = + &_tc_TAO_tc_TAO_BufferingConstraint; +} -// TAO_IDL - Generated from +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 -void TAO::BufferingConstraint::_tao_any_destructor (void *_tao_void_pointer) +void +TAO::BufferingConstraint::_tao_any_destructor ( + void *_tao_void_pointer + ) { - BufferingConstraint *tmp = ACE_static_cast (BufferingConstraint*, _tao_void_pointer); - delete tmp; + BufferingConstraint *_tao_tmp_pointer = + ACE_static_cast (BufferingConstraint *, _tao_void_pointer); + delete _tao_tmp_pointer; } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60 -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class - TAO_Fixed_Var_T< - TAO::BufferingConstraint - >; -template class - TAO_Var_Base_T< - TAO::BufferingConstraint - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO_Fixed_Var_T< \ - TAO::BufferingConstraint \ - > +// Traits specializations for TAO::BufferingConstraintPolicy. -# pragma instantiate \ - TAO_Var_Base_T< \ - TAO::BufferingConstraint \ - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +TAO::BufferingConstraintPolicy_ptr +TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::tao_duplicate ( + TAO::BufferingConstraintPolicy_ptr p + ) +{ + return TAO::BufferingConstraintPolicy::_duplicate (p); +} -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61 +void +TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::tao_release ( + TAO::BufferingConstraintPolicy_ptr p + ) +{ + CORBA::release (p); +} -int TAO::BufferingConstraintPolicy::_tao_class_id = 0; +TAO::BufferingConstraintPolicy_ptr +TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::tao_nil (void) +{ + return TAO::BufferingConstraintPolicy::_nil (); +} -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class - TAO_Objref_Var_T< - TAO::BufferingConstraintPolicy, - TAO::tao_BufferingConstraintPolicy_life - >; - template class - TAO_Objref_Out_T< - TAO::BufferingConstraintPolicy, - TAO::tao_BufferingConstraintPolicy_life - >; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate \ - TAO_Objref_Var_T< \ - TAO::BufferingConstraintPolicy, \ - TAO::tao_BufferingConstraintPolicy_life \ - > -# pragma instantiate \ - TAO_Objref_Out_T< \ - TAO::BufferingConstraintPolicy, \ - TAO::tao_BufferingConstraintPolicy_life \ - > -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +CORBA::Boolean +TAO::Objref_Traits<TAO::BufferingConstraintPolicy>::tao_marshal ( + TAO::BufferingConstraintPolicy_ptr p, + TAO_OutputCDR & cdr + ) +{ + return p->marshal (cdr); +} -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 +// Function pointer for collocation factory initialization. +TAO::Collocation_Proxy_Broker * +(*TAO__TAO_BufferingConstraintPolicy_Proxy_Broker_Factory_function_pointer) ( + CORBA::Object_ptr obj + ) = 0; TAO::BufferingConstraintPolicy::BufferingConstraintPolicy (void) {} @@ -260,43 +274,29 @@ TAO::BufferingConstraintPolicy::BufferingConstraintPolicy (void) TAO::BufferingConstraintPolicy::~BufferingConstraintPolicy (void) {} -void +void TAO::BufferingConstraintPolicy::_tao_any_destructor (void *_tao_void_pointer) { - BufferingConstraintPolicy *tmp = ACE_static_cast (BufferingConstraintPolicy *, _tao_void_pointer); - CORBA::release (tmp); + BufferingConstraintPolicy *_tao_tmp_pointer = + ACE_static_cast (BufferingConstraintPolicy *, _tao_void_pointer); + CORBA::release (_tao_tmp_pointer); } TAO::BufferingConstraintPolicy_ptr TAO::BufferingConstraintPolicy::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL - ) -{ - return BufferingConstraintPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); -} - -TAO::BufferingConstraintPolicy_ptr -TAO::BufferingConstraintPolicy::_unchecked_narrow ( - CORBA::Object_ptr obj + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { - if (CORBA::is_nil (obj)) + if (CORBA::is_nil (_tao_objref)) { return BufferingConstraintPolicy::_nil (); } + + BufferingConstraintPolicy_ptr proxy = + dynamic_cast<BufferingConstraintPolicy_ptr> (_tao_objref); - return - ACE_reinterpret_cast ( - BufferingConstraintPolicy_ptr, - obj->_tao_QueryInterface ( - ACE_reinterpret_cast ( - ptrdiff_t, - &BufferingConstraintPolicy::_tao_class_id - ) - ) - ); + return BufferingConstraintPolicy::_duplicate (proxy); } TAO::BufferingConstraintPolicy_ptr @@ -306,53 +306,41 @@ TAO::BufferingConstraintPolicy::_duplicate (BufferingConstraintPolicy_ptr obj) { obj->_add_ref (); } - + return obj; } -void *TAO::BufferingConstraintPolicy::_tao_QueryInterface (ptrdiff_t type) +CORBA::Boolean +TAO::BufferingConstraintPolicy::_is_a ( + const char *value + ACE_ENV_ARG_DECL_NOT_USED + ) { - void *retv = 0; - - if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &ACE_NESTED_CLASS (::TAO, BufferingConstraintPolicy)::_tao_class_id) - ) + if ( + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/Policy:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:tao/TAO/BufferingConstraintPolicy:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/LocalObject:1.0" + ) || + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/CORBA/Object:1.0" + ) + ) { - retv = ACE_reinterpret_cast (void*, this); + return 1; // success using local knowledge } - else if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &::CORBA::Policy::_tao_class_id) - ) + else { - retv = - ACE_reinterpret_cast ( - void *, - ACE_static_cast ( - CORBA::Policy_ptr, - this - ) - ); + return 0; } - else if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &CORBA::Object::_tao_class_id) - ) - { - retv = - ACE_reinterpret_cast ( - void *, - ACE_static_cast (CORBA::Object_ptr, this) - ); - } - - if (retv != 0) - { - this->_add_ref (); - } - - return retv; } const char* TAO::BufferingConstraintPolicy::_interface_repository_id (void) const @@ -373,24 +361,24 @@ static const CORBA::Long _oc_TAO_BufferingConstraintPolicy[] = { TAO_ENCAP_BYTE_ORDER, // byte order 42, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x74616f2f), - ACE_NTOHL (0x54414f2f), - ACE_NTOHL (0x42756666), - ACE_NTOHL (0x6572696e), - ACE_NTOHL (0x67436f6e), - ACE_NTOHL (0x73747261), - ACE_NTOHL (0x696e7450), - ACE_NTOHL (0x6f6c6963), - ACE_NTOHL (0x793a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x74616f2f), + ACE_NTOHL (0x54414f2f), + ACE_NTOHL (0x42756666), + ACE_NTOHL (0x6572696e), + ACE_NTOHL (0x67436f6e), + ACE_NTOHL (0x73747261), + ACE_NTOHL (0x696e7450), + ACE_NTOHL (0x6f6c6963), + ACE_NTOHL (0x793a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:tao/TAO/BufferingConstraintPolicy:1.0 26, - ACE_NTOHL (0x42756666), - ACE_NTOHL (0x6572696e), - ACE_NTOHL (0x67436f6e), - ACE_NTOHL (0x73747261), - ACE_NTOHL (0x696e7450), - ACE_NTOHL (0x6f6c6963), + ACE_NTOHL (0x42756666), + ACE_NTOHL (0x6572696e), + ACE_NTOHL (0x67436f6e), + ACE_NTOHL (0x73747261), + ACE_NTOHL (0x696e7450), + ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x79000000), // name = BufferingConstraintPolicy }; @@ -402,16 +390,13 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_BufferingConstraintPolicy ( sizeof (TAO::BufferingConstraintPolicy) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (TAO) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_BufferingConstraintPolicy, - &_tc_TAO_tc_TAO_BufferingConstraintPolicy - ) -TAO_NAMESPACE_END +namespace TAO +{ + ::CORBA::TypeCode_ptr _tc_BufferingConstraintPolicy = + &_tc_TAO_tc_TAO_BufferingConstraintPolicy; +} -// TAO_IDL - Generated from +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -469,15 +454,8 @@ CORBA::Boolean operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<TAO::BufferingConstraint>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<TAO::BufferingConstraint> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50 // Copying insertion. void @@ -521,11 +499,154 @@ operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<TAO::BufferingConstraintPolicy,TAO::BufferingConstraintPolicy_var,TAO::tao_BufferingConstraintPolicy_life>; - template class TAO::Any_Impl_T<TAO::BufferingConstraintPolicy>; +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::Any_Impl_T<TAO::BufferingConstraintPolicy>::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<TAO::BufferingConstraintPolicy>::marshal_value (TAO_OutputCDR &) +{ + return 0; +} + +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::Any_Impl_T<TAO::BufferingConstraintPolicy>::demarshal_value (TAO_InputCDR &) +{ + return 0; +} + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1703 + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + + template class + TAO::Any_Basic_Impl_T< + CORBA::SetOverrideType + >; + + template class + TAO::Any_Dual_Impl_T< + CORBA::PolicyError + >; + + template class + TAO::Any_Dual_Impl_T< + CORBA::InvalidPolicies + >; + +#if !defined (_TAO_BUFFERINGCONSTRAINT__ARG_TRAITS_TMPLINST_CS_) +#define _TAO_BUFFERINGCONSTRAINT__ARG_TRAITS_TMPLINST_CS_ + + template class TAO::Arg_Traits<TAO::BufferingConstraint>; + + template class + TAO::Fixed_Size_Arg_Traits< + TAO::BufferingConstraint + >; + +#endif /* end #if !defined */ + + template class + TAO_Fixed_Var_T< + TAO::BufferingConstraint + >; + + template class + TAO_Var_Base_T< + TAO::BufferingConstraint + >; + + template class + TAO::Any_Dual_Impl_T< + TAO::BufferingConstraint + >; + + template class + TAO_Objref_Var_T< + TAO::BufferingConstraintPolicy, + TAO::Objref_Traits<TAO::BufferingConstraintPolicy> + >; + + template class + TAO_Objref_Out_T< + TAO::BufferingConstraintPolicy, + TAO::Objref_Traits<TAO::BufferingConstraintPolicy> + >; + + template class + TAO::Any_Impl_T< + TAO::BufferingConstraintPolicy + >; + #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<TAO::BufferingConstraintPolicy, TAO::BufferingConstraintPolicy_var,TAO::tao_BufferingConstraintPolicy_life> -# pragma instantiate TAO::Any_Impl_T<TAO::BufferingConstraintPolicy> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +# pragma instantiate \ + TAO::Any_Basic_Impl_T< \ + CORBA::SetOverrideType \ + > + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + CORBA::PolicyError \ + > + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + CORBA::InvalidPolicies \ + > + +#if !defined (_TAO_BUFFERINGCONSTRAINT__ARG_TRAITS_TMPLINST_CS_) +#define _TAO_BUFFERINGCONSTRAINT__ARG_TRAITS_TMPLINST_CS_ + +# pragma instantiate TAO::Arg_Traits<TAO::BufferingConstraint> + +# pragma instantiate \ + TAO::Fixed_Size_Arg_Traits< \ + TAO::BufferingConstraint \ + > + +#endif /* end #if !defined */ + +# pragma instantiate \ + TAO_Fixed_Var_T< \ + TAO::BufferingConstraint \ + > + +# pragma instantiate \ + TAO_Var_Base_T< \ + TAO::BufferingConstraint \ + > + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + TAO::BufferingConstraint \ + > + +# pragma instantiate \ + TAO_Objref_Var_T< \ + TAO::BufferingConstraintPolicy, \ + TAO::Objref_Traits<TAO::BufferingConstraintPolicy> \ + > + +# pragma instantiate \ + TAO_Objref_Out_T< \ + TAO::BufferingConstraintPolicy, \ + TAO::Objref_Traits<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 ca65f7b591b..b9764f86257 100644 --- a/TAO/tao/TAOC.h +++ b/TAO/tao/TAOC.h @@ -15,6 +15,12 @@ // 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 @@ -35,7 +41,6 @@ #include "Messaging_SyncScopeC.h" #include "TimeBaseC.h" -#include "VarOut_T.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -60,10 +65,20 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #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<typename T> class Narrow_Utils; +} + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48 -TAO_NAMESPACE TAO +namespace TAO { // TAO_IDL - Generated from @@ -98,7 +113,7 @@ TAO_NAMESPACE TAO const TAO::BufferingConstraintMode BUFFER_MESSAGE_BYTES = 4U; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:258 struct BufferingConstraint; @@ -137,20 +152,30 @@ TAO_NAMESPACE TAO const CORBA::PolicyType BUFFERING_CONSTRAINT_POLICY_TYPE = 1413545985U; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601 -#if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY__ODDS_N_ENDS_CH_) -#define _TAO_BUFFERINGCONSTRAINTPOLICY__ODDS_N_ENDS_CH_ +#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> BufferingConstraintPolicy_out; + typedef + TAO_Objref_Var_T< + BufferingConstraintPolicy + > + BufferingConstraintPolicy_var; + + typedef + TAO_Objref_Out_T< + BufferingConstraintPolicy + > + BufferingConstraintPolicy_out; + #endif /* end #if !defined */ // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53 #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY_CH_) #define _TAO_BUFFERINGCONSTRAINTPOLICY_CH_ @@ -161,7 +186,6 @@ TAO_NAMESPACE TAO public: typedef BufferingConstraintPolicy_ptr _ptr_type; typedef BufferingConstraintPolicy_var _var_type; - static int _tao_class_id; // The static operations. static BufferingConstraintPolicy_ptr _duplicate (BufferingConstraintPolicy_ptr obj); @@ -171,11 +195,6 @@ TAO_NAMESPACE TAO 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; @@ -194,9 +213,12 @@ TAO_NAMESPACE TAO )) = 0; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:185 - virtual void *_tao_QueryInterface (ptrdiff_t type); + 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); @@ -228,10 +250,17 @@ TAO_NAMESPACE TAO const Messaging::SyncScope SYNC_DELAYED_BUFFERING = -2; // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:66 -} -TAO_NAMESPACE_CLOSE // module TAO +} // module TAO + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:48 + +// Traits specializations. +namespace TAO +{ +}; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52 @@ -254,7 +283,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::BufferingConstra #ifndef __ACE_INLINE__ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:53 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO::BufferingConstraint &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO::BufferingConstraint &); @@ -265,7 +294,7 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO::BufferingConstraint & #endif /* __ACE_INLINE__ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "TAOC.i" diff --git a/TAO/tao/TAOC.i b/TAO/tao/TAOC.i index 0e5dcf9bb14..449a24ba1f2 100644 --- a/TAO/tao/TAOC.i +++ b/TAO/tao/TAOC.i @@ -15,47 +15,27 @@ // 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 -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63 #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY___CI_) #define _TAO_BUFFERINGCONSTRAINTPOLICY___CI_ -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<TAO::BufferingConstraintPolicy>::to_object ( - CORBA::Object_ptr &_tao_elem - ) const -{ - _tao_elem = CORBA::Object::_duplicate (this->value_); - return 1; -} - -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<TAO::BufferingConstraintPolicy>::marshal_value (TAO_OutputCDR &) -{ - return 0; -} - -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<TAO::BufferingConstraintPolicy>::demarshal_value (TAO_InputCDR &) -{ - return 0; -} #endif /* end #if !defined */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:70 ACE_INLINE CORBA::Boolean operator<< ( @@ -63,19 +43,11 @@ CORBA::Boolean operator<< ( const TAO::BufferingConstraint &_tao_aggregate ) { - if ( + return (strm << _tao_aggregate.mode) && (strm << _tao_aggregate.timeout) && (strm << _tao_aggregate.message_count) && - (strm << _tao_aggregate.message_bytes) - ) - { - return 1; - } - else - { - return 0; - } + (strm << _tao_aggregate.message_bytes); } ACE_INLINE @@ -84,17 +56,10 @@ CORBA::Boolean operator>> ( TAO::BufferingConstraint &_tao_aggregate ) { - if ( + return (strm >> _tao_aggregate.mode) && (strm >> _tao_aggregate.timeout) && (strm >> _tao_aggregate.message_count) && - (strm >> _tao_aggregate.message_bytes) - ) - { - return 1; - } - else - { - return 0; - } + (strm >> _tao_aggregate.message_bytes); } + diff --git a/TAO/tao/TimeBase.pidl b/TAO/tao/TimeBase.pidl index eba62cb9c6f..f53dfc0af68 100644 --- a/TAO/tao/TimeBase.pidl +++ b/TAO/tao/TimeBase.pidl @@ -11,7 +11,7 @@ * The command used to generate code from this file is: * * tao_idl.exe - * -o orig -Gp -Gd -Ge 1 + * -o orig -Ge 1 -GT * -Wb,export_macro=TAO_Export * -Wb,export_include=tao/TAO_Export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/TimeBaseC.cpp b/TAO/tao/TimeBaseC.cpp index 41461a32fe6..dd4d79141af 100644 --- a/TAO/tao/TimeBaseC.cpp +++ b/TAO/tao/TimeBaseC.cpp @@ -15,21 +15,22 @@ // 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 -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314 - +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:301 -#include "tao/TimeBaseC.h" -#include "tao/Stub.h" -#include "tao/Invocation.h" -#if TAO_HAS_INTERCEPTORS == 1 -#include "tao/RequestInfo_Util.h" -#endif /* TAO_HAS_INTERCEPTORS == 1 */ +#include "TimeBaseC.h" +#include "tao/Any_Dual_Impl_T.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig @@ -40,22 +41,30 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:59 + +// Arg traits specializations. +namespace TAO +{ +}; + +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_TimeBase_TimeT[] = { 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, @@ -69,14 +78,11 @@ static CORBA::TypeCode _tc_TAO_tc_TimeBase_TimeT ( sizeof (TimeBase::TimeT) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (TimeBase) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_TimeT, - &_tc_TAO_tc_TimeBase_TimeT - ) -TAO_NAMESPACE_END +namespace TimeBase +{ + ::CORBA::TypeCode_ptr _tc_TimeT = + &_tc_TAO_tc_TimeBase_TimeT; +} // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -85,34 +91,34 @@ static const CORBA::Long _oc_TimeBase_InaccuracyT[] = { TAO_ENCAP_BYTE_ORDER, // byte order 37, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x54696d65), - ACE_NTOHL (0x42617365), - ACE_NTOHL (0x2f496e61), - ACE_NTOHL (0x63637572), - ACE_NTOHL (0x61637954), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x54696d65), + ACE_NTOHL (0x42617365), + ACE_NTOHL (0x2f496e61), + ACE_NTOHL (0x63637572), + ACE_NTOHL (0x61637954), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/TimeBase/InaccuracyT:1.0 12, - ACE_NTOHL (0x496e6163), - ACE_NTOHL (0x63757261), + ACE_NTOHL (0x496e6163), + ACE_NTOHL (0x63757261), ACE_NTOHL (0x63795400), // name = InaccuracyT 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, @@ -127,14 +133,11 @@ static CORBA::TypeCode _tc_TAO_tc_TimeBase_InaccuracyT ( sizeof (TimeBase::InaccuracyT) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (TimeBase) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_InaccuracyT, - &_tc_TAO_tc_TimeBase_InaccuracyT - ) -TAO_NAMESPACE_END +namespace TimeBase +{ + ::CORBA::TypeCode_ptr _tc_InaccuracyT = + &_tc_TAO_tc_TimeBase_InaccuracyT; +} // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -143,16 +146,16 @@ static const CORBA::Long _oc_TimeBase_TdfT[] = { TAO_ENCAP_BYTE_ORDER, // byte order 30, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x54696d65), - ACE_NTOHL (0x42617365), - ACE_NTOHL (0x2f546466), - ACE_NTOHL (0x543a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x54696d65), + ACE_NTOHL (0x42617365), + ACE_NTOHL (0x2f546466), + ACE_NTOHL (0x543a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/TimeBase/TdfT:1.0 5, - ACE_NTOHL (0x54646654), + ACE_NTOHL (0x54646654), ACE_NTOHL (0x0), // name = TdfT CORBA::tk_short, @@ -166,14 +169,11 @@ static CORBA::TypeCode _tc_TAO_tc_TimeBase_TdfT ( sizeof (TimeBase::TdfT) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (TimeBase) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_TdfT, - &_tc_TAO_tc_TimeBase_TdfT - ) -TAO_NAMESPACE_END +namespace TimeBase +{ + ::CORBA::TypeCode_ptr _tc_TdfT = + &_tc_TAO_tc_TimeBase_TdfT; +} // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -182,46 +182,46 @@ static const CORBA::Long _oc_TimeBase_UtcT[] = { TAO_ENCAP_BYTE_ORDER, // byte order 30, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x54696d65), - ACE_NTOHL (0x42617365), - ACE_NTOHL (0x2f557463), - ACE_NTOHL (0x543a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x54696d65), + ACE_NTOHL (0x42617365), + ACE_NTOHL (0x2f557463), + ACE_NTOHL (0x543a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/TimeBase/UtcT:1.0 5, - ACE_NTOHL (0x55746354), + ACE_NTOHL (0x55746354), ACE_NTOHL (0x0), // name = UtcT 4, // member count 5, - ACE_NTOHL (0x74696d65), + ACE_NTOHL (0x74696d65), ACE_NTOHL (0x0), // name = time 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, 8, - ACE_NTOHL (0x696e6163), + ACE_NTOHL (0x696e6163), ACE_NTOHL (0x636c6f00), // name = inacclo CORBA::tk_ulong, 8, - ACE_NTOHL (0x696e6163), + ACE_NTOHL (0x696e6163), ACE_NTOHL (0x63686900), // name = inacchi CORBA::tk_ushort, @@ -231,16 +231,16 @@ static const CORBA::Long _oc_TimeBase_UtcT[] = 56, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 30, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x54696d65), - ACE_NTOHL (0x42617365), - ACE_NTOHL (0x2f546466), - ACE_NTOHL (0x543a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x54696d65), + ACE_NTOHL (0x42617365), + ACE_NTOHL (0x2f546466), + ACE_NTOHL (0x543a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/TimeBase/TdfT:1.0 5, - ACE_NTOHL (0x54646654), + ACE_NTOHL (0x54646654), ACE_NTOHL (0x0), // name = TdfT CORBA::tk_short, @@ -255,93 +255,90 @@ static CORBA::TypeCode _tc_TAO_tc_TimeBase_UtcT ( sizeof (TimeBase::UtcT) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (TimeBase) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_UtcT, - &_tc_TAO_tc_TimeBase_UtcT - ) -TAO_NAMESPACE_END +namespace TimeBase +{ + ::CORBA::TypeCode_ptr _tc_UtcT = + &_tc_TAO_tc_TimeBase_UtcT; +} -// TAO_IDL - Generated from +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 -void TimeBase::UtcT::_tao_any_destructor (void *_tao_void_pointer) +void +TimeBase::UtcT::_tao_any_destructor ( + void *_tao_void_pointer + ) { - UtcT *tmp = ACE_static_cast (UtcT*, _tao_void_pointer); - delete tmp; + UtcT *_tao_tmp_pointer = + ACE_static_cast (UtcT *, _tao_void_pointer); + delete _tao_tmp_pointer; } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274 - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class - TAO_Fixed_Var_T< - TimeBase::UtcT - >; - -template class TAO_Var_Base_T<TimeBase::UtcT>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO_Fixed_Var_T< \ - TimeBase::UtcT \ - > -#pragma instantiate TAO_Var_Base_T<TimeBase::UtcT> -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_TimeBase_IntervalT[] = { TAO_ENCAP_BYTE_ORDER, // byte order 35, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x54696d65), - ACE_NTOHL (0x42617365), - ACE_NTOHL (0x2f496e74), - ACE_NTOHL (0x65727661), - ACE_NTOHL (0x6c543a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x54696d65), + ACE_NTOHL (0x42617365), + ACE_NTOHL (0x2f496e74), + ACE_NTOHL (0x65727661), + ACE_NTOHL (0x6c543a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/TimeBase/IntervalT:1.0 10, - ACE_NTOHL (0x496e7465), - ACE_NTOHL (0x7276616c), + ACE_NTOHL (0x496e7465), + ACE_NTOHL (0x7276616c), ACE_NTOHL (0x54000000), // name = IntervalT 2, // member count 12, - ACE_NTOHL (0x6c6f7765), - ACE_NTOHL (0x725f626f), + ACE_NTOHL (0x6c6f7765), + ACE_NTOHL (0x725f626f), ACE_NTOHL (0x756e6400), // name = lower_bound 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, 12, - ACE_NTOHL (0x75707065), - ACE_NTOHL (0x725f626f), + ACE_NTOHL (0x75707065), + ACE_NTOHL (0x725f626f), ACE_NTOHL (0x756e6400), // name = upper_bound - 0xffffffff, // indirection - 0xffffffac, // negative offset (-84) + 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 (0x2e300000), // repository ID = IDL:omg.org/TimeBase/TimeT:1.0 + 6, + ACE_NTOHL (0x54696d65), + ACE_NTOHL (0x54000000), // name = TimeT + CORBA::tk_ulonglong, + + }; static CORBA::TypeCode _tc_TAO_tc_TimeBase_IntervalT ( @@ -352,46 +349,26 @@ static CORBA::TypeCode _tc_TAO_tc_TimeBase_IntervalT ( sizeof (TimeBase::IntervalT) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (TimeBase) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_IntervalT, - &_tc_TAO_tc_TimeBase_IntervalT - ) -TAO_NAMESPACE_END +namespace TimeBase +{ + ::CORBA::TypeCode_ptr _tc_IntervalT = + &_tc_TAO_tc_TimeBase_IntervalT; +} -// TAO_IDL - Generated from +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 -void TimeBase::IntervalT::_tao_any_destructor (void *_tao_void_pointer) +void +TimeBase::IntervalT::_tao_any_destructor ( + void *_tao_void_pointer + ) { - IntervalT *tmp = ACE_static_cast (IntervalT*, _tao_void_pointer); - delete tmp; + IntervalT *_tao_tmp_pointer = + ACE_static_cast (IntervalT *, _tao_void_pointer); + delete _tao_tmp_pointer; } -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274 - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class - TAO_Fixed_Var_T< - TimeBase::IntervalT - >; - -template class TAO_Var_Base_T<TimeBase::IntervalT>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO_Fixed_Var_T< \ - TimeBase::IntervalT \ - > -#pragma instantiate TAO_Var_Base_T<TimeBase::IntervalT> -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -// TAO_IDL - Generated from +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -449,14 +426,7 @@ CORBA::Boolean operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) -template class TAO::Any_Dual_Impl_T<TimeBase::UtcT>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<TimeBase::UtcT> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -// TAO_IDL - Generated from +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -514,9 +484,72 @@ CORBA::Boolean operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<TimeBase::IntervalT>; +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1703 + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + + template class + TAO_Fixed_Var_T< + TimeBase::UtcT + >; + + template class + TAO_Var_Base_T< + TimeBase::UtcT + >; + + template class + TAO::Any_Dual_Impl_T< + TimeBase::UtcT + >; + + template class + TAO_Fixed_Var_T< + TimeBase::IntervalT + >; + + template class + TAO_Var_Base_T< + TimeBase::IntervalT + >; + + template class + TAO::Any_Dual_Impl_T< + TimeBase::IntervalT + >; + #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<TimeBase::IntervalT> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +# pragma instantiate \ + TAO_Fixed_Var_T< \ + TimeBase::UtcT \ + > + +# pragma instantiate \ + TAO_Var_Base_T< \ + TimeBase::UtcT \ + > + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + TimeBase::UtcT \ + > + +# pragma instantiate \ + TAO_Fixed_Var_T< \ + TimeBase::IntervalT \ + > + +# pragma instantiate \ + TAO_Var_Base_T< \ + TimeBase::IntervalT \ + > + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + TimeBase::IntervalT \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/TimeBaseC.h b/TAO/tao/TimeBaseC.h index ecdacbd4858..c43f42ac9ea 100644 --- a/TAO/tao/TimeBaseC.h +++ b/TAO/tao/TimeBaseC.h @@ -15,6 +15,12 @@ // 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 @@ -26,12 +32,14 @@ #define _TAO_IDL_ORIG_TIMEBASEC_H_ #include /**/ "ace/pre.h" -#include "tao/Any_Dual_Impl_T.h" + +#include "tao/corbafwd.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/CDR.h" #include "tao/VarOut_T.h" #if defined (TAO_EXPORT_MACRO) @@ -60,7 +68,7 @@ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48 -TAO_NAMESPACE TimeBase +namespace TimeBase { // TAO_IDL - Generated from @@ -97,7 +105,7 @@ TAO_NAMESPACE TimeBase TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TdfT; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:258 struct UtcT; @@ -131,7 +139,7 @@ TAO_NAMESPACE TimeBase TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UtcT; // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:258 struct IntervalT; @@ -163,10 +171,17 @@ TAO_NAMESPACE TimeBase TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IntervalT; // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:66 + +} // module TimeBase -} -TAO_NAMESPACE_CLOSE // module TimeBase +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:48 + +// Traits specializations. +namespace TAO +{ +}; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52 @@ -190,13 +205,13 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TimeBase::Inter #ifndef __ACE_INLINE__ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:53 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TimeBase::UtcT &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TimeBase::UtcT &); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:53 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TimeBase::IntervalT &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TimeBase::IntervalT &); @@ -207,7 +222,7 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TimeBase::IntervalT &); #endif /* __ACE_INLINE__ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "TimeBaseC.i" diff --git a/TAO/tao/TimeBaseC.i b/TAO/tao/TimeBaseC.i index 02bd740e22c..dad4e618c22 100644 --- a/TAO/tao/TimeBaseC.i +++ b/TAO/tao/TimeBaseC.i @@ -15,13 +15,19 @@ // 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 -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:70 ACE_INLINE CORBA::Boolean operator<< ( @@ -29,19 +35,11 @@ CORBA::Boolean operator<< ( const TimeBase::UtcT &_tao_aggregate ) { - if ( + return (strm << _tao_aggregate.time) && (strm << _tao_aggregate.inacclo) && (strm << _tao_aggregate.inacchi) && - (strm << _tao_aggregate.tdf) - ) - { - return 1; - } - else - { - return 0; - } + (strm << _tao_aggregate.tdf); } ACE_INLINE @@ -50,23 +48,15 @@ CORBA::Boolean operator>> ( TimeBase::UtcT &_tao_aggregate ) { - if ( + return (strm >> _tao_aggregate.time) && (strm >> _tao_aggregate.inacclo) && (strm >> _tao_aggregate.inacchi) && - (strm >> _tao_aggregate.tdf) - ) - { - return 1; - } - else - { - return 0; - } + (strm >> _tao_aggregate.tdf); } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:70 ACE_INLINE CORBA::Boolean operator<< ( @@ -74,17 +64,9 @@ CORBA::Boolean operator<< ( const TimeBase::IntervalT &_tao_aggregate ) { - if ( + return (strm << _tao_aggregate.lower_bound) && - (strm << _tao_aggregate.upper_bound) - ) - { - return 1; - } - else - { - return 0; - } + (strm << _tao_aggregate.upper_bound); } ACE_INLINE @@ -93,16 +75,8 @@ CORBA::Boolean operator>> ( TimeBase::IntervalT &_tao_aggregate ) { - if ( + return (strm >> _tao_aggregate.lower_bound) && - (strm >> _tao_aggregate.upper_bound) - ) - { - return 1; - } - else - { - return 0; - } + (strm >> _tao_aggregate.upper_bound); } diff --git a/TAO/tao/WrongTransaction.pidl b/TAO/tao/WrongTransaction.pidl index c632de95513..2b5ac5fa4e8 100644 --- a/TAO/tao/WrongTransaction.pidl +++ b/TAO/tao/WrongTransaction.pidl @@ -10,7 +10,7 @@ * following command: * * tao_idl - * -o orig -Gp -Gd -Ge 1 + * -o orig -Ge 1 -GT * -Wb,export_macro=TAO_Export * -Wb,export_include=tao/TAO_Export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp index b07cbfd85cc..3a725020593 100644 --- a/TAO/tao/WrongTransactionC.cpp +++ b/TAO/tao/WrongTransactionC.cpp @@ -15,28 +15,25 @@ // 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 -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:301 #include "WrongTransactionC.h" #if (TAO_HAS_MINIMUM_CORBA == 0) -#include "tao/Stub.h" -#include "tao/Invocation.h" -#include "tao/PortableInterceptor.h" - -#if TAO_HAS_INTERCEPTORS == 1 -#include "tao/RequestInfo_Util.h" -#include "tao/ClientRequestInfo_i.h" -#include "tao/ClientInterceptorAdapter.h" -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - +#include "tao/Any_Dual_Impl_T.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig @@ -47,6 +44,14 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:59 + +// Arg traits specializations. +namespace TAO +{ +}; + +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63 CORBA::WrongTransaction::WrongTransaction (void) @@ -72,14 +77,15 @@ CORBA::WrongTransaction::WrongTransaction (const ::CORBA::WrongTransaction &_tao CORBA::WrongTransaction& CORBA::WrongTransaction::operator= (const ::CORBA::WrongTransaction &_tao_excp) { - this->UserException::operator= (_tao_excp); + this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp); return *this; } void CORBA::WrongTransaction::_tao_any_destructor (void *_tao_void_pointer) { - WrongTransaction *tmp = ACE_static_cast (WrongTransaction*, _tao_void_pointer); - delete tmp; + WrongTransaction *_tao_tmp_pointer = + ACE_static_cast (WrongTransaction*, _tao_void_pointer); + delete _tao_tmp_pointer; } CORBA::WrongTransaction * @@ -128,7 +134,7 @@ void CORBA::WrongTransaction::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -141,7 +147,7 @@ void CORBA::WrongTransaction::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -158,21 +164,21 @@ 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 }; @@ -185,17 +191,41 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_WrongTransaction ( sizeof (CORBA::WrongTransaction) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_WrongTransaction, - &_tc_TAO_tc_CORBA_WrongTransaction - ) -TAO_NAMESPACE_END +namespace CORBA +{ + ::CORBA::TypeCode_ptr _tc_WrongTransaction = + &_tc_TAO_tc_CORBA_WrongTransaction; +} -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54 +// 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<CORBA::WrongTransaction>::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<<= ( @@ -252,11 +282,23 @@ CORBA::Boolean operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<CORBA::WrongTransaction>; +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1703 + +#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 */ + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + CORBA::WrongTransaction \ + > + +#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 285e96fa346..e771535a31b 100644 --- a/TAO/tao/WrongTransactionC.h +++ b/TAO/tao/WrongTransactionC.h @@ -15,6 +15,12 @@ // 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 @@ -26,18 +32,17 @@ #define _TAO_IDL_ORIG_WRONGTRANSACTIONC_H_ #include /**/ "ace/pre.h" + #include "tao/corbafwd.h" #if (TAO_HAS_MINIMUM_CORBA == 0) -#include "tao/Exception.h" -#include "tao/CDR.h" - #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "TAO_Export.h" +#include "tao/Exception.h" +#include "tao/CDR.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -65,7 +70,7 @@ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48 -TAO_NAMESPACE CORBA +namespace CORBA { // TAO_IDL - Generated from @@ -95,12 +100,12 @@ TAO_NAMESPACE CORBA virtual void _tao_encode ( TAO_OutputCDR & - ACE_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL ) const; virtual void _tao_decode ( TAO_InputCDR & - ACE_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL ); // TAO_IDL - Generated from @@ -117,10 +122,17 @@ TAO_NAMESPACE CORBA #endif /* end #if !defined */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67 +// W:\ACE_wrappers\TAO\TAO_IDL\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 -} -TAO_NAMESPACE_CLOSE // module CORBA +// Traits specializations. +namespace TAO +{ +}; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52 @@ -147,7 +159,7 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::WrongTransaction &) #endif /* __ACE_INLINE__ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1009 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "WrongTransactionC.i" diff --git a/TAO/tao/WrongTransactionC.i b/TAO/tao/WrongTransactionC.i index bc6631d62a3..2ded907841f 100644 --- a/TAO/tao/WrongTransactionC.i +++ b/TAO/tao/WrongTransactionC.i @@ -15,13 +15,19 @@ // 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 -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:103 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:71 ACE_INLINE CORBA::Boolean operator<< ( |