diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-09-01 00:42:10 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-09-01 00:42:10 +0000 |
| commit | 8d9bbfa5623c0225d21d085851ccd9ca7e49f294 (patch) | |
| tree | 862e9d8ca9cdccbedcc04f599c56f0b02bab157d | |
| parent | 2dbe5a60f6e0e277d4a084e99f90a87c7936558c (diff) | |
| download | ATCD-8d9bbfa5623c0225d21d085851ccd9ca7e49f294.tar.gz | |
ChangeLogTag: Sun Aug 31 19:39:16 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
55 files changed, 5277 insertions, 6127 deletions
diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref index 5091442c7cb..2f0f54fffbb 100644 --- a/TAO/ChangeLog_ref +++ b/TAO/ChangeLog_ref @@ -1,3 +1,74 @@ +Sun Aug 31 19:39:16 2003 Jeff Parsons <j.parsons@vanderbilt.edu> + + * tao/Bounds.pidl: + * tao/BoundsC.cpp: + * tao/BoundsC.h: + * tao/BoundsC.i: + * tao/CONV_FRAME.pidl: + * tao/CONV_FRAMEC.cpp: + * tao/CONV_FRAMEC.h: + * tao/CONV_FRAMEC.i: + * tao/Current.pidl: + * tao/CurrentC.cpp: + * tao/CurrentC.h: + * tao/CurrentC.i: + * tao/Domain.pidl: + * tao/DomainC.cpp: + * tao/DomainC.h: + * tao/DomainC.i: + * tao/Dynamic.pidl: + * tao/DynamicC.cpp: + * tao/DynamicC.h: + * tao/DynamicC.i: + * tao/GIOP.pidl: + * tao/GIOPC.cpp: + * tao/GIOPC.h: + * tao/GIOPC.i: + * tao/IIOP.pidl: + * tao/IIOPC.cpp: + * tao/IIOPC.h: + * tao/IIOPC.i: + * tao/IOP.pidl: + * tao/IOPC.cpp: + * tao/IOPC.h: + * tao/IOPC.i: + * tao/IOP_Codec.pidl: + * tao/IOP_CodecC.cpp: + * tao/IOP_CodecC.h: + * tao/IOP_CodecC.i: + * tao/IOP_IOR.pidl: + * tao/IOP_IORC.cpp: + * tao/IOP_IORC.h: + * tao/IOP_IORC.i: + * tao/Messaging_PolicyValue.pidl: + * tao/Messaging_PolicyValueC.cpp: + * tao/Messaging_PolicyValueC.h: + * tao/Messaging_PolicyValueC.i: + * tao/Messaging_SyncScope.pidl: + * tao/Messaging_SyncScopeC.cpp: + * tao/Messaging_SyncScopeC.h: + * tao/Messaging_SyncScopeC.i: + * tao/ObjectIdList.pidl: + + Regenerated the above hand-crafted files and updated + the command line documentation in the corresponding + .pidl files. + + * tao/Object_T.h: + + Added #include of ace/CORBA_macros.h. + + * tao/PolicyC.cpp: + * tao/PolicyC.h: + * tao/PolicyC.i: + + Hacked these files to compile until I get a chance + to regenerate them. + + * tao/Tagged_Profile.cpp: + + Corrected name of struct member type in declaration. + Sun Aug 31 15:49:35 2003 Jeff Parsons <j.parsons@vanderbilt.edu> * tao/Object_T.h: diff --git a/TAO/tao/Bounds.pidl b/TAO/tao/Bounds.pidl index c8ccda63db3..e6dfbe288d1 100644 --- a/TAO/tao/Bounds.pidl +++ b/TAO/tao/Bounds.pidl @@ -10,7 +10,7 @@ * following command: * * tao_idl - * -o orig -Gp -Gd -Ge 1 + * -o orig -Gp -Gd -Ge 1 -GT * -Wb,export_macro=TAO_Export * -Wb,export_include=TAO_Export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/BoundsC.cpp b/TAO/tao/BoundsC.cpp index 6df29ade66f..4f3fc937040 100644 --- a/TAO/tao/BoundsC.cpp +++ b/TAO/tao/BoundsC.cpp @@ -15,26 +15,24 @@ // 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 "BoundsC.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_Dual_Impl_T.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig @@ -44,6 +42,14 @@ #include "BoundsC.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_exception/exception_cs.cpp:63 @@ -70,14 +76,15 @@ CORBA::Bounds::Bounds (const ::CORBA::Bounds &_tao_excp) CORBA::Bounds& CORBA::Bounds::operator= (const ::CORBA::Bounds &_tao_excp) { - this->UserException::operator= (_tao_excp); + this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp); return *this; } void CORBA::Bounds::_tao_any_destructor (void *_tao_void_pointer) { - Bounds *tmp = ACE_static_cast (Bounds*, _tao_void_pointer); - delete tmp; + Bounds *_tao_tmp_pointer = + ACE_static_cast (Bounds*, _tao_void_pointer); + delete _tao_tmp_pointer; } CORBA::Bounds * @@ -178,17 +185,41 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Bounds ( sizeof (CORBA::Bounds) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_Bounds, - &_tc_TAO_tc_CORBA_Bounds - ) -TAO_NAMESPACE_END +namespace CORBA +{ + ::CORBA::TypeCode_ptr _tc_Bounds = + &_tc_TAO_tc_CORBA_Bounds; +} // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54 +// 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::Bounds>::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<<= ( @@ -245,10 +276,22 @@ CORBA::Boolean operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<CORBA::Bounds>; +// 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::Bounds + >; + #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::Bounds> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + CORBA::Bounds \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/BoundsC.h b/TAO/tao/BoundsC.h index b7078cf36b3..8bc7c825c8e 100644 --- a/TAO/tao/BoundsC.h +++ b/TAO/tao/BoundsC.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 @@ -25,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" @@ -33,8 +39,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "tao/Exception.h" #include "tao/CDR.h" +#include "tao/VarOut_T.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -62,27 +70,27 @@ // 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_exception/exception_ch.cpp:51 #if !defined (_CORBA_BOUNDS_CH_) #define _CORBA_BOUNDS_CH_ - + class TAO_Export Bounds : public CORBA::UserException { public: - + Bounds (void); Bounds (const Bounds &); ~Bounds (void); Bounds &operator= (const Bounds &); - + static void _tao_any_destructor (void *); - + static Bounds *_downcast (CORBA::Exception *); static CORBA::Exception *_alloc (void); @@ -92,32 +100,39 @@ 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_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_Bounds; #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_exception/any_op_ch.cpp:52 @@ -144,7 +159,7 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Bounds &); #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 "BoundsC.i" @@ -158,5 +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/BoundsC.i b/TAO/tao/BoundsC.i index 2e83c822e08..4caecfcfe78 100644 --- a/TAO/tao/BoundsC.i +++ b/TAO/tao/BoundsC.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<< ( diff --git a/TAO/tao/CONV_FRAME.pidl b/TAO/tao/CONV_FRAME.pidl index a26ed5325bb..0c046073517 100644 --- a/TAO/tao/CONV_FRAME.pidl +++ b/TAO/tao/CONV_FRAME.pidl @@ -1,4 +1,23 @@ -// $Id$ +/** + * @file CONV_FRAME.pidl + * + * $Id$ + * + * This file is used to generate CONV_FRAMEC.{h,i,cpp}, using the + * following command: + * + * tao_idl + * -o orig -Sa -Ge 1 -GT + * -Wb,export_macro=TAO_Export + * -Wb,export_include=TAO_Export.h + * -Wb,pre_include="ace/pre.h" + * -Wb,post_include="ace/post.h" + * CONV_FRAME.pidl + * + */ + +#ifndef TAO_CORBA_CONV_FRAME_PIDL +#define TAO_CORBA_CONV_FRAME_PIDL #pragma prefix "omg.org" @@ -21,3 +40,5 @@ module CONV_FRAME { }; }; +#endif /* TAO_CORBA_CONV_FRAME_PIDL */ + diff --git a/TAO/tao/CONV_FRAMEC.cpp b/TAO/tao/CONV_FRAMEC.cpp index 2d3c9803658..2b82ecda6e1 100644 --- a/TAO/tao/CONV_FRAMEC.cpp +++ b/TAO/tao/CONV_FRAMEC.cpp @@ -15,16 +15,21 @@ // 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/CONV_FRAMEC.h" -#include "tao/Any_Dual_Impl_T.h" +#include "CONV_FRAMEC.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig @@ -35,25 +40,33 @@ #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_CONV_FRAME_CodeSetId[] = { TAO_ENCAP_BYTE_ORDER, // byte order 37, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f4e56), - ACE_NTOHL (0x5f465241), - ACE_NTOHL (0x4d452f43), - ACE_NTOHL (0x6f646553), - ACE_NTOHL (0x65744964), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f4e56), + ACE_NTOHL (0x5f465241), + ACE_NTOHL (0x4d452f43), + ACE_NTOHL (0x6f646553), + ACE_NTOHL (0x65744964), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0 10, - ACE_NTOHL (0x436f6465), - ACE_NTOHL (0x53657449), + ACE_NTOHL (0x436f6465), + ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000), // name = CodeSetId CORBA::tk_ulong, @@ -67,14 +80,11 @@ static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetId ( sizeof (CONV_FRAME::CodeSetId) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CONV_FRAME) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_CodeSetId, - &_tc_TAO_tc_CONV_FRAME_CodeSetId - ) -TAO_NAMESPACE_END +namespace CONV_FRAME +{ + ::CORBA::TypeCode_ptr _tc_CodeSetId = + &_tc_TAO_tc_CONV_FRAME_CodeSetId; +} // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -83,62 +93,81 @@ static const CORBA::Long _oc_CONV_FRAME_CodeSetComponent[] = { TAO_ENCAP_BYTE_ORDER, // byte order 44, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f4e56), - ACE_NTOHL (0x5f465241), - ACE_NTOHL (0x4d452f43), - ACE_NTOHL (0x6f646553), - ACE_NTOHL (0x6574436f), - ACE_NTOHL (0x6d706f6e), - ACE_NTOHL (0x656e743a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f4e56), + ACE_NTOHL (0x5f465241), + ACE_NTOHL (0x4d452f43), + ACE_NTOHL (0x6f646553), + ACE_NTOHL (0x6574436f), + ACE_NTOHL (0x6d706f6e), + ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponent:1.0 17, - ACE_NTOHL (0x436f6465), - ACE_NTOHL (0x53657443), - ACE_NTOHL (0x6f6d706f), - ACE_NTOHL (0x6e656e74), + ACE_NTOHL (0x436f6465), + ACE_NTOHL (0x53657443), + ACE_NTOHL (0x6f6d706f), + ACE_NTOHL (0x6e656e74), ACE_NTOHL (0x0), // name = CodeSetComponent 2, // member count 16, - ACE_NTOHL (0x6e617469), - ACE_NTOHL (0x76655f63), - ACE_NTOHL (0x6f64655f), + ACE_NTOHL (0x6e617469), + ACE_NTOHL (0x76655f63), + ACE_NTOHL (0x6f64655f), ACE_NTOHL (0x73657400), // name = native_code_set CORBA::tk_alias, // typecode kind for typedefs 68, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 37, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f4e56), - ACE_NTOHL (0x5f465241), - ACE_NTOHL (0x4d452f43), - ACE_NTOHL (0x6f646553), - ACE_NTOHL (0x65744964), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f4e56), + ACE_NTOHL (0x5f465241), + ACE_NTOHL (0x4d452f43), + ACE_NTOHL (0x6f646553), + ACE_NTOHL (0x65744964), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0 10, - ACE_NTOHL (0x436f6465), - ACE_NTOHL (0x53657449), + ACE_NTOHL (0x436f6465), + ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000), // name = CodeSetId CORBA::tk_ulong, 21, - ACE_NTOHL (0x636f6e76), - ACE_NTOHL (0x65727369), - ACE_NTOHL (0x6f6e5f63), - ACE_NTOHL (0x6f64655f), - ACE_NTOHL (0x73657473), + ACE_NTOHL (0x636f6e76), + ACE_NTOHL (0x65727369), + ACE_NTOHL (0x6f6e5f63), + ACE_NTOHL (0x6f64655f), + ACE_NTOHL (0x73657473), ACE_NTOHL (0x0), // name = conversion_code_sets CORBA::tk_sequence, // typecode kind - 16, // encapsulation length + 84, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order - 0xffffffff, // indirection - 0xffffff88, // negative offset (-120) + CORBA::tk_alias, // typecode kind for typedefs + 68, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + 37, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f4e56), + ACE_NTOHL (0x5f465241), + ACE_NTOHL (0x4d452f43), + ACE_NTOHL (0x6f646553), + ACE_NTOHL (0x65744964), + ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0 + 10, + ACE_NTOHL (0x436f6465), + ACE_NTOHL (0x53657449), + ACE_NTOHL (0x64000000), // name = CodeSetId + CORBA::tk_ulong, + + 0U, }; @@ -151,41 +180,39 @@ static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetComponent ( sizeof (CONV_FRAME::CodeSetComponent) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CONV_FRAME) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_CodeSetComponent, - &_tc_TAO_tc_CONV_FRAME_CodeSetComponent - ) -TAO_NAMESPACE_END +namespace CONV_FRAME +{ + ::CORBA::TypeCode_ptr _tc_CodeSetComponent = + &_tc_TAO_tc_CONV_FRAME_CodeSetComponent; +} -// TAO_IDL - Generated from +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 -void CONV_FRAME::CodeSetComponent::_tao_any_destructor (void *_tao_void_pointer) -{ - CodeSetComponent *tmp = ACE_static_cast (CodeSetComponent*, _tao_void_pointer); - delete tmp; -} -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50 -CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_seq_CodeSetId (void) +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:66 + +#if !defined (_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CONV_FRAME_CODESETID__CS_) +#define _CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CONV_FRAME_CODESETID__CS_ + +CONV_FRAME::CodeSetComponent::_tao_seq_CONV_FRAME_CodeSetId_::_tao_seq_CONV_FRAME_CodeSetId_ (void) {} -CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_seq_CodeSetId (CORBA::ULong max) +CONV_FRAME::CodeSetComponent::_tao_seq_CONV_FRAME_CodeSetId_::_tao_seq_CONV_FRAME_CodeSetId_ ( + CORBA::ULong max + ) : TAO_Unbounded_Sequence< CONV_FRAME::CodeSetId > (max) {} -CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_seq_CodeSetId ( +CONV_FRAME::CodeSetComponent::_tao_seq_CONV_FRAME_CodeSetId_::_tao_seq_CONV_FRAME_CodeSetId_ ( CORBA::ULong max, CORBA::ULong length, - CORBA::ULong *buffer, + CORBA::ULong * buffer, CORBA::Boolean release ) : TAO_Unbounded_Sequence< @@ -194,53 +221,19 @@ CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_seq_CodeSetId ( (max, length, buffer, release) {} -CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_seq_CodeSetId (const _tao_seq_CodeSetId &seq) +CONV_FRAME::CodeSetComponent::_tao_seq_CONV_FRAME_CodeSetId_::_tao_seq_CONV_FRAME_CodeSetId_ ( + const _tao_seq_CONV_FRAME_CodeSetId_ &seq + ) : TAO_Unbounded_Sequence< CONV_FRAME::CodeSetId > (seq) {} -CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::~_tao_seq_CodeSetId (void) +CONV_FRAME::CodeSetComponent::_tao_seq_CONV_FRAME_CodeSetId_::~_tao_seq_CONV_FRAME_CodeSetId_ (void) {} -void CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_any_destructor (void *_tao_void_pointer) -{ - _tao_seq_CodeSetId *tmp = ACE_static_cast (_tao_seq_CodeSetId*, _tao_void_pointer); - delete tmp; -} - -// 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< - CONV_FRAME::CodeSetComponent - >; - -template class TAO_Var_Base_T<CONV_FRAME::CodeSetComponent>; -template class - TAO_Out_T< - CONV_FRAME::CodeSetComponent, - CONV_FRAME::CodeSetComponent_var - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO_Var_Var_T< \ - CONV_FRAME::CodeSetComponent \ - > -#pragma instantiate TAO_Var_Base_T<CONV_FRAME::CodeSetComponent> -# pragma instantiate \ - TAO_Out_T< \ - CONV_FRAME::CodeSetComponent, \ - CONV_FRAME::CodeSetComponent_var \ - > - -#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 @@ -249,100 +242,199 @@ static const CORBA::Long _oc_CONV_FRAME_CodeSetComponentInfo[] = { TAO_ENCAP_BYTE_ORDER, // byte order 48, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f4e56), - ACE_NTOHL (0x5f465241), - ACE_NTOHL (0x4d452f43), - ACE_NTOHL (0x6f646553), - ACE_NTOHL (0x6574436f), - ACE_NTOHL (0x6d706f6e), - ACE_NTOHL (0x656e7449), - ACE_NTOHL (0x6e666f3a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f4e56), + ACE_NTOHL (0x5f465241), + ACE_NTOHL (0x4d452f43), + ACE_NTOHL (0x6f646553), + ACE_NTOHL (0x6574436f), + ACE_NTOHL (0x6d706f6e), + ACE_NTOHL (0x656e7449), + ACE_NTOHL (0x6e666f3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponentInfo:1.0 21, - ACE_NTOHL (0x436f6465), - ACE_NTOHL (0x53657443), - ACE_NTOHL (0x6f6d706f), - ACE_NTOHL (0x6e656e74), - ACE_NTOHL (0x496e666f), + ACE_NTOHL (0x436f6465), + ACE_NTOHL (0x53657443), + ACE_NTOHL (0x6f6d706f), + ACE_NTOHL (0x6e656e74), + ACE_NTOHL (0x496e666f), ACE_NTOHL (0x0), // name = CodeSetComponentInfo 2, // member count 12, - ACE_NTOHL (0x466f7243), - ACE_NTOHL (0x68617244), + ACE_NTOHL (0x466f7243), + ACE_NTOHL (0x68617244), ACE_NTOHL (0x61746100), // name = ForCharData CORBA::tk_struct, // typecode kind - 228, // encapsulation length + 296, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 44, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f4e56), - ACE_NTOHL (0x5f465241), - ACE_NTOHL (0x4d452f43), - ACE_NTOHL (0x6f646553), - ACE_NTOHL (0x6574436f), - ACE_NTOHL (0x6d706f6e), - ACE_NTOHL (0x656e743a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f4e56), + ACE_NTOHL (0x5f465241), + ACE_NTOHL (0x4d452f43), + ACE_NTOHL (0x6f646553), + ACE_NTOHL (0x6574436f), + ACE_NTOHL (0x6d706f6e), + ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponent:1.0 17, - ACE_NTOHL (0x436f6465), - ACE_NTOHL (0x53657443), - ACE_NTOHL (0x6f6d706f), - ACE_NTOHL (0x6e656e74), + ACE_NTOHL (0x436f6465), + ACE_NTOHL (0x53657443), + ACE_NTOHL (0x6f6d706f), + ACE_NTOHL (0x6e656e74), ACE_NTOHL (0x0), // name = CodeSetComponent 2, // member count 16, - ACE_NTOHL (0x6e617469), - ACE_NTOHL (0x76655f63), - ACE_NTOHL (0x6f64655f), + ACE_NTOHL (0x6e617469), + ACE_NTOHL (0x76655f63), + ACE_NTOHL (0x6f64655f), ACE_NTOHL (0x73657400), // name = native_code_set CORBA::tk_alias, // typecode kind for typedefs 68, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 37, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f4e56), - ACE_NTOHL (0x5f465241), - ACE_NTOHL (0x4d452f43), - ACE_NTOHL (0x6f646553), - ACE_NTOHL (0x65744964), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f4e56), + ACE_NTOHL (0x5f465241), + ACE_NTOHL (0x4d452f43), + ACE_NTOHL (0x6f646553), + ACE_NTOHL (0x65744964), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0 10, - ACE_NTOHL (0x436f6465), - ACE_NTOHL (0x53657449), + ACE_NTOHL (0x436f6465), + ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000), // name = CodeSetId CORBA::tk_ulong, 21, - ACE_NTOHL (0x636f6e76), - ACE_NTOHL (0x65727369), - ACE_NTOHL (0x6f6e5f63), - ACE_NTOHL (0x6f64655f), - ACE_NTOHL (0x73657473), + ACE_NTOHL (0x636f6e76), + ACE_NTOHL (0x65727369), + ACE_NTOHL (0x6f6e5f63), + ACE_NTOHL (0x6f64655f), + ACE_NTOHL (0x73657473), ACE_NTOHL (0x0), // name = conversion_code_sets CORBA::tk_sequence, // typecode kind - 16, // encapsulation length + 84, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order - 0xffffffff, // indirection - 0xffffff88, // negative offset (-120) + CORBA::tk_alias, // typecode kind for typedefs + 68, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + 37, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f4e56), + ACE_NTOHL (0x5f465241), + ACE_NTOHL (0x4d452f43), + ACE_NTOHL (0x6f646553), + ACE_NTOHL (0x65744964), + ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0 + 10, + ACE_NTOHL (0x436f6465), + ACE_NTOHL (0x53657449), + ACE_NTOHL (0x64000000), // name = CodeSetId + CORBA::tk_ulong, + + 0U, 13, - ACE_NTOHL (0x466f7257), - ACE_NTOHL (0x63686172), - ACE_NTOHL (0x44617461), + ACE_NTOHL (0x466f7257), + ACE_NTOHL (0x63686172), + ACE_NTOHL (0x44617461), ACE_NTOHL (0x0), // name = ForWcharData - 0xffffffff, // indirection - 0xfffffefc, // negative offset (-260) + CORBA::tk_struct, // typecode kind + 296, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + 44, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f4e56), + ACE_NTOHL (0x5f465241), + ACE_NTOHL (0x4d452f43), + ACE_NTOHL (0x6f646553), + ACE_NTOHL (0x6574436f), + ACE_NTOHL (0x6d706f6e), + ACE_NTOHL (0x656e743a), + ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponent:1.0 + 17, + ACE_NTOHL (0x436f6465), + ACE_NTOHL (0x53657443), + ACE_NTOHL (0x6f6d706f), + ACE_NTOHL (0x6e656e74), + ACE_NTOHL (0x0), // name = CodeSetComponent + 2, // member count + 16, + ACE_NTOHL (0x6e617469), + ACE_NTOHL (0x76655f63), + ACE_NTOHL (0x6f64655f), + ACE_NTOHL (0x73657400), // name = native_code_set + CORBA::tk_alias, // typecode kind for typedefs + 68, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + 37, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f4e56), + ACE_NTOHL (0x5f465241), + ACE_NTOHL (0x4d452f43), + ACE_NTOHL (0x6f646553), + ACE_NTOHL (0x65744964), + ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0 + 10, + ACE_NTOHL (0x436f6465), + ACE_NTOHL (0x53657449), + ACE_NTOHL (0x64000000), // name = CodeSetId + CORBA::tk_ulong, + + + 21, + ACE_NTOHL (0x636f6e76), + ACE_NTOHL (0x65727369), + ACE_NTOHL (0x6f6e5f63), + ACE_NTOHL (0x6f64655f), + ACE_NTOHL (0x73657473), + ACE_NTOHL (0x0), // name = conversion_code_sets + CORBA::tk_sequence, // typecode kind + 84, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + CORBA::tk_alias, // typecode kind for typedefs + 68, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + 37, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f4e56), + ACE_NTOHL (0x5f465241), + ACE_NTOHL (0x4d452f43), + ACE_NTOHL (0x6f646553), + ACE_NTOHL (0x65744964), + ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0 + 10, + ACE_NTOHL (0x436f6465), + ACE_NTOHL (0x53657449), + ACE_NTOHL (0x64000000), // name = CodeSetId + CORBA::tk_ulong, + + + 0U, + + }; static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetComponentInfo ( @@ -353,55 +445,16 @@ static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetComponentInfo ( sizeof (CONV_FRAME::CodeSetComponentInfo) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CONV_FRAME) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_CodeSetComponentInfo, - &_tc_TAO_tc_CONV_FRAME_CodeSetComponentInfo - ) -TAO_NAMESPACE_END - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 - -void CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor (void *_tao_void_pointer) +namespace CONV_FRAME { - CodeSetComponentInfo *tmp = ACE_static_cast (CodeSetComponentInfo*, _tao_void_pointer); - delete tmp; + ::CORBA::TypeCode_ptr _tc_CodeSetComponentInfo = + &_tc_TAO_tc_CONV_FRAME_CodeSetComponentInfo; } -// 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< - CONV_FRAME::CodeSetComponentInfo - >; - -template class TAO_Var_Base_T<CONV_FRAME::CodeSetComponentInfo>; -template class - TAO_Out_T< - CONV_FRAME::CodeSetComponentInfo, - CONV_FRAME::CodeSetComponentInfo_var - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 -# pragma instantiate \ - TAO_Var_Var_T< \ - CONV_FRAME::CodeSetComponentInfo \ - > -#pragma instantiate TAO_Var_Base_T<CONV_FRAME::CodeSetComponentInfo> -# pragma instantiate \ - TAO_Out_T< \ - CONV_FRAME::CodeSetComponentInfo, \ - CONV_FRAME::CodeSetComponentInfo_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 @@ -410,54 +463,73 @@ static const CORBA::Long _oc_CONV_FRAME_CodeSetContext[] = { TAO_ENCAP_BYTE_ORDER, // byte order 42, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f4e56), - ACE_NTOHL (0x5f465241), - ACE_NTOHL (0x4d452f43), - ACE_NTOHL (0x6f646553), - ACE_NTOHL (0x6574436f), - ACE_NTOHL (0x6e746578), - ACE_NTOHL (0x743a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f4e56), + ACE_NTOHL (0x5f465241), + ACE_NTOHL (0x4d452f43), + ACE_NTOHL (0x6f646553), + ACE_NTOHL (0x6574436f), + ACE_NTOHL (0x6e746578), + ACE_NTOHL (0x743a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CONV_FRAME/CodeSetContext:1.0 15, - ACE_NTOHL (0x436f6465), - ACE_NTOHL (0x53657443), - ACE_NTOHL (0x6f6e7465), + ACE_NTOHL (0x436f6465), + ACE_NTOHL (0x53657443), + ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78740000), // name = CodeSetContext 2, // member count 10, - ACE_NTOHL (0x63686172), - ACE_NTOHL (0x5f646174), + ACE_NTOHL (0x63686172), + ACE_NTOHL (0x5f646174), ACE_NTOHL (0x61000000), // name = char_data CORBA::tk_alias, // typecode kind for typedefs 68, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 37, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f4e56), - ACE_NTOHL (0x5f465241), - ACE_NTOHL (0x4d452f43), - ACE_NTOHL (0x6f646553), - ACE_NTOHL (0x65744964), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f4e56), + ACE_NTOHL (0x5f465241), + ACE_NTOHL (0x4d452f43), + ACE_NTOHL (0x6f646553), + ACE_NTOHL (0x65744964), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0 10, - ACE_NTOHL (0x436f6465), - ACE_NTOHL (0x53657449), + ACE_NTOHL (0x436f6465), + ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000), // name = CodeSetId CORBA::tk_ulong, 11, - ACE_NTOHL (0x77636861), - ACE_NTOHL (0x725f6461), + ACE_NTOHL (0x77636861), + ACE_NTOHL (0x725f6461), ACE_NTOHL (0x74610000), // name = wchar_data - 0xffffffff, // indirection - 0xffffffa0, // negative offset (-96) + CORBA::tk_alias, // typecode kind for typedefs + 68, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + 37, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f4e56), + ACE_NTOHL (0x5f465241), + ACE_NTOHL (0x4d452f43), + ACE_NTOHL (0x6f646553), + ACE_NTOHL (0x65744964), + ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0 + 10, + ACE_NTOHL (0x436f6465), + ACE_NTOHL (0x53657449), + ACE_NTOHL (0x64000000), // name = CodeSetId + CORBA::tk_ulong, + + }; static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetContext ( @@ -468,269 +540,46 @@ static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetContext ( sizeof (CONV_FRAME::CodeSetContext) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CONV_FRAME) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_CodeSetContext, - &_tc_TAO_tc_CONV_FRAME_CodeSetContext - ) -TAO_NAMESPACE_END - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 - -void CONV_FRAME::CodeSetContext::_tao_any_destructor (void *_tao_void_pointer) -{ - CodeSetContext *tmp = ACE_static_cast (CodeSetContext*, _tao_void_pointer); - delete tmp; -} - -// 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< - CONV_FRAME::CodeSetContext - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO_Fixed_Var_T< \ - CONV_FRAME::CodeSetContext \ - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54 - -// Copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - const CONV_FRAME::CodeSetComponent &_tao_elem - ) -{ - TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponent>::insert_copy ( - _tao_any, - CONV_FRAME::CodeSetComponent::_tao_any_destructor, - CONV_FRAME::_tc_CodeSetComponent, - _tao_elem - ); -} - -// Non-copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - CONV_FRAME::CodeSetComponent *_tao_elem - ) -{ - TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponent>::insert ( - _tao_any, - CONV_FRAME::CodeSetComponent::_tao_any_destructor, - CONV_FRAME::_tc_CodeSetComponent, - _tao_elem - ); -} - -// Extraction to non-const pointer (deprecated). -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - CONV_FRAME::CodeSetComponent *&_tao_elem - ) -{ - return _tao_any >>= ACE_const_cast ( - const CONV_FRAME::CodeSetComponent *&, - _tao_elem - ); -} - -// Extraction to const pointer. -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - const CONV_FRAME::CodeSetComponent *&_tao_elem - ) -{ - return - TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponent>::extract ( - _tao_any, - CONV_FRAME::CodeSetComponent::_tao_any_destructor, - CONV_FRAME::_tc_CodeSetComponent, - _tao_elem - ); -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponent>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponent> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54 - -// Copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - const CONV_FRAME::CodeSetComponentInfo &_tao_elem - ) -{ - TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponentInfo>::insert_copy ( - _tao_any, - CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor, - CONV_FRAME::_tc_CodeSetComponentInfo, - _tao_elem - ); -} - -// Non-copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - CONV_FRAME::CodeSetComponentInfo *_tao_elem - ) -{ - TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponentInfo>::insert ( - _tao_any, - CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor, - CONV_FRAME::_tc_CodeSetComponentInfo, - _tao_elem - ); -} - -// Extraction to non-const pointer (deprecated). -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - CONV_FRAME::CodeSetComponentInfo *&_tao_elem - ) -{ - return _tao_any >>= ACE_const_cast ( - const CONV_FRAME::CodeSetComponentInfo *&, - _tao_elem - ); -} - -// Extraction to const pointer. -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - const CONV_FRAME::CodeSetComponentInfo *&_tao_elem - ) -{ - return - TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponentInfo>::extract ( - _tao_any, - CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor, - CONV_FRAME::_tc_CodeSetComponentInfo, - _tao_elem - ); -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponentInfo>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponentInfo> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54 - -// Copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - const CONV_FRAME::CodeSetContext &_tao_elem - ) -{ - TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetContext>::insert_copy ( - _tao_any, - CONV_FRAME::CodeSetContext::_tao_any_destructor, - CONV_FRAME::_tc_CodeSetContext, - _tao_elem - ); -} - -// Non-copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - CONV_FRAME::CodeSetContext *_tao_elem - ) +namespace CONV_FRAME { - TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetContext>::insert ( - _tao_any, - CONV_FRAME::CodeSetContext::_tao_any_destructor, - CONV_FRAME::_tc_CodeSetContext, - _tao_elem - ); + ::CORBA::TypeCode_ptr _tc_CodeSetContext = + &_tc_TAO_tc_CONV_FRAME_CodeSetContext; } -// Extraction to non-const pointer (deprecated). -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - CONV_FRAME::CodeSetContext *&_tao_elem - ) -{ - return _tao_any >>= ACE_const_cast ( - const CONV_FRAME::CodeSetContext *&, - _tao_elem - ); -} +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 -// Extraction to const pointer. -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - const CONV_FRAME::CodeSetContext *&_tao_elem - ) -{ - return - TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetContext>::extract ( - _tao_any, - CONV_FRAME::CodeSetContext::_tao_any_destructor, - CONV_FRAME::_tc_CodeSetContext, - _tao_elem - ); -} -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) -template class TAO_Var_Base_T<CONV_FRAME::CodeSetContext>; -template class TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetContext>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate TAO_Var_Base_T<CONV_FRAME::CodeSetContext> -# pragma instantiate TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetContext> -#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_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId_CPP_ -#define _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId_CPP_ +#if !defined _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CONV_FRAME_CodeSetId__CPP_ +#define _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CONV_FRAME_CodeSetId__CPP_ CORBA::Boolean operator<< ( TAO_OutputCDR &strm, - const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &_tao_sequence + const CONV_FRAME::CodeSetComponent::_tao_seq_CONV_FRAME_CodeSetId_ &_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, - CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &_tao_sequence + CONV_FRAME::CodeSetComponent::_tao_seq_CONV_FRAME_CodeSetId_ &_tao_sequence ) { CORBA::ULong _tao_seq_len; - + if (strm >> _tao_seq_len) { // Add a check to the length of the sequence @@ -740,21 +589,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. return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); + } - + return 0; } -#endif /* _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId_CPP_ */ +#endif /* _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CONV_FRAME_CodeSetId__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) + +#if !defined (_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CONV_FRAME_CODESETID__CS_) +#define _CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CONV_FRAME_CODESETID__CS_ + + template class + TAO_Unbounded_Sequence< + CONV_FRAME::CodeSetId + >; + +#endif /* end #if !defined */ + + template class + TAO_Var_Var_T< + CONV_FRAME::CodeSetComponent + >; + + template class + TAO_Var_Base_T< + CONV_FRAME::CodeSetComponent + >; + + template class + TAO_Out_T< + CONV_FRAME::CodeSetComponent, + CONV_FRAME::CodeSetComponent_var + >; + + template class + TAO_Var_Var_T< + CONV_FRAME::CodeSetComponentInfo + >; + + template class + TAO_Var_Base_T< + CONV_FRAME::CodeSetComponentInfo + >; + + template class + TAO_Out_T< + CONV_FRAME::CodeSetComponentInfo, + CONV_FRAME::CodeSetComponentInfo_var + >; + + template class + TAO_Fixed_Var_T< + CONV_FRAME::CodeSetContext + >; + + template class + TAO_Var_Base_T< + CONV_FRAME::CodeSetContext + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +#if !defined (_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CONV_FRAME_CODESETID__CS_) +#define _CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CONV_FRAME_CODESETID__CS_ + +# pragma instantiate \ + TAO_Unbounded_Sequence< \ + CONV_FRAME::CodeSetId \ + > + +#endif /* end #if !defined */ + +# pragma instantiate \ + TAO_Var_Var_T< \ + CONV_FRAME::CodeSetComponent \ + > + +# pragma instantiate \ + TAO_Var_Base_T< \ + CONV_FRAME::CodeSetComponent \ + > + +# pragma instantiate \ + TAO_Out_T< \ + CONV_FRAME::CodeSetComponent, \ + CONV_FRAME::CodeSetComponent_var \ + > + +# pragma instantiate \ + TAO_Var_Var_T< \ + CONV_FRAME::CodeSetComponentInfo \ + > + +# pragma instantiate \ + TAO_Var_Base_T< \ + CONV_FRAME::CodeSetComponentInfo \ + > + +# pragma instantiate \ + TAO_Out_T< \ + CONV_FRAME::CodeSetComponentInfo, \ + CONV_FRAME::CodeSetComponentInfo_var \ + > + +# pragma instantiate \ + TAO_Fixed_Var_T< \ + CONV_FRAME::CodeSetContext \ + > + +# pragma instantiate \ + TAO_Var_Base_T< \ + CONV_FRAME::CodeSetContext \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/CONV_FRAMEC.h b/TAO/tao/CONV_FRAMEC.h index b7135f59646..dce87fb59f2 100644 --- a/TAO/tao/CONV_FRAMEC.h +++ b/TAO/tao/CONV_FRAMEC.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 @@ -25,15 +31,16 @@ #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" -#include "tao/Sequence.h" -#include "tao/VarOut_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Sequence.h" +#include "tao/VarOut_T.h" #if defined (TAO_EXPORT_MACRO) #undef 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 CONV_FRAME +namespace CONV_FRAME { // TAO_IDL - Generated from @@ -76,7 +83,7 @@ TAO_NAMESPACE CONV_FRAME TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetId; // 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 CodeSetComponent; @@ -100,41 +107,44 @@ TAO_NAMESPACE CONV_FRAME { typedef CodeSetComponent_var _var_type; - static void _tao_any_destructor (void *); + CONV_FRAME::CodeSetId native_code_set; // 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 (_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CONV_FRAME_CODESETID__CH_) +#define _CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CONV_FRAME_CODESETID__CH_ - class TAO_Export _tao_seq_CodeSetId + class TAO_Export _tao_seq_CONV_FRAME_CodeSetId_ : public TAO_Unbounded_Sequence< - CONV_FRAME::CodeSetId + ACE_NESTED_CLASS (CONV_FRAME, CodeSetId) > { public: - _tao_seq_CodeSetId (void); - _tao_seq_CodeSetId (CORBA::ULong max); - _tao_seq_CodeSetId ( + _tao_seq_CONV_FRAME_CodeSetId_ (void); + _tao_seq_CONV_FRAME_CodeSetId_ (CORBA::ULong max); + _tao_seq_CONV_FRAME_CodeSetId_ ( CORBA::ULong max, CORBA::ULong length, - CORBA::ULong *buffer, + CORBA::ULong* buffer, CORBA::Boolean release = 0 ); - _tao_seq_CodeSetId (const _tao_seq_CodeSetId &); - ~_tao_seq_CodeSetId (void); - - static void _tao_any_destructor (void *); + _tao_seq_CONV_FRAME_CodeSetId_ (const _tao_seq_CONV_FRAME_CodeSetId_ &); + ~_tao_seq_CONV_FRAME_CodeSetId_ (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_CodeSetId _conversion_code_sets_seq; - _tao_seq_CodeSetId conversion_code_sets; + typedef _tao_seq_CONV_FRAME_CodeSetId_ _conversion_code_sets_seq; + _tao_seq_CONV_FRAME_CodeSetId_ conversion_code_sets; }; // TAO_IDL - Generated from @@ -143,7 +153,7 @@ TAO_NAMESPACE CONV_FRAME TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetComponent; // 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 CodeSetComponentInfo; @@ -167,7 +177,7 @@ TAO_NAMESPACE CONV_FRAME { typedef CodeSetComponentInfo_var _var_type; - static void _tao_any_destructor (void *); + CONV_FRAME::CodeSetComponent ForCharData; CONV_FRAME::CodeSetComponent ForWcharData; }; @@ -178,7 +188,7 @@ TAO_NAMESPACE CONV_FRAME TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetComponentInfo; // 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 CodeSetContext; @@ -199,7 +209,7 @@ TAO_NAMESPACE CONV_FRAME { typedef CodeSetContext_var _var_type; - static void _tao_any_destructor (void *); + CONV_FRAME::CodeSetId char_data; CONV_FRAME::CodeSetId wchar_data; }; @@ -210,34 +220,17 @@ TAO_NAMESPACE CONV_FRAME TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetContext; // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67 - -} -TAO_NAMESPACE_CLOSE // module CONV_FRAME - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:66 -TAO_Export void operator<<= (CORBA::Any &, const CONV_FRAME::CodeSetComponent &); // copying version -TAO_Export void operator<<= (CORBA::Any &, CONV_FRAME::CodeSetComponent*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CONV_FRAME::CodeSetComponent *&); // deprecated -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CONV_FRAME::CodeSetComponent *&); +} // module CONV_FRAME // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52 - -TAO_Export void operator<<= (CORBA::Any &, const CONV_FRAME::CodeSetComponentInfo &); // copying version -TAO_Export void operator<<= (CORBA::Any &, CONV_FRAME::CodeSetComponentInfo*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CONV_FRAME::CodeSetComponentInfo *&); // deprecated -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CONV_FRAME::CodeSetComponentInfo *&); +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:48 -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52 - -TAO_Export void operator<<= (CORBA::Any &, const CONV_FRAME::CodeSetContext &); // copying version -TAO_Export void operator<<= (CORBA::Any &, CONV_FRAME::CodeSetContext*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CONV_FRAME::CodeSetContext *&); // deprecated -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CONV_FRAME::CodeSetContext *&); +// Traits specializations. +namespace TAO +{ +}; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48 @@ -245,36 +238,36 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CONV_FRAME::Cod #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 CONV_FRAME::CodeSetComponent &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetComponent &); // 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_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId_H_ -#define _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId_H_ +#if !defined _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CONV_FRAME_CodeSetId__H_ +#define _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CONV_FRAME_CodeSetId__H_ TAO_Export CORBA::Boolean operator<< ( TAO_OutputCDR &, - const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId & + const CONV_FRAME::CodeSetComponent::_tao_seq_CONV_FRAME_CodeSetId_ & ); TAO_Export CORBA::Boolean operator>> ( TAO_InputCDR &, - CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId & + CONV_FRAME::CodeSetComponent::_tao_seq_CONV_FRAME_CodeSetId_ & ); -#endif /* _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId_H_ */ +#endif /* _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CONV_FRAME_CodeSetId__H_ */ // 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 CONV_FRAME::CodeSetComponentInfo &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetComponentInfo &); // 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 CONV_FRAME::CodeSetContext &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetContext &); @@ -285,7 +278,7 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetContext #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 "CONV_FRAMEC.i" @@ -299,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/CONV_FRAMEC.i b/TAO/tao/CONV_FRAMEC.i index 1414e6641dc..9099e9deb23 100644 --- a/TAO/tao/CONV_FRAMEC.i +++ b/TAO/tao/CONV_FRAMEC.i @@ -15,31 +15,37 @@ // 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_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId_I_ -#define _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId_I_ +#if !defined _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CONV_FRAME_CodeSetId__I_ +#define _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CONV_FRAME_CodeSetId__I_ CORBA::Boolean TAO_Export operator<< ( TAO_OutputCDR &, - const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId & + const CONV_FRAME::CodeSetComponent::_tao_seq_CONV_FRAME_CodeSetId_ & ); CORBA::Boolean TAO_Export operator>> ( TAO_InputCDR &, - CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId & + CONV_FRAME::CodeSetComponent::_tao_seq_CONV_FRAME_CodeSetId_ & ); -#endif /* _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId_I_ */ +#endif /* _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CONV_FRAME_CodeSetId__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<< ( @@ -47,17 +53,9 @@ CORBA::Boolean operator<< ( const CONV_FRAME::CodeSetComponent &_tao_aggregate ) { - if ( + return (strm << _tao_aggregate.native_code_set) && - (strm << _tao_aggregate.conversion_code_sets) - ) - { - return 1; - } - else - { - return 0; - } + (strm << _tao_aggregate.conversion_code_sets); } ACE_INLINE @@ -66,21 +64,13 @@ CORBA::Boolean operator>> ( CONV_FRAME::CodeSetComponent &_tao_aggregate ) { - if ( + return (strm >> _tao_aggregate.native_code_set) && - (strm >> _tao_aggregate.conversion_code_sets) - ) - { - return 1; - } - else - { - return 0; - } + (strm >> _tao_aggregate.conversion_code_sets); } // 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<< ( @@ -88,17 +78,9 @@ CORBA::Boolean operator<< ( const CONV_FRAME::CodeSetComponentInfo &_tao_aggregate ) { - if ( + return (strm << _tao_aggregate.ForCharData) && - (strm << _tao_aggregate.ForWcharData) - ) - { - return 1; - } - else - { - return 0; - } + (strm << _tao_aggregate.ForWcharData); } ACE_INLINE @@ -107,21 +89,13 @@ CORBA::Boolean operator>> ( CONV_FRAME::CodeSetComponentInfo &_tao_aggregate ) { - if ( + return (strm >> _tao_aggregate.ForCharData) && - (strm >> _tao_aggregate.ForWcharData) - ) - { - return 1; - } - else - { - return 0; - } + (strm >> _tao_aggregate.ForWcharData); } // 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<< ( @@ -129,17 +103,9 @@ CORBA::Boolean operator<< ( const CONV_FRAME::CodeSetContext &_tao_aggregate ) { - if ( + return (strm << _tao_aggregate.char_data) && - (strm << _tao_aggregate.wchar_data) - ) - { - return 1; - } - else - { - return 0; - } + (strm << _tao_aggregate.wchar_data); } ACE_INLINE @@ -148,16 +114,8 @@ CORBA::Boolean operator>> ( CONV_FRAME::CodeSetContext &_tao_aggregate ) { - if ( + return (strm >> _tao_aggregate.char_data) && - (strm >> _tao_aggregate.wchar_data) - ) - { - return 1; - } - else - { - return 0; - } + (strm >> _tao_aggregate.wchar_data); } diff --git a/TAO/tao/Current.pidl b/TAO/tao/Current.pidl index 408a7a41f80..83b2183b6c5 100644 --- a/TAO/tao/Current.pidl +++ b/TAO/tao/Current.pidl @@ -27,7 +27,7 @@ // command used for this is: // // tao_idl.exe -// -o orig -Gp -Gd -Ge 1 +// -o orig -Sa -Gp -Gd -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/CurrentC.cpp b/TAO/tao/CurrentC.cpp index 28e8b0d9874..0702cfb2e4d 100644 --- a/TAO/tao/CurrentC.cpp +++ b/TAO/tao/CurrentC.cpp @@ -15,16 +15,21 @@ // 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 "CurrentC.h" -#include "tao/Sequence_T.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig @@ -35,80 +40,71 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61 - -int CORBA::Current::_tao_class_id = 0; +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:59 -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class - TAO_Objref_Var_T< - CORBA::Current, - CORBA::tao_Current_life - >; - template class - TAO_Objref_Out_T< - CORBA::Current, - CORBA::tao_Current_life - >; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate \ - TAO_Objref_Var_T< \ - CORBA::Current, \ - CORBA::tao_Current_life \ - > -# pragma instantiate \ - TAO_Objref_Out_T< \ - CORBA::Current, \ - CORBA::tao_Current_life \ - > -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +// Arg traits specializations. +namespace TAO +{ +}; // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60 -CORBA::Current::Current (void) -{} +// Traits specializations for CORBA::Current. -CORBA::Current::~Current (void) -{} +CORBA::Current_ptr +TAO::Objref_Traits<CORBA::Current>::tao_duplicate ( + CORBA::Current_ptr p + ) +{ + return CORBA::Current::_duplicate (p); +} void -CORBA::Current::_tao_any_destructor (void *_tao_void_pointer) +TAO::Objref_Traits<CORBA::Current>::tao_release ( + CORBA::Current_ptr p + ) { - Current *tmp = ACE_static_cast (Current *, _tao_void_pointer); - CORBA::release (tmp); + CORBA::release (p); } CORBA::Current_ptr -CORBA::Current::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL +TAO::Objref_Traits<CORBA::Current>::tao_nil (void) +{ + return CORBA::Current::_nil (); +} + +CORBA::Boolean +TAO::Objref_Traits<CORBA::Current>::tao_marshal ( + CORBA::Current_ptr p, + TAO_OutputCDR & cdr ) { - return Current::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); + return p->marshal (cdr); } -CORBA::Current_ptr -CORBA::Current::_unchecked_narrow ( +// Function pointer for collocation factory initialization. +TAO::Collocation_Proxy_Broker * +(*CORBA__TAO_Current_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj + ) = 0; + +CORBA::Current::Current (void) +{} + +CORBA::Current::~Current (void) +{} + +CORBA::Current_ptr +CORBA::Current::_narrow ( + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL_NOT_USED ) { - if (CORBA::is_nil (obj)) - { - 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); + proxy->_add_ref (); + return proxy; } CORBA::Current_ptr @@ -118,39 +114,37 @@ CORBA::Current::_duplicate (Current_ptr obj) { obj->_add_ref (); } - + return obj; } -void *CORBA::Current::_tao_QueryInterface (ptrdiff_t type) +CORBA::Boolean +CORBA::Current::_is_a ( + const char *value + ACE_ENV_ARG_DECL + ) { - void *retv = 0; - - if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &ACE_NESTED_CLASS (::CORBA, Current)::_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/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 *, - 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::Current::_interface_repository_id (void) const @@ -171,16 +165,16 @@ static const CORBA::Long _oc_CORBA_Current[] = { TAO_ENCAP_BYTE_ORDER, // byte order 30, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f4375), - ACE_NTOHL (0x7272656e), - ACE_NTOHL (0x743a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f4375), + ACE_NTOHL (0x7272656e), + ACE_NTOHL (0x743a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CORBA/Current:1.0 8, - ACE_NTOHL (0x43757272), + ACE_NTOHL (0x43757272), ACE_NTOHL (0x656e7400), // name = Current }; @@ -192,63 +186,42 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Current ( sizeof (CORBA::Current) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_Current, - &_tc_TAO_tc_CORBA_Current - ) -TAO_NAMESPACE_END - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52 - -// Copying insertion. -void -operator<<= ( - CORBA::Any &_tao_any, - CORBA::Current_ptr _tao_elem - ) +namespace CORBA { - CORBA::Current_ptr _tao_objptr = - CORBA::Current::_duplicate (_tao_elem); - _tao_any <<= &_tao_objptr; + ::CORBA::TypeCode_ptr _tc_Current = + &_tc_TAO_tc_CORBA_Current; } -// Non-copying insertion. -void -operator<<= ( - CORBA::Any &_tao_any, - CORBA::Current_ptr *_tao_elem - ) -{ - TAO::Any_Impl_T<CORBA::Current>::insert ( - _tao_any, - CORBA::Current::_tao_any_destructor, - CORBA::_tc_Current, - *_tao_elem - ); -} +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1703 -CORBA::Boolean -operator>>= ( - const CORBA::Any &_tao_any, - CORBA::Current_ptr &_tao_elem - ) -{ - return - TAO::Any_Impl_T<CORBA::Current>::extract ( - _tao_any, - CORBA::Current::_tao_any_destructor, - CORBA::_tc_Current, - _tao_elem - ); -} +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + + template class + TAO_Objref_Var_T< + CORBA::Current, + TAO::Objref_Traits<CORBA::Current> + >; + + template class + TAO_Objref_Out_T< + CORBA::Current, + TAO::Objref_Traits<CORBA::Current> + >; -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Impl_T<CORBA::Current>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Impl_T<CORBA::Current> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +# pragma instantiate \ + TAO_Objref_Var_T< \ + CORBA::Current, \ + TAO::Objref_Traits<CORBA::Current> \ + > + +# pragma instantiate \ + TAO_Objref_Out_T< \ + CORBA::Current, \ + TAO::Objref_Traits<CORBA::Current> \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h index c61e26b72a2..04221a7b620 100644 --- a/TAO/tao/CurrentC.h +++ b/TAO/tao/CurrentC.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 @@ -25,14 +31,16 @@ #ifndef _TAO_IDL_ORIG_CURRENTC_H_ #define _TAO_IDL_ORIG_CURRENTC_H_ -#include /**/ "ace/pre.h" +#include "ace/pre.h" + #include "tao/Object.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Any_Impl_T.h" +#include "tao/Object_T.h" +#include "tao/Objref_VarOut_T.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -57,90 +65,110 @@ #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; +} + // 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:566 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601 +#if !defined (_CORBA_CURRENT__VAR_OUT_CH_) +#define _CORBA_CURRENT__VAR_OUT_CH_ + class Current; typedef Current *Current_ptr; - typedef TAO_Objref_Var_T<Current> Current_var; - typedef TAO_Objref_Out_T<Current> Current_out; + + typedef + TAO_Objref_Var_T< + Current + > + Current_var; + + typedef + TAO_Objref_Out_T< + Current + > + Current_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_CURRENT_CH_) #define _CORBA_CURRENT_CH_ - + class TAO_Export Current : public virtual CORBA::Object { 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); - + static Current_ptr _narrow ( CORBA::Object_ptr obj 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; } - - 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: Current (void); virtual ~Current (void); - + private: Current (const Current &); void operator= (const Current &); }; #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_Current; // 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_interface/any_op_ch.cpp:52 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:48 -TAO_Export void operator<<= (CORBA::Any &, CORBA::Current_ptr); // copying -TAO_Export void operator<<= (CORBA::Any &, CORBA::Current_ptr *); // non-copying -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Current_ptr &); +// Traits specializations. +namespace TAO +{ +}; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48 @@ -153,7 +181,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Current_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 "CurrentC.i" @@ -167,5 +195,6 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Current_ptr &) #pragma option pop #endif /* __BORLANDC__ */ -#include /**/ "ace/post.h" +#include "ace/post.h" #endif /* ifndef */ + diff --git a/TAO/tao/CurrentC.i b/TAO/tao/CurrentC.i index 1e2d655daae..c380ec6f072 100644 --- a/TAO/tao/CurrentC.i +++ b/TAO/tao/CurrentC.i @@ -15,41 +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_visitor_interface/interface_ci.cpp:68 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63 #if !defined (_CORBA_CURRENT___CI_) #define _CORBA_CURRENT___CI_ -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<CORBA::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<CORBA::Current>::marshal_value (TAO_OutputCDR &) -{ - return 0; -} - -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<CORBA::Current>::demarshal_value (TAO_InputCDR &) -{ - return 0; -} #endif /* end #if !defined */ + diff --git a/TAO/tao/Domain.pidl b/TAO/tao/Domain.pidl index df8f168b268..6ed4c23ac24 100644 --- a/TAO/tao/Domain.pidl +++ b/TAO/tao/Domain.pidl @@ -14,7 +14,7 @@ * command used for this 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" diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp index 76b240a9c04..dffd2fec0f4 100644 --- a/TAO/tao/DomainC.cpp +++ b/TAO/tao/DomainC.cpp @@ -15,26 +15,28 @@ // 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 "DomainC.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/Basic_Arguments.h" +#include "tao/Object_Argument_T.h" +#include "tao/Special_Basic_Arguments.h" #include "tao/IFR_Client_Adapter.h" + #include "ace/Dynamic_Service.h" #if defined (__BORLANDC__) @@ -45,173 +47,144 @@ #include "DomainC.i" #endif /* !defined INLINE */ -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61 - -int CORBA::DomainManager::_tao_class_id = 0; - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class - TAO_Objref_Var_T< - CORBA::DomainManager, - CORBA::tao_DomainManager_life - >; - template class - TAO_Objref_Out_T< - CORBA::DomainManager, - CORBA::tao_DomainManager_life - >; -template class TAO_Seq_Var_Base_T<CORBA::DomainManagerList, - TAO_Object_Manager<CORBA::DomainManager, - TAO_Objref_Var_T<CORBA::DomainManager, - CORBA::tao_DomainManager_life>, - CORBA::tao_DomainManager_life> >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate \ - TAO_Objref_Var_T< \ - CORBA::DomainManager, \ - CORBA::tao_DomainManager_life \ - > -# pragma instantiate \ - TAO_Objref_Out_T< \ - CORBA::DomainManager, \ - CORBA::tao_DomainManager_life \ - > - -#pragma instantiate TAO_Seq_Var_Base_T<CORBA::DomainManagerList, - TAO_Object_Manager<CORBA::DomainManager, - TAO_Objref_Var_T<CORBA::DomainManager, CORBA::tao_DomainManager_life>, - CORBA::tao_DomainManager_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_DomainManager_get_domain_policy : public TAO_ClientRequestInfo_i +namespace CORBA { -public: - TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy ( - TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target, - const CORBA::PolicyType & policy_type - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + class InterfaceDef; + typedef InterfaceDef *InterfaceDef_ptr; + typedef TAO_Objref_Var_T<InterfaceDef> InterfaceDef_var; + typedef TAO_Objref_Out_T<InterfaceDef> InterfaceDef_out; +} - virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); +ACE_TEMPLATE_SPECIALIZATION +void +TAO::In_Object_Argument_T<CORBA::InterfaceDef_ptr>::interceptor_param (Dynamic::Parameter & p) +{ + TAO_IFR_Client_Adapter *adapter = + ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( + TAO_ORB_Core::ifr_client_adapter_name () + ); - virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); + adapter->interfacedef_any_insert (p.argument, this->x_); + p.mode = CORBA::PARAM_IN; +} - virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::In_Object_Argument_T<CORBA::InterfaceDef_ptr>::marshal (TAO_OutputCDR & cdr) +{ + TAO_IFR_Client_Adapter *adapter = + ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( + TAO_ORB_Core::ifr_client_adapter_name () + ); - void result (::CORBA::Policy_ptr result); + return adapter->interfacedef_cdr_insert (cdr, this->x_); +} - private: - TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy (const TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy &); - void operator= (const TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy &); - const CORBA::PolicyType & policy_type_; +// 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> + > + { + }; - ::CORBA::Policy_ptr _result; +#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> + > + { }; - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376 - - TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy ( - TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target, - const CORBA::PolicyType & policy_type - ACE_ENV_ARG_DECL_NOT_USED - ) - : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), - policy_type_ (policy_type) -{} +#endif /* end #if !defined */ + +#if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_CS_) +#define _CORBA_INTERFACEDEF__ARG_TRAITS_CS_ + + ACE_TEMPLATE_SPECIALIZATION + class TAO_Export Arg_Traits<CORBA::InterfaceDef> + : public + Object_Arg_Traits_T< + CORBA::InterfaceDef_ptr, + CORBA::InterfaceDef_var, + CORBA::InterfaceDef_out, + TAO::Objref_Traits<CORBA::InterfaceDef> + > + { + }; -Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::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); +#endif /* end #if !defined */ +}; - Dynamic::ParameterList_var safe_parameter_list = parameter_list; +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60 - parameter_list->length (1); - CORBA::ULong len = 0; - (*parameter_list)[len].argument <<= policy_type_; - (*parameter_list)[len].mode = CORBA::PARAM_IN; - len++; +// Traits specializations for CORBA::DomainManager. - return safe_parameter_list._retn (); +CORBA::DomainManager_ptr +TAO::Objref_Traits<CORBA::DomainManager>::tao_duplicate ( + CORBA::DomainManager_ptr p + ) +{ + return CORBA::DomainManager::_duplicate (p); } -Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::exceptions (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) +void +TAO::Objref_Traits<CORBA::DomainManager>::tao_release ( + CORBA::DomainManager_ptr p + ) { - // 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::release (p); } -CORBA::Any * -TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::result (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) +CORBA::DomainManager_ptr +TAO::Objref_Traits<CORBA::DomainManager>::tao_nil (void) { - // 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 (); + return CORBA::DomainManager::_nil (); } -void -TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::result (::CORBA::Policy_ptr result) +CORBA::Boolean +TAO::Objref_Traits<CORBA::DomainManager>::tao_marshal ( + CORBA::DomainManager_ptr p, + TAO_OutputCDR & cdr + ) { - // Update the result. - this->_result = result; + return p->marshal (cdr); } -#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_DomainManager_Proxy_Impl::_TAO_DomainManager_Proxy_Impl (void) -{} - -CORBA::_TAO_DomainManager_Remote_Proxy_Impl::_TAO_DomainManager_Remote_Proxy_Impl (void) -{} - -// Remote Implementation of the IDL interface methods +// Function pointer for collocation factory initialization. +TAO::Collocation_Proxy_Broker * +(*CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer) ( + CORBA::Object_ptr obj + ) = 0; // 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_DomainManager_Remote_Proxy_Impl::get_domain_policy ( - CORBA::Object *_collocated_tao_target_, +::CORBA::Policy_ptr CORBA::DomainManager::get_domain_policy ( CORBA::PolicyType policy_type ACE_ENV_ARG_DECL ) @@ -219,267 +192,44 @@ CORBA::_TAO_DomainManager_Remote_Proxy_Impl::_TAO_DomainManager_Remote_Proxy_Imp 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, - "get_domain_policy", - 17, - 1, - 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_DomainManager_Proxy_Broker_ == 0) { - _invoke_status = TAO_INVOKE_EXCEPTION; - -#if TAO_HAS_INTERCEPTORS == 1 - TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy _tao_ri ( - &_tao_call, - _collocated_tao_target_, - policy_type - ACE_ENV_ARG_PARAMETER + CORBA_DomainManager_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 ()); - - TAO_OutputCDR &_tao_out = _tao_call.out_stream (); - - if (!( - (_tao_out << policy_type) - )) - { - TAO_OutputCDR::throw_stub_exception (errno 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 (); -} - -// -// 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_DomainManager_Proxy_Broker::_TAO_DomainManager_Proxy_Broker (void) -{ -} - -CORBA::_TAO_DomainManager_Proxy_Broker::~_TAO_DomainManager_Proxy_Broker (void) -{ -} - -CORBA::_TAO_DomainManager_Proxy_Broker * (*CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer) ( - CORBA::Object_ptr obj - ) = 0; - -// Factory Member function Implementation. -CORBA::_TAO_DomainManager_Remote_Proxy_Broker * -CORBA::_TAO_DomainManager_Remote_Proxy_Broker::the_TAO_DomainManager_Remote_Proxy_Broker (void) -{ - static ::CORBA::_TAO_DomainManager_Remote_Proxy_Broker remote_proxy_broker; - return &remote_proxy_broker; -} - -CORBA::_TAO_DomainManager_Remote_Proxy_Broker::_TAO_DomainManager_Remote_Proxy_Broker (void) -{ -} - -CORBA::_TAO_DomainManager_Remote_Proxy_Broker::~_TAO_DomainManager_Remote_Proxy_Broker (void) -{ -} - -CORBA::_TAO_DomainManager_Proxy_Impl& -CORBA::_TAO_DomainManager_Remote_Proxy_Broker::select_proxy ( - ::CORBA::DomainManager * - ACE_ENV_ARG_DECL_NOT_USED - ) -{ - return this->remote_proxy_impl_; + + TAO::Arg_Traits<CORBA::Policy>::ret_val _tao_retval; + TAO::Arg_Traits<CORBA::PolicyType>::in_arg_val _tao_policy_type (policy_type); + + TAO::Argument *_tao_signature [] = + { + &_tao_retval, + &_tao_policy_type + }; + + TAO::Invocation_Adapter _tao_call ( + this, + _tao_signature, + 2, + "get_domain_policy", + 17, + this->the_TAO_DomainManager_Proxy_Broker_ + ); + + _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (_tao_retval.excp ()); + + return _tao_retval.retn (); } -// -// 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::DomainManager::DomainManager (int collocated) + : the_TAO_DomainManager_Proxy_Broker_ (0) { this->CORBA_DomainManager_setup_collocation (collocated); } @@ -488,118 +238,28 @@ void CORBA::DomainManager::CORBA_DomainManager_setup_collocation (int collocated) { if (collocated) - this->the_TAO_DomainManager_Proxy_Broker_ = - ::CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer (this); - else - this->the_TAO_DomainManager_Proxy_Broker_ = - ::CORBA::_TAO_DomainManager_Remote_Proxy_Broker::the_TAO_DomainManager_Remote_Proxy_Broker (); + { + this->the_TAO_DomainManager_Proxy_Broker_ = + ::CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer (this); + } } CORBA::DomainManager::~DomainManager (void) {} -void -CORBA::DomainManager::_tao_any_destructor (void *_tao_void_pointer) -{ - DomainManager *tmp = ACE_static_cast (DomainManager *, _tao_void_pointer); - CORBA::release (tmp); -} - CORBA::DomainManager_ptr CORBA::DomainManager::_narrow ( - CORBA::Object_ptr obj + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL ) { - if (CORBA::is_nil (obj)) - { - return DomainManager::_nil (); - } - - if (! obj->_is_local ()) - { - CORBA::Boolean is_a = - obj->_is_a ( - "IDL:omg.org/CORBA/DomainManager:1.0" - ACE_ENV_ARG_PARAMETER - ); - ACE_CHECK_RETURN (DomainManager::_nil ()); - - if (is_a == 0) - { - return DomainManager::_nil (); - } - } - - return DomainManager::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); -} - -CORBA::DomainManager_ptr -CORBA::DomainManager::_unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED - ) -{ - if (CORBA::is_nil (obj)) - { - return DomainManager::_nil (); - } - - if (! obj->_is_local ()) - { - TAO_Stub* stub = obj->_stubobj (); - - if (stub != 0) - { - stub->_incr_refcnt (); - } - - DomainManager_ptr default_proxy = DomainManager::_nil (); - - if ( - !CORBA::is_nil (stub->servant_orb_var ().ptr ()) && - stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () && - obj->_is_collocated () && - CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer != 0 - ) - { - ACE_NEW_RETURN ( - default_proxy, - ::CORBA::DomainManager ( - stub, - 1, - obj->_servant () - ), - DomainManager::_nil () - ); - } - - if (CORBA::is_nil (default_proxy)) - { - ACE_NEW_RETURN ( - default_proxy, - ::CORBA::DomainManager ( - stub, - 0, - obj->_servant () - ), - DomainManager::_nil () - ); - } - - return default_proxy; - } - else - return - ACE_reinterpret_cast ( - DomainManager_ptr, - obj->_tao_QueryInterface ( - ACE_reinterpret_cast ( - ptrdiff_t, - &DomainManager::_tao_class_id - ) - ) - ); + return + TAO::Narrow_Utils<DomainManager>::narrow ( + _tao_objref, + "IDL:omg.org/CORBA/DomainManager:1.0", + CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer + ACE_ENV_ARG_PARAMETER + ); } CORBA::DomainManager_ptr @@ -609,7 +269,7 @@ CORBA::DomainManager::_duplicate (DomainManager_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -641,37 +301,6 @@ CORBA::DomainManager::_is_a ( } } -void *CORBA::DomainManager::_tao_QueryInterface (ptrdiff_t type) -{ - void *retv = 0; - - if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &ACE_NESTED_CLASS (::CORBA, DomainManager)::_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::DomainManager::_interface_repository_id (void) const { return "IDL:omg.org/CORBA/DomainManager:1.0"; @@ -684,228 +313,51 @@ CORBA::DomainManager::marshal (TAO_OutputCDR &cdr) } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60 -::CORBA::Policy_ptr CORBA::DomainManager::get_domain_policy ( - CORBA::PolicyType policy_type - ACE_ENV_ARG_DECL +// Traits specializations for CORBA::ConstructionPolicy. + +CORBA::ConstructionPolicy_ptr +TAO::Objref_Traits<CORBA::ConstructionPolicy>::tao_duplicate ( + CORBA::ConstructionPolicy_ptr p ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { - _TAO_DomainManager_Proxy_Impl &proxy = - this->the_TAO_DomainManager_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - - return proxy.get_domain_policy ( - this, - policy_type - ACE_ENV_ARG_PARAMETER - ); + return CORBA::ConstructionPolicy::_duplicate (p); } -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 - -static const CORBA::Long _oc_CORBA_DomainManager[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 36, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f446f), - ACE_NTOHL (0x6d61696e), - ACE_NTOHL (0x4d616e61), - ACE_NTOHL (0x6765723a), - ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/DomainManager:1.0 - 14, - ACE_NTOHL (0x446f6d61), - ACE_NTOHL (0x696e4d61), - ACE_NTOHL (0x6e616765), - ACE_NTOHL (0x72000000), // name = DomainManager - }; - -static CORBA::TypeCode _tc_TAO_tc_CORBA_DomainManager ( - CORBA::tk_objref, - sizeof (_oc_CORBA_DomainManager), - (char *) &_oc_CORBA_DomainManager, - 0, - sizeof (CORBA::DomainManager) - ); - -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_DomainManager, - &_tc_TAO_tc_CORBA_DomainManager +void +TAO::Objref_Traits<CORBA::ConstructionPolicy>::tao_release ( + CORBA::ConstructionPolicy_ptr p ) -TAO_NAMESPACE_END - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61 - -int CORBA::ConstructionPolicy::_tao_class_id = 0; - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class - TAO_Objref_Var_T< - CORBA::ConstructionPolicy, - CORBA::tao_ConstructionPolicy_life - >; - template class - TAO_Objref_Out_T< - CORBA::ConstructionPolicy, - CORBA::tao_ConstructionPolicy_life - >; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate \ - TAO_Objref_Var_T< \ - CORBA::ConstructionPolicy, \ - CORBA::tao_ConstructionPolicy_life \ - > -# pragma instantiate \ - TAO_Objref_Out_T< \ - CORBA::ConstructionPolicy, \ - CORBA::tao_ConstructionPolicy_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_ConstructionPolicy_make_domain_manager : public TAO_ClientRequestInfo_i { -public: - TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager ( - TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target, - CORBA::InterfaceDef_ptr object_type, - const CORBA::Boolean & constr_policy - 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_ConstructionPolicy_make_domain_manager (const TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager &); - void operator= (const TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager &); - CORBA::InterfaceDef_ptr object_type_; - const CORBA::Boolean & constr_policy_; - }; - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:376 - - TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager ( - TAO_GIOP_Invocation *_tao_invocation, - CORBA::Object_ptr _tao_target, - CORBA::InterfaceDef_ptr object_type, - const CORBA::Boolean & constr_policy - ACE_ENV_ARG_DECL_NOT_USED - ) - : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), - object_type_ (object_type), - constr_policy_ (constr_policy) -{} - -Dynamic::ParameterList * -TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::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); - - Dynamic::ParameterList_var safe_parameter_list = parameter_list; - - parameter_list->length (2); - CORBA::ULong len = 0; - - TAO_IFR_Client_Adapter *adapter = - ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( - TAO_ORB_Core::ifr_client_adapter_name () - ); - - adapter->interfacedef_any_insert ( - (*parameter_list)[len].argument, - this->object_type_ - ); - - (*parameter_list)[len].mode = CORBA::PARAM_IN; - len++; - - (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->constr_policy_); - (*parameter_list)[len].mode = CORBA::PARAM_IN; - len++; - - return safe_parameter_list._retn (); + CORBA::release (p); } -Dynamic::ExceptionList * -TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::exceptions (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) +CORBA::ConstructionPolicy_ptr +TAO::Objref_Traits<CORBA::ConstructionPolicy>::tao_nil (void) { - // 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 CORBA::ConstructionPolicy::_nil (); } -CORBA::Any * -TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::result (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) +CORBA::Boolean +TAO::Objref_Traits<CORBA::ConstructionPolicy>::tao_marshal ( + CORBA::ConstructionPolicy_ptr p, + TAO_OutputCDR & cdr + ) { - // 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 p->marshal (cdr); } - - -#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_ConstructionPolicy_Proxy_Impl::_TAO_ConstructionPolicy_Proxy_Impl (void) -{} - -CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Impl::_TAO_ConstructionPolicy_Remote_Proxy_Impl (void) -{} - -// Remote Implementation of the IDL interface methods +// Function pointer for collocation factory initialization. +TAO::Collocation_Proxy_Broker * +(*CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer) ( + CORBA::Object_ptr obj + ) = 0; // 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_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager ( - CORBA::Object *_collocated_tao_target_, +void CORBA::ConstructionPolicy::make_domain_manager ( CORBA::InterfaceDef_ptr object_type, CORBA::Boolean constr_policy ACE_ENV_ARG_DECL @@ -914,252 +366,44 @@ void CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager ( 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, - "make_domain_manager", - 19, - 2, - 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 */ - - TAO_IFR_Client_Adapter *adapter = - ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( - TAO_ORB_Core::ifr_client_adapter_name () - ); - - for (;;) + + if (this->the_TAO_ConstructionPolicy_Proxy_Broker_ == 0) { - _invoke_status = TAO_INVOKE_EXCEPTION; - -#if TAO_HAS_INTERCEPTORS == 1 - TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager _tao_ri ( - &_tao_call, - _collocated_tao_target_, - object_type, - constr_policy - ACE_ENV_ARG_PARAMETER + CORBA_ConstructionPolicy_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; - - TAO_OutputCDR &_tao_out = _tao_call.out_stream (); - - if (!( - (adapter->interfacedef_cdr_insert (_tao_out, object_type)) && - (_tao_out << CORBA::Any::from_boolean (constr_policy)) - )) - { - TAO_OutputCDR::throw_stub_exception (errno 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::Arg_Traits<CORBA::InterfaceDef>::in_arg_val _tao_object_type (object_type); + TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val _tao_constr_policy (constr_policy); + + TAO::Argument *_tao_signature [] = + { + &_tao_retval, + &_tao_object_type, + &_tao_constr_policy + }; + + TAO::Invocation_Adapter _tao_call ( + this, + _tao_signature, + 3, + "make_domain_manager", + 19, + this->the_TAO_ConstructionPolicy_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_ConstructionPolicy_Proxy_Broker::_TAO_ConstructionPolicy_Proxy_Broker (void) -{ -} - -CORBA::_TAO_ConstructionPolicy_Proxy_Broker::~_TAO_ConstructionPolicy_Proxy_Broker (void) -{ -} - -CORBA::_TAO_ConstructionPolicy_Proxy_Broker * (*CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer) ( - CORBA::Object_ptr obj - ) = 0; - -// Factory Member function Implementation. -CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Broker * -CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Broker::the_TAO_ConstructionPolicy_Remote_Proxy_Broker (void) -{ - static ::CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Broker remote_proxy_broker; - return &remote_proxy_broker; -} - -CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Broker::_TAO_ConstructionPolicy_Remote_Proxy_Broker (void) -{ -} - -CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Broker::~_TAO_ConstructionPolicy_Remote_Proxy_Broker (void) -{ -} - -CORBA::_TAO_ConstructionPolicy_Proxy_Impl& -CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Broker::select_proxy ( - ::CORBA::ConstructionPolicy * - 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::ConstructionPolicy::ConstructionPolicy (int collocated) + : the_TAO_ConstructionPolicy_Proxy_Broker_ (0) { this->CORBA_ConstructionPolicy_setup_collocation (collocated); } @@ -1168,120 +412,30 @@ void CORBA::ConstructionPolicy::CORBA_ConstructionPolicy_setup_collocation (int collocated) { if (collocated) - this->the_TAO_ConstructionPolicy_Proxy_Broker_ = - ::CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer (this); - else - this->the_TAO_ConstructionPolicy_Proxy_Broker_ = - ::CORBA::_TAO_ConstructionPolicy_Remote_Proxy_Broker::the_TAO_ConstructionPolicy_Remote_Proxy_Broker (); - + { + this->the_TAO_ConstructionPolicy_Proxy_Broker_ = + ::CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer (this); + } + this->CORBA_Policy_setup_collocation (collocated); } CORBA::ConstructionPolicy::~ConstructionPolicy (void) {} -void -CORBA::ConstructionPolicy::_tao_any_destructor (void *_tao_void_pointer) -{ - ConstructionPolicy *tmp = ACE_static_cast (ConstructionPolicy *, _tao_void_pointer); - CORBA::release (tmp); -} - CORBA::ConstructionPolicy_ptr CORBA::ConstructionPolicy::_narrow ( - CORBA::Object_ptr obj + CORBA::Object_ptr _tao_objref ACE_ENV_ARG_DECL ) { - if (CORBA::is_nil (obj)) - { - return ConstructionPolicy::_nil (); - } - - if (! obj->_is_local ()) - { - CORBA::Boolean is_a = - obj->_is_a ( - "IDL:omg.org/CORBA/ConstructionPolicy:1.0" - ACE_ENV_ARG_PARAMETER - ); - ACE_CHECK_RETURN (ConstructionPolicy::_nil ()); - - if (is_a == 0) - { - return ConstructionPolicy::_nil (); - } - } - - return ConstructionPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); -} - -CORBA::ConstructionPolicy_ptr -CORBA::ConstructionPolicy::_unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED - ) -{ - if (CORBA::is_nil (obj)) - { - return ConstructionPolicy::_nil (); - } - - if (! obj->_is_local ()) - { - TAO_Stub* stub = obj->_stubobj (); - - if (stub != 0) - { - stub->_incr_refcnt (); - } - - ConstructionPolicy_ptr default_proxy = ConstructionPolicy::_nil (); - - if ( - !CORBA::is_nil (stub->servant_orb_var ().ptr ()) && - stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () && - obj->_is_collocated () && - CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer != 0 - ) - { - ACE_NEW_RETURN ( - default_proxy, - ::CORBA::ConstructionPolicy ( - stub, - 1, - obj->_servant () - ), - ConstructionPolicy::_nil () - ); - } - - if (CORBA::is_nil (default_proxy)) - { - ACE_NEW_RETURN ( - default_proxy, - ::CORBA::ConstructionPolicy ( - stub, - 0, - obj->_servant () - ), - ConstructionPolicy::_nil () - ); - } - - return default_proxy; - } - else - return - ACE_reinterpret_cast ( - ConstructionPolicy_ptr, - obj->_tao_QueryInterface ( - ACE_reinterpret_cast ( - ptrdiff_t, - &ConstructionPolicy::_tao_class_id - ) - ) - ); + return + TAO::Narrow_Utils<ConstructionPolicy>::narrow ( + _tao_objref, + "IDL:omg.org/CORBA/ConstructionPolicy:1.0", + CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer + ACE_ENV_ARG_PARAMETER + ); } CORBA::ConstructionPolicy_ptr @@ -1291,7 +445,7 @@ CORBA::ConstructionPolicy::_duplicate (ConstructionPolicy_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -1304,11 +458,11 @@ CORBA::ConstructionPolicy::_is_a ( if ( !ACE_OS::strcmp ( (char *)value, - "IDL:omg.org/CORBA/ConstructionPolicy:1.0" + "IDL:omg.org/CORBA/Policy:1.0" ) || !ACE_OS::strcmp ( (char *)value, - "IDL:omg.org/CORBA/Policy:1.0" + "IDL:omg.org/CORBA/ConstructionPolicy:1.0" ) || !ACE_OS::strcmp ( (char *)value, @@ -1327,51 +481,6 @@ CORBA::ConstructionPolicy::_is_a ( } } -void *CORBA::ConstructionPolicy::_tao_QueryInterface (ptrdiff_t type) -{ - void *retv = 0; - - if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &ACE_NESTED_CLASS (::CORBA, ConstructionPolicy)::_tao_class_id) - ) - { - retv = ACE_reinterpret_cast (void*, this); - } - else if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &::CORBA::Policy::_tao_class_id) - ) - { - retv = - ACE_reinterpret_cast ( - void *, - ACE_static_cast ( - CORBA::Policy_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) - { - this->_add_ref (); - } - - return retv; -} - const char* CORBA::ConstructionPolicy::_interface_repository_id (void) const { return "IDL:omg.org/CORBA/ConstructionPolicy:1.0"; @@ -1383,80 +492,18 @@ CORBA::ConstructionPolicy::marshal (TAO_OutputCDR &cdr) return (cdr << this); } -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:80 - -void CORBA::ConstructionPolicy::make_domain_manager ( - CORBA::InterfaceDef_ptr object_type, - CORBA::Boolean constr_policy - ACE_ENV_ARG_DECL - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) -{ - _TAO_ConstructionPolicy_Proxy_Impl &proxy = - this->the_TAO_ConstructionPolicy_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - proxy.make_domain_manager ( - this, - object_type, - constr_policy - ACE_ENV_ARG_PARAMETER - ); -} - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 - -static const CORBA::Long _oc_CORBA_ConstructionPolicy[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 41, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f436f), - ACE_NTOHL (0x6e737472), - ACE_NTOHL (0x75637469), - ACE_NTOHL (0x6f6e506f), - ACE_NTOHL (0x6c696379), - ACE_NTOHL (0x3a312e30), - ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/ConstructionPolicy:1.0 - 19, - ACE_NTOHL (0x436f6e73), - ACE_NTOHL (0x74727563), - ACE_NTOHL (0x74696f6e), - ACE_NTOHL (0x506f6c69), - ACE_NTOHL (0x63790000), // name = ConstructionPolicy - }; - -static CORBA::TypeCode _tc_TAO_tc_CORBA_ConstructionPolicy ( - CORBA::tk_objref, - sizeof (_oc_CORBA_ConstructionPolicy), - (char *) &_oc_CORBA_ConstructionPolicy, - 0, - sizeof (CORBA::ConstructionPolicy) - ); - -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (CORBA) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_ConstructionPolicy, - &_tc_TAO_tc_CORBA_ConstructionPolicy - ) -TAO_NAMESPACE_END +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:66 -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50 +#if !defined (_CORBA_DOMAINMANAGERLIST_CS_) +#define _CORBA_DOMAINMANAGERLIST_CS_ CORBA::DomainManagerList::DomainManagerList (void) {} -CORBA::DomainManagerList::DomainManagerList (CORBA::ULong max) +CORBA::DomainManagerList::DomainManagerList ( + CORBA::ULong max + ) : TAO_Unbounded_Object_Sequence< CORBA::DomainManager, CORBA::DomainManager_var @@ -1467,7 +514,7 @@ CORBA::DomainManagerList::DomainManagerList (CORBA::ULong max) CORBA::DomainManagerList::DomainManagerList ( CORBA::ULong max, CORBA::ULong length, - CORBA::DomainManager_ptr *buffer, + CORBA::DomainManager_ptr * buffer, CORBA::Boolean release ) : TAO_Unbounded_Object_Sequence< @@ -1477,7 +524,9 @@ CORBA::DomainManagerList::DomainManagerList ( (max, length, buffer, release) {} -CORBA::DomainManagerList::DomainManagerList (const DomainManagerList &seq) +CORBA::DomainManagerList::DomainManagerList ( + const DomainManagerList &seq + ) : TAO_Unbounded_Object_Sequence< CORBA::DomainManager, CORBA::DomainManager_var @@ -1488,316 +537,7 @@ CORBA::DomainManagerList::DomainManagerList (const DomainManagerList &seq) CORBA::DomainManagerList::~DomainManagerList (void) {} -void CORBA::DomainManagerList::_tao_any_destructor (void *_tao_void_pointer) -{ - DomainManagerList *tmp = ACE_static_cast (DomainManagerList*, _tao_void_pointer); - delete tmp; -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class - TAO_MngSeq_Var_T< - CORBA::DomainManagerList, - TAO_Object_Manager< - CORBA::DomainManager, - CORBA::DomainManager_var, - CORBA::tao_DomainManager_life - > - >; -template class TAO_Unbounded_Object_Sequence<CORBA::DomainManager, - CORBA::DomainManager_var, - CORBA::tao_DomainManager_life, - CORBA::tao_DomainManager_cast>; - -template class - TAO_MngSeq_Out_T< - CORBA::DomainManagerList, - CORBA::DomainManagerList_var, - TAO_Object_Manager< - CORBA::DomainManager, - CORBA::DomainManager_var, - CORBA::tao_DomainManager_life - > - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO_MngSeq_Var_T< \ - CORBA::DomainManagerList, \ - TAO_Object_Manager< \ - CORBA::DomainManager, \ - CORBA::DomainManager_var, \ - CORBA::tao_DomainManager_life \ - > \ - > -#pragma instantiate TAO_Unbounded_Object_Sequence<CORBA::DomainManager, - CORBA::DomainManager_var, - CORBA::tao_DomainManager_life, - CORBA::tao_DomainManager_cast> - -# pragma instantiate \ - TAO_Seq_Out_T< \ - CORBA::DomainManagerList, \ - CORBA::DomainManagerList_var, \ - TAO_Object_Manager< \ - CORBA::DomainManager, \ - CORBA::DomainManager_var, \ - CORBA::tao_DomainManager_life \ - > \ - > - -#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_DomainManagerList[] = - { - TAO_ENCAP_BYTE_ORDER, // byte order - 40, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f446f), - ACE_NTOHL (0x6d61696e), - ACE_NTOHL (0x4d616e61), - ACE_NTOHL (0x6765724c), - ACE_NTOHL (0x6973743a), - ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/DomainManagerList:1.0 - 18, - ACE_NTOHL (0x446f6d61), - ACE_NTOHL (0x696e4d61), - ACE_NTOHL (0x6e616765), - ACE_NTOHL (0x724c6973), - ACE_NTOHL (0x74000000), // name = DomainManagerList - CORBA::tk_sequence, // typecode kind - 80, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - CORBA::tk_objref, // typecode kind - 64, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - 36, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f446f), - ACE_NTOHL (0x6d61696e), - ACE_NTOHL (0x4d616e61), - ACE_NTOHL (0x6765723a), - ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/DomainManager:1.0 - 14, - ACE_NTOHL (0x446f6d61), - ACE_NTOHL (0x696e4d61), - ACE_NTOHL (0x6e616765), - ACE_NTOHL (0x72000000), // name = DomainManager - - 0U, - -}; - - static CORBA::TypeCode _tc_TAO_tc_CORBA_DomainManagerList ( - CORBA::tk_alias, - sizeof (_oc_CORBA_DomainManagerList), - (char *) &_oc_CORBA_DomainManagerList, - 0, - sizeof (CORBA::DomainManagerList) - ); - - TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) - TAO_NAMESPACE_BEGIN (CORBA) - TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_DomainManagerList, - &_tc_TAO_tc_CORBA_DomainManagerList - ) - TAO_NAMESPACE_END - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52 - - // Copying insertion. - void - operator<<= ( - CORBA::Any &_tao_any, - CORBA::DomainManager_ptr _tao_elem - ) - { - CORBA::DomainManager_ptr _tao_objptr = - CORBA::DomainManager::_duplicate (_tao_elem); - _tao_any <<= &_tao_objptr; - } - - // Non-copying insertion. - void - operator<<= ( - CORBA::Any &_tao_any, - CORBA::DomainManager_ptr *_tao_elem - ) - { - TAO::Any_Impl_T<CORBA::DomainManager>::insert ( - _tao_any, - CORBA::DomainManager::_tao_any_destructor, - CORBA::_tc_DomainManager, - *_tao_elem - ); - } - - CORBA::Boolean - operator>>= ( - const CORBA::Any &_tao_any, - CORBA::DomainManager_ptr &_tao_elem - ) - { - return - TAO::Any_Impl_T<CORBA::DomainManager>::extract ( - _tao_any, - CORBA::DomainManager::_tao_any_destructor, - CORBA::_tc_DomainManager, - _tao_elem - ); - } - - template<> - CORBA::Boolean - TAO::Any_Impl_T<CORBA::DomainManager>::to_object ( - CORBA::Object_ptr &_tao_elem - ) const - { - _tao_elem = CORBA::Object::_duplicate (this->value_); - return 1; - } - - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<CORBA::DomainManager,CORBA::DomainManager_var, CORBA::tao_DomainManager_life>; - template class TAO::Any_Impl_T<CORBA::DomainManager>; - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - # pragma instantiate TAO_Object_Manager<CORBA::DomainManager, CORBA::DomainManager_var, CORBA::tao_DomainManager_life> - # pragma instantiate TAO::Any_Impl_T<CORBA::DomainManager> -#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 - -// Copying insertion. -void -operator<<= ( - CORBA::Any &_tao_any, - CORBA::ConstructionPolicy_ptr _tao_elem - ) -{ - CORBA::ConstructionPolicy_ptr _tao_objptr = - CORBA::ConstructionPolicy::_duplicate (_tao_elem); - _tao_any <<= &_tao_objptr; -} - -// Non-copying insertion. -void -operator<<= ( - CORBA::Any &_tao_any, - CORBA::ConstructionPolicy_ptr *_tao_elem - ) -{ - TAO::Any_Impl_T<CORBA::ConstructionPolicy>::insert ( - _tao_any, - CORBA::ConstructionPolicy::_tao_any_destructor, - CORBA::_tc_ConstructionPolicy, - *_tao_elem - ); -} - -CORBA::Boolean -operator>>= ( - const CORBA::Any &_tao_any, - CORBA::ConstructionPolicy_ptr &_tao_elem - ) -{ - return - TAO::Any_Impl_T<CORBA::ConstructionPolicy>::extract ( - _tao_any, - CORBA::ConstructionPolicy::_tao_any_destructor, - CORBA::_tc_ConstructionPolicy, - _tao_elem - ); -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<CORBA::ConstructionPolicy,CORBA::ConstructionPolicy_var, CORBA::tao_ConstructionPolicy_life>; - template class TAO::Any_Impl_T<CORBA::ConstructionPolicy>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<CORBA::ConstructionPolicy, CORBA::ConstructionPolicy_var, CORBA::tao_ConstructionPolicy_life> -# pragma instantiate TAO::Any_Impl_T<CORBA::ConstructionPolicy> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -// 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::DomainManagerList &_tao_elem - ) -{ - TAO::Any_Dual_Impl_T<CORBA::DomainManagerList>::insert_copy ( - _tao_any, - CORBA::DomainManagerList::_tao_any_destructor, - CORBA::_tc_DomainManagerList, - _tao_elem - ); -} - -// Non-copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - CORBA::DomainManagerList *_tao_elem - ) -{ - TAO::Any_Dual_Impl_T<CORBA::DomainManagerList>::insert ( - _tao_any, - CORBA::DomainManagerList::_tao_any_destructor, - CORBA::_tc_DomainManagerList, - _tao_elem - ); -} - -// Extraction to non-const pointer (deprecated). -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - CORBA::DomainManagerList *&_tao_elem - ) -{ - return _tao_any >>= ACE_const_cast ( - const CORBA::DomainManagerList *&, - _tao_elem - ); -} - -// Extraction to const pointer. -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - const CORBA::DomainManagerList *&_tao_elem - ) -{ - return - TAO::Any_Dual_Impl_T<CORBA::DomainManagerList>::extract ( - _tao_any, - CORBA::DomainManagerList::_tao_any_destructor, - CORBA::_tc_DomainManagerList, - _tao_elem - ); -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<CORBA::DomainManagerList>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::DomainManagerList> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* end #if !defined */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63 @@ -1816,30 +556,23 @@ CORBA::Boolean operator>> ( CORBA::DomainManager_ptr &_tao_objref ) { - ACE_TRY_NEW_ENV - { - CORBA::Object_var obj; - - if ((strm >> obj.inout ()) == 0) - { - return 0; - } - - // Narrow to the right type. - _tao_objref = - CORBA::DomainManager::_unchecked_narrow ( - obj.in () - ACE_ENV_ARG_PARAMETER - ); - ACE_TRY_CHECK; - return 1; - } - ACE_CATCHANY - { - // do nothing - } - ACE_ENDTRY; - return 0; + CORBA::Object_var obj; + + if ((strm >> obj.inout ()) == 0) + { + return 0; + } + + typedef ::CORBA::DomainManager RHS_SCOPED_NAME; + + // Narrow to the right type. + _tao_objref = + TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( + obj.in (), + CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer + ); + + return 1; } // TAO_IDL - Generated from @@ -1859,34 +592,30 @@ CORBA::Boolean operator>> ( CORBA::ConstructionPolicy_ptr &_tao_objref ) { - ACE_TRY_NEW_ENV - { - CORBA::Object_var obj; - - if ((strm >> obj.inout ()) == 0) - { - return 0; - } - - // Narrow to the right type. - _tao_objref = - CORBA::ConstructionPolicy::_unchecked_narrow ( - obj.in () - ACE_ENV_ARG_PARAMETER - ); - ACE_TRY_CHECK; - return 1; - } - ACE_CATCHANY - { - // do nothing - } - ACE_ENDTRY; - return 0; + CORBA::Object_var obj; + + if ((strm >> obj.inout ()) == 0) + { + return 0; + } + + typedef ::CORBA::ConstructionPolicy RHS_SCOPED_NAME; + + // Narrow to the right type. + _tao_objref = + TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow ( + obj.in (), + CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer + ); + + return 1; } // 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_DomainManagerList_CPP_ +#define _TAO_CDR_OP_CORBA_DomainManagerList_CPP_ CORBA::Boolean operator<< ( TAO_OutputCDR &strm, @@ -1894,21 +623,21 @@ 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 = _tao_sequence[i].in ()->marshal (strm); } - + return _tao_marshal_flag; } - + return 0; } @@ -1918,7 +647,7 @@ CORBA::Boolean operator>> ( ) { CORBA::ULong _tao_seq_len; - + if (strm >> _tao_seq_len) { // Add a check to the length of the sequence @@ -1928,26 +657,243 @@ 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; } + +#endif /* _TAO_CDR_OP_CORBA_DomainManagerList_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) + +#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 */ + +#if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_TMPLINST_CS_) +#define _CORBA_INTERFACEDEF__ARG_TRAITS_TMPLINST_CS_ + + template class TAO::Arg_Traits<CORBA::InterfaceDef>; + + template class + TAO::Object_Arg_Traits_T< + CORBA::InterfaceDef_ptr, + CORBA::InterfaceDef_var, + CORBA::InterfaceDef_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::DomainManager, + TAO::Objref_Traits<CORBA::DomainManager> + >; + + template class + TAO_Objref_Out_T< + CORBA::DomainManager, + TAO::Objref_Traits<CORBA::DomainManager> + >; + + template class + TAO::In_Object_Argument_T< + CORBA::InterfaceDef_ptr + >; + + template class + TAO_Objref_Var_T< + CORBA::ConstructionPolicy, + TAO::Objref_Traits<CORBA::ConstructionPolicy> + >; + + template class + TAO_Objref_Out_T< + CORBA::ConstructionPolicy, + TAO::Objref_Traits<CORBA::ConstructionPolicy> + >; + + template class + TAO_Object_Manager< + CORBA::DomainManager, + CORBA::DomainManager_va, + >; + + template class + TAO_MngSeq_Var_T< + CORBA::DomainManagerList, + TAO_Object_Manager< + CORBA::DomainManager, + CORBA::DomainManager_var + > + >; + + template class + TAO_Seq_Var_Base_T< + CORBA::DomainManagerList, + TAO_Object_Manager< + CORBA::DomainManager, + CORBA::DomainManager_var + > + >; + + template class + TAO_MngSeq_Out_T< + CORBA::DomainManagerList, + CORBA::DomainManagerList_var, + TAO_Object_Manager< + CORBA::DomainManager, + CORBA::DomainManager_var + > + >; + +#if !defined (_CORBA_DOMAINMANAGERLIST_CS_) +#define _CORBA_DOMAINMANAGERLIST_CS_ + + template class + TAO_Unbounded_Object_Sequence< + CORBA::DomainManager, + CORBA::DomainManager_var + >; + +#endif /* end #if !defined */ + +#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 */ + +#if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_TMPLINST_CS_) +#define _CORBA_INTERFACEDEF__ARG_TRAITS_TMPLINST_CS_ + +# pragma instantiate TAO::Arg_Traits<CORBA::InterfaceDef> + +# pragma instantiate \ + TAO::Object_Arg_Traits_T< \ + CORBA::InterfaceDef_ptr, \ + CORBA::InterfaceDef_var, \ + CORBA::InterfaceDef_out \ + > + +#endif /* end #if !defined */ + +# pragma instantiate \ + TAO_Objref_Var_T< \ + CORBA::DomainManager, \ + TAO::Objref_Traits<CORBA::DomainManager> \ + > + +# pragma instantiate \ + TAO_Objref_Out_T< \ + CORBA::DomainManager, \ + TAO::Objref_Traits<CORBA::DomainManager> \ + > + +# pragma instantiate \ + TAO::In_Object_Argument_T< \ + CORBA::InterfaceDef_ptr \ + > + +# pragma instantiate \ + TAO_Objref_Var_T< \ + CORBA::ConstructionPolicy, \ + TAO::Objref_Traits<CORBA::ConstructionPolicy> \ + > + +# pragma instantiate \ + TAO_Objref_Out_T< \ + CORBA::ConstructionPolicy, \ + TAO::Objref_Traits<CORBA::ConstructionPolicy> \ + > + +# pragma instantiate \ + TAO_MngSeq_Var_T< \ + CORBA::DomainManagerList, \ + TAO_Object_Manager< \ + CORBA::DomainManager, \ + CORBA::DomainManager_var \ + > \ + > + +# pragma instantiate \ + TAO_Seq_Var_Base_T< \ + CORBA::DomainManagerList, \ + TAO_Object_Manager< \ + CORBA::DomainManager, \ + CORBA::DomainManager_var \ + > \ + > + +# pragma instantiate \ + TAO_MngSeq_Out_T< \ + CORBA::DomainManagerList, \ + CORBA::DomainManagerList_var, \ + TAO_Object_Manager< \ + CORBA::DomainManager, \ + CORBA::DomainManager_var \ + > \ + > + +#if !defined (_CORBA_DOMAINMANAGERLIST_CS_) +#define _CORBA_DOMAINMANAGERLIST_CS_ + +# pragma instantiate \ + TAO_Unbounded_Object_Sequence< \ + CORBA::DomainManager, \ + CORBA::DomainManager_var \ + > + +#endif /* end #if !defined */ + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h index 387be637e37..2ae8b06055d 100644 --- a/TAO/tao/DomainC.h +++ b/TAO/tao/DomainC.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 @@ -25,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" @@ -33,6 +39,12 @@ # 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" +#include "tao/Seq_Out_T.h" + #include "PolicyC.h" #if defined (TAO_EXPORT_MACRO) @@ -58,62 +70,75 @@ #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; +} + // 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:566 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601 +#if !defined (_CORBA_DOMAINMANAGER__VAR_OUT_CH_) +#define _CORBA_DOMAINMANAGER__VAR_OUT_CH_ + class DomainManager; typedef DomainManager *DomainManager_ptr; - typedef TAO_Objref_Var_T<DomainManager> DomainManager_var; - typedef TAO_Objref_Out_T<DomainManager> DomainManager_out; + + typedef + TAO_Objref_Var_T< + DomainManager + > + DomainManager_var; + + typedef + TAO_Objref_Out_T< + DomainManager + > + DomainManager_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_DOMAINMANAGER_CH_) #define _CORBA_DOMAINMANAGER_CH_ - - class _TAO_DomainManager_Proxy_Impl; - class _TAO_DomainManager_Remote_Proxy_Impl; - class _TAO_DomainManager_Proxy_Broker; - class _TAO_DomainManager_Remote_Proxy_Broker; - + class TAO_Export DomainManager : public virtual CORBA::Object { public: + friend class TAO::Narrow_Utils<DomainManager>; typedef DomainManager_ptr _ptr_type; typedef DomainManager_var _var_type; - static int _tao_class_id; - + // The static operations. static DomainManager_ptr _duplicate (DomainManager_ptr obj); - + static DomainManager_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - - static DomainManager_ptr _unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); - + static DomainManager_ptr _nil (void) { return (DomainManager_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::Policy_ptr get_domain_policy ( CORBA::PolicyType policy_type ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -121,244 +146,105 @@ TAO_NAMESPACE CORBA 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); private: - _TAO_DomainManager_Proxy_Broker *the_TAO_DomainManager_Proxy_Broker_; - + TAO::Collocation_Proxy_Broker *the_TAO_DomainManager_Proxy_Broker_; + protected: DomainManager (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_DomainManager_setup_collocation (int collocated); - + + DomainManager (IOP::IOR *ior, + TAO_ORB_Core *orb_core = 0); + DomainManager ( - 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 ~DomainManager (void); - - friend class _TAO_DomainManager_Remote_Proxy_Impl; - friend class _TAO_DomainManager_ThruPOA_Proxy_Impl; - friend class _TAO_DomainManager_Direct_Proxy_Impl; - + private: DomainManager (const DomainManager &); void operator= (const DomainManager &); }; - // 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_DomainManager_Proxy_Impl - : public virtual TAO_Object_Proxy_Impl - { - public: - virtual ~_TAO_DomainManager_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::Policy_ptr get_domain_policy ( - CORBA::Object *_collocated_tao_target_, - CORBA::PolicyType policy_type - ACE_ENV_ARG_DECL - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - protected: - _TAO_DomainManager_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_DomainManager_Remote_Proxy_Impl - : public virtual _TAO_DomainManager_Proxy_Impl, - public virtual TAO_Remote_Object_Proxy_Impl - { - public: - _TAO_DomainManager_Remote_Proxy_Impl (void); - - virtual ~_TAO_DomainManager_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::Policy_ptr get_domain_policy ( - CORBA::Object *_collocated_tao_target_, - CORBA::PolicyType policy_type - 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_DomainManager_Proxy_Broker - { - public: - virtual ~_TAO_DomainManager_Proxy_Broker (void); - virtual _TAO_DomainManager_Proxy_Impl &select_proxy ( - DomainManager *object - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) = 0; - - protected: - _TAO_DomainManager_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_DomainManager_Remote_Proxy_Broker - : public virtual _TAO_DomainManager_Proxy_Broker - { - public: - _TAO_DomainManager_Remote_Proxy_Broker (void); - - virtual ~_TAO_DomainManager_Remote_Proxy_Broker (void); - - virtual _TAO_DomainManager_Proxy_Impl &select_proxy ( - DomainManager *object - ACE_ENV_ARG_DECL - ); - - private: - _TAO_DomainManager_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_DomainManager_Remote_Proxy_Broker *the_TAO_DomainManager_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_DomainManager; - + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - + const CORBA::PolicyType SecConstruction = 11U; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:566 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601 +#if !defined (_CORBA_CONSTRUCTIONPOLICY__VAR_OUT_CH_) +#define _CORBA_CONSTRUCTIONPOLICY__VAR_OUT_CH_ + class ConstructionPolicy; typedef ConstructionPolicy *ConstructionPolicy_ptr; - typedef TAO_Objref_Var_T<ConstructionPolicy> ConstructionPolicy_var; - typedef TAO_Objref_Out_T<ConstructionPolicy> ConstructionPolicy_out; + + typedef + TAO_Objref_Var_T< + ConstructionPolicy + > + ConstructionPolicy_var; + + typedef + TAO_Objref_Out_T< + ConstructionPolicy + > + ConstructionPolicy_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_CONSTRUCTIONPOLICY_CH_) #define _CORBA_CONSTRUCTIONPOLICY_CH_ - - class _TAO_ConstructionPolicy_Proxy_Impl; - class _TAO_ConstructionPolicy_Remote_Proxy_Impl; - class _TAO_ConstructionPolicy_Proxy_Broker; - class _TAO_ConstructionPolicy_Remote_Proxy_Broker; - + class TAO_Export ConstructionPolicy : public virtual CORBA::Policy { public: + friend class TAO::Narrow_Utils<ConstructionPolicy>; typedef ConstructionPolicy_ptr _ptr_type; typedef ConstructionPolicy_var _var_type; - static int _tao_class_id; - + // The static operations. static ConstructionPolicy_ptr _duplicate (ConstructionPolicy_ptr obj); - + static ConstructionPolicy_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - - static ConstructionPolicy_ptr _unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); - + static ConstructionPolicy_ptr _nil (void) { return (ConstructionPolicy_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 void make_domain_manager ( CORBA::InterfaceDef_ptr object_type, CORBA::Boolean constr_policy @@ -367,223 +253,79 @@ TAO_NAMESPACE CORBA 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); private: - _TAO_ConstructionPolicy_Proxy_Broker *the_TAO_ConstructionPolicy_Proxy_Broker_; - + TAO::Collocation_Proxy_Broker *the_TAO_ConstructionPolicy_Proxy_Broker_; + protected: ConstructionPolicy (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_ConstructionPolicy_setup_collocation (int collocated); - + + ConstructionPolicy (IOP::IOR *ior, + TAO_ORB_Core *orb_core = 0); + ConstructionPolicy ( - 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 ~ConstructionPolicy (void); - - friend class _TAO_ConstructionPolicy_Remote_Proxy_Impl; - friend class _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl; - friend class _TAO_ConstructionPolicy_Direct_Proxy_Impl; - + private: ConstructionPolicy (const ConstructionPolicy &); void operator= (const ConstructionPolicy &); }; - // 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_ConstructionPolicy_Proxy_Impl - : public virtual CORBA::_TAO_Policy_Proxy_Impl - { - public: - virtual ~_TAO_ConstructionPolicy_Proxy_Impl (void) {} - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/base_proxy_impl_ch.cpp:24 - - virtual void make_domain_manager ( - CORBA::Object *_collocated_tao_target_, - CORBA::InterfaceDef_ptr object_type, - CORBA::Boolean constr_policy - ACE_ENV_ARG_DECL - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - protected: - _TAO_ConstructionPolicy_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_ConstructionPolicy_Remote_Proxy_Impl - : public virtual _TAO_ConstructionPolicy_Proxy_Impl, - public virtual TAO_Remote_Object_Proxy_Impl, - public virtual CORBA::_TAO_Policy_Remote_Proxy_Impl - { - public: - _TAO_ConstructionPolicy_Remote_Proxy_Impl (void); - - virtual ~_TAO_ConstructionPolicy_Remote_Proxy_Impl (void) {} - - // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24 - - virtual void make_domain_manager ( - CORBA::Object *_collocated_tao_target_, - CORBA::InterfaceDef_ptr object_type, - CORBA::Boolean constr_policy - 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_ConstructionPolicy_Proxy_Broker - { - public: - virtual ~_TAO_ConstructionPolicy_Proxy_Broker (void); - virtual _TAO_ConstructionPolicy_Proxy_Impl &select_proxy ( - ConstructionPolicy *object - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) = 0; - - protected: - _TAO_ConstructionPolicy_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_ConstructionPolicy_Remote_Proxy_Broker - : public virtual _TAO_ConstructionPolicy_Proxy_Broker - { - public: - _TAO_ConstructionPolicy_Remote_Proxy_Broker (void); - - virtual ~_TAO_ConstructionPolicy_Remote_Proxy_Broker (void); - - virtual _TAO_ConstructionPolicy_Proxy_Impl &select_proxy ( - ConstructionPolicy *object - ACE_ENV_ARG_DECL - ); - - private: - _TAO_ConstructionPolicy_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_ConstructionPolicy_Remote_Proxy_Broker *the_TAO_ConstructionPolicy_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_ConstructionPolicy; - + // 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_DOMAINMANAGERLIST_CH_) +#define _CORBA_DOMAINMANAGERLIST_CH_ + class DomainManagerList; - + typedef TAO_MngSeq_Var_T< DomainManagerList, TAO_Object_Manager< - CORBA::DomainManager, - CORBA::DomainManager_var + DomainManager, + DomainManager_var > > DomainManagerList_var; - + typedef TAO_MngSeq_Out_T< DomainManagerList, DomainManagerList_var, TAO_Object_Manager< - CORBA::DomainManager, - CORBA::DomainManager_var + DomainManager, + DomainManager_var > > DomainManagerList_out; - + class TAO_Export DomainManagerList : public TAO_Unbounded_Object_Sequence< - CORBA::DomainManager, - CORBA::DomainManager_var + DomainManager, + DomainManager_var > { public: @@ -592,66 +334,46 @@ TAO_NAMESPACE CORBA DomainManagerList ( CORBA::ULong max, CORBA::ULong length, - DomainManager_ptr *buffer, + DomainManager_ptr* buffer, CORBA::Boolean release = 0 ); DomainManagerList (const DomainManagerList &); ~DomainManagerList (void); - - static void _tao_any_destructor (void *); - + typedef DomainManagerList_var _var_type; }; - // 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_DomainManagerList; +#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 // 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_DomainManager_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ); extern TAO_Export -CORBA::_TAO_ConstructionPolicy_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52 - -TAO_Export void operator<<= (CORBA::Any &, CORBA::DomainManager_ptr); // copying -TAO_Export void operator<<= (CORBA::Any &, CORBA::DomainManager_ptr *); // non-copying -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::DomainManager_ptr &); - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:48 -TAO_Export void operator<<= (CORBA::Any &, CORBA::ConstructionPolicy_ptr); // copying -TAO_Export void operator<<= (CORBA::Any &, CORBA::ConstructionPolicy_ptr *); // non-copying -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ConstructionPolicy_ptr &); - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52 - -TAO_Export void operator<<= (CORBA::Any &, const CORBA::DomainManagerList &); // copying version -TAO_Export void operator<<= (CORBA::Any &, CORBA::DomainManagerList*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::DomainManagerList *&); // deprecated -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::DomainManagerList *&); +// Traits specializations. +namespace TAO +{ +}; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48 @@ -671,7 +393,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Construction TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ConstructionPolicy_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_DomainManagerList_H_ #define _TAO_CDR_OP_CORBA_DomainManagerList_H_ @@ -693,7 +415,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 "DomainC.i" @@ -707,5 +429,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/DomainC.i b/TAO/tao/DomainC.i index af668cdf363..1628e81bc94 100644 --- a/TAO/tao/DomainC.i +++ b/TAO/tao/DomainC.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_DOMAINMANAGER___CI_) #define _CORBA_DOMAINMANAGER___CI_ @@ -30,17 +36,31 @@ ACE_INLINE CORBA::DomainManager::DomainManager ( 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_DomainManager_Proxy_Broker_ (0) + { this->CORBA_DomainManager_setup_collocation (_tao_collocated); } +ACE_INLINE +CORBA::DomainManager::DomainManager ( + IOP::IOR *ior, + TAO_ORB_Core *oc + ) + : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + the_TAO_DomainManager_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_CONSTRUCTIONPOLICY___CI_) #define _CORBA_CONSTRUCTIONPOLICY___CI_ @@ -49,30 +69,30 @@ ACE_INLINE CORBA::ConstructionPolicy::ConstructionPolicy ( 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_ConstructionPolicy_Proxy_Broker_ (0) + { this->CORBA_ConstructionPolicy_setup_collocation (_tao_collocated); } -template<> ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<CORBA::ConstructionPolicy>::to_object ( - CORBA::Object_ptr &_tao_elem - ) const +CORBA::ConstructionPolicy::ConstructionPolicy ( + IOP::IOR *ior, + TAO_ORB_Core *oc + ) + : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), + the_TAO_ConstructionPolicy_Proxy_Broker_ (0) + { - _tao_elem = CORBA::Object::_duplicate (this->value_); - return 1; } #endif /* end #if !defined */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp:108 - -// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72 TAO_Export CORBA::Boolean operator<< ( @@ -99,7 +119,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_DomainManagerList_I_ #define _TAO_CDR_OP_CORBA_DomainManagerList_I_ @@ -115,3 +135,4 @@ CORBA::Boolean TAO_Export operator>> ( ); #endif /* _TAO_CDR_OP_CORBA_DomainManagerList_I_ */ + diff --git a/TAO/tao/Dynamic.pidl b/TAO/tao/Dynamic.pidl index a4ea129f37c..a03a0de08b7 100644 --- a/TAO/tao/Dynamic.pidl +++ b/TAO/tao/Dynamic.pidl @@ -10,7 +10,7 @@ * 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" diff --git a/TAO/tao/DynamicC.cpp b/TAO/tao/DynamicC.cpp index c0146005615..fe724649cab 100644 --- a/TAO/tao/DynamicC.cpp +++ b/TAO/tao/DynamicC.cpp @@ -26,20 +26,16 @@ // 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 "DynamicC.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" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig @@ -50,67 +46,75 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:284 +// 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_Dynamic_Parameter[] = { TAO_ENCAP_BYTE_ORDER, // byte order 34, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x44796e61), - ACE_NTOHL (0x6d69632f), - ACE_NTOHL (0x50617261), - ACE_NTOHL (0x6d657465), - ACE_NTOHL (0x723a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x44796e61), + ACE_NTOHL (0x6d69632f), + ACE_NTOHL (0x50617261), + ACE_NTOHL (0x6d657465), + ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/Dynamic/Parameter:1.0 10, - ACE_NTOHL (0x50617261), - ACE_NTOHL (0x6d657465), + ACE_NTOHL (0x50617261), + ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72000000), // name = Parameter 2, // member count 9, - ACE_NTOHL (0x61726775), - ACE_NTOHL (0x6d656e74), + ACE_NTOHL (0x61726775), + ACE_NTOHL (0x6d656e74), ACE_NTOHL (0x0), // name = argument CORBA::tk_any, 5, - ACE_NTOHL (0x6d6f6465), + ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode CORBA::tk_enum, // typecode kind 116, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 36, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f5061), - ACE_NTOHL (0x72616d65), - ACE_NTOHL (0x7465724d), - ACE_NTOHL (0x6f64653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f5061), + ACE_NTOHL (0x72616d65), + ACE_NTOHL (0x7465724d), + ACE_NTOHL (0x6f64653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0 14, - ACE_NTOHL (0x50617261), - ACE_NTOHL (0x6d657465), - ACE_NTOHL (0x724d6f64), + ACE_NTOHL (0x50617261), + ACE_NTOHL (0x6d657465), + ACE_NTOHL (0x724d6f64), ACE_NTOHL (0x65000000), // name = ParameterMode 3, // member count 9, - ACE_NTOHL (0x50415241), - ACE_NTOHL (0x4d5f494e), + ACE_NTOHL (0x50415241), + ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x0), // name = PARAM_IN 10, - ACE_NTOHL (0x50415241), - ACE_NTOHL (0x4d5f4f55), + ACE_NTOHL (0x50415241), + ACE_NTOHL (0x4d5f4f55), ACE_NTOHL (0x54000000), // name = PARAM_OUT 12, - ACE_NTOHL (0x50415241), - ACE_NTOHL (0x4d5f494e), + ACE_NTOHL (0x50415241), + ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x4f555400), // name = PARAM_INOUT - + }; static CORBA::TypeCode _tc_TAO_tc_Dynamic_Parameter ( @@ -121,65 +125,27 @@ static CORBA::TypeCode _tc_TAO_tc_Dynamic_Parameter ( sizeof (Dynamic::Parameter) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (Dynamic) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_Parameter, - &_tc_TAO_tc_Dynamic_Parameter - ) -TAO_NAMESPACE_END - -// TAO_IDL - Generated from -// be/be_visitor_structure/structure_cs.cpp:66 - -void Dynamic::Parameter::_tao_any_destructor (void *_tao_void_pointer) +namespace Dynamic { - Parameter *tmp = ACE_static_cast (Parameter*, _tao_void_pointer); - delete tmp; + ::CORBA::TypeCode_ptr _tc_Parameter = + &_tc_TAO_tc_Dynamic_Parameter; } -// TAO_IDL - Generated from -// be/be_type.cpp:292 - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class - TAO_Var_Var_T< - Dynamic::Parameter - >; - -template class TAO_Var_Base_T< - Dynamic::Parameter - >; - -template class - TAO_Out_T< - Dynamic::Parameter, - Dynamic::Parameter_var - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 -# pragma instantiate \ - TAO_Var_Var_T< \ - Dynamic::Parameter \ - > - -#pragma instantiate TAO_Var_Base_T< - Dynamic::Parameter - > - -# pragma instantiate \ - TAO_Out_T< \ - Dynamic::Parameter, \ - Dynamic::Parameter_var \ - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +void +Dynamic::Parameter::_tao_any_destructor ( + void *_tao_void_pointer + ) +{ + Parameter *_tao_tmp_pointer = + ACE_static_cast (Parameter *, _tao_void_pointer); + delete _tao_tmp_pointer; +} -// TAO_IDL - Generated from -// be/be_visitor_sequence/sequence_cs.cpp:70 +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:66 #if !defined (_DYNAMIC_PARAMETERLIST_CS_) #define _DYNAMIC_PARAMETERLIST_CS_ @@ -224,96 +190,34 @@ void Dynamic::ParameterList::_tao_any_destructor ( void * _tao_void_pointer ) { - ParameterList * tmp = - ACE_static_cast ( - ParameterList *, - _tao_void_pointer - ); - delete tmp; + ParameterList * _tao_tmp_pointer = + ACE_static_cast (ParameterList *, _tao_void_pointer); + delete _tao_tmp_pointer; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class - TAO_VarSeq_Var_T< - Dynamic::ParameterList, - Dynamic::Parameter - >; - -template class - TAO_Seq_Var_Base_T< - Dynamic::ParameterList, - Dynamic::Parameter - >; - -template class - TAO_Seq_Out_T< - Dynamic::ParameterList, - Dynamic::ParameterList_var, - Dynamic::Parameter - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO_VarSeq_Var_T< \ - ParameterList, \ - Dynamic::Parameter \ - > - -# pragma instantiate \ - TAO_Seq_Var_Base_T< \ - ParameterList, \ - Dynamic::Parameter \ - > - -# pragma instantiate \ - TAO_Seq_Out_T< \ - ParameterList, \ - ParameterList_var, \ - Dynamic::Parameter \ - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class TAO_Unbounded_Sequence< - Dynamic::Parameter - >; - - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate TAO_Unbounded_Sequence< - Dynamic::Parameter - > - - -#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_Dynamic_ParameterList[] = { TAO_ENCAP_BYTE_ORDER, // byte order 38, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x44796e61), - ACE_NTOHL (0x6d69632f), - ACE_NTOHL (0x50617261), - ACE_NTOHL (0x6d657465), - ACE_NTOHL (0x724c6973), - ACE_NTOHL (0x743a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x44796e61), + ACE_NTOHL (0x6d69632f), + ACE_NTOHL (0x50617261), + ACE_NTOHL (0x6d657465), + ACE_NTOHL (0x724c6973), + ACE_NTOHL (0x743a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/Dynamic/ParameterList:1.0 14, - ACE_NTOHL (0x50617261), - ACE_NTOHL (0x6d657465), - ACE_NTOHL (0x724c6973), + ACE_NTOHL (0x50617261), + ACE_NTOHL (0x6d657465), + ACE_NTOHL (0x724c6973), ACE_NTOHL (0x74000000), // name = ParameterList CORBA::tk_sequence, // typecode kind 236, // encapsulation length @@ -322,61 +226,61 @@ static const CORBA::Long _oc_Dynamic_ParameterList[] = 220, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 34, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x44796e61), - ACE_NTOHL (0x6d69632f), - ACE_NTOHL (0x50617261), - ACE_NTOHL (0x6d657465), - ACE_NTOHL (0x723a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x44796e61), + ACE_NTOHL (0x6d69632f), + ACE_NTOHL (0x50617261), + ACE_NTOHL (0x6d657465), + ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/Dynamic/Parameter:1.0 10, - ACE_NTOHL (0x50617261), - ACE_NTOHL (0x6d657465), + ACE_NTOHL (0x50617261), + ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72000000), // name = Parameter 2, // member count 9, - ACE_NTOHL (0x61726775), - ACE_NTOHL (0x6d656e74), + ACE_NTOHL (0x61726775), + ACE_NTOHL (0x6d656e74), ACE_NTOHL (0x0), // name = argument CORBA::tk_any, 5, - ACE_NTOHL (0x6d6f6465), + ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode CORBA::tk_enum, // typecode kind 116, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 36, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f5061), - ACE_NTOHL (0x72616d65), - ACE_NTOHL (0x7465724d), - ACE_NTOHL (0x6f64653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f5061), + ACE_NTOHL (0x72616d65), + ACE_NTOHL (0x7465724d), + ACE_NTOHL (0x6f64653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0 14, - ACE_NTOHL (0x50617261), - ACE_NTOHL (0x6d657465), - ACE_NTOHL (0x724d6f64), + ACE_NTOHL (0x50617261), + ACE_NTOHL (0x6d657465), + ACE_NTOHL (0x724d6f64), ACE_NTOHL (0x65000000), // name = ParameterMode 3, // member count 9, - ACE_NTOHL (0x50415241), - ACE_NTOHL (0x4d5f494e), + ACE_NTOHL (0x50415241), + ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x0), // name = PARAM_IN 10, - ACE_NTOHL (0x50415241), - ACE_NTOHL (0x4d5f4f55), + ACE_NTOHL (0x50415241), + ACE_NTOHL (0x4d5f4f55), ACE_NTOHL (0x54000000), // name = PARAM_OUT 12, - ACE_NTOHL (0x50415241), - ACE_NTOHL (0x4d5f494e), + ACE_NTOHL (0x50415241), + ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x4f555400), // name = PARAM_INOUT - + 0U, @@ -390,55 +294,52 @@ static CORBA::TypeCode _tc_TAO_tc_Dynamic_ParameterList ( sizeof (Dynamic::ParameterList) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (Dynamic) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_ParameterList, - &_tc_TAO_tc_Dynamic_ParameterList - ) -TAO_NAMESPACE_END +namespace Dynamic +{ + ::CORBA::TypeCode_ptr _tc_ParameterList = + &_tc_TAO_tc_Dynamic_ParameterList; +} // 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_Dynamic_ContextList[] = { TAO_ENCAP_BYTE_ORDER, // byte order 36, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x44796e61), - ACE_NTOHL (0x6d69632f), - ACE_NTOHL (0x436f6e74), - ACE_NTOHL (0x6578744c), - ACE_NTOHL (0x6973743a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x44796e61), + ACE_NTOHL (0x6d69632f), + ACE_NTOHL (0x436f6e74), + ACE_NTOHL (0x6578744c), + ACE_NTOHL (0x6973743a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/Dynamic/ContextList:1.0 12, - ACE_NTOHL (0x436f6e74), - ACE_NTOHL (0x6578744c), + ACE_NTOHL (0x436f6e74), + ACE_NTOHL (0x6578744c), ACE_NTOHL (0x69737400), // name = ContextList CORBA::tk_alias, // typecode kind for typedefs 80, // encapsulation length 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, @@ -453,34 +354,31 @@ static CORBA::TypeCode _tc_TAO_tc_Dynamic_ContextList ( sizeof (Dynamic::ContextList) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (Dynamic) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_ContextList, - &_tc_TAO_tc_Dynamic_ContextList - ) -TAO_NAMESPACE_END +namespace Dynamic +{ + ::CORBA::TypeCode_ptr _tc_ContextList = + &_tc_TAO_tc_Dynamic_ContextList; +} // 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_Dynamic_TypeCode[] = { TAO_ENCAP_BYTE_ORDER, // byte order 33, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x44796e61), - ACE_NTOHL (0x6d69632f), - ACE_NTOHL (0x54797065), - ACE_NTOHL (0x436f6465), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x44796e61), + ACE_NTOHL (0x6d69632f), + ACE_NTOHL (0x54797065), + ACE_NTOHL (0x436f6465), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/Dynamic/TypeCode:1.0 9, - ACE_NTOHL (0x54797065), - ACE_NTOHL (0x436f6465), + ACE_NTOHL (0x54797065), + ACE_NTOHL (0x436f6465), ACE_NTOHL (0x0), // name = TypeCode CORBA::tk_TypeCode, @@ -494,17 +392,14 @@ static CORBA::TypeCode _tc_TAO_tc_Dynamic_TypeCode ( sizeof (Dynamic::TypeCode) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (Dynamic) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_TypeCode, - &_tc_TAO_tc_Dynamic_TypeCode - ) -TAO_NAMESPACE_END +namespace Dynamic +{ + ::CORBA::TypeCode_ptr _tc_TypeCode = + &_tc_TAO_tc_Dynamic_TypeCode; +} -// TAO_IDL - Generated from -// be/be_visitor_sequence/sequence_cs.cpp:70 +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:66 #if !defined (_DYNAMIC_EXCEPTIONLIST_CS_) #define _DYNAMIC_EXCEPTIONLIST_CS_ @@ -549,100 +444,34 @@ void Dynamic::ExceptionList::_tao_any_destructor ( void * _tao_void_pointer ) { - ExceptionList * tmp = - ACE_static_cast ( - ExceptionList *, - _tao_void_pointer - ); - delete tmp; + ExceptionList * _tao_tmp_pointer = + ACE_static_cast (ExceptionList *, _tao_void_pointer); + delete _tao_tmp_pointer; } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class - TAO_MngSeq_Var_T< - Dynamic::ExceptionList, - TAO_Pseudo_Object_Manager< - Dynamic::TypeCode, - Dynamic::TypeCode_var - > - >; - -template class - TAO_Seq_Var_Base_T< - Dynamic::ExceptionList, - TAO_Pseudo_Object_Manager< - Dynamic::TypeCode, - Dynamic::TypeCode_var - > - >; - -template class - TAO_MngSeq_Out_T< - Dynamic::ExceptionList, - Dynamic::ExceptionList_var, - TAO_Pseudo_Object_Manager< - Dynamic::TypeCode, - Dynamic::TypeCode_var - > - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO_MngSeq_Var_T< \ - Dynamic::ExceptionList, \ - TAO_Pseudo_Object_Manager< \ - Dynamic::TypeCode, \ - Dynamic::TypeCode_var \ - > \ - > - -# pragma instantiate \ - TAO_Seq_Var_Base_T< \ - Dynamic::ExceptionList, \ - TAO_Pseudo_Object_Manager< \ - Dynamic::TypeCode, \ - Dynamic::TypeCode_var \ - > \ - > - -# pragma instantiate \ - TAO_MngSeq_Out_T< \ - Dynamic::ExceptionList, \ - Dynamic::ExceptionList_var, \ - TAO_Pseudo_Object_Manager< \ - Dynamic::TypeCode, \ - Dynamic::TypeCode_var \ - > \ - > - -#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_Dynamic_ExceptionList[] = { TAO_ENCAP_BYTE_ORDER, // byte order 38, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x44796e61), - ACE_NTOHL (0x6d69632f), - ACE_NTOHL (0x45786365), - ACE_NTOHL (0x7074696f), - ACE_NTOHL (0x6e4c6973), - ACE_NTOHL (0x743a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x44796e61), + ACE_NTOHL (0x6d69632f), + ACE_NTOHL (0x45786365), + ACE_NTOHL (0x7074696f), + ACE_NTOHL (0x6e4c6973), + ACE_NTOHL (0x743a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/Dynamic/ExceptionList:1.0 14, - ACE_NTOHL (0x45786365), - ACE_NTOHL (0x7074696f), - ACE_NTOHL (0x6e4c6973), + ACE_NTOHL (0x45786365), + ACE_NTOHL (0x7074696f), + ACE_NTOHL (0x6e4c6973), ACE_NTOHL (0x74000000), // name = ExceptionList CORBA::tk_sequence, // typecode kind 80, // encapsulation length @@ -651,18 +480,18 @@ static const CORBA::Long _oc_Dynamic_ExceptionList[] = 64, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 33, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x44796e61), - ACE_NTOHL (0x6d69632f), - ACE_NTOHL (0x54797065), - ACE_NTOHL (0x436f6465), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x44796e61), + ACE_NTOHL (0x6d69632f), + ACE_NTOHL (0x54797065), + ACE_NTOHL (0x436f6465), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/Dynamic/TypeCode:1.0 9, - ACE_NTOHL (0x54797065), - ACE_NTOHL (0x436f6465), + ACE_NTOHL (0x54797065), + ACE_NTOHL (0x436f6465), ACE_NTOHL (0x0), // name = TypeCode CORBA::tk_TypeCode, @@ -679,57 +508,54 @@ static CORBA::TypeCode _tc_TAO_tc_Dynamic_ExceptionList ( sizeof (Dynamic::ExceptionList) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (Dynamic) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_ExceptionList, - &_tc_TAO_tc_Dynamic_ExceptionList - ) -TAO_NAMESPACE_END +namespace Dynamic +{ + ::CORBA::TypeCode_ptr _tc_ExceptionList = + &_tc_TAO_tc_Dynamic_ExceptionList; +} // 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_Dynamic_RequestContext[] = { TAO_ENCAP_BYTE_ORDER, // byte order 39, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x44796e61), - ACE_NTOHL (0x6d69632f), - ACE_NTOHL (0x52657175), - ACE_NTOHL (0x65737443), - ACE_NTOHL (0x6f6e7465), - ACE_NTOHL (0x78743a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x44796e61), + ACE_NTOHL (0x6d69632f), + ACE_NTOHL (0x52657175), + ACE_NTOHL (0x65737443), + ACE_NTOHL (0x6f6e7465), + ACE_NTOHL (0x78743a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/Dynamic/RequestContext:1.0 15, - ACE_NTOHL (0x52657175), - ACE_NTOHL (0x65737443), - ACE_NTOHL (0x6f6e7465), + ACE_NTOHL (0x52657175), + ACE_NTOHL (0x65737443), + ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78740000), // name = RequestContext CORBA::tk_alias, // typecode kind for typedefs 80, // encapsulation length 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, @@ -744,17 +570,14 @@ static CORBA::TypeCode _tc_TAO_tc_Dynamic_RequestContext ( sizeof (Dynamic::RequestContext) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (Dynamic) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_RequestContext, - &_tc_TAO_tc_Dynamic_RequestContext - ) -TAO_NAMESPACE_END +namespace Dynamic +{ + ::CORBA::TypeCode_ptr _tc_RequestContext = + &_tc_TAO_tc_Dynamic_RequestContext; +} -// TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -811,15 +634,8 @@ CORBA::Boolean operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<Dynamic::Parameter>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<Dynamic::Parameter> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -// TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -876,15 +692,8 @@ CORBA::Boolean operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<Dynamic::ParameterList>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<Dynamic::ParameterList> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -// TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -941,15 +750,8 @@ CORBA::Boolean operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<Dynamic::ExceptionList>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<Dynamic::ExceptionList> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - // TAO_IDL - Generated from -// be/be_visitor_sequence/cdr_op_cs.cpp:80 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:95 #if !defined _TAO_CDR_OP_Dynamic_ParameterList_CPP_ #define _TAO_CDR_OP_Dynamic_ParameterList_CPP_ @@ -960,20 +762,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]); } - + return _tao_marshal_flag; } - + return 0; } @@ -983,7 +785,7 @@ CORBA::Boolean operator>> ( ) { CORBA::ULong _tao_seq_len; - + if (strm >> _tao_seq_len) { // Add a check to the length of the sequence @@ -993,35 +795,35 @@ 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_Dynamic_ParameterList_CPP_ */ // TAO_IDL - Generated from -// be/be_visitor_sequence/cdr_op_cs.cpp:80 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:95 #if !defined _TAO_CDR_OP_Dynamic_ExceptionList_CPP_ #define _TAO_CDR_OP_Dynamic_ExceptionList_CPP_ @@ -1032,20 +834,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; } @@ -1055,7 +857,7 @@ CORBA::Boolean operator>> ( ) { CORBA::ULong _tao_seq_len; - + if (strm >> _tao_seq_len) { // Add a check to the length of the sequence @@ -1065,29 +867,274 @@ 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; } #endif /* _TAO_CDR_OP_Dynamic_ExceptionList_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::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 + >; + + template class + TAO_Var_Var_T< + Dynamic::Parameter + >; + + template class + TAO_Var_Base_T< + Dynamic::Parameter + >; + + template class + TAO_Out_T< + Dynamic::Parameter, + Dynamic::Parameter_var + >; + + template class + TAO::Any_Dual_Impl_T< + Dynamic::Parameter + >; + + template class + TAO_VarSeq_Var_T< + Dynamic::ParameterList, + Dynamic::Parameter + >; + + template class + TAO_Seq_Var_Base_T< + Dynamic::ParameterList, + Dynamic::Parameter + >; + + template class + TAO_Seq_Out_T< + Dynamic::ParameterList, + Dynamic::ParameterList_var, + Dynamic::Parameter + >; + +#if !defined (_DYNAMIC_PARAMETERLIST_CS_) +#define _DYNAMIC_PARAMETERLIST_CS_ + + template class + TAO_Unbounded_Sequence< + Dynamic::Parameter + >; + +#endif /* end #if !defined */ + + template class + TAO::Any_Dual_Impl_T< + Dynamic::ParameterList + >; + + template class + TAO_Pseudo_Object_Manager< + Dynamic::TypeCode + >; + + template class + TAO_MngSeq_Var_T< + Dynamic::ExceptionList, + TAO_Pseudo_Object_Manager< + Dynamic::TypeCode + > + >; + + template class + TAO_Seq_Var_Base_T< + Dynamic::ExceptionList, + TAO_Pseudo_Object_Manager< + Dynamic::TypeCode + > + >; + + template class + TAO_MngSeq_Out_T< + Dynamic::ExceptionList, + Dynamic::ExceptionList_var, + TAO_Pseudo_Object_Manager< + Dynamic::TypeCode + > + >; + + template class + TAO::Any_Dual_Impl_T< + Dynamic::ExceptionList + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# 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 \ + > + +# pragma instantiate \ + TAO_Var_Var_T< \ + Dynamic::Parameter \ + > + +# pragma instantiate \ + TAO_Var_Base_T< \ + Dynamic::Parameter \ + > + +# pragma instantiate \ + TAO_Out_T< \ + Dynamic::Parameter, \ + Dynamic::Parameter_var \ + > + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + Dynamic::Parameter \ + > + +# pragma instantiate \ + TAO_VarSeq_Var_T< \ + Dynamic::ParameterList, \ + Dynamic::Parameter \ + > + +# pragma instantiate \ + TAO_Seq_Var_Base_T< \ + Dynamic::ParameterList, \ + Dynamic::Parameter \ + > + +# pragma instantiate \ + TAO_Seq_Out_T< \ + Dynamic::ParameterList, \ + Dynamic::ParameterList_var, \ + Dynamic::Parameter \ + > + +#if !defined (_DYNAMIC_PARAMETERLIST_CS_) +#define _DYNAMIC_PARAMETERLIST_CS_ + +# pragma instantiate \ + TAO_Unbounded_Sequence< \ + Dynamic::Parameter \ + > + +#endif /* end #if !defined */ + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + Dynamic::ParameterList \ + > + +# pragma instantiate \ + TAO_MngSeq_Var_T< \ + Dynamic::ExceptionList, \ + TAO_Pseudo_Object_Manager< \ + Dynamic::TypeCode \ + > \ + > + +# pragma instantiate \ + TAO_Seq_Var_Base_T< \ + Dynamic::ExceptionList, \ + TAO_Pseudo_Object_Manager< \ + Dynamic::TypeCode \ + > \ + > + +# pragma instantiate \ + TAO_MngSeq_Out_T< \ + Dynamic::ExceptionList, \ + Dynamic::ExceptionList_var, \ + TAO_Pseudo_Object_Manager< \ + Dynamic::TypeCode \ + > \ + > + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + Dynamic::ExceptionList \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/DynamicC.h b/TAO/tao/DynamicC.h index 9a32e89e318..3cc6fc6c9e7 100644 --- a/TAO/tao/DynamicC.h +++ b/TAO/tao/DynamicC.h @@ -26,19 +26,20 @@ // 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_DYNAMICC_H_ #define _TAO_IDL_ORIG_DYNAMICC_H_ -#include /**/ "ace/pre.h" -#include "tao/corbafwd.h" +#include "ace/pre.h" + +#include "tao/corbafwd.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "StringSeqC.h" +#include "tao/StringSeqC.h" #include "tao/Any_Dual_Impl_T.h" #include "tao/TAO_Export.h" #include "tao/Sequence.h" @@ -69,14 +70,22 @@ #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; +} + // 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 Dynamic +namespace Dynamic { // TAO_IDL - Generated from - // be/be_type.cpp:249 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:258 struct Parameter; @@ -94,7 +103,7 @@ TAO_NAMESPACE Dynamic Parameter_out; // TAO_IDL - Generated from - // be/be_visitor_structure/structure_ch.cpp:52 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52 struct TAO_Export Parameter { @@ -106,12 +115,12 @@ TAO_NAMESPACE Dynamic }; // 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_Parameter; // TAO_IDL - Generated from - // be/be_visitor_sequence/sequence_ch.cpp:89 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_DYNAMIC_PARAMETERLIST_CH_) #define _DYNAMIC_PARAMETERLIST_CH_ @@ -159,24 +168,24 @@ TAO_NAMESPACE Dynamic #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_ParameterList; // TAO_IDL - Generated from - // be/be_visitor_typedef/typedef_ch.cpp:426 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:426 typedef CORBA::StringSeq ContextList; typedef CORBA::StringSeq_var ContextList_var; typedef CORBA::StringSeq_out ContextList_out; // 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_ContextList; // TAO_IDL - Generated from - // be/be_visitor_typedef/typedef_ch.cpp:333 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333 typedef CORBA::TypeCode TypeCode; typedef CORBA::TypeCode_ptr TypeCode_ptr; @@ -184,12 +193,12 @@ TAO_NAMESPACE Dynamic typedef CORBA::TypeCode_out TypeCode_out; // 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_TypeCode; // TAO_IDL - Generated from - // be/be_visitor_sequence/sequence_ch.cpp:89 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_DYNAMIC_EXCEPTIONLIST_CH_) #define _DYNAMIC_EXCEPTIONLIST_CH_ @@ -241,30 +250,37 @@ TAO_NAMESPACE Dynamic #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_ExceptionList; // TAO_IDL - Generated from - // be/be_visitor_typedef/typedef_ch.cpp:426 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:426 typedef CORBA::StringSeq RequestContext; typedef CORBA::StringSeq_var RequestContext_var; typedef CORBA::StringSeq_out RequestContext_out; // 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_RequestContext; // 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 Dynamic +} // module Dynamic + +// 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_structure/any_op_ch.cpp:52 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52 TAO_Export void operator<<= (CORBA::Any &, const Dynamic::Parameter &); // copying version TAO_Export void operator<<= (CORBA::Any &, Dynamic::Parameter*); // noncopying version @@ -272,7 +288,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Dynamic::Parameter *& TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Dynamic::Parameter *&); // 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 Dynamic::ParameterList &); // copying version TAO_Export void operator<<= (CORBA::Any &, Dynamic::ParameterList*); // noncopying version @@ -280,7 +296,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Dynamic::ParameterLis TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Dynamic::ParameterList *&); // 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 Dynamic::ExceptionList &); // copying version TAO_Export void operator<<= (CORBA::Any &, Dynamic::ExceptionList*); // noncopying version @@ -288,18 +304,18 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Dynamic::ExceptionLis TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Dynamic::ExceptionList *&); // 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_structure/cdr_op_ch.cpp:53 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:53 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Dynamic::Parameter &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Dynamic::Parameter &); // 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_Dynamic_ParameterList_H_ #define _TAO_CDR_OP_Dynamic_ParameterList_H_ @@ -316,7 +332,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_Dynamic_ParameterList_H_ */ // 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_Dynamic_ExceptionList_H_ #define _TAO_CDR_OP_Dynamic_ExceptionList_H_ @@ -333,12 +349,12 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_Dynamic_ExceptionList_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 "DynamicC.i" @@ -352,6 +368,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.i b/TAO/tao/DynamicC.i index 9a37ec03fd4..d711582958d 100644 --- a/TAO/tao/DynamicC.i +++ b/TAO/tao/DynamicC.i @@ -27,7 +27,7 @@ // TAO_IDL - Generated from -// be/be_visitor_structure/cdr_op_ci.cpp:70 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:70 ACE_INLINE CORBA::Boolean operator<< ( @@ -52,7 +52,7 @@ CORBA::Boolean operator>> ( } // 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_Dynamic_ParameterList_I_ #define _TAO_CDR_OP_Dynamic_ParameterList_I_ @@ -70,7 +70,7 @@ CORBA::Boolean TAO_Export operator>> ( #endif /* _TAO_CDR_OP_Dynamic_ParameterList_I_ */ // 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_Dynamic_ExceptionList_I_ #define _TAO_CDR_OP_Dynamic_ExceptionList_I_ diff --git a/TAO/tao/GIOP.pidl b/TAO/tao/GIOP.pidl index efd946270de..5a51be0b4e7 100644 --- a/TAO/tao/GIOP.pidl +++ b/TAO/tao/GIOP.pidl @@ -14,7 +14,7 @@ // is: // // tao_idl -// -o orig -Gp -Gd -Ge 1 +// -o orig -Sa -Gp -Gd -Ge 1 -GT // -Wb,export_macro=TAO_Export // -Wb,export_include="tao/TAO_Export.h" // -Wb,pre_include="ace/pre.h" @@ -39,6 +39,7 @@ module GIOP octet major; octet minor; }; + struct IORAddressingInfo { unsigned long selected_profile_index; diff --git a/TAO/tao/GIOPC.cpp b/TAO/tao/GIOPC.cpp index 7037f2d3543..de2fd23c8cc 100644 --- a/TAO/tao/GIOPC.cpp +++ b/TAO/tao/GIOPC.cpp @@ -26,7 +26,7 @@ // 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 "GIOPC.h" @@ -40,15 +40,21 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:284 +// 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_GIOP_AddressingDisposition[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 43, + 35, ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x47494f50), ACE_NTOHL (0x2f416464), ACE_NTOHL (0x72657373), @@ -56,7 +62,7 @@ static const CORBA::Long _oc_GIOP_AddressingDisposition[] = ACE_NTOHL (0x6973706f), ACE_NTOHL (0x73697469), ACE_NTOHL (0x6f6e3a31), - ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/GIOP/AddressingDisposition:1.0 + ACE_NTOHL (0x2e300000), // repository ID = IDL:GIOP/AddressingDisposition:1.0 22, ACE_NTOHL (0x41646472), ACE_NTOHL (0x65737369), @@ -76,30 +82,25 @@ static CORBA::TypeCode _tc_TAO_tc_GIOP_AddressingDisposition ( sizeof (GIOP::AddressingDisposition) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (GIOP) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_AddressingDisposition, - &_tc_TAO_tc_GIOP_AddressingDisposition - ) -TAO_NAMESPACE_END +namespace GIOP +{ + ::CORBA::TypeCode_ptr _tc_AddressingDisposition = + &_tc_TAO_tc_GIOP_AddressingDisposition; +} // 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_GIOP_Version[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 29, + 21, ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x47494f50), ACE_NTOHL (0x2f566572), ACE_NTOHL (0x73696f6e), ACE_NTOHL (0x3a312e30), - ACE_NTOHL (0x0), // repository ID = IDL:omg.org/GIOP/Version:1.0 + ACE_NTOHL (0x0), // repository ID = IDL:GIOP/Version:1.0 8, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e00), // name = Version @@ -124,68 +125,32 @@ static CORBA::TypeCode _tc_TAO_tc_GIOP_Version ( sizeof (GIOP::Version) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (GIOP) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_Version, - &_tc_TAO_tc_GIOP_Version - ) -TAO_NAMESPACE_END - -// TAO_IDL - Generated from -// be/be_visitor_structure/structure_cs.cpp:66 - -void GIOP::Version::_tao_any_destructor (void *_tao_void_pointer) +namespace GIOP { - Version *tmp = ACE_static_cast (Version*, _tao_void_pointer); - delete tmp; + ::CORBA::TypeCode_ptr _tc_Version = + &_tc_TAO_tc_GIOP_Version; } -// TAO_IDL - Generated from -// be/be_type.cpp:292 - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class - TAO_Fixed_Var_T< - GIOP::Version - >; - -template class TAO_Var_Base_T< - GIOP::Version - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO_Fixed_Var_T< \ - GIOP::Version \ - > +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 -#pragma instantiate TAO_Var_Base_T< - GIOP::Version - > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // 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_GIOP_IORAddressingInfo[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 39, + 31, ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x47494f50), ACE_NTOHL (0x2f494f52), ACE_NTOHL (0x41646472), ACE_NTOHL (0x65737369), ACE_NTOHL (0x6e67496e), ACE_NTOHL (0x666f3a31), - ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/GIOP/IORAddressingInfo:1.0 + ACE_NTOHL (0x2e300000), // repository ID = IDL:GIOP/IORAddressingInfo:1.0 18, ACE_NTOHL (0x494f5241), ACE_NTOHL (0x64647265), @@ -312,65 +277,19 @@ static CORBA::TypeCode _tc_TAO_tc_GIOP_IORAddressingInfo ( sizeof (GIOP::IORAddressingInfo) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (GIOP) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_IORAddressingInfo, - &_tc_TAO_tc_GIOP_IORAddressingInfo - ) -TAO_NAMESPACE_END - -// TAO_IDL - Generated from -// be/be_visitor_structure/structure_cs.cpp:66 - -void GIOP::IORAddressingInfo::_tao_any_destructor (void *_tao_void_pointer) +namespace GIOP { - IORAddressingInfo *tmp = ACE_static_cast (IORAddressingInfo*, _tao_void_pointer); - delete tmp; + ::CORBA::TypeCode_ptr _tc_IORAddressingInfo = + &_tc_TAO_tc_GIOP_IORAddressingInfo; } -// TAO_IDL - Generated from -// be/be_type.cpp:292 - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class - TAO_Var_Var_T< - GIOP::IORAddressingInfo - >; - -template class TAO_Var_Base_T< - GIOP::IORAddressingInfo - >; - -template class - TAO_Out_T< - GIOP::IORAddressingInfo, - GIOP::IORAddressingInfo_var - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO_Var_Var_T< \ - GIOP::IORAddressingInfo \ - > - -#pragma instantiate TAO_Var_Base_T< - GIOP::IORAddressingInfo - > +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 -# pragma instantiate \ - TAO_Out_T< \ - GIOP::IORAddressingInfo, \ - GIOP::IORAddressingInfo_var \ - > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// be/be_visitor_union/union_cs.cpp:91 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/union_cs.cpp:91 GIOP::TargetAddress::TargetAddress (void) { @@ -440,12 +359,6 @@ GIOP::TargetAddress::~TargetAddress (void) this->_reset (this->disc_, 1); } -void GIOP::TargetAddress::_tao_any_destructor (void *_tao_void_pointer) -{ - TargetAddress *tmp = ACE_static_cast (TargetAddress*, _tao_void_pointer); - delete tmp; -} - GIOP::TargetAddress & GIOP::TargetAddress::operator= (const ::GIOP::TargetAddress &u) { @@ -537,21 +450,19 @@ void GIOP::TargetAddress::_reset (CORBA::Short, CORBA::Boolean /*finalize*/) } // 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_GIOP_TargetAddress[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 35, + 27, ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x47494f50), ACE_NTOHL (0x2f546172), ACE_NTOHL (0x67657441), ACE_NTOHL (0x64647265), ACE_NTOHL (0x73733a31), - ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/GIOP/TargetAddress:1.0 + ACE_NTOHL (0x2e300000), // repository ID = IDL:GIOP/TargetAddress:1.0 14, ACE_NTOHL (0x54617267), ACE_NTOHL (0x65744164), @@ -595,7 +506,7 @@ static const CORBA::Long _oc_GIOP_TargetAddress[] = ACE_NTOHL (0x70726f66), ACE_NTOHL (0x696c6500), // name = profile CORBA::tk_struct, // typecode kind - 172, // encapsulation length + 248, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 34, ACE_NTOHL (0x49444c3a), @@ -639,26 +550,46 @@ static const CORBA::Long _oc_GIOP_TargetAddress[] = ACE_NTOHL (0x696c655f), ACE_NTOHL (0x64617461), ACE_NTOHL (0x0), // name = profile_data - 0xffffffff, // indirection - 0xfffffeec, // negative offset (-276) + 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 (0x2e300000), // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0 + 9, + ACE_NTOHL (0x4f637465), + ACE_NTOHL (0x74536571), + ACE_NTOHL (0x0), // name = OctetSeq + CORBA::tk_sequence, // typecode kind + 12, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + CORBA::tk_octet, + + 0U, + + ACE_IDL_NSTOHL (0x0002), // union case label (evaluated value) 4, ACE_NTOHL (0x696f7200), // name = ior CORBA::tk_struct, // typecode kind - 228, // encapsulation length + 468, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order - 39, + 31, ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x47494f50), ACE_NTOHL (0x2f494f52), ACE_NTOHL (0x41646472), ACE_NTOHL (0x65737369), ACE_NTOHL (0x6e67496e), ACE_NTOHL (0x666f3a31), - ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/GIOP/IORAddressingInfo:1.0 + ACE_NTOHL (0x2e300000), // repository ID = IDL:GIOP/IORAddressingInfo:1.0 18, ACE_NTOHL (0x494f5241), ACE_NTOHL (0x64647265), @@ -678,7 +609,7 @@ static const CORBA::Long _oc_GIOP_TargetAddress[] = 4, ACE_NTOHL (0x696f7200), // name = ior CORBA::tk_struct, // typecode kind - 104, // encapsulation length + 352, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 24, ACE_NTOHL (0x49444c3a), @@ -700,10 +631,78 @@ static const CORBA::Long _oc_GIOP_TargetAddress[] = ACE_NTOHL (0x696c6573), ACE_NTOHL (0x0), // name = profiles CORBA::tk_sequence, // typecode kind - 16, // encapsulation length + 264, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order - 0xffffffff, // indirection - 0xfffffe5c, // negative offset (-420) + CORBA::tk_struct, // typecode kind + 248, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + 34, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x54616767), + ACE_NTOHL (0x65645072), + ACE_NTOHL (0x6f66696c), + ACE_NTOHL (0x653a312e), + ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0 + 14, + ACE_NTOHL (0x54616767), + ACE_NTOHL (0x65645072), + ACE_NTOHL (0x6f66696c), + ACE_NTOHL (0x65000000), // name = TaggedProfile + 2, // member count + 4, + ACE_NTOHL (0x74616700), // name = tag + CORBA::tk_alias, // typecode kind for typedefs + 60, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + 30, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x50726f66), + ACE_NTOHL (0x696c6549), + ACE_NTOHL (0x643a312e), + ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IOP/ProfileId:1.0 + 10, + ACE_NTOHL (0x50726f66), + ACE_NTOHL (0x696c6549), + ACE_NTOHL (0x64000000), // name = ProfileId + CORBA::tk_ulong, + + + 13, + ACE_NTOHL (0x70726f66), + ACE_NTOHL (0x696c655f), + ACE_NTOHL (0x64617461), + ACE_NTOHL (0x0), // name = profile_data + 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 (0x2e300000), // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0 + 9, + ACE_NTOHL (0x4f637465), + ACE_NTOHL (0x74536571), + ACE_NTOHL (0x0), // name = OctetSeq + CORBA::tk_sequence, // typecode kind + 12, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + CORBA::tk_octet, + + 0U, + + + 0U, @@ -718,246 +717,102 @@ static CORBA::TypeCode _tc_TAO_tc_GIOP_TargetAddress ( sizeof (GIOP::TargetAddress) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (GIOP) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_TargetAddress, - &_tc_TAO_tc_GIOP_TargetAddress - ) -TAO_NAMESPACE_END +namespace GIOP +{ + ::CORBA::TypeCode_ptr _tc_TargetAddress = + &_tc_TAO_tc_GIOP_TargetAddress; +} // TAO_IDL - Generated from -// be/be_type.cpp:292 +// 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< - GIOP::TargetAddress - >; - -template class TAO_Var_Base_T< - GIOP::TargetAddress - >; - -template class - TAO_Out_T< - GIOP::TargetAddress, - GIOP::TargetAddress_var - >; + template class + TAO_Fixed_Var_T< + GIOP::Version + >; + + template class + TAO_Var_Base_T< + GIOP::Version + >; + + template class + TAO_Var_Var_T< + GIOP::IORAddressingInfo + >; + + template class + TAO_Var_Base_T< + GIOP::IORAddressingInfo + >; + + template class + TAO_Out_T< + GIOP::IORAddressingInfo, + GIOP::IORAddressingInfo_var + >; + + template class + TAO_Var_Var_T< + GIOP::TargetAddress + >; + + template class + TAO_Var_Base_T< + GIOP::TargetAddress + >; + + template class + TAO_Out_T< + GIOP::TargetAddress, + GIOP::TargetAddress_var + >; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ - TAO_Var_Var_T< \ - GIOP::TargetAddress \ - > - -#pragma instantiate TAO_Var_Base_T< - GIOP::TargetAddress - > + TAO_Fixed_Var_T< \ + GIOP::Version \ + > # pragma instantiate \ - TAO_Out_T< \ - GIOP::TargetAddress, \ - GIOP::TargetAddress_var \ - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -// TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 - -// Copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - const GIOP::Version &_tao_elem - ) -{ - TAO::Any_Dual_Impl_T<GIOP::Version>::insert_copy ( - _tao_any, - GIOP::Version::_tao_any_destructor, - GIOP::_tc_Version, - _tao_elem - ); -} - -// Non-copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - GIOP::Version *_tao_elem - ) -{ - TAO::Any_Dual_Impl_T<GIOP::Version>::insert ( - _tao_any, - GIOP::Version::_tao_any_destructor, - GIOP::_tc_Version, - _tao_elem - ); -} - -// Extraction to non-const pointer (deprecated). -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - GIOP::Version *&_tao_elem - ) -{ - return _tao_any >>= ACE_const_cast ( - const GIOP::Version *&, - _tao_elem - ); -} - -// Extraction to const pointer. -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - const GIOP::Version *&_tao_elem - ) -{ - return - TAO::Any_Dual_Impl_T<GIOP::Version>::extract ( - _tao_any, - GIOP::Version::_tao_any_destructor, - GIOP::_tc_Version, - _tao_elem - ); -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<GIOP::Version>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<GIOP::Version> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -// TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 + TAO_Var_Base_T< \ + GIOP::Version \ + > -// Copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - const GIOP::IORAddressingInfo &_tao_elem - ) -{ - TAO::Any_Dual_Impl_T<GIOP::IORAddressingInfo>::insert_copy ( - _tao_any, - GIOP::IORAddressingInfo::_tao_any_destructor, - GIOP::_tc_IORAddressingInfo, - _tao_elem - ); -} - -// Non-copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - GIOP::IORAddressingInfo *_tao_elem - ) -{ - TAO::Any_Dual_Impl_T<GIOP::IORAddressingInfo>::insert ( - _tao_any, - GIOP::IORAddressingInfo::_tao_any_destructor, - GIOP::_tc_IORAddressingInfo, - _tao_elem - ); -} - -// Extraction to non-const pointer (deprecated). -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - GIOP::IORAddressingInfo *&_tao_elem - ) -{ - return _tao_any >>= ACE_const_cast ( - const GIOP::IORAddressingInfo *&, - _tao_elem - ); -} - -// Extraction to const pointer. -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - const GIOP::IORAddressingInfo *&_tao_elem - ) -{ - return - TAO::Any_Dual_Impl_T<GIOP::IORAddressingInfo>::extract ( - _tao_any, - GIOP::IORAddressingInfo::_tao_any_destructor, - GIOP::_tc_IORAddressingInfo, - _tao_elem - ); -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<GIOP::IORAddressingInfo>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<GIOP::IORAddressingInfo> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +# pragma instantiate \ + TAO_Var_Var_T< \ + GIOP::IORAddressingInfo \ + > -// TAO_IDL - Generated from -// be/be_visitor_union/any_op_cs.cpp:54 +# pragma instantiate \ + TAO_Var_Base_T< \ + GIOP::IORAddressingInfo \ + > -// Copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - const GIOP::TargetAddress &_tao_elem - ) -{ - TAO::Any_Dual_Impl_T<GIOP::TargetAddress>::insert_copy ( - _tao_any, - GIOP::TargetAddress::_tao_any_destructor, - GIOP::_tc_TargetAddress, - _tao_elem - ); -} +# pragma instantiate \ + TAO_Out_T< \ + GIOP::IORAddressingInfo, \ + GIOP::IORAddressingInfo_var \ + > -// Non-copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - GIOP::TargetAddress *_tao_elem - ) -{ - TAO::Any_Dual_Impl_T<GIOP::TargetAddress>::insert ( - _tao_any, - GIOP::TargetAddress::_tao_any_destructor, - GIOP::_tc_TargetAddress, - _tao_elem - ); -} +# pragma instantiate \ + TAO_Var_Var_T< \ + GIOP::TargetAddress \ + > -// Extraction to non-const pointer (deprecated). -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - GIOP::TargetAddress *&_tao_elem - ) -{ - return _tao_any >>= ACE_const_cast ( - const GIOP::TargetAddress *&, - _tao_elem - ); -} +# pragma instantiate \ + TAO_Var_Base_T< \ + GIOP::TargetAddress \ + > -// Extraction to const pointer. -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - const GIOP::TargetAddress *&_tao_elem - ) -{ - return - TAO::Any_Dual_Impl_T<GIOP::TargetAddress>::extract ( - _tao_any, - GIOP::TargetAddress::_tao_any_destructor, - GIOP::_tc_TargetAddress, - _tao_elem - ); -} +# pragma instantiate \ + TAO_Out_T< \ + GIOP::TargetAddress, \ + GIOP::TargetAddress_var \ + > -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<GIOP::TargetAddress>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<GIOP::TargetAddress> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/GIOPC.h b/TAO/tao/GIOPC.h index 2b9d65662ce..1bbdda77eba 100644 --- a/TAO/tao/GIOPC.h +++ b/TAO/tao/GIOPC.h @@ -26,11 +26,12 @@ // 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_GIOPC_H_ #define _TAO_IDL_ORIG_GIOPC_H_ -#include /**/ "ace/pre.h" + +#include "ace/pre.h" #include "tao/corbafwd.h" @@ -40,7 +41,6 @@ #include "tao/IOP_IORC.h" #include "tao/VarOut_T.h" -#include "Any_Dual_Impl_T.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -65,40 +65,48 @@ #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; +} + // 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 GIOP +namespace GIOP { // TAO_IDL - Generated from - // be/be_visitor_typedef/typedef_ch.cpp:333 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333 typedef CORBA::Short AddressingDisposition; typedef CORBA::Short_out AddressingDisposition_out; // 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_AddressingDisposition; // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 const CORBA::Short KeyAddr = 0; // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 const CORBA::Short ProfileAddr = 1; // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 const CORBA::Short ReferenceAddr = 2; // TAO_IDL - Generated from - // be/be_type.cpp:249 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:258 struct Version; @@ -113,24 +121,24 @@ TAO_NAMESPACE GIOP Version_out; // TAO_IDL - Generated from - // be/be_visitor_structure/structure_ch.cpp:52 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52 struct TAO_Export Version { typedef Version_var _var_type; - static void _tao_any_destructor (void *); + CORBA::Octet major; CORBA::Octet minor; }; // 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_Version; // TAO_IDL - Generated from - // be/be_type.cpp:249 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:258 struct IORAddressingInfo; @@ -148,24 +156,24 @@ TAO_NAMESPACE GIOP IORAddressingInfo_out; // TAO_IDL - Generated from - // be/be_visitor_structure/structure_ch.cpp:52 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52 struct TAO_Export IORAddressingInfo { typedef IORAddressingInfo_var _var_type; - static void _tao_any_destructor (void *); + CORBA::ULong selected_profile_index; IOP::IOR ior; }; // 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_IORAddressingInfo; // TAO_IDL - Generated from - // be/be_type.cpp:249 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:258 class TargetAddress; @@ -191,44 +199,42 @@ TAO_NAMESPACE GIOP TargetAddress (void); TargetAddress (const TargetAddress &); ~TargetAddress (void); - static void _tao_any_destructor (void*); - TargetAddress &operator= (const TargetAddress &); // TAO_IDL - Generated from - // be/be_visitor_union/discriminant_ch.cpp:114 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/discriminant_ch.cpp:114 void _d (CORBA::Short); CORBA::Short _d (void) const; // TAO_IDL - Generated from - // be/be_visitor_union/union_ch.cpp:108 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/union_ch.cpp:108 typedef TargetAddress_var _var_type; // TAO_IDL - Generated from - // be/be_visitor_union_branch/public_ch.cpp:507 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ch.cpp:507 void object_key (const CORBA::OctetSeq &); const CORBA::OctetSeq &object_key (void) const; CORBA::OctetSeq &object_key (void); // TAO_IDL - Generated from - // be/be_visitor_union_branch/public_ch.cpp:615 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ch.cpp:615 void profile (const IOP::TaggedProfile &); const IOP::TaggedProfile &profile (void) const; IOP::TaggedProfile &profile (void); // TAO_IDL - Generated from - // be/be_visitor_union_branch/public_ch.cpp:615 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ch.cpp:615 void ior (const ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &); const ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &ior (void) const; ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &ior (void); // TAO_IDL - Generated from - // be/be_visitor_union/union_ch.cpp:142 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/union_ch.cpp:142 void _default (void); private: @@ -238,13 +244,13 @@ TAO_NAMESPACE GIOP union { // TAO_IDL - Generated from - // be/be_visitor_union_branch/private_ch.cpp:407 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/private_ch.cpp:407 CORBA::OctetSeq *object_key_; // TAO_IDL - Generated from - // be/be_visitor_union_branch/private_ch.cpp:482 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/private_ch.cpp:482 IOP::TaggedProfile *profile_; // TAO_IDL - Generated from - // be/be_visitor_union_branch/private_ch.cpp:482 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/private_ch.cpp:482 ACE_NESTED_CLASS (GIOP, IORAddressingInfo) *ior_; } u_; @@ -253,72 +259,55 @@ TAO_NAMESPACE GIOP }; // 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_TargetAddress; #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 GIOP - -// TAO_IDL - Generated from -// be/be_visitor_structure/any_op_ch.cpp:52 - -TAO_Export void operator<<= (CORBA::Any &, const GIOP::Version &); // copying version -TAO_Export void operator<<= (CORBA::Any &, GIOP::Version*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, GIOP::Version *&); // deprecated -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const GIOP::Version *&); +} // module GIOP // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_ch.cpp:52 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:48 -TAO_Export void operator<<= (CORBA::Any &, const GIOP::IORAddressingInfo &); // copying version -TAO_Export void operator<<= (CORBA::Any &, GIOP::IORAddressingInfo*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, GIOP::IORAddressingInfo *&); // deprecated -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const GIOP::IORAddressingInfo *&); - -// TAO_IDL - Generated from -// be/be_visitor_union/any_op_ch.cpp:52 - -TAO_Export void operator<<= (CORBA::Any &, const GIOP::TargetAddress &); // copying version -TAO_Export void operator<<= (CORBA::Any &, GIOP::TargetAddress*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, GIOP::TargetAddress *&); // deprecated -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const GIOP::TargetAddress *&); +// 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_structure/cdr_op_ch.cpp:53 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:53 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const GIOP::Version &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, GIOP::Version &); // TAO_IDL - Generated from -// be/be_visitor_structure/cdr_op_ch.cpp:53 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:53 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const GIOP::IORAddressingInfo &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, GIOP::IORAddressingInfo &); // TAO_IDL - Generated from -// be/be_visitor_union/cdr_op_ch.cpp:54 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/cdr_op_ch.cpp:54 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const GIOP::TargetAddress &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, GIOP::TargetAddress &); // 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 "GIOPC.i" @@ -332,6 +321,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/GIOPC.i b/TAO/tao/GIOPC.i index 27aac9780aa..d8e84c5449c 100644 --- a/TAO/tao/GIOPC.i +++ b/TAO/tao/GIOPC.i @@ -27,14 +27,14 @@ // TAO_IDL - Generated from -// be/be_visitor_union/union_ci.cpp:51 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/union_ci.cpp:51 // ************************************************************* // Inline operations for union GIOP::TargetAddress // ************************************************************* // TAO_IDL - Generated from -// be/be_visitor_union/discriminant_ci.cpp:164 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/discriminant_ci.cpp:164 ACE_INLINE void @@ -60,7 +60,7 @@ GIOP::TargetAddress::_d (void) const } // TAO_IDL - Generated from -// be/be_visitor_union_branch/public_ci.cpp:906 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ci.cpp:890 // Accessor to set the member. ACE_INLINE @@ -93,7 +93,7 @@ GIOP::TargetAddress::object_key (void) } // TAO_IDL - Generated from -// be/be_visitor_union_branch/public_ci.cpp:1215 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ci.cpp:1199 // Accessor to set the member. ACE_INLINE @@ -126,7 +126,7 @@ GIOP::TargetAddress::profile (void) } // TAO_IDL - Generated from -// be/be_visitor_union_branch/public_ci.cpp:1215 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union_branch/public_ci.cpp:1199 // Accessor to set the member. ACE_INLINE @@ -159,7 +159,7 @@ GIOP::TargetAddress::ior (void) } // TAO_IDL - Generated from -// be/be_visitor_structure/cdr_op_ci.cpp:70 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:70 ACE_INLINE CORBA::Boolean operator<< ( @@ -168,8 +168,8 @@ CORBA::Boolean operator<< ( ) { return - (strm << CORBA::Any::from_octet (_tao_aggregate.major)) && - (strm << CORBA::Any::from_octet (_tao_aggregate.minor)); + (strm << ACE_OutputCDR::from_octet (_tao_aggregate.major)) && + (strm << ACE_OutputCDR::from_octet (_tao_aggregate.minor)); } ACE_INLINE @@ -179,12 +179,12 @@ CORBA::Boolean operator>> ( ) { return - (strm >> CORBA::Any::to_octet (_tao_aggregate.major)) && - (strm >> CORBA::Any::to_octet (_tao_aggregate.minor)); + (strm >> ACE_InputCDR::to_octet (_tao_aggregate.major)) && + (strm >> ACE_InputCDR::to_octet (_tao_aggregate.minor)); } // TAO_IDL - Generated from -// be/be_visitor_structure/cdr_op_ci.cpp:70 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:70 ACE_INLINE CORBA::Boolean operator<< ( @@ -209,7 +209,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be/be_visitor_union/cdr_op_ci.cpp:69 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/cdr_op_ci.cpp:69 ACE_INLINE CORBA::Boolean operator<< ( diff --git a/TAO/tao/IIOP.pidl b/TAO/tao/IIOP.pidl index 835a640776e..d17ab272ef9 100644 --- a/TAO/tao/IIOP.pidl +++ b/TAO/tao/IIOP.pidl @@ -8,7 +8,7 @@ // is: // // tao_idl \ -// -o orig -Gp -Gd -Ge 1 +// -o orig -Sa -Gp -Gd -Ge 1 -GT // -Wb,export_macro=TAO_Export \ // -Wb,export_include="tao/TAO_Export.h" \ // -Wb,pre_include="ace/pre.h" \ @@ -32,7 +32,9 @@ module IIOP string host; unsigned short port; }; + typedef sequence<ListenPoint> ListenPointList; + struct BiDirIIOPServiceContext { ListenPointList listen_points; diff --git a/TAO/tao/IIOPC.cpp b/TAO/tao/IIOPC.cpp index fddbf332cce..12642eb56d3 100644 --- a/TAO/tao/IIOPC.cpp +++ b/TAO/tao/IIOPC.cpp @@ -15,17 +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/IIOPC.h" +#include "IIOPC.h" #include "tao/Typecode.h" -#include "tao/Any_Dual_Impl_T.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig @@ -36,33 +41,41 @@ #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_IIOP_ListenPoint[] = { TAO_ENCAP_BYTE_ORDER, // byte order 33, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x49494f50), - ACE_NTOHL (0x2f4c6973), - ACE_NTOHL (0x74656e50), - ACE_NTOHL (0x6f696e74), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x49494f50), + ACE_NTOHL (0x2f4c6973), + ACE_NTOHL (0x74656e50), + ACE_NTOHL (0x6f696e74), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IIOP/ListenPoint:1.0 12, - ACE_NTOHL (0x4c697374), - ACE_NTOHL (0x656e506f), + ACE_NTOHL (0x4c697374), + ACE_NTOHL (0x656e506f), ACE_NTOHL (0x696e7400), // name = ListenPoint 2, // member count 5, - ACE_NTOHL (0x686f7374), + ACE_NTOHL (0x686f7374), ACE_NTOHL (0x0), // name = host - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 5, - ACE_NTOHL (0x706f7274), + ACE_NTOHL (0x706f7274), ACE_NTOHL (0x0), // name = port CORBA::tk_ushort, @@ -76,68 +89,29 @@ static CORBA::TypeCode _tc_TAO_tc_IIOP_ListenPoint ( sizeof (IIOP::ListenPoint) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (IIOP) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_ListenPoint, - &_tc_TAO_tc_IIOP_ListenPoint - ) -TAO_NAMESPACE_END - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 - -void IIOP::ListenPoint::_tao_any_destructor (void *_tao_void_pointer) +namespace IIOP { - ListenPoint *tmp = ACE_static_cast (ListenPoint*, _tao_void_pointer); - delete tmp; + ::CORBA::TypeCode_ptr _tc_ListenPoint = + &_tc_TAO_tc_IIOP_ListenPoint; } -// 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< - IIOP::ListenPoint - >; -template class TAO_Var_Base_T<IIOP::ListenPoint>; -template class TAO_Unbounded_Sequence<IIOP::ListenPoint>; - -template class - TAO_Out_T< - IIOP::ListenPoint, - IIOP::ListenPoint_var - >; - -template class TAO_Seq_Var_Base_T<IIOP::ListenPointList, IIOP::ListenPoint>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 -# pragma instantiate \ - TAO_Var_Var_T< \ - IIOP::ListenPoint \ - > -#pragma instantiate TAO_Var_Base_T<IIOP::ListenPoint> -#pragma instantiate TAO_Unbounded_Sequence<IIOP::ListenPoint> -#pragma instantiate TAO_Seq_Var_Base_T<IIOP::ListenPointList, IIOP::ListenPoint> -# pragma instantiate \ - TAO_Out_T< \ - IIOP::ListenPoint, \ - IIOP::ListenPoint_var \ - > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:66 -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50 +#if !defined (_IIOP_LISTENPOINTLIST_CS_) +#define _IIOP_LISTENPOINTLIST_CS_ IIOP::ListenPointList::ListenPointList (void) {} -IIOP::ListenPointList::ListenPointList (CORBA::ULong max) +IIOP::ListenPointList::ListenPointList ( + CORBA::ULong max + ) : TAO_Unbounded_Sequence< IIOP::ListenPoint > @@ -147,7 +121,7 @@ IIOP::ListenPointList::ListenPointList (CORBA::ULong max) IIOP::ListenPointList::ListenPointList ( CORBA::ULong max, CORBA::ULong length, - IIOP::ListenPoint *buffer, + IIOP::ListenPoint * buffer, CORBA::Boolean release ) : TAO_Unbounded_Sequence< @@ -156,7 +130,9 @@ IIOP::ListenPointList::ListenPointList ( (max, length, buffer, release) {} -IIOP::ListenPointList::ListenPointList (const ListenPointList &seq) +IIOP::ListenPointList::ListenPointList ( + const ListenPointList &seq + ) : TAO_Unbounded_Sequence< IIOP::ListenPoint > @@ -166,43 +142,7 @@ IIOP::ListenPointList::ListenPointList (const ListenPointList &seq) IIOP::ListenPointList::~ListenPointList (void) {} -void IIOP::ListenPointList::_tao_any_destructor (void *_tao_void_pointer) -{ - ListenPointList *tmp = ACE_static_cast (ListenPointList*, _tao_void_pointer); - delete tmp; -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class - TAO_VarSeq_Var_T< - IIOP::ListenPointList, - IIOP::ListenPoint - >; - -template class - TAO_Seq_Out_T< - IIOP::ListenPointList, - IIOP::ListenPointList_var, - IIOP::ListenPoint - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO_VarSeq_Var_T< \ - IIOP::ListenPointList, \ - IIOP::ListenPoint \ - > - -# pragma instantiate \ - TAO_Seq_Out_T< \ - ListenPointList, \ - ListenPointList_var, \ - IIOP::ListenPoint \ - > - -#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 @@ -211,20 +151,20 @@ static const CORBA::Long _oc_IIOP_ListenPointList[] = { TAO_ENCAP_BYTE_ORDER, // byte order 37, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x49494f50), - ACE_NTOHL (0x2f4c6973), - ACE_NTOHL (0x74656e50), - ACE_NTOHL (0x6f696e74), - ACE_NTOHL (0x4c697374), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x49494f50), + ACE_NTOHL (0x2f4c6973), + ACE_NTOHL (0x74656e50), + ACE_NTOHL (0x6f696e74), + ACE_NTOHL (0x4c697374), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IIOP/ListenPointList:1.0 16, - ACE_NTOHL (0x4c697374), - ACE_NTOHL (0x656e506f), - ACE_NTOHL (0x696e744c), + ACE_NTOHL (0x4c697374), + ACE_NTOHL (0x656e506f), + ACE_NTOHL (0x696e744c), ACE_NTOHL (0x69737400), // name = ListenPointList CORBA::tk_sequence, // typecode kind 116, // encapsulation length @@ -233,27 +173,27 @@ static const CORBA::Long _oc_IIOP_ListenPointList[] = 100, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 33, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x49494f50), - ACE_NTOHL (0x2f4c6973), - ACE_NTOHL (0x74656e50), - ACE_NTOHL (0x6f696e74), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x49494f50), + ACE_NTOHL (0x2f4c6973), + ACE_NTOHL (0x74656e50), + ACE_NTOHL (0x6f696e74), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IIOP/ListenPoint:1.0 12, - ACE_NTOHL (0x4c697374), - ACE_NTOHL (0x656e506f), + ACE_NTOHL (0x4c697374), + ACE_NTOHL (0x656e506f), ACE_NTOHL (0x696e7400), // name = ListenPoint 2, // member count 5, - ACE_NTOHL (0x686f7374), + ACE_NTOHL (0x686f7374), ACE_NTOHL (0x0), // name = host - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 5, - ACE_NTOHL (0x706f7274), + ACE_NTOHL (0x706f7274), ACE_NTOHL (0x0), // name = port CORBA::tk_ushort, @@ -270,14 +210,11 @@ static CORBA::TypeCode _tc_TAO_tc_IIOP_ListenPointList ( sizeof (IIOP::ListenPointList) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (IIOP) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_ListenPointList, - &_tc_TAO_tc_IIOP_ListenPointList - ) -TAO_NAMESPACE_END +namespace IIOP +{ + ::CORBA::TypeCode_ptr _tc_ListenPointList = + &_tc_TAO_tc_IIOP_ListenPointList; +} // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -286,49 +223,49 @@ static const CORBA::Long _oc_IIOP_BiDirIIOPServiceContext[] = { TAO_ENCAP_BYTE_ORDER, // byte order 45, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x49494f50), - ACE_NTOHL (0x2f426944), - ACE_NTOHL (0x69724949), - ACE_NTOHL (0x4f505365), - ACE_NTOHL (0x72766963), - ACE_NTOHL (0x65436f6e), - ACE_NTOHL (0x74657874), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x49494f50), + ACE_NTOHL (0x2f426944), + ACE_NTOHL (0x69724949), + ACE_NTOHL (0x4f505365), + ACE_NTOHL (0x72766963), + ACE_NTOHL (0x65436f6e), + ACE_NTOHL (0x74657874), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IIOP/BiDirIIOPServiceContext:1.0 24, - ACE_NTOHL (0x42694469), - ACE_NTOHL (0x7249494f), - ACE_NTOHL (0x50536572), - ACE_NTOHL (0x76696365), - ACE_NTOHL (0x436f6e74), + ACE_NTOHL (0x42694469), + ACE_NTOHL (0x7249494f), + ACE_NTOHL (0x50536572), + ACE_NTOHL (0x76696365), + ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x65787400), // name = BiDirIIOPServiceContext 1, // member count 14, - ACE_NTOHL (0x6c697374), - ACE_NTOHL (0x656e5f70), - ACE_NTOHL (0x6f696e74), + ACE_NTOHL (0x6c697374), + ACE_NTOHL (0x656e5f70), + ACE_NTOHL (0x6f696e74), ACE_NTOHL (0x73000000), // name = listen_points CORBA::tk_alias, // typecode kind for typedefs 192, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 37, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x49494f50), - ACE_NTOHL (0x2f4c6973), - ACE_NTOHL (0x74656e50), - ACE_NTOHL (0x6f696e74), - ACE_NTOHL (0x4c697374), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x49494f50), + ACE_NTOHL (0x2f4c6973), + ACE_NTOHL (0x74656e50), + ACE_NTOHL (0x6f696e74), + ACE_NTOHL (0x4c697374), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IIOP/ListenPointList:1.0 16, - ACE_NTOHL (0x4c697374), - ACE_NTOHL (0x656e506f), - ACE_NTOHL (0x696e744c), + ACE_NTOHL (0x4c697374), + ACE_NTOHL (0x656e506f), + ACE_NTOHL (0x696e744c), ACE_NTOHL (0x69737400), // name = ListenPointList CORBA::tk_sequence, // typecode kind 116, // encapsulation length @@ -337,27 +274,27 @@ static const CORBA::Long _oc_IIOP_BiDirIIOPServiceContext[] = 100, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 33, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x49494f50), - ACE_NTOHL (0x2f4c6973), - ACE_NTOHL (0x74656e50), - ACE_NTOHL (0x6f696e74), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x49494f50), + ACE_NTOHL (0x2f4c6973), + ACE_NTOHL (0x74656e50), + ACE_NTOHL (0x6f696e74), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IIOP/ListenPoint:1.0 12, - ACE_NTOHL (0x4c697374), - ACE_NTOHL (0x656e506f), + ACE_NTOHL (0x4c697374), + ACE_NTOHL (0x656e506f), ACE_NTOHL (0x696e7400), // name = ListenPoint 2, // member count 5, - ACE_NTOHL (0x686f7374), + ACE_NTOHL (0x686f7374), ACE_NTOHL (0x0), // name = host - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 5, - ACE_NTOHL (0x706f7274), + ACE_NTOHL (0x706f7274), ACE_NTOHL (0x0), // name = port CORBA::tk_ushort, @@ -375,254 +312,22 @@ static CORBA::TypeCode _tc_TAO_tc_IIOP_BiDirIIOPServiceContext ( sizeof (IIOP::BiDirIIOPServiceContext) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (IIOP) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_BiDirIIOPServiceContext, - &_tc_TAO_tc_IIOP_BiDirIIOPServiceContext - ) -TAO_NAMESPACE_END - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 - -void IIOP::BiDirIIOPServiceContext::_tao_any_destructor (void *_tao_void_pointer) -{ - BiDirIIOPServiceContext *tmp = ACE_static_cast (BiDirIIOPServiceContext*, _tao_void_pointer); - delete tmp; -} - -// 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< - IIOP::BiDirIIOPServiceContext - >; -template class TAO_Var_Base_T<IIOP::BiDirIIOPServiceContext>; - -template class - TAO_Out_T< - IIOP::BiDirIIOPServiceContext, - IIOP::BiDirIIOPServiceContext_var - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO_Var_Var_T< \ - IIOP::BiDirIIOPServiceContext \ - > -#pragms instantiate TAO_Var_Base_T<IIOP::BiDirIIOPServiceContext> - -# pragma instantiate \ - TAO_Out_T< \ - IIOP::BiDirIIOPServiceContext, \ - IIOP::BiDirIIOPServiceContext_var \ - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54 - -// Copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - const IIOP::ListenPoint &_tao_elem - ) -{ - TAO::Any_Dual_Impl_T<IIOP::ListenPoint>::insert_copy ( - _tao_any, - IIOP::ListenPoint::_tao_any_destructor, - IIOP::_tc_ListenPoint, - _tao_elem - ); -} - -// Non-copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - IIOP::ListenPoint *_tao_elem - ) +namespace IIOP { - TAO::Any_Dual_Impl_T<IIOP::ListenPoint>::insert ( - _tao_any, - IIOP::ListenPoint::_tao_any_destructor, - IIOP::_tc_ListenPoint, - _tao_elem - ); + ::CORBA::TypeCode_ptr _tc_BiDirIIOPServiceContext = + &_tc_TAO_tc_IIOP_BiDirIIOPServiceContext; } -// Extraction to non-const pointer (deprecated). -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - IIOP::ListenPoint *&_tao_elem - ) -{ - return _tao_any >>= ACE_const_cast ( - const IIOP::ListenPoint *&, - _tao_elem - ); -} - -// Extraction to const pointer. -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - const IIOP::ListenPoint *&_tao_elem - ) -{ - return - TAO::Any_Dual_Impl_T<IIOP::ListenPoint>::extract ( - _tao_any, - IIOP::ListenPoint::_tao_any_destructor, - IIOP::_tc_ListenPoint, - _tao_elem - ); -} - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<IIOP::ListenPoint>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<IIOP::ListenPoint> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -// 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 IIOP::ListenPointList &_tao_elem - ) -{ - TAO::Any_Dual_Impl_T<IIOP::ListenPointList>::insert_copy ( - _tao_any, - IIOP::ListenPointList::_tao_any_destructor, - IIOP::_tc_ListenPointList, - _tao_elem - ); -} - -// Non-copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - IIOP::ListenPointList *_tao_elem - ) -{ - TAO::Any_Dual_Impl_T<IIOP::ListenPointList>::insert ( - _tao_any, - IIOP::ListenPointList::_tao_any_destructor, - IIOP::_tc_ListenPointList, - _tao_elem - ); -} - -// Extraction to non-const pointer (deprecated). -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - IIOP::ListenPointList *&_tao_elem - ) -{ - return _tao_any >>= ACE_const_cast ( - const IIOP::ListenPointList *&, - _tao_elem - ); -} +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 -// Extraction to const pointer. -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - const IIOP::ListenPointList *&_tao_elem - ) -{ - return - TAO::Any_Dual_Impl_T<IIOP::ListenPointList>::extract ( - _tao_any, - IIOP::ListenPointList::_tao_any_destructor, - IIOP::_tc_ListenPointList, - _tao_elem - ); -} -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<IIOP::ListenPointList>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<IIOP::ListenPointList> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54 - -// Copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - const IIOP::BiDirIIOPServiceContext &_tao_elem - ) -{ - TAO::Any_Dual_Impl_T<IIOP::BiDirIIOPServiceContext>::insert_copy ( - _tao_any, - IIOP::BiDirIIOPServiceContext::_tao_any_destructor, - IIOP::_tc_BiDirIIOPServiceContext, - _tao_elem - ); -} - -// Non-copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - IIOP::BiDirIIOPServiceContext *_tao_elem - ) -{ - TAO::Any_Dual_Impl_T<IIOP::BiDirIIOPServiceContext>::insert ( - _tao_any, - IIOP::BiDirIIOPServiceContext::_tao_any_destructor, - IIOP::_tc_BiDirIIOPServiceContext, - _tao_elem - ); -} - -// Extraction to non-const pointer (deprecated). -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - IIOP::BiDirIIOPServiceContext *&_tao_elem - ) -{ - return _tao_any >>= ACE_const_cast ( - const IIOP::BiDirIIOPServiceContext *&, - _tao_elem - ); -} - -// Extraction to const pointer. -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - const IIOP::BiDirIIOPServiceContext *&_tao_elem - ) -{ - return - TAO::Any_Dual_Impl_T<IIOP::BiDirIIOPServiceContext>::extract ( - _tao_any, - IIOP::BiDirIIOPServiceContext::_tao_any_destructor, - IIOP::_tc_BiDirIIOPServiceContext, - _tao_elem - ); -} +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:95 -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<IIOP::BiDirIIOPServiceContext>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<IIOP::BiDirIIOPServiceContext> -#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 +#if !defined _TAO_CDR_OP_IIOP_ListenPointList_CPP_ +#define _TAO_CDR_OP_IIOP_ListenPointList_CPP_ CORBA::Boolean operator<< ( TAO_OutputCDR &strm, @@ -630,20 +335,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]); } - + return _tao_marshal_flag; } - + return 0; } @@ -653,7 +358,7 @@ CORBA::Boolean operator>> ( ) { CORBA::ULong _tao_seq_len; - + if (strm >> _tao_seq_len) { // Add a check to the length of the sequence @@ -663,26 +368,161 @@ 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_IIOP_ListenPointList_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< + IIOP::ListenPoint + >; + + template class + TAO_Var_Base_T< + IIOP::ListenPoint + >; + + template class + TAO_Out_T< + IIOP::ListenPoint, + IIOP::ListenPoint_var + >; + + template class + TAO_VarSeq_Var_T< + IIOP::ListenPointList, + IIOP::ListenPoint + >; + + template class + TAO_Seq_Var_Base_T< + IIOP::ListenPointList, + IIOP::ListenPoint + >; + + template class + TAO_Seq_Out_T< + IIOP::ListenPointList, + IIOP::ListenPointList_var, + IIOP::ListenPoint + >; + +#if !defined (_IIOP_LISTENPOINTLIST_CS_) +#define _IIOP_LISTENPOINTLIST_CS_ + + template class + TAO_Unbounded_Sequence< + IIOP::ListenPoint + >; + +#endif /* end #if !defined */ + + template class + TAO_Var_Var_T< + IIOP::BiDirIIOPServiceContext + >; + + template class + TAO_Var_Base_T< + IIOP::BiDirIIOPServiceContext + >; + + template class + TAO_Out_T< + IIOP::BiDirIIOPServiceContext, + IIOP::BiDirIIOPServiceContext_var + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# pragma instantiate \ + TAO_Var_Var_T< \ + IIOP::ListenPoint \ + > + +# pragma instantiate \ + TAO_Var_Base_T< \ + IIOP::ListenPoint \ + > + +# pragma instantiate \ + TAO_Out_T< \ + IIOP::ListenPoint, \ + IIOP::ListenPoint_var \ + > + +# pragma instantiate \ + TAO_VarSeq_Var_T< \ + IIOP::ListenPointList, \ + IIOP::ListenPoint \ + > + +# pragma instantiate \ + TAO_Seq_Var_Base_T< \ + IIOP::ListenPointList, \ + IIOP::ListenPoint \ + > + +# pragma instantiate \ + TAO_Seq_Out_T< \ + IIOP::ListenPointList, \ + IIOP::ListenPointList_var, \ + IIOP::ListenPoint \ + > + +#if !defined (_IIOP_LISTENPOINTLIST_CS_) +#define _IIOP_LISTENPOINTLIST_CS_ + +# pragma instantiate \ + TAO_Unbounded_Sequence< \ + IIOP::ListenPoint \ + > + +#endif /* end #if !defined */ + +# pragma instantiate \ + TAO_Var_Var_T< \ + IIOP::BiDirIIOPServiceContext \ + > + +# pragma instantiate \ + TAO_Var_Base_T< \ + IIOP::BiDirIIOPServiceContext \ + > + +# pragma instantiate \ + TAO_Out_T< \ + IIOP::BiDirIIOPServiceContext, \ + IIOP::BiDirIIOPServiceContext_var \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/IIOPC.h b/TAO/tao/IIOPC.h index 3dc482430a2..fc586b328d2 100644 --- a/TAO/tao/IIOPC.h +++ b/TAO/tao/IIOPC.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 @@ -25,7 +31,8 @@ #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" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -33,9 +40,9 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "CDR.h" -#include "tao/VarOut_T.h" -#include "tao/Seq_Out_T.h" #include "tao/Seq_Var_T.h" +#include "tao/Seq_Out_T.h" +#include "tao/VarOut_T.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -63,68 +70,71 @@ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48 -TAO_NAMESPACE IIOP +namespace IIOP { - + // 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 ListenPoint; - + typedef TAO_Var_Var_T< ListenPoint > ListenPoint_var; - + typedef TAO_Out_T< ListenPoint, ListenPoint_var > ListenPoint_out; - + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52 - + struct TAO_Export ListenPoint { typedef ListenPoint_var _var_type; - - static void _tao_any_destructor (void *); + + TAO_String_Manager host; CORBA::UShort port; }; - + // 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_ListenPoint; - + // 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 (_IIOP_LISTENPOINTLIST_CH_) +#define _IIOP_LISTENPOINTLIST_CH_ + class ListenPointList; - + typedef TAO_VarSeq_Var_T< ListenPointList, - IIOP::ListenPoint + ListenPoint > ListenPointList_var; - + typedef TAO_Seq_Out_T< ListenPointList, ListenPointList_var, - IIOP::ListenPoint + ListenPoint > ListenPointList_out; - + class TAO_Export ListenPointList : public TAO_Unbounded_Sequence< - IIOP::ListenPoint + ListenPoint > { public: @@ -133,85 +143,68 @@ TAO_NAMESPACE IIOP ListenPointList ( CORBA::ULong max, CORBA::ULong length, - ListenPoint *buffer, + ListenPoint* buffer, CORBA::Boolean release = 0 ); ListenPointList (const ListenPointList &); ~ListenPointList (void); - - static void _tao_any_destructor (void *); - + typedef ListenPointList_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_ListenPointList; - + // 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 BiDirIIOPServiceContext; - + typedef TAO_Var_Var_T< BiDirIIOPServiceContext > BiDirIIOPServiceContext_var; - + typedef TAO_Out_T< BiDirIIOPServiceContext, BiDirIIOPServiceContext_var > BiDirIIOPServiceContext_out; - + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52 - + struct TAO_Export BiDirIIOPServiceContext { typedef BiDirIIOPServiceContext_var _var_type; - - static void _tao_any_destructor (void *); + + IIOP::ListenPointList listen_points; }; - + // 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_BiDirIIOPServiceContext; // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67 - -} -TAO_NAMESPACE_CLOSE // module IIOP - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:66 -TAO_Export void operator<<= (CORBA::Any &, const IIOP::ListenPoint &); // copying version -TAO_Export void operator<<= (CORBA::Any &, IIOP::ListenPoint*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IIOP::ListenPoint *&); // deprecated -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IIOP::ListenPoint *&); +} // module IIOP // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\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 IIOP::ListenPointList &); // copying version -TAO_Export void operator<<= (CORBA::Any &, IIOP::ListenPointList*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IIOP::ListenPointList *&); // deprecated -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IIOP::ListenPointList *&); - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52 - -TAO_Export void operator<<= (CORBA::Any &, const IIOP::BiDirIIOPServiceContext &); // copying version -TAO_Export void operator<<= (CORBA::Any &, IIOP::BiDirIIOPServiceContext*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IIOP::BiDirIIOPServiceContext *&); // deprecated -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IIOP::BiDirIIOPServiceContext *&); +// Traits specializations. +namespace TAO +{ +}; // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48 @@ -219,13 +212,13 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IIOP::BiDirIIOP #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 IIOP::ListenPoint &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IIOP::ListenPoint &); // 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_IIOP_ListenPointList_H_ #define _TAO_CDR_OP_IIOP_ListenPointList_H_ @@ -242,7 +235,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_IIOP_ListenPointList_H_ */ // 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 IIOP::BiDirIIOPServiceContext &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IIOP::BiDirIIOPServiceContext &); @@ -253,7 +246,7 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IIOP::BiDirIIOPServiceCont #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 "IIOPC.i" @@ -267,5 +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/IIOPC.i b/TAO/tao/IIOPC.i index b03a811ff87..02ae57e20f1 100644 --- a/TAO/tao/IIOPC.i +++ b/TAO/tao/IIOPC.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 IIOP::ListenPoint &_tao_aggregate ) { - if ( + return (strm << _tao_aggregate.host.in ()) && - (strm << _tao_aggregate.port) - ) - { - return 1; - } - else - { - return 0; - } + (strm << _tao_aggregate.port); } ACE_INLINE @@ -48,21 +46,13 @@ CORBA::Boolean operator>> ( IIOP::ListenPoint &_tao_aggregate ) { - if ( + return (strm >> _tao_aggregate.host.out ()) && - (strm >> _tao_aggregate.port) - ) - { - return 1; - } - else - { - return 0; - } + (strm >> _tao_aggregate.port); } // 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_IIOP_ListenPointList_I_ #define _TAO_CDR_OP_IIOP_ListenPointList_I_ @@ -80,7 +70,7 @@ CORBA::Boolean TAO_Export operator>> ( #endif /* _TAO_CDR_OP_IIOP_ListenPointList_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<< ( @@ -88,16 +78,8 @@ CORBA::Boolean operator<< ( const IIOP::BiDirIIOPServiceContext &_tao_aggregate ) { - if ( - (strm << _tao_aggregate.listen_points) - ) - { - return 1; - } - else - { - return 0; - } + return + (strm << _tao_aggregate.listen_points); } ACE_INLINE @@ -106,15 +88,7 @@ CORBA::Boolean operator>> ( IIOP::BiDirIIOPServiceContext &_tao_aggregate ) { - if ( - (strm >> _tao_aggregate.listen_points) - ) - { - return 1; - } - else - { - return 0; - } + return + (strm >> _tao_aggregate.listen_points); } diff --git a/TAO/tao/IOP.pidl b/TAO/tao/IOP.pidl index 697672090cb..51ad29939a7 100644 --- a/TAO/tao/IOP.pidl +++ b/TAO/tao/IOP.pidl @@ -10,7 +10,7 @@ * command: * * tao_idl.exe - * -o orig -Gp -Gd -Ge 1 + * -o orig -St -Sp -Ge 1 * -Wb,export_macro=TAO_Export * -Wb,export_include=TAO_Export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/IOPC.cpp b/TAO/tao/IOPC.cpp index befdc3f9ef7..89207c7f07b 100644 --- a/TAO/tao/IOPC.cpp +++ b/TAO/tao/IOPC.cpp @@ -15,24 +15,21 @@ // Irvine, CA // USA // http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ // // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be/be_codegen.cpp:314 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:301 #include "IOPC.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 */ #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig @@ -41,3 +38,12 @@ #if !defined (__ACE_INLINE__) #include "IOPC.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 +{ +}; + diff --git a/TAO/tao/IOPC.h b/TAO/tao/IOPC.h index c7c71a78b43..d59bb70802d 100644 --- a/TAO/tao/IOPC.h +++ b/TAO/tao/IOPC.h @@ -15,28 +15,31 @@ // Irvine, CA // USA // http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ // // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be/be_codegen.cpp:151 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151 #ifndef _TAO_IDL_ORIG_IOPC_H_ #define _TAO_IDL_ORIG_IOPC_H_ -#include /**/ "ace/pre.h" -#include "tao/corbafwd.h" +#include "ace/pre.h" + +#include "IOP_IORC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/TAO_Export.h" -#include "tao/IOP_IORC.h" -#include "tao/IOP_CodecC.h" -#include "tao/VarOut_T.h" - +#include "IOP_CodecC.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -61,10 +64,34 @@ #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; +} + // TAO_IDL - Generated from -// be/be_visitor_root/cdr_op.cpp:48 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:48 -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018 +// Traits specializations. +namespace TAO +{ +}; + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48 + +#ifndef __ACE_INLINE__ + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64 + +#endif /* __ACE_INLINE__ */ + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "IOPC.i" @@ -78,5 +105,6 @@ #pragma option pop #endif /* __BORLANDC__ */ -#include /**/ "ace/post.h" +#include "ace/post.h" #endif /* ifndef */ + diff --git a/TAO/tao/IOPC.i b/TAO/tao/IOPC.i index 95f0b8ea192..38aa32569ba 100644 --- a/TAO/tao/IOPC.i +++ b/TAO/tao/IOPC.i @@ -15,6 +15,14 @@ // 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 + + diff --git a/TAO/tao/IOP_Codec.pidl b/TAO/tao/IOP_Codec.pidl index 35416c8bec7..d478bad54b6 100644 --- a/TAO/tao/IOP_Codec.pidl +++ b/TAO/tao/IOP_Codec.pidl @@ -11,7 +11,7 @@ * command: * * tao_idl.exe - * -o orig -Gp -Gd -Ge 1 -Gv + * -o orig -Gp -Gd -Ge 1 -GT * -Wb,export_macro=TAO_Export * -Wb,export_include=TAO_Export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/IOP_CodecC.cpp b/TAO/tao/IOP_CodecC.cpp index edbe5dada20..cd45c0ea815 100644 --- a/TAO/tao/IOP_CodecC.cpp +++ b/TAO/tao/IOP_CodecC.cpp @@ -26,20 +26,19 @@ // 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 "IOP_CodecC.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/Fixed_Size_Argument_T.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 @@ -50,137 +49,110 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be/be_visitor_interface/interface_cs.cpp:57 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:59 -int IOP::Codec::_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< - IOP::Codec, - IOP::tao_Codec_life - >; - template class - TAO_Objref_Out_T< - IOP::Codec, - IOP::tao_Codec_life - >; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate \ - TAO_Objref_Var_T< \ - IOP::Codec, \ - IOP::tao_Codec_life \ - > -# pragma instantiate \ - TAO_Objref_Out_T< \ - IOP::Codec, \ - IOP::tao_Codec_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 -// be/be_visitor_interface/interface_cs.cpp:239 +#endif /* end #if !defined */ -IOP::Codec::Codec (void) -{} +#if !defined (_IOP_CODEC__ARG_TRAITS_CS_) +#define _IOP_CODEC__ARG_TRAITS_CS_ + + ACE_TEMPLATE_SPECIALIZATION + class TAO_Export Arg_Traits<IOP::Codec> + : public + Object_Arg_Traits_T< + IOP::Codec_ptr, + IOP::Codec_var, + IOP::Codec_out, + TAO::Objref_Traits<IOP::Codec> + > + { + }; -IOP::Codec::~Codec (void) -{} +#endif /* end #if !defined */ + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:428 -void -IOP::Codec::_tao_any_destructor (void *_tao_void_pointer) -{ - Codec *tmp = ACE_static_cast (Codec *, _tao_void_pointer); - CORBA::release (tmp); -} +#if !defined (_IOP_ENCODING__ARG_TRAITS_CS_) +#define _IOP_ENCODING__ARG_TRAITS_CS_ + + ACE_TEMPLATE_SPECIALIZATION + class TAO_Export Arg_Traits<IOP::Encoding> + : public + Fixed_Size_Arg_Traits_T< + IOP::Encoding + > + { + }; + +#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 IOP::Codec. IOP::Codec_ptr -IOP::Codec::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL +TAO::Objref_Traits<IOP::Codec>::tao_duplicate ( + IOP::Codec_ptr p ) { - return Codec::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); + return IOP::Codec::_duplicate (p); } -IOP::Codec_ptr -IOP::Codec::_unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED +void +TAO::Objref_Traits<IOP::Codec>::tao_release ( + IOP::Codec_ptr p ) { - if (CORBA::is_nil (obj)) - { - return Codec::_nil (); - } - - return - ACE_reinterpret_cast ( - Codec_ptr, - obj->_tao_QueryInterface ( - ACE_reinterpret_cast ( - ptrdiff_t, - &Codec::_tao_class_id - ) - ) - ); + CORBA::release (p); } IOP::Codec_ptr -IOP::Codec::_duplicate (Codec_ptr obj) -{ - if (! CORBA::is_nil (obj)) - { - obj->_add_ref (); - } - - return obj; -} - -void *IOP::Codec::_tao_QueryInterface (ptrdiff_t type) -{ - void *retv = 0; - - if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &ACE_NESTED_CLASS (::IOP, Codec)::_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* IOP::Codec::_interface_repository_id (void) const +TAO::Objref_Traits<IOP::Codec>::tao_nil (void) { - return "IDL:omg.org/IOP/Codec:1.0"; + return IOP::Codec::_nil (); } CORBA::Boolean -IOP::Codec::marshal (TAO_OutputCDR &) +TAO::Objref_Traits<IOP::Codec>::tao_marshal ( + IOP::Codec_ptr p, + TAO_OutputCDR & cdr + ) { - return 0; + return p->marshal (cdr); } +// Function pointer for collocation factory initialization. +TAO::Collocation_Proxy_Broker * +(*IOP__TAO_Codec_Proxy_Broker_Factory_function_pointer) ( + CORBA::Object_ptr obj + ) = 0; + // TAO_IDL - Generated from -// be/be_visitor_exception/exception_cs.cpp:63 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63 IOP::Codec::InvalidTypeForEncoding::InvalidTypeForEncoding (void) : CORBA::UserException ( @@ -211,8 +183,9 @@ IOP::Codec::InvalidTypeForEncoding::operator= (const ::IOP::Codec::InvalidTypeFo void IOP::Codec::InvalidTypeForEncoding::_tao_any_destructor (void *_tao_void_pointer) { - InvalidTypeForEncoding *tmp = ACE_static_cast (InvalidTypeForEncoding*, _tao_void_pointer); - delete tmp; + InvalidTypeForEncoding *_tao_tmp_pointer = + ACE_static_cast (InvalidTypeForEncoding*, _tao_void_pointer); + delete _tao_tmp_pointer; } IOP::Codec::InvalidTypeForEncoding * @@ -275,7 +248,7 @@ CORBA::TypeCode_ptr IOP::Codec::InvalidTypeForEncoding::_type (void) const } // 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_IOP_Codec_InvalidTypeForEncoding[] = { @@ -316,7 +289,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_InvalidTypeForEncoding ( &_tc_TAO_tc_IOP_Codec_InvalidTypeForEncoding; // TAO_IDL - Generated from -// be/be_visitor_exception/exception_cs.cpp:63 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63 IOP::Codec::FormatMismatch::FormatMismatch (void) : CORBA::UserException ( @@ -347,8 +320,9 @@ IOP::Codec::FormatMismatch::operator= (const ::IOP::Codec::FormatMismatch &_tao_ void IOP::Codec::FormatMismatch::_tao_any_destructor (void *_tao_void_pointer) { - FormatMismatch *tmp = ACE_static_cast (FormatMismatch*, _tao_void_pointer); - delete tmp; + FormatMismatch *_tao_tmp_pointer = + ACE_static_cast (FormatMismatch*, _tao_void_pointer); + delete _tao_tmp_pointer; } IOP::Codec::FormatMismatch * @@ -411,7 +385,7 @@ CORBA::TypeCode_ptr IOP::Codec::FormatMismatch::_type (void) const } // 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_IOP_Codec_FormatMismatch[] = { @@ -448,7 +422,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_FormatMismatch ( &_tc_TAO_tc_IOP_Codec_FormatMismatch; // TAO_IDL - Generated from -// be/be_visitor_exception/exception_cs.cpp:63 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63 IOP::Codec::TypeMismatch::TypeMismatch (void) : CORBA::UserException ( @@ -479,8 +453,9 @@ IOP::Codec::TypeMismatch::operator= (const ::IOP::Codec::TypeMismatch &_tao_excp void IOP::Codec::TypeMismatch::_tao_any_destructor (void *_tao_void_pointer) { - TypeMismatch *tmp = ACE_static_cast (TypeMismatch*, _tao_void_pointer); - delete tmp; + TypeMismatch *_tao_tmp_pointer = + ACE_static_cast (TypeMismatch*, _tao_void_pointer); + delete _tao_tmp_pointer; } IOP::Codec::TypeMismatch * @@ -543,7 +518,7 @@ CORBA::TypeCode_ptr IOP::Codec::TypeMismatch::_type (void) const } // 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_IOP_Codec_TypeMismatch[] = { @@ -578,8 +553,85 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_TypeMismatch ( ::CORBA::TypeCode_ptr IOP::Codec::_tc_TypeMismatch = &_tc_TAO_tc_IOP_Codec_TypeMismatch; +IOP::Codec::Codec (void) +{} + +IOP::Codec::~Codec (void) +{} + +void +IOP::Codec::_tao_any_destructor (void *_tao_void_pointer) +{ + Codec *_tao_tmp_pointer = + ACE_static_cast (Codec *, _tao_void_pointer); + CORBA::release (_tao_tmp_pointer); +} + +IOP::Codec_ptr +IOP::Codec::_narrow ( + CORBA::Object_ptr _tao_objref + ACE_ENV_ARG_DECL_NOT_USED + ) +{ + Codec_ptr proxy = + dynamic_cast<Codec_ptr> (_tao_objref); + proxy->_add_ref (); + return proxy; +} + +IOP::Codec_ptr +IOP::Codec::_duplicate (Codec_ptr obj) +{ + if (! CORBA::is_nil (obj)) + { + obj->_add_ref (); + } + + return obj; +} + +CORBA::Boolean +IOP::Codec::_is_a ( + const char *value + ACE_ENV_ARG_DECL + ) +{ + if ( + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/IOP/Codec: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* IOP::Codec::_interface_repository_id (void) const +{ + return "IDL:omg.org/IOP/Codec:1.0"; +} + +CORBA::Boolean +IOP::Codec::marshal (TAO_OutputCDR &) +{ + return 0; +} + // 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_IOP_Codec[] = { @@ -605,17 +657,14 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_Codec ( sizeof (IOP::Codec) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_Codec, - &_tc_TAO_tc_IOP_Codec - ) -TAO_NAMESPACE_END +namespace IOP +{ + ::CORBA::TypeCode_ptr _tc_Codec = + &_tc_TAO_tc_IOP_Codec; +} // 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_IOP_EncodingFormat[] = { @@ -647,17 +696,14 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_EncodingFormat ( sizeof (IOP::EncodingFormat) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_EncodingFormat, - &_tc_TAO_tc_IOP_EncodingFormat - ) -TAO_NAMESPACE_END +namespace IOP +{ + ::CORBA::TypeCode_ptr _tc_EncodingFormat = + &_tc_TAO_tc_IOP_EncodingFormat; +} // 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_IOP_Encoding[] = { @@ -724,183 +770,69 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_Encoding ( sizeof (IOP::Encoding) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_Encoding, - &_tc_TAO_tc_IOP_Encoding - ) -TAO_NAMESPACE_END - -// TAO_IDL - Generated from -// be/be_visitor_structure/structure_cs.cpp:66 - -void IOP::Encoding::_tao_any_destructor (void *_tao_void_pointer) +namespace IOP { - Encoding *tmp = ACE_static_cast (Encoding*, _tao_void_pointer); - delete tmp; + ::CORBA::TypeCode_ptr _tc_Encoding = + &_tc_TAO_tc_IOP_Encoding; } -// TAO_IDL - Generated from -// be/be_type.cpp:292 - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class - TAO_Fixed_Var_T< - IOP::Encoding - >; - -template class TAO_Var_Base_T< - IOP::Encoding - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO_Fixed_Var_T< \ - IOP::Encoding \ - > - -#pragma instantiate TAO_Var_Base_T< - IOP::Encoding - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_cs.cpp:57 - -int IOP::CodecFactory::_tao_class_id = 0; - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class - TAO_Objref_Var_T< - IOP::CodecFactory, - IOP::tao_CodecFactory_life - >; - template class - TAO_Objref_Out_T< - IOP::CodecFactory, - IOP::tao_CodecFactory_life - >; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate \ - TAO_Objref_Var_T< \ - IOP::CodecFactory, \ - IOP::tao_CodecFactory_life \ - > -# pragma instantiate \ - TAO_Objref_Out_T< \ - IOP::CodecFactory, \ - IOP::tao_CodecFactory_life \ - > -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - // TAO_IDL - Generated from -// be/be_visitor_interface/interface_cs.cpp:239 - -IOP::CodecFactory::CodecFactory (void) -{} - -IOP::CodecFactory::~CodecFactory (void) -{} +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 void -IOP::CodecFactory::_tao_any_destructor (void *_tao_void_pointer) +IOP::Encoding::_tao_any_destructor ( + void *_tao_void_pointer + ) { - CodecFactory *tmp = ACE_static_cast (CodecFactory *, _tao_void_pointer); - CORBA::release (tmp); + Encoding *_tao_tmp_pointer = + ACE_static_cast (Encoding *, _tao_void_pointer); + delete _tao_tmp_pointer; } +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60 + +// Traits specializations for IOP::CodecFactory. + IOP::CodecFactory_ptr -IOP::CodecFactory::_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL +TAO::Objref_Traits<IOP::CodecFactory>::tao_duplicate ( + IOP::CodecFactory_ptr p ) { - return CodecFactory::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); + return IOP::CodecFactory::_duplicate (p); } -IOP::CodecFactory_ptr -IOP::CodecFactory::_unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED +void +TAO::Objref_Traits<IOP::CodecFactory>::tao_release ( + IOP::CodecFactory_ptr p ) { - if (CORBA::is_nil (obj)) - { - return CodecFactory::_nil (); - } - - return - ACE_reinterpret_cast ( - CodecFactory_ptr, - obj->_tao_QueryInterface ( - ACE_reinterpret_cast ( - ptrdiff_t, - &CodecFactory::_tao_class_id - ) - ) - ); + CORBA::release (p); } IOP::CodecFactory_ptr -IOP::CodecFactory::_duplicate (CodecFactory_ptr obj) +TAO::Objref_Traits<IOP::CodecFactory>::tao_nil (void) { - if (! CORBA::is_nil (obj)) - { - obj->_add_ref (); - } - - return obj; -} - -void *IOP::CodecFactory::_tao_QueryInterface (ptrdiff_t type) -{ - void *retv = 0; - - if (type == ACE_reinterpret_cast ( - ptrdiff_t, - &ACE_NESTED_CLASS (::IOP, CodecFactory)::_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* IOP::CodecFactory::_interface_repository_id (void) const -{ - return "IDL:omg.org/IOP/CodecFactory:1.0"; + return IOP::CodecFactory::_nil (); } CORBA::Boolean -IOP::CodecFactory::marshal (TAO_OutputCDR &) +TAO::Objref_Traits<IOP::CodecFactory>::tao_marshal ( + IOP::CodecFactory_ptr p, + TAO_OutputCDR & cdr + ) { - return 0; + return p->marshal (cdr); } +// Function pointer for collocation factory initialization. +TAO::Collocation_Proxy_Broker * +(*IOP__TAO_CodecFactory_Proxy_Broker_Factory_function_pointer) ( + CORBA::Object_ptr obj + ) = 0; + // TAO_IDL - Generated from -// be/be_visitor_exception/exception_cs.cpp:63 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63 IOP::CodecFactory::UnknownEncoding::UnknownEncoding (void) : CORBA::UserException ( @@ -931,8 +863,9 @@ IOP::CodecFactory::UnknownEncoding::operator= (const ::IOP::CodecFactory::Unknow void IOP::CodecFactory::UnknownEncoding::_tao_any_destructor (void *_tao_void_pointer) { - UnknownEncoding *tmp = ACE_static_cast (UnknownEncoding*, _tao_void_pointer); - delete tmp; + UnknownEncoding *_tao_tmp_pointer = + ACE_static_cast (UnknownEncoding*, _tao_void_pointer); + delete _tao_tmp_pointer; } IOP::CodecFactory::UnknownEncoding * @@ -995,7 +928,7 @@ CORBA::TypeCode_ptr IOP::CodecFactory::UnknownEncoding::_type (void) const } // 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_IOP_CodecFactory_UnknownEncoding[] = { @@ -1033,8 +966,85 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_CodecFactory_UnknownEncoding ( ::CORBA::TypeCode_ptr IOP::CodecFactory::_tc_UnknownEncoding = &_tc_TAO_tc_IOP_CodecFactory_UnknownEncoding; +IOP::CodecFactory::CodecFactory (void) +{} + +IOP::CodecFactory::~CodecFactory (void) +{} + +void +IOP::CodecFactory::_tao_any_destructor (void *_tao_void_pointer) +{ + CodecFactory *_tao_tmp_pointer = + ACE_static_cast (CodecFactory *, _tao_void_pointer); + CORBA::release (_tao_tmp_pointer); +} + +IOP::CodecFactory_ptr +IOP::CodecFactory::_narrow ( + CORBA::Object_ptr _tao_objref + ACE_ENV_ARG_DECL_NOT_USED + ) +{ + CodecFactory_ptr proxy = + dynamic_cast<CodecFactory_ptr> (_tao_objref); + proxy->_add_ref (); + return proxy; +} + +IOP::CodecFactory_ptr +IOP::CodecFactory::_duplicate (CodecFactory_ptr obj) +{ + if (! CORBA::is_nil (obj)) + { + obj->_add_ref (); + } + + return obj; +} + +CORBA::Boolean +IOP::CodecFactory::_is_a ( + const char *value + ACE_ENV_ARG_DECL + ) +{ + if ( + !ACE_OS::strcmp ( + (char *)value, + "IDL:omg.org/IOP/CodecFactory: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* IOP::CodecFactory::_interface_repository_id (void) const +{ + return "IDL:omg.org/IOP/CodecFactory:1.0"; +} + +CORBA::Boolean +IOP::CodecFactory::marshal (TAO_OutputCDR &) +{ + return 0; +} + // 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_IOP_CodecFactory[] = { @@ -1064,17 +1074,14 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_CodecFactory ( sizeof (IOP::CodecFactory) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_CodecFactory, - &_tc_TAO_tc_IOP_CodecFactory - ) -TAO_NAMESPACE_END +namespace IOP +{ + ::CORBA::TypeCode_ptr _tc_CodecFactory = + &_tc_TAO_tc_IOP_CodecFactory; +} // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:50 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50 // Copying insertion. void @@ -1118,15 +1125,8 @@ operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Impl_T<IOP::Codec>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Impl_T<IOP::Codec> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -1183,15 +1183,8 @@ CORBA::Boolean operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<IOP::Encoding>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<IOP::Encoding> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:50 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50 // Copying insertion. void @@ -1235,10 +1228,322 @@ operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Impl_T<IOP::CodecFactory>; +// 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 (_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 */ + + 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 (_IOP_CODEC__ARG_TRAITS_TMPLINST_CS_) +#define _IOP_CODEC__ARG_TRAITS_TMPLINST_CS_ + + template class TAO::Arg_Traits<IOP::Codec>; + + template class + TAO::Object_Arg_Traits_T< + IOP::Codec_ptr, + IOP::Codec_var, + IOP::Codec_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 + >; + + 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_Objref_Var_T< + IOP::Codec, + TAO::Objref_Traits<IOP::Codec> + >; + + template class + TAO_Objref_Out_T< + IOP::Codec, + TAO::Objref_Traits<IOP::Codec> + >; + + template class + TAO::Any_Impl_T< + IOP::Codec + >; + +#if !defined (_IOP_ENCODING__ARG_TRAITS_TMPLINST_CS_) +#define _IOP_ENCODING__ARG_TRAITS_TMPLINST_CS_ + + template class TAO::Arg_Traits<IOP::Encoding>; + + template class + TAO::Fixed_Size_Arg_Traits< + IOP::Encoding + >; + +#endif /* end #if !defined */ + + template class + TAO_Fixed_Var_T< + IOP::Encoding + >; + + template class + TAO_Var_Base_T< + IOP::Encoding + >; + + template class + TAO::Any_Dual_Impl_T< + IOP::Encoding + >; + + template class + TAO::Any_Dual_Impl_T< + IOP::CodecFactory::UnknownEncoding + >; + + template class + TAO::Ret_Object_Argument_T< + IOP::Codec_ptr, + IOP::Codec_var + >; + + template class + TAO::In_Fixed_Size_Argument_T< + IOP::Encoding + >; + + template class + TAO_Objref_Var_T< + IOP::CodecFactory, + TAO::Objref_Traits<IOP::CodecFactory> + >; + + template class + TAO_Objref_Out_T< + IOP::CodecFactory, + TAO::Objref_Traits<IOP::CodecFactory> + >; + + template class + TAO::Any_Impl_T< + IOP::CodecFactory + >; + #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Impl_T<IOP::CodecFactory> -#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 (_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 */ + +# 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 (_IOP_CODEC__ARG_TRAITS_TMPLINST_CS_) +#define _IOP_CODEC__ARG_TRAITS_TMPLINST_CS_ + +# pragma instantiate TAO::Arg_Traits<IOP::Codec> + +# pragma instantiate \ + TAO::Object_Arg_Traits_T< \ + IOP::Codec_ptr, \ + IOP::Codec_var, \ + IOP::Codec_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 \ + > + +# pragma instantiate \ + TAO::In_Var_Size_Argument_T< \ + CORBA::sequence \ + > + +# pragma instantiate \ + TAO_Objref_Var_T< \ + IOP::Codec, \ + TAO::Objref_Traits<IOP::Codec> \ + > + +# pragma instantiate \ + TAO_Objref_Out_T< \ + IOP::Codec, \ + TAO::Objref_Traits<IOP::Codec> \ + > + +# pragma instantiate \ + TAO::Any_Impl_T< \ + IOP::Codec \ + > + +#if !defined (_IOP_ENCODING__ARG_TRAITS_TMPLINST_CS_) +#define _IOP_ENCODING__ARG_TRAITS_TMPLINST_CS_ + +# pragma instantiate TAO::Arg_Traits<IOP::Encoding> + +# pragma instantiate \ + TAO::Fixed_Size_Arg_Traits< \ + IOP::Encoding \ + > + +#endif /* end #if !defined */ + +# pragma instantiate \ + TAO_Fixed_Var_T< \ + IOP::Encoding \ + > + +# pragma instantiate \ + TAO_Var_Base_T< \ + IOP::Encoding \ + > + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + IOP::Encoding \ + > + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + IOP::CodecFactory::UnknownEncoding \ + > + +# pragma instantiate \ + TAO::In_Fixed_Size_Argument_T< \ + IOP::Encoding \ + > + +# pragma instantiate \ + TAO_Objref_Var_T< \ + IOP::CodecFactory, \ + TAO::Objref_Traits<IOP::CodecFactory> \ + > + +# pragma instantiate \ + TAO_Objref_Out_T< \ + IOP::CodecFactory, \ + TAO::Objref_Traits<IOP::CodecFactory> \ + > + +# pragma instantiate \ + TAO::Any_Impl_T< \ + IOP::CodecFactory \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/IOP_CodecC.h b/TAO/tao/IOP_CodecC.h index 430d38214c2..3d3f779284a 100644 --- a/TAO/tao/IOP_CodecC.h +++ b/TAO/tao/IOP_CodecC.h @@ -26,20 +26,26 @@ // 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_IOP_CODECC_H_ #define _TAO_IDL_ORIG_IOP_CODECC_H_ -#include /**/ "ace/pre.h" + +#include "ace/pre.h" + #include "tao/corbafwd.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/TAO_Export.h" + +#include "tao/Object.h" +#include "tao/Object_T.h" +#include "tao/Sequence_T.h" +#include "tao/Objref_VarOut_T.h" +#include "tao/Seq_Var_T.h" +#include "tao/Seq_Out_T.h" #include "tao/VarOut_T.h" -#include "tao/Any_Impl_T.h" -#include "tao/Any_Dual_Impl_T.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -64,17 +70,25 @@ #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; +} + // 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 IOP +namespace IOP { // TAO_IDL - Generated from - // be/be_interface.cpp:570 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601 -#if !defined (_IOP_CODEC__ODDS_N_ENDS_CH_) -#define _IOP_CODEC__ODDS_N_ENDS_CH_ +#if !defined (_IOP_CODEC__VAR_OUT_CH_) +#define _IOP_CODEC__VAR_OUT_CH_ class Codec; typedef Codec *Codec_ptr; @@ -90,11 +104,11 @@ TAO_NAMESPACE IOP Codec > Codec_out; - + #endif /* end #if !defined */ // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:50 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53 #if !defined (_IOP_CODEC_CH_) #define _IOP_CODEC_CH_ @@ -105,7 +119,6 @@ TAO_NAMESPACE IOP public: typedef Codec_ptr _ptr_type; typedef Codec_var _var_type; - static int _tao_class_id; // The static operations. static Codec_ptr _duplicate (Codec_ptr obj); @@ -115,11 +128,6 @@ TAO_NAMESPACE IOP ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - static Codec_ptr _unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); - static Codec_ptr _nil (void) { return (Codec_ptr)0; @@ -128,7 +136,7 @@ TAO_NAMESPACE IOP static void _tao_any_destructor (void *); // TAO_IDL - Generated from - // be/be_visitor_exception/exception_ch.cpp:51 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_IOP_CODEC_INVALIDTYPEFORENCODING_CH_) #define _IOP_CODEC_INVALIDTYPEFORENCODING_CH_ @@ -154,29 +162,29 @@ TAO_NAMESPACE IOP 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 - // be/be_visitor_exception/exception_ch.cpp:125 + // 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 - // be/be_visitor_typecode/typecode_decl.cpp:44 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 static ::CORBA::TypeCode_ptr _tc_InvalidTypeForEncoding; #endif /* end #if !defined */ // TAO_IDL - Generated from - // be/be_visitor_exception/exception_ch.cpp:51 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_IOP_CODEC_FORMATMISMATCH_CH_) #define _IOP_CODEC_FORMATMISMATCH_CH_ @@ -202,29 +210,29 @@ TAO_NAMESPACE IOP 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 - // be/be_visitor_exception/exception_ch.cpp:125 + // 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 - // be/be_visitor_typecode/typecode_decl.cpp:44 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 static ::CORBA::TypeCode_ptr _tc_FormatMismatch; #endif /* end #if !defined */ // TAO_IDL - Generated from - // be/be_visitor_exception/exception_ch.cpp:51 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_IOP_CODEC_TYPEMISMATCH_CH_) #define _IOP_CODEC_TYPEMISMATCH_CH_ @@ -250,29 +258,29 @@ TAO_NAMESPACE IOP 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 - // be/be_visitor_exception/exception_ch.cpp:125 + // 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 - // be/be_visitor_typecode/typecode_decl.cpp:44 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 static ::CORBA::TypeCode_ptr _tc_TypeMismatch; #endif /* end #if !defined */ // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 virtual ::CORBA::OctetSeq * encode ( const CORBA::Any & data @@ -284,7 +292,7 @@ TAO_NAMESPACE IOP )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Any * decode ( const CORBA::OctetSeq & data @@ -296,7 +304,7 @@ TAO_NAMESPACE IOP )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 virtual ::CORBA::OctetSeq * encode_value ( const CORBA::Any & data @@ -308,7 +316,7 @@ TAO_NAMESPACE IOP )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Any * decode_value ( const CORBA::OctetSeq & data, @@ -322,9 +330,12 @@ TAO_NAMESPACE IOP )) = 0; // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:207 + // 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); @@ -341,28 +352,28 @@ TAO_NAMESPACE IOP #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_Codec; // TAO_IDL - Generated from - // be/be_visitor_typedef/typedef_ch.cpp:333 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333 typedef CORBA::Short EncodingFormat; typedef CORBA::Short_out EncodingFormat_out; // 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_EncodingFormat; // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 const IOP::EncodingFormat ENCODING_CDR_ENCAPS = 0; // TAO_IDL - Generated from - // be/be_type.cpp:249 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:258 struct Encoding; @@ -377,7 +388,7 @@ TAO_NAMESPACE IOP Encoding_out; // TAO_IDL - Generated from - // be/be_visitor_structure/structure_ch.cpp:52 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52 struct TAO_Export Encoding { @@ -390,15 +401,15 @@ TAO_NAMESPACE IOP }; // 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_Encoding; // TAO_IDL - Generated from - // be/be_interface.cpp:570 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601 -#if !defined (_IOP_CODECFACTORY__ODDS_N_ENDS_CH_) -#define _IOP_CODECFACTORY__ODDS_N_ENDS_CH_ +#if !defined (_IOP_CODECFACTORY__VAR_OUT_CH_) +#define _IOP_CODECFACTORY__VAR_OUT_CH_ class CodecFactory; typedef CodecFactory *CodecFactory_ptr; @@ -414,11 +425,11 @@ TAO_NAMESPACE IOP CodecFactory > CodecFactory_out; - + #endif /* end #if !defined */ // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:50 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53 #if !defined (_IOP_CODECFACTORY_CH_) #define _IOP_CODECFACTORY_CH_ @@ -429,7 +440,6 @@ TAO_NAMESPACE IOP public: typedef CodecFactory_ptr _ptr_type; typedef CodecFactory_var _var_type; - static int _tao_class_id; // The static operations. static CodecFactory_ptr _duplicate (CodecFactory_ptr obj); @@ -439,11 +449,6 @@ TAO_NAMESPACE IOP ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - static CodecFactory_ptr _unchecked_narrow ( - CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ); - static CodecFactory_ptr _nil (void) { return (CodecFactory_ptr)0; @@ -452,7 +457,7 @@ TAO_NAMESPACE IOP static void _tao_any_destructor (void *); // TAO_IDL - Generated from - // be/be_visitor_exception/exception_ch.cpp:51 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_IOP_CODECFACTORY_UNKNOWNENCODING_CH_) #define _IOP_CODECFACTORY_UNKNOWNENCODING_CH_ @@ -478,29 +483,29 @@ TAO_NAMESPACE IOP 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 - // be/be_visitor_exception/exception_ch.cpp:125 + // 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 - // be/be_visitor_typecode/typecode_decl.cpp:44 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 static ::CORBA::TypeCode_ptr _tc_UnknownEncoding; #endif /* end #if !defined */ // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 virtual ::IOP::Codec_ptr create_codec ( const IOP::Encoding & enc @@ -512,9 +517,12 @@ TAO_NAMESPACE IOP )) = 0; // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:207 + // 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); @@ -531,25 +539,32 @@ TAO_NAMESPACE IOP #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_CodecFactory; // 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 IOP +} // module IOP + +// 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_interface/any_op_ch.cpp:52 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52 TAO_Export void operator<<= (CORBA::Any &, IOP::Codec_ptr); // copying TAO_Export void operator<<= (CORBA::Any &, IOP::Codec_ptr *); // non-copying TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Codec_ptr &); // TAO_IDL - Generated from -// be/be_visitor_exception/any_op_ch.cpp:52 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52 TAO_Export void operator<<= (CORBA::Any &, const IOP::Codec::InvalidTypeForEncoding &); // copying version TAO_Export void operator<<= (CORBA::Any &, IOP::Codec::InvalidTypeForEncoding*); // noncopying version @@ -557,7 +572,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Codec::InvalidTy TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::Codec::InvalidTypeForEncoding *&); // TAO_IDL - Generated from -// be/be_visitor_exception/any_op_ch.cpp:52 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52 TAO_Export void operator<<= (CORBA::Any &, const IOP::Codec::FormatMismatch &); // copying version TAO_Export void operator<<= (CORBA::Any &, IOP::Codec::FormatMismatch*); // noncopying version @@ -565,7 +580,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Codec::FormatMis TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::Codec::FormatMismatch *&); // TAO_IDL - Generated from -// be/be_visitor_exception/any_op_ch.cpp:52 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52 TAO_Export void operator<<= (CORBA::Any &, const IOP::Codec::TypeMismatch &); // copying version TAO_Export void operator<<= (CORBA::Any &, IOP::Codec::TypeMismatch*); // noncopying version @@ -573,7 +588,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Codec::TypeMisma TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::Codec::TypeMismatch *&); // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_ch.cpp:52 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52 TAO_Export void operator<<= (CORBA::Any &, const IOP::Encoding &); // copying version TAO_Export void operator<<= (CORBA::Any &, IOP::Encoding*); // noncopying version @@ -581,14 +596,14 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Encoding *&); // TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::Encoding *&); // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_ch.cpp:52 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52 TAO_Export void operator<<= (CORBA::Any &, IOP::CodecFactory_ptr); // copying TAO_Export void operator<<= (CORBA::Any &, IOP::CodecFactory_ptr *); // non-copying TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::CodecFactory_ptr &); // TAO_IDL - Generated from -// be/be_visitor_exception/any_op_ch.cpp:52 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52 TAO_Export void operator<<= (CORBA::Any &, const IOP::CodecFactory::UnknownEncoding &); // copying version TAO_Export void operator<<= (CORBA::Any &, IOP::CodecFactory::UnknownEncoding*); // noncopying version @@ -596,23 +611,23 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::CodecFactory::Un TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::CodecFactory::UnknownEncoding *&); // 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_structure/cdr_op_ch.cpp:53 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:53 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::Encoding &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::Encoding &); // 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 "IOP_CodecC.i" @@ -626,6 +641,6 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::Encoding &); #pragma option pop #endif /* __BORLANDC__ */ -#include /**/ "ace/post.h" +#include "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/IOP_CodecC.i b/TAO/tao/IOP_CodecC.i index f3e5515bf0d..15db319f637 100644 --- a/TAO/tao/IOP_CodecC.i +++ b/TAO/tao/IOP_CodecC.i @@ -75,7 +75,7 @@ TAO::Any_Dual_Impl_T<IOP::Codec::TypeMismatch>::demarshal_value (TAO_InputCDR &) } // TAO_IDL - Generated from -// be/be_visitor_interface/interface_ci.cpp:63 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63 #if !defined (_IOP_CODEC___CI_) #define _IOP_CODEC___CI_ @@ -126,7 +126,7 @@ TAO::Any_Dual_Impl_T<IOP::CodecFactory::UnknownEncoding>::demarshal_value (TAO_I } // TAO_IDL - Generated from -// be/be_visitor_interface/interface_ci.cpp:63 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63 #if !defined (_IOP_CODECFACTORY___CI_) #define _IOP_CODECFACTORY___CI_ @@ -161,7 +161,7 @@ TAO::Any_Impl_T<IOP::CodecFactory>::demarshal_value (TAO_InputCDR &) #endif /* end #if !defined */ // TAO_IDL - Generated from -// be/be_visitor_structure/cdr_op_ci.cpp:70 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:70 ACE_INLINE CORBA::Boolean operator<< ( diff --git a/TAO/tao/IOP_IOR.pidl b/TAO/tao/IOP_IOR.pidl index ab49e96f1cb..315400f5b01 100644 --- a/TAO/tao/IOP_IOR.pidl +++ b/TAO/tao/IOP_IOR.pidl @@ -10,7 +10,7 @@ * command: * * tao_idl.exe - * -o orig -Gp -Gd -Ge 1 -Gv + * -o orig -Gp -Gd -Ge 1 -GT * -Wb,export_macro=TAO_Export * -Wb,export_include=TAO_Export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/IOP_IORC.cpp b/TAO/tao/IOP_IORC.cpp index 7fcd22c2cbb..de4e0252271 100644 --- a/TAO/tao/IOP_IORC.cpp +++ b/TAO/tao/IOP_IORC.cpp @@ -26,11 +26,14 @@ // 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 "IOP_IORC.h" -#include "Any_Dual_Impl_T.h" +#include "tao/Stub.h" +#include "tao/Invocation_Adapter.h" +#include "tao/Any_Dual_Impl_T.h" +#include "tao/Basic_Arguments.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig @@ -41,7 +44,15 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:284 +// 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_IOP_ProfileId[] = { @@ -71,17 +82,14 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_ProfileId ( sizeof (IOP::ProfileId) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_ProfileId, - &_tc_TAO_tc_IOP_ProfileId - ) -TAO_NAMESPACE_END +namespace IOP +{ + ::CORBA::TypeCode_ptr _tc_ProfileId = + &_tc_TAO_tc_IOP_ProfileId; +} // 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_IOP_TaggedProfile[] = { @@ -162,65 +170,27 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedProfile ( sizeof (IOP::TaggedProfile) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_TaggedProfile, - &_tc_TAO_tc_IOP_TaggedProfile - ) -TAO_NAMESPACE_END +namespace IOP +{ + ::CORBA::TypeCode_ptr _tc_TaggedProfile = + &_tc_TAO_tc_IOP_TaggedProfile; +} // TAO_IDL - Generated from -// be/be_visitor_structure/structure_cs.cpp:66 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 -void IOP::TaggedProfile::_tao_any_destructor (void *_tao_void_pointer) +void +IOP::TaggedProfile::_tao_any_destructor ( + void *_tao_void_pointer + ) { - TaggedProfile *tmp = ACE_static_cast (TaggedProfile*, _tao_void_pointer); - delete tmp; + TaggedProfile *_tao_tmp_pointer = + ACE_static_cast (TaggedProfile *, _tao_void_pointer); + delete _tao_tmp_pointer; } // TAO_IDL - Generated from -// be/be_type.cpp:292 - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class - TAO_Var_Var_T< - IOP::TaggedProfile - >; - -template class TAO_Var_Base_T< - IOP::TaggedProfile - >; - -template class - TAO_Out_T< - IOP::TaggedProfile, - IOP::TaggedProfile_var - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO_Var_Var_T< \ - IOP::TaggedProfile \ - > - -#pragma instantiate TAO_Var_Base_T< - IOP::TaggedProfile - > - -# pragma instantiate \ - TAO_Out_T< \ - IOP::TaggedProfile, \ - IOP::TaggedProfile_var \ - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -// 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_IOP_IOR[] = { @@ -329,34 +299,35 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_IOR ( sizeof (IOP::IOR) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_IOR, - &_tc_TAO_tc_IOP_IOR - ) -TAO_NAMESPACE_END +namespace IOP +{ + ::CORBA::TypeCode_ptr _tc_IOR = + &_tc_TAO_tc_IOP_IOR; +} // TAO_IDL - Generated from -// be/be_visitor_structure/structure_cs.cpp:66 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 -void IOP::IOR::_tao_any_destructor (void *_tao_void_pointer) +void +IOP::IOR::_tao_any_destructor ( + void *_tao_void_pointer + ) { - IOR *tmp = ACE_static_cast (IOR*, _tao_void_pointer); - delete tmp; + IOR *_tao_tmp_pointer = + ACE_static_cast (IOR *, _tao_void_pointer); + delete _tao_tmp_pointer; } // TAO_IDL - Generated from -// be/be_visitor_sequence/sequence_cs.cpp:70 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:66 -#if !defined (_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_PROFILES_CS_) -#define _IOP_IOR__TAO_SEQ_TAGGEDPROFILE_PROFILES_CS_ +#if !defined (_IOP_IOR__TAO_SEQ_IOP_TAGGEDPROFILE__CS_) +#define _IOP_IOR__TAO_SEQ_IOP_TAGGEDPROFILE__CS_ -IOP::IOR::_tao_seq_TaggedProfile_profiles::_tao_seq_TaggedProfile_profiles (void) +IOP::IOR::_tao_seq_IOP_TaggedProfile_::_tao_seq_IOP_TaggedProfile_ (void) {} -IOP::IOR::_tao_seq_TaggedProfile_profiles::_tao_seq_TaggedProfile_profiles ( +IOP::IOR::_tao_seq_IOP_TaggedProfile_::_tao_seq_IOP_TaggedProfile_ ( CORBA::ULong max ) : TAO_Unbounded_Sequence< @@ -365,7 +336,7 @@ IOP::IOR::_tao_seq_TaggedProfile_profiles::_tao_seq_TaggedProfile_profiles ( (max) {} -IOP::IOR::_tao_seq_TaggedProfile_profiles::_tao_seq_TaggedProfile_profiles ( +IOP::IOR::_tao_seq_IOP_TaggedProfile_::_tao_seq_IOP_TaggedProfile_ ( CORBA::ULong max, CORBA::ULong length, IOP::TaggedProfile * buffer, @@ -377,8 +348,8 @@ IOP::IOR::_tao_seq_TaggedProfile_profiles::_tao_seq_TaggedProfile_profiles ( (max, length, buffer, release) {} -IOP::IOR::_tao_seq_TaggedProfile_profiles::_tao_seq_TaggedProfile_profiles ( - const _tao_seq_TaggedProfile_profiles &seq +IOP::IOR::_tao_seq_IOP_TaggedProfile_::_tao_seq_IOP_TaggedProfile_ ( + const _tao_seq_IOP_TaggedProfile_ &seq ) : TAO_Unbounded_Sequence< IOP::TaggedProfile @@ -386,64 +357,22 @@ IOP::IOR::_tao_seq_TaggedProfile_profiles::_tao_seq_TaggedProfile_profiles ( (seq) {} -IOP::IOR::_tao_seq_TaggedProfile_profiles::~_tao_seq_TaggedProfile_profiles (void) +IOP::IOR::_tao_seq_IOP_TaggedProfile_::~_tao_seq_IOP_TaggedProfile_ (void) {} -void IOP::IOR::_tao_seq_TaggedProfile_profiles::_tao_any_destructor ( +void IOP::IOR::_tao_seq_IOP_TaggedProfile_::_tao_any_destructor ( void * _tao_void_pointer ) { - _tao_seq_TaggedProfile_profiles * tmp = - ACE_static_cast ( - _tao_seq_TaggedProfile_profiles *, - _tao_void_pointer - ); - delete tmp; + _tao_seq_IOP_TaggedProfile_ * _tao_tmp_pointer = + ACE_static_cast (_tao_seq_IOP_TaggedProfile_ *, _tao_void_pointer); + delete _tao_tmp_pointer; } #endif /* end #if !defined */ // TAO_IDL - Generated from -// be/be_type.cpp:292 - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class - TAO_Var_Var_T< - IOP::IOR - >; - -template class TAO_Var_Base_T< - IOP::IOR - >; - -template class - TAO_Out_T< - IOP::IOR, - IOP::IOR_var - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO_Var_Var_T< \ - IOP::IOR \ - > - -#pragma instantiate TAO_Var_Base_T< - IOP::IOR - > - -# pragma instantiate \ - TAO_Out_T< \ - IOP::IOR, \ - IOP::IOR_var \ - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -// 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_IOP_ComponentId[] = { @@ -473,17 +402,14 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_ComponentId ( sizeof (IOP::ComponentId) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_ComponentId, - &_tc_TAO_tc_IOP_ComponentId - ) -TAO_NAMESPACE_END +namespace IOP +{ + ::CORBA::TypeCode_ptr _tc_ComponentId = + &_tc_TAO_tc_IOP_ComponentId; +} // 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_IOP_TaggedComponent[] = { @@ -564,65 +490,27 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedComponent ( sizeof (IOP::TaggedComponent) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_TaggedComponent, - &_tc_TAO_tc_IOP_TaggedComponent - ) -TAO_NAMESPACE_END +namespace IOP +{ + ::CORBA::TypeCode_ptr _tc_TaggedComponent = + &_tc_TAO_tc_IOP_TaggedComponent; +} // TAO_IDL - Generated from -// be/be_visitor_structure/structure_cs.cpp:66 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 -void IOP::TaggedComponent::_tao_any_destructor (void *_tao_void_pointer) +void +IOP::TaggedComponent::_tao_any_destructor ( + void *_tao_void_pointer + ) { - TaggedComponent *tmp = ACE_static_cast (TaggedComponent*, _tao_void_pointer); - delete tmp; + TaggedComponent *_tao_tmp_pointer = + ACE_static_cast (TaggedComponent *, _tao_void_pointer); + delete _tao_tmp_pointer; } -// TAO_IDL - Generated from -// be/be_type.cpp:292 - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class - TAO_Var_Var_T< - IOP::TaggedComponent - >; - -template class TAO_Var_Base_T< - IOP::TaggedComponent - >; - -template class - TAO_Out_T< - IOP::TaggedComponent, - IOP::TaggedComponent_var - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO_Var_Var_T< \ - IOP::TaggedComponent \ - > - -#pragma instantiate TAO_Var_Base_T< - IOP::TaggedComponent - > - -# pragma instantiate \ - TAO_Out_T< \ - IOP::TaggedComponent, \ - IOP::TaggedComponent_var \ - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - // TAO_IDL - Generated from -// be/be_visitor_sequence/sequence_cs.cpp:70 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:66 #if !defined (_IOP_MULTIPLECOMPONENTPROFILE_CS_) #define _IOP_MULTIPLECOMPONENTPROFILE_CS_ @@ -667,77 +555,15 @@ void IOP::MultipleComponentProfile::_tao_any_destructor ( void * _tao_void_pointer ) { - MultipleComponentProfile * tmp = - ACE_static_cast ( - MultipleComponentProfile *, - _tao_void_pointer - ); - delete tmp; + MultipleComponentProfile * _tao_tmp_pointer = + ACE_static_cast (MultipleComponentProfile *, _tao_void_pointer); + delete _tao_tmp_pointer; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class - TAO_VarSeq_Var_T< - IOP::MultipleComponentProfile, - IOP::TaggedComponent - >; - -template class - TAO_Seq_Var_Base_T< - IOP::MultipleComponentProfile, - IOP::TaggedComponent - >; - -template class - TAO_Seq_Out_T< - IOP::MultipleComponentProfile, - IOP::MultipleComponentProfile_var, - IOP::TaggedComponent - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO_VarSeq_Var_T< \ - MultipleComponentProfile, \ - IOP::TaggedComponent \ - > - -# pragma instantiate \ - TAO_Seq_Var_Base_T< \ - MultipleComponentProfile, \ - IOP::TaggedComponent \ - > - -# pragma instantiate \ - TAO_Seq_Out_T< \ - MultipleComponentProfile, \ - MultipleComponentProfile_var, \ - IOP::TaggedComponent \ - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class TAO_Unbounded_Sequence< - IOP::TaggedComponent - >; - - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate TAO_Unbounded_Sequence< - IOP::TaggedComponent - > - - -#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_IOP_MultipleComponentProfile[] = { @@ -848,17 +674,14 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_MultipleComponentProfile ( sizeof (IOP::MultipleComponentProfile) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_MultipleComponentProfile, - &_tc_TAO_tc_IOP_MultipleComponentProfile - ) -TAO_NAMESPACE_END +namespace IOP +{ + ::CORBA::TypeCode_ptr _tc_MultipleComponentProfile = + &_tc_TAO_tc_IOP_MultipleComponentProfile; +} // TAO_IDL - Generated from -// be/be_visitor_sequence/sequence_cs.cpp:70 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:66 #if !defined (_IOP_TAGGEDCOMPONENTLIST_CS_) #define _IOP_TAGGEDCOMPONENTLIST_CS_ @@ -903,68 +726,15 @@ void IOP::TaggedComponentList::_tao_any_destructor ( void * _tao_void_pointer ) { - TaggedComponentList * tmp = - ACE_static_cast ( - TaggedComponentList *, - _tao_void_pointer - ); - delete tmp; + TaggedComponentList * _tao_tmp_pointer = + ACE_static_cast (TaggedComponentList *, _tao_void_pointer); + delete _tao_tmp_pointer; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class - TAO_VarSeq_Var_T< - IOP::TaggedComponentList, - IOP::TaggedComponent - >; - -template class - TAO_Seq_Var_Base_T< - IOP::TaggedComponentList, - IOP::TaggedComponent - >; - -template class - TAO_Seq_Out_T< - IOP::TaggedComponentList, - IOP::TaggedComponentList_var, - IOP::TaggedComponent - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO_VarSeq_Var_T< \ - TaggedComponentList, \ - IOP::TaggedComponent \ - > - -# pragma instantiate \ - TAO_Seq_Var_Base_T< \ - TaggedComponentList, \ - IOP::TaggedComponent \ - > - -# pragma instantiate \ - TAO_Seq_Out_T< \ - TaggedComponentList, \ - TaggedComponentList_var, \ - IOP::TaggedComponent \ - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#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_IOP_TaggedComponentList[] = { @@ -1071,17 +841,14 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedComponentList ( sizeof (IOP::TaggedComponentList) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_TaggedComponentList, - &_tc_TAO_tc_IOP_TaggedComponentList - ) -TAO_NAMESPACE_END +namespace IOP +{ + ::CORBA::TypeCode_ptr _tc_TaggedComponentList = + &_tc_TAO_tc_IOP_TaggedComponentList; +} // TAO_IDL - Generated from -// be/be_visitor_sequence/sequence_cs.cpp:70 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:66 #if !defined (_IOP_TAGGEDCOMPONENTSEQ_CS_) #define _IOP_TAGGEDCOMPONENTSEQ_CS_ @@ -1126,68 +893,15 @@ void IOP::TaggedComponentSeq::_tao_any_destructor ( void * _tao_void_pointer ) { - TaggedComponentSeq * tmp = - ACE_static_cast ( - TaggedComponentSeq *, - _tao_void_pointer - ); - delete tmp; + TaggedComponentSeq * _tao_tmp_pointer = + ACE_static_cast (TaggedComponentSeq *, _tao_void_pointer); + delete _tao_tmp_pointer; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class - TAO_VarSeq_Var_T< - IOP::TaggedComponentSeq, - IOP::TaggedComponent - >; - -template class - TAO_Seq_Var_Base_T< - IOP::TaggedComponentSeq, - IOP::TaggedComponent - >; - -template class - TAO_Seq_Out_T< - IOP::TaggedComponentSeq, - IOP::TaggedComponentSeq_var, - IOP::TaggedComponent - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO_VarSeq_Var_T< \ - TaggedComponentSeq, \ - IOP::TaggedComponent \ - > - -# pragma instantiate \ - TAO_Seq_Var_Base_T< \ - TaggedComponentSeq, \ - IOP::TaggedComponent \ - > - -# pragma instantiate \ - TAO_Seq_Out_T< \ - TaggedComponentSeq, \ - TaggedComponentSeq_var, \ - IOP::TaggedComponent \ - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#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_IOP_TaggedComponentSeq[] = { @@ -1294,17 +1008,14 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedComponentSeq ( sizeof (IOP::TaggedComponentSeq) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_TaggedComponentSeq, - &_tc_TAO_tc_IOP_TaggedComponentSeq - ) -TAO_NAMESPACE_END +namespace IOP +{ + ::CORBA::TypeCode_ptr _tc_TaggedComponentSeq = + &_tc_TAO_tc_IOP_TaggedComponentSeq; +} // 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_IOP_ServiceId[] = { @@ -1334,17 +1045,14 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceId ( sizeof (IOP::ServiceId) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_ServiceId, - &_tc_TAO_tc_IOP_ServiceId - ) -TAO_NAMESPACE_END +namespace IOP +{ + ::CORBA::TypeCode_ptr _tc_ServiceId = + &_tc_TAO_tc_IOP_ServiceId; +} // 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_IOP_ServiceContext[] = { @@ -1410,34 +1118,35 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceContext ( sizeof (IOP::ServiceContext) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_ServiceContext, - &_tc_TAO_tc_IOP_ServiceContext - ) -TAO_NAMESPACE_END +namespace IOP +{ + ::CORBA::TypeCode_ptr _tc_ServiceContext = + &_tc_TAO_tc_IOP_ServiceContext; +} // TAO_IDL - Generated from -// be/be_visitor_structure/structure_cs.cpp:66 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 -void IOP::ServiceContext::_tao_any_destructor (void *_tao_void_pointer) +void +IOP::ServiceContext::_tao_any_destructor ( + void *_tao_void_pointer + ) { - ServiceContext *tmp = ACE_static_cast (ServiceContext*, _tao_void_pointer); - delete tmp; + ServiceContext *_tao_tmp_pointer = + ACE_static_cast (ServiceContext *, _tao_void_pointer); + delete _tao_tmp_pointer; } // TAO_IDL - Generated from -// be/be_visitor_sequence/sequence_cs.cpp:70 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:66 -#if !defined (_IOP_SERVICECONTEXT__TAO_SEQ_OCTET_CONTEXT_DATA_CS_) -#define _IOP_SERVICECONTEXT__TAO_SEQ_OCTET_CONTEXT_DATA_CS_ +#if !defined (_IOP_SERVICECONTEXT__TAO_SEQ_CORBA_OCTET__CS_) +#define _IOP_SERVICECONTEXT__TAO_SEQ_CORBA_OCTET__CS_ -IOP::ServiceContext::_tao_seq_Octet_context_data::_tao_seq_Octet_context_data (void) +IOP::ServiceContext::_tao_seq_CORBA_Octet_::_tao_seq_CORBA_Octet_ (void) {} -IOP::ServiceContext::_tao_seq_Octet_context_data::_tao_seq_Octet_context_data ( +IOP::ServiceContext::_tao_seq_CORBA_Octet_::_tao_seq_CORBA_Octet_ ( CORBA::ULong max ) : TAO_Unbounded_Sequence< @@ -1446,7 +1155,7 @@ IOP::ServiceContext::_tao_seq_Octet_context_data::_tao_seq_Octet_context_data ( (max) {} -IOP::ServiceContext::_tao_seq_Octet_context_data::_tao_seq_Octet_context_data ( +IOP::ServiceContext::_tao_seq_CORBA_Octet_::_tao_seq_CORBA_Octet_ ( CORBA::ULong max, CORBA::ULong length, CORBA::Octet * buffer, @@ -1458,8 +1167,8 @@ IOP::ServiceContext::_tao_seq_Octet_context_data::_tao_seq_Octet_context_data ( (max, length, buffer, release) {} -IOP::ServiceContext::_tao_seq_Octet_context_data::_tao_seq_Octet_context_data ( - const _tao_seq_Octet_context_data &seq +IOP::ServiceContext::_tao_seq_CORBA_Octet_::_tao_seq_CORBA_Octet_ ( + const _tao_seq_CORBA_Octet_ &seq ) : TAO_Unbounded_Sequence< CORBA::Octet @@ -1467,64 +1176,22 @@ IOP::ServiceContext::_tao_seq_Octet_context_data::_tao_seq_Octet_context_data ( (seq) {} -IOP::ServiceContext::_tao_seq_Octet_context_data::~_tao_seq_Octet_context_data (void) +IOP::ServiceContext::_tao_seq_CORBA_Octet_::~_tao_seq_CORBA_Octet_ (void) {} -void IOP::ServiceContext::_tao_seq_Octet_context_data::_tao_any_destructor ( +void IOP::ServiceContext::_tao_seq_CORBA_Octet_::_tao_any_destructor ( void * _tao_void_pointer ) { - _tao_seq_Octet_context_data * tmp = - ACE_static_cast ( - _tao_seq_Octet_context_data *, - _tao_void_pointer - ); - delete tmp; + _tao_seq_CORBA_Octet_ * _tao_tmp_pointer = + ACE_static_cast (_tao_seq_CORBA_Octet_ *, _tao_void_pointer); + delete _tao_tmp_pointer; } #endif /* end #if !defined */ -// TAO_IDL - Generated from -// be/be_type.cpp:292 - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class - TAO_Var_Var_T< - IOP::ServiceContext - >; - -template class TAO_Var_Base_T< - IOP::ServiceContext - >; - -template class - TAO_Out_T< - IOP::ServiceContext, - IOP::ServiceContext_var - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO_Var_Var_T< \ - IOP::ServiceContext \ - > - -#pragma instantiate TAO_Var_Base_T< - IOP::ServiceContext - > - -# pragma instantiate \ - TAO_Out_T< \ - IOP::ServiceContext, \ - IOP::ServiceContext_var \ - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - // TAO_IDL - Generated from -// be/be_visitor_sequence/sequence_cs.cpp:70 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:66 #if !defined (_IOP_SERVICECONTEXTLIST_CS_) #define _IOP_SERVICECONTEXTLIST_CS_ @@ -1569,77 +1236,15 @@ void IOP::ServiceContextList::_tao_any_destructor ( void * _tao_void_pointer ) { - ServiceContextList * tmp = - ACE_static_cast ( - ServiceContextList *, - _tao_void_pointer - ); - delete tmp; + ServiceContextList * _tao_tmp_pointer = + ACE_static_cast (ServiceContextList *, _tao_void_pointer); + delete _tao_tmp_pointer; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class - TAO_VarSeq_Var_T< - IOP::ServiceContextList, - IOP::ServiceContext - >; - -template class - TAO_Seq_Var_Base_T< - IOP::ServiceContextList, - IOP::ServiceContext - >; - -template class - TAO_Seq_Out_T< - IOP::ServiceContextList, - IOP::ServiceContextList_var, - IOP::ServiceContext - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO_VarSeq_Var_T< \ - ServiceContextList, \ - IOP::ServiceContext \ - > - -# pragma instantiate \ - TAO_Seq_Var_Base_T< \ - ServiceContextList, \ - IOP::ServiceContext \ - > - -# pragma instantiate \ - TAO_Seq_Out_T< \ - ServiceContextList, \ - ServiceContextList_var, \ - IOP::ServiceContext \ - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class TAO_Unbounded_Sequence< - IOP::ServiceContext - >; - - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate TAO_Unbounded_Sequence< - IOP::ServiceContext - > - - -#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_IOP_ServiceContextList[] = { @@ -1731,17 +1336,14 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceContextList ( sizeof (IOP::ServiceContextList) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (IOP) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_ServiceContextList, - &_tc_TAO_tc_IOP_ServiceContextList - ) -TAO_NAMESPACE_END +namespace IOP +{ + ::CORBA::TypeCode_ptr _tc_ServiceContextList = + &_tc_TAO_tc_IOP_ServiceContextList; +} // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -1798,15 +1400,8 @@ CORBA::Boolean operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<IOP::TaggedProfile>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<IOP::TaggedProfile> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -1863,15 +1458,8 @@ CORBA::Boolean operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<IOP::IOR>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<IOP::IOR> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -1928,15 +1516,8 @@ CORBA::Boolean operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<IOP::TaggedComponent>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<IOP::TaggedComponent> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - // 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<<= ( @@ -1993,15 +1574,8 @@ CORBA::Boolean operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<IOP::MultipleComponentProfile>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<IOP::MultipleComponentProfile> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - // 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<<= ( @@ -2058,15 +1632,8 @@ CORBA::Boolean operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<IOP::TaggedComponentList>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<IOP::TaggedComponentList> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - // 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<<= ( @@ -2123,15 +1690,8 @@ CORBA::Boolean operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<IOP::TaggedComponentSeq>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<IOP::TaggedComponentSeq> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -2188,15 +1748,8 @@ CORBA::Boolean operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<IOP::ServiceContext>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<IOP::ServiceContext> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - // 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<<= ( @@ -2253,22 +1806,15 @@ CORBA::Boolean operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<IOP::ServiceContextList>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<IOP::ServiceContextList> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - // TAO_IDL - Generated from -// be/be_visitor_sequence/cdr_op_cs.cpp:80 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:95 -#if !defined _TAO_CDR_OP_IOP_IOR__tao_seq_TaggedProfile_profiles_CPP_ -#define _TAO_CDR_OP_IOP_IOR__tao_seq_TaggedProfile_profiles_CPP_ +#if !defined _TAO_CDR_OP_IOP_IOR__tao_seq_IOP_TaggedProfile__CPP_ +#define _TAO_CDR_OP_IOP_IOR__tao_seq_IOP_TaggedProfile__CPP_ CORBA::Boolean operator<< ( TAO_OutputCDR &strm, - const IOP::IOR::_tao_seq_TaggedProfile_profiles &_tao_sequence + const IOP::IOR::_tao_seq_IOP_TaggedProfile_ &_tao_sequence ) { CORBA::ULong _tao_seq_len = _tao_sequence.length (); @@ -2291,7 +1837,7 @@ CORBA::Boolean operator<< ( CORBA::Boolean operator>> ( TAO_InputCDR &strm, - IOP::IOR::_tao_seq_TaggedProfile_profiles &_tao_sequence + IOP::IOR::_tao_seq_IOP_TaggedProfile_ &_tao_sequence ) { CORBA::ULong _tao_seq_len; @@ -2330,10 +1876,10 @@ CORBA::Boolean operator>> ( return 0; } -#endif /* _TAO_CDR_OP_IOP_IOR__tao_seq_TaggedProfile_profiles_CPP_ */ +#endif /* _TAO_CDR_OP_IOP_IOR__tao_seq_IOP_TaggedProfile__CPP_ */ // TAO_IDL - Generated from -// be/be_visitor_sequence/cdr_op_cs.cpp:80 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:95 #if !defined _TAO_CDR_OP_IOP_MultipleComponentProfile_CPP_ #define _TAO_CDR_OP_IOP_MultipleComponentProfile_CPP_ @@ -2405,7 +1951,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_IOP_MultipleComponentProfile_CPP_ */ // TAO_IDL - Generated from -// be/be_visitor_sequence/cdr_op_cs.cpp:80 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:95 #if !defined _TAO_CDR_OP_IOP_TaggedComponentList_CPP_ #define _TAO_CDR_OP_IOP_TaggedComponentList_CPP_ @@ -2477,7 +2023,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_IOP_TaggedComponentList_CPP_ */ // TAO_IDL - Generated from -// be/be_visitor_sequence/cdr_op_cs.cpp:80 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:95 #if !defined _TAO_CDR_OP_IOP_TaggedComponentSeq_CPP_ #define _TAO_CDR_OP_IOP_TaggedComponentSeq_CPP_ @@ -2549,14 +2095,14 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_IOP_TaggedComponentSeq_CPP_ */ // TAO_IDL - Generated from -// be/be_visitor_sequence/cdr_op_cs.cpp:80 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:95 -#if !defined _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_context_data_CPP_ -#define _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_context_data_CPP_ +#if !defined _TAO_CDR_OP_IOP_ServiceContext__tao_seq_CORBA_Octet__CPP_ +#define _TAO_CDR_OP_IOP_ServiceContext__tao_seq_CORBA_Octet__CPP_ CORBA::Boolean operator<< ( TAO_OutputCDR &strm, - const IOP::ServiceContext::_tao_seq_Octet_context_data &_tao_sequence + const IOP::ServiceContext::_tao_seq_CORBA_Octet_ &_tao_sequence ) { CORBA::ULong _tao_seq_len = _tao_sequence.length (); @@ -2564,15 +2110,21 @@ CORBA::Boolean operator<< ( 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 << CORBA::Any::from_octet (_tao_sequence[i])); - } +#if (TAO_NO_COPY_OCTET_SEQUENCES == 1) + { + TAO_Unbounded_Sequence<CORBA::Octet> *oseq = + ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (IOP::ServiceContext::_tao_seq_CORBA_Octet_ *)&_tao_sequence); + if (oseq->mb ()) + return strm.write_octet_array_mb (oseq->mb ()); + else + return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); + } - return _tao_marshal_flag; +#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; @@ -2580,7 +2132,7 @@ CORBA::Boolean operator<< ( CORBA::Boolean operator>> ( TAO_InputCDR &strm, - IOP::ServiceContext::_tao_seq_Octet_context_data &_tao_sequence + IOP::ServiceContext::_tao_seq_CORBA_Octet_ &_tao_sequence ) { CORBA::ULong _tao_seq_len; @@ -2605,25 +2157,39 @@ CORBA::Boolean operator>> ( } // Retrieve all the elements. - CORBA::Boolean _tao_marshal_flag = 1; - for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) +#if (TAO_NO_COPY_OCTET_SEQUENCES == 1) + if (ACE_BIT_DISABLED (strm.start ()->flags (), + ACE_Message_Block::DONT_DELETE)) + { + TAO_ORB_Core* orb_core = strm.orb_core (); + if (orb_core != 0 && + strm.orb_core ()->resource_factory ()-> + input_cdr_allocator_type_locked () == 1) { - _tao_marshal_flag = - (strm >> CORBA::Any::to_octet (_tao_sequence[i])); + 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); + strm.skip_bytes (_tao_seq_len); + return 1; } - - return _tao_marshal_flag; + } + 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_IOP_ServiceContext__tao_seq_Octet_context_data_CPP_ */ +#endif /* _TAO_CDR_OP_IOP_ServiceContext__tao_seq_CORBA_Octet__CPP_ */ // TAO_IDL - Generated from -// be/be_visitor_sequence/cdr_op_cs.cpp:80 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:95 #if !defined _TAO_CDR_OP_IOP_ServiceContextList_CPP_ #define _TAO_CDR_OP_IOP_ServiceContextList_CPP_ @@ -2694,3 +2260,552 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_IOP_ServiceContextList_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::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 + >; + + template class + TAO_Var_Var_T< + IOP::TaggedProfile + >; + + template class + TAO_Var_Base_T< + IOP::TaggedProfile + >; + + template class + TAO_Out_T< + IOP::TaggedProfile, + IOP::TaggedProfile_var + >; + + template class + TAO::Any_Dual_Impl_T< + IOP::TaggedProfile + >; + +#if !defined (_IOP_IOR__TAO_SEQ_IOP_TAGGEDPROFILE__CS_) +#define _IOP_IOR__TAO_SEQ_IOP_TAGGEDPROFILE__CS_ + + template class + TAO_Unbounded_Sequence< + IOP::TaggedProfile + >; + +#endif /* end #if !defined */ + + template class + TAO::Any_Dual_Impl_T< + IOP::IOR::_tao_seq_IOP_TaggedProfile_ + >; + + template class + TAO_Var_Var_T< + IOP::IOR + >; + + template class + TAO_Var_Base_T< + IOP::IOR + >; + + template class + TAO_Out_T< + IOP::IOR, + IOP::IOR_var + >; + + template class + TAO::Any_Dual_Impl_T< + IOP::IOR + >; + + template class + TAO_Var_Var_T< + IOP::TaggedComponent + >; + + template class + TAO_Var_Base_T< + IOP::TaggedComponent + >; + + template class + TAO_Out_T< + IOP::TaggedComponent, + IOP::TaggedComponent_var + >; + + template class + TAO::Any_Dual_Impl_T< + IOP::TaggedComponent + >; + + template class + TAO_VarSeq_Var_T< + IOP::MultipleComponentProfile, + IOP::TaggedComponent + >; + + template class + TAO_Seq_Var_Base_T< + IOP::MultipleComponentProfile, + IOP::TaggedComponent + >; + + template class + TAO_Seq_Out_T< + IOP::MultipleComponentProfile, + IOP::MultipleComponentProfile_var, + IOP::TaggedComponent + >; + +#if !defined (_IOP_MULTIPLECOMPONENTPROFILE_CS_) +#define _IOP_MULTIPLECOMPONENTPROFILE_CS_ + + template class + TAO_Unbounded_Sequence< + IOP::TaggedComponent + >; + +#endif /* end #if !defined */ + + template class + TAO::Any_Dual_Impl_T< + IOP::MultipleComponentProfile + >; + + template class + TAO_VarSeq_Var_T< + IOP::TaggedComponentList, + IOP::TaggedComponent + >; + + template class + TAO_Seq_Var_Base_T< + IOP::TaggedComponentList, + IOP::TaggedComponent + >; + + template class + TAO_Seq_Out_T< + IOP::TaggedComponentList, + IOP::TaggedComponentList_var, + IOP::TaggedComponent + >; + +#if !defined (_IOP_TAGGEDCOMPONENTLIST_CS_) +#define _IOP_TAGGEDCOMPONENTLIST_CS_ + + template class + TAO_Unbounded_Sequence< + IOP::TaggedComponent + >; + +#endif /* end #if !defined */ + + template class + TAO::Any_Dual_Impl_T< + IOP::TaggedComponentList + >; + + template class + TAO_VarSeq_Var_T< + IOP::TaggedComponentSeq, + IOP::TaggedComponent + >; + + template class + TAO_Seq_Var_Base_T< + IOP::TaggedComponentSeq, + IOP::TaggedComponent + >; + + template class + TAO_Seq_Out_T< + IOP::TaggedComponentSeq, + IOP::TaggedComponentSeq_var, + IOP::TaggedComponent + >; + +#if !defined (_IOP_TAGGEDCOMPONENTSEQ_CS_) +#define _IOP_TAGGEDCOMPONENTSEQ_CS_ + + template class + TAO_Unbounded_Sequence< + IOP::TaggedComponent + >; + +#endif /* end #if !defined */ + + template class + TAO::Any_Dual_Impl_T< + IOP::TaggedComponentSeq + >; + + template class + TAO::Any_Dual_Impl_T< + IOP::ServiceContext::_tao_seq_CORBA_Octet_ + >; + + template class + TAO_Var_Var_T< + IOP::ServiceContext + >; + + template class + TAO_Var_Base_T< + IOP::ServiceContext + >; + + template class + TAO_Out_T< + IOP::ServiceContext, + IOP::ServiceContext_var + >; + + template class + TAO::Any_Dual_Impl_T< + IOP::ServiceContext + >; + + template class + TAO_VarSeq_Var_T< + IOP::ServiceContextList, + IOP::ServiceContext + >; + + template class + TAO_Seq_Var_Base_T< + IOP::ServiceContextList, + IOP::ServiceContext + >; + + template class + TAO_Seq_Out_T< + IOP::ServiceContextList, + IOP::ServiceContextList_var, + IOP::ServiceContext + >; + +#if !defined (_IOP_SERVICECONTEXTLIST_CS_) +#define _IOP_SERVICECONTEXTLIST_CS_ + + template class + TAO_Unbounded_Sequence< + IOP::ServiceContext + >; + +#endif /* end #if !defined */ + + template class + TAO::Any_Dual_Impl_T< + IOP::ServiceContextList + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# 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 \ + > + +# pragma instantiate \ + TAO_Var_Var_T< \ + IOP::TaggedProfile \ + > + +# pragma instantiate \ + TAO_Var_Base_T< \ + IOP::TaggedProfile \ + > + +# pragma instantiate \ + TAO_Out_T< \ + IOP::TaggedProfile, \ + IOP::TaggedProfile_var \ + > + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + IOP::TaggedProfile \ + > + +#if !defined (_IOP_IOR__TAO_SEQ_IOP_TAGGEDPROFILE__CS_) +#define _IOP_IOR__TAO_SEQ_IOP_TAGGEDPROFILE__CS_ + +# pragma instantiate \ + TAO_Unbounded_Sequence< \ + IOP::TaggedProfile \ + > + +#endif /* end #if !defined */ + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + IOP::IOR::_tao_seq_IOP_TaggedProfile_ \ + > + +# pragma instantiate \ + TAO_Var_Var_T< \ + IOP::IOR \ + > + +# pragma instantiate \ + TAO_Var_Base_T< \ + IOP::IOR \ + > + +# pragma instantiate \ + TAO_Out_T< \ + IOP::IOR, \ + IOP::IOR_var \ + > + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + IOP::IOR \ + > + +# pragma instantiate \ + TAO_Var_Var_T< \ + IOP::TaggedComponent \ + > + +# pragma instantiate \ + TAO_Var_Base_T< \ + IOP::TaggedComponent \ + > + +# pragma instantiate \ + TAO_Out_T< \ + IOP::TaggedComponent, \ + IOP::TaggedComponent_var \ + > + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + IOP::TaggedComponent \ + > + +# pragma instantiate \ + TAO_VarSeq_Var_T< \ + IOP::MultipleComponentProfile, \ + IOP::TaggedComponent \ + > + +# pragma instantiate \ + TAO_Seq_Var_Base_T< \ + IOP::MultipleComponentProfile, \ + IOP::TaggedComponent \ + > + +# pragma instantiate \ + TAO_Seq_Out_T< \ + IOP::MultipleComponentProfile, \ + IOP::MultipleComponentProfile_var, \ + IOP::TaggedComponent \ + > + +#if !defined (_IOP_MULTIPLECOMPONENTPROFILE_CS_) +#define _IOP_MULTIPLECOMPONENTPROFILE_CS_ + +# pragma instantiate \ + TAO_Unbounded_Sequence< \ + IOP::TaggedComponent \ + > + +#endif /* end #if !defined */ + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + IOP::MultipleComponentProfile \ + > + +# pragma instantiate \ + TAO_VarSeq_Var_T< \ + IOP::TaggedComponentList, \ + IOP::TaggedComponent \ + > + +# pragma instantiate \ + TAO_Seq_Var_Base_T< \ + IOP::TaggedComponentList, \ + IOP::TaggedComponent \ + > + +# pragma instantiate \ + TAO_Seq_Out_T< \ + IOP::TaggedComponentList, \ + IOP::TaggedComponentList_var, \ + IOP::TaggedComponent \ + > + +#if !defined (_IOP_TAGGEDCOMPONENTLIST_CS_) +#define _IOP_TAGGEDCOMPONENTLIST_CS_ + +# pragma instantiate \ + TAO_Unbounded_Sequence< \ + IOP::TaggedComponent \ + > + +#endif /* end #if !defined */ + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + IOP::TaggedComponentList \ + > + +# pragma instantiate \ + TAO_VarSeq_Var_T< \ + IOP::TaggedComponentSeq, \ + IOP::TaggedComponent \ + > + +# pragma instantiate \ + TAO_Seq_Var_Base_T< \ + IOP::TaggedComponentSeq, \ + IOP::TaggedComponent \ + > + +# pragma instantiate \ + TAO_Seq_Out_T< \ + IOP::TaggedComponentSeq, \ + IOP::TaggedComponentSeq_var, \ + IOP::TaggedComponent \ + > + +#if !defined (_IOP_TAGGEDCOMPONENTSEQ_CS_) +#define _IOP_TAGGEDCOMPONENTSEQ_CS_ + +# pragma instantiate \ + TAO_Unbounded_Sequence< \ + IOP::TaggedComponent \ + > + +#endif /* end #if !defined */ + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + IOP::TaggedComponentSeq \ + > + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + IOP::ServiceContext::_tao_seq_CORBA_Octet_ \ + > + +# pragma instantiate \ + TAO_Var_Var_T< \ + IOP::ServiceContext \ + > + +# pragma instantiate \ + TAO_Var_Base_T< \ + IOP::ServiceContext \ + > + +# pragma instantiate \ + TAO_Out_T< \ + IOP::ServiceContext, \ + IOP::ServiceContext_var \ + > + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + IOP::ServiceContext \ + > + +# pragma instantiate \ + TAO_VarSeq_Var_T< \ + IOP::ServiceContextList, \ + IOP::ServiceContext \ + > + +# pragma instantiate \ + TAO_Seq_Var_Base_T< \ + IOP::ServiceContextList, \ + IOP::ServiceContext \ + > + +# pragma instantiate \ + TAO_Seq_Out_T< \ + IOP::ServiceContextList, \ + IOP::ServiceContextList_var, \ + IOP::ServiceContext \ + > + +#if !defined (_IOP_SERVICECONTEXTLIST_CS_) +#define _IOP_SERVICECONTEXTLIST_CS_ + +# pragma instantiate \ + TAO_Unbounded_Sequence< \ + IOP::ServiceContext \ + > + +#endif /* end #if !defined */ + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + IOP::ServiceContextList \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/IOP_IORC.h b/TAO/tao/IOP_IORC.h index dbf2a9c9c60..c89a1ffe8bf 100644 --- a/TAO/tao/IOP_IORC.h +++ b/TAO/tao/IOP_IORC.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_IOP_IORC_H_ #define _TAO_IDL_ORIG_IOP_IORC_H_ @@ -39,7 +39,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/TAO_Export.h" #include "tao/OctetSeqC.h" #include "tao/VarOut_T.h" #include "tao/CDR.h" @@ -67,206 +66,209 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -// TAO_IDL - Generated from -// be/be_visitor_module/module_ch.cpp:48 +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_ch.cpp:63 -TAO_NAMESPACE IOP +namespace TAO { + class Collocation_Proxy_Broker; +} - // TAO_IDL - Generated from - // be/be_visitor_typedef/typedef_ch.cpp:333 +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48 +namespace IOP +{ + + // TAO_IDL - Generated from + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333 + typedef CORBA::ULong ProfileId; typedef CORBA::ULong_out ProfileId_out; - + // 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_ProfileId; - + // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + const IOP::ProfileId TAG_INTERNET_IOP = 0U; - + // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + const IOP::ProfileId TAG_MULTIPLE_COMPONENTS = 1U; - + // TAO_IDL - Generated from - // be/be_type.cpp:249 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:258 + struct TaggedProfile; - + typedef TAO_Var_Var_T< TaggedProfile > TaggedProfile_var; - + typedef TAO_Out_T< TaggedProfile, TaggedProfile_var > TaggedProfile_out; - + // TAO_IDL - Generated from - // be/be_visitor_structure/structure_ch.cpp:52 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52 + struct TAO_Export TaggedProfile { typedef TaggedProfile_var _var_type; - + static void _tao_any_destructor (void *); IOP::ProfileId tag; CORBA::OctetSeq profile_data; }; - + // 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_TaggedProfile; - + // TAO_IDL - Generated from - // be/be_type.cpp:249 - -#ifdef HPUX_11 - // Remove clash with /usr/include/machine/inline.h and - // /usr/include/pa/inline.h -#undef IOR -#endif + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:258 + struct IOR; - + typedef TAO_Var_Var_T< IOR > IOR_var; - + typedef TAO_Out_T< IOR, IOR_var > IOR_out; - + // TAO_IDL - Generated from - // be/be_visitor_structure/structure_ch.cpp:52 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52 + struct TAO_Export IOR { typedef IOR_var _var_type; - + static void _tao_any_destructor (void *); TAO_String_Manager type_id; - - + + // TAO_IDL - Generated from - // be/be_visitor_sequence/sequence_ch.cpp:89 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101 -#if !defined (_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_PROFILES_CH_) -#define _IOP_IOR__TAO_SEQ_TAGGEDPROFILE_PROFILES_CH_ - - class TAO_Export _tao_seq_TaggedProfile_profiles +#if !defined (_IOP_IOR__TAO_SEQ_IOP_TAGGEDPROFILE__CH_) +#define _IOP_IOR__TAO_SEQ_IOP_TAGGEDPROFILE__CH_ + + class TAO_Export _tao_seq_IOP_TaggedProfile_ : public TAO_Unbounded_Sequence< ACE_NESTED_CLASS (IOP, TaggedProfile) > { public: - _tao_seq_TaggedProfile_profiles (void); - _tao_seq_TaggedProfile_profiles (CORBA::ULong max); - _tao_seq_TaggedProfile_profiles ( + _tao_seq_IOP_TaggedProfile_ (void); + _tao_seq_IOP_TaggedProfile_ (CORBA::ULong max); + _tao_seq_IOP_TaggedProfile_ ( CORBA::ULong max, CORBA::ULong length, - ACE_NESTED_CLASS (IOP, TaggedProfile)* buffer, + ACE_NESTED_CLASS (IOP, TaggedProfile)* buffer, CORBA::Boolean release = 0 ); - _tao_seq_TaggedProfile_profiles (const _tao_seq_TaggedProfile_profiles &); - ~_tao_seq_TaggedProfile_profiles (void); - + _tao_seq_IOP_TaggedProfile_ (const _tao_seq_IOP_TaggedProfile_ &); + ~_tao_seq_IOP_TaggedProfile_ (void); + static void _tao_any_destructor (void *); - - + + }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // be/be_visitor_field/field_ch.cpp:453 - - typedef _tao_seq_TaggedProfile_profiles _profiles_seq; - _tao_seq_TaggedProfile_profiles profiles; + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_field/field_ch.cpp:453 + + typedef _tao_seq_IOP_TaggedProfile_ _profiles_seq; + _tao_seq_IOP_TaggedProfile_ profiles; }; - + // 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_IOR; - + // TAO_IDL - Generated from - // be/be_visitor_typedef/typedef_ch.cpp:333 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333 + typedef CORBA::ULong ComponentId; typedef CORBA::ULong_out ComponentId_out; - + // 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_ComponentId; - + // TAO_IDL - Generated from - // be/be_type.cpp:249 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:258 + struct TaggedComponent; - + typedef TAO_Var_Var_T< TaggedComponent > TaggedComponent_var; - + typedef TAO_Out_T< TaggedComponent, TaggedComponent_var > TaggedComponent_out; - + // TAO_IDL - Generated from - // be/be_visitor_structure/structure_ch.cpp:52 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52 + struct TAO_Export TaggedComponent { typedef TaggedComponent_var _var_type; - + static void _tao_any_destructor (void *); IOP::ComponentId tag; CORBA::OctetSeq component_data; }; - + // 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_TaggedComponent; - + // TAO_IDL - Generated from - // be/be_visitor_sequence/sequence_ch.cpp:89 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_IOP_MULTIPLECOMPONENTPROFILE_CH_) #define _IOP_MULTIPLECOMPONENTPROFILE_CH_ - + class MultipleComponentProfile; - + typedef TAO_VarSeq_Var_T< MultipleComponentProfile, TaggedComponent > MultipleComponentProfile_var; - + typedef TAO_Seq_Out_T< MultipleComponentProfile, @@ -274,7 +276,7 @@ TAO_NAMESPACE IOP TaggedComponent > MultipleComponentProfile_out; - + class TAO_Export MultipleComponentProfile : public TAO_Unbounded_Sequence< @@ -287,39 +289,39 @@ TAO_NAMESPACE IOP MultipleComponentProfile ( CORBA::ULong max, CORBA::ULong length, - TaggedComponent* buffer, + TaggedComponent* buffer, CORBA::Boolean release = 0 ); MultipleComponentProfile (const MultipleComponentProfile &); ~MultipleComponentProfile (void); - + static void _tao_any_destructor (void *); - + typedef MultipleComponentProfile_var _var_type; }; #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_MultipleComponentProfile; - + // TAO_IDL - Generated from - // be/be_visitor_sequence/sequence_ch.cpp:89 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_IOP_TAGGEDCOMPONENTLIST_CH_) #define _IOP_TAGGEDCOMPONENTLIST_CH_ - + class TaggedComponentList; - + typedef TAO_VarSeq_Var_T< TaggedComponentList, TaggedComponent > TaggedComponentList_var; - + typedef TAO_Seq_Out_T< TaggedComponentList, @@ -327,7 +329,7 @@ TAO_NAMESPACE IOP TaggedComponent > TaggedComponentList_out; - + class TAO_Export TaggedComponentList : public TAO_Unbounded_Sequence< @@ -340,39 +342,39 @@ TAO_NAMESPACE IOP TaggedComponentList ( CORBA::ULong max, CORBA::ULong length, - TaggedComponent* buffer, + TaggedComponent* buffer, CORBA::Boolean release = 0 ); TaggedComponentList (const TaggedComponentList &); ~TaggedComponentList (void); - + static void _tao_any_destructor (void *); - + typedef TaggedComponentList_var _var_type; }; #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_TaggedComponentList; - + // TAO_IDL - Generated from - // be/be_visitor_sequence/sequence_ch.cpp:89 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_IOP_TAGGEDCOMPONENTSEQ_CH_) #define _IOP_TAGGEDCOMPONENTSEQ_CH_ - + class TaggedComponentSeq; - + typedef TAO_VarSeq_Var_T< TaggedComponentSeq, TaggedComponent > TaggedComponentSeq_var; - + typedef TAO_Seq_Out_T< TaggedComponentSeq, @@ -380,7 +382,7 @@ TAO_NAMESPACE IOP TaggedComponent > TaggedComponentSeq_out; - + class TAO_Export TaggedComponentSeq : public TAO_Unbounded_Sequence< @@ -393,144 +395,144 @@ TAO_NAMESPACE IOP TaggedComponentSeq ( CORBA::ULong max, CORBA::ULong length, - TaggedComponent* buffer, + TaggedComponent* buffer, CORBA::Boolean release = 0 ); TaggedComponentSeq (const TaggedComponentSeq &); ~TaggedComponentSeq (void); - + static void _tao_any_destructor (void *); - + typedef TaggedComponentSeq_var _var_type; }; #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_TaggedComponentSeq; - + // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + const IOP::ComponentId TAG_ORB_TYPE = 0U; - + // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + const IOP::ComponentId TAG_CODE_SETS = 1U; - + // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + const IOP::ComponentId TAG_POLICIES = 2U; - + // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + const IOP::ComponentId TAG_ALTERNATE_IIOP_ADDRESS = 3U; - + // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + const IOP::ComponentId TAG_COMPLETE_OBJECT_KEY = 5U; - + // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + const IOP::ComponentId TAG_ENDPOINT_ID_POSITION = 6U; - + // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + const IOP::ComponentId TAG_LOCATION_POLICY = 12U; - + // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + const IOP::ComponentId TAG_DCE_STRING_BINDING = 100U; - + // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + const IOP::ComponentId TAG_DCE_BINDING_NAME = 101U; - + // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + const IOP::ComponentId TAG_DCE_NO_PIPES = 102U; - + // TAO_IDL - Generated from - // be/be_visitor_typedef/typedef_ch.cpp:333 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333 + typedef CORBA::ULong ServiceId; typedef CORBA::ULong_out ServiceId_out; - + // 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_ServiceId; - + // TAO_IDL - Generated from - // be/be_type.cpp:249 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:258 + struct ServiceContext; - + typedef TAO_Var_Var_T< ServiceContext > ServiceContext_var; - + typedef TAO_Out_T< ServiceContext, ServiceContext_var > ServiceContext_out; - + // TAO_IDL - Generated from - // be/be_visitor_structure/structure_ch.cpp:52 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52 + struct TAO_Export ServiceContext { typedef ServiceContext_var _var_type; - + static void _tao_any_destructor (void *); IOP::ServiceId context_id; - - + + // TAO_IDL - Generated from - // be/be_visitor_sequence/sequence_ch.cpp:89 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101 -#if !defined (_IOP_SERVICECONTEXT__TAO_SEQ_OCTET_CONTEXT_DATA_CH_) -#define _IOP_SERVICECONTEXT__TAO_SEQ_OCTET_CONTEXT_DATA_CH_ - - class TAO_Export _tao_seq_Octet_context_data +#if !defined (_IOP_SERVICECONTEXT__TAO_SEQ_CORBA_OCTET__CH_) +#define _IOP_SERVICECONTEXT__TAO_SEQ_CORBA_OCTET__CH_ + + class TAO_Export _tao_seq_CORBA_Octet_ : public TAO_Unbounded_Sequence< CORBA::Octet > { public: - _tao_seq_Octet_context_data (void); - _tao_seq_Octet_context_data (CORBA::ULong max); - _tao_seq_Octet_context_data ( + _tao_seq_CORBA_Octet_ (void); + _tao_seq_CORBA_Octet_ (CORBA::ULong max); + _tao_seq_CORBA_Octet_ ( CORBA::ULong max, CORBA::ULong length, - CORBA::Octet* buffer, + CORBA::Octet* buffer, CORBA::Boolean release = 0 ); - _tao_seq_Octet_context_data (const _tao_seq_Octet_context_data &); - ~_tao_seq_Octet_context_data (void); - + _tao_seq_CORBA_Octet_ (const _tao_seq_CORBA_Octet_ &); + ~_tao_seq_CORBA_Octet_ (void); + static void _tao_any_destructor (void *); - - + + #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) - _tao_seq_Octet_context_data ( + _tao_seq_CORBA_Octet_ ( CORBA::ULong length, const ACE_Message_Block* mb ) @@ -539,34 +541,34 @@ TAO_NAMESPACE IOP }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // be/be_visitor_field/field_ch.cpp:453 - - typedef _tao_seq_Octet_context_data _context_data_seq; - _tao_seq_Octet_context_data context_data; + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_field/field_ch.cpp:453 + + typedef _tao_seq_CORBA_Octet_ _context_data_seq; + _tao_seq_CORBA_Octet_ context_data; }; - + // 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_ServiceContext; - + // TAO_IDL - Generated from - // be/be_visitor_sequence/sequence_ch.cpp:89 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_IOP_SERVICECONTEXTLIST_CH_) #define _IOP_SERVICECONTEXTLIST_CH_ - + class ServiceContextList; - + typedef TAO_VarSeq_Var_T< ServiceContextList, ServiceContext > ServiceContextList_var; - + typedef TAO_Seq_Out_T< ServiceContextList, @@ -574,7 +576,7 @@ TAO_NAMESPACE IOP ServiceContext > ServiceContextList_out; - + class TAO_Export ServiceContextList : public TAO_Unbounded_Sequence< @@ -587,127 +589,134 @@ TAO_NAMESPACE IOP ServiceContextList ( CORBA::ULong max, CORBA::ULong length, - ServiceContext* buffer, + ServiceContext* buffer, CORBA::Boolean release = 0 ); ServiceContextList (const ServiceContextList &); ~ServiceContextList (void); - + static void _tao_any_destructor (void *); - + typedef ServiceContextList_var _var_type; }; #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_ServiceContextList; - + // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + const IOP::ServiceId TransactionService = 0U; - + // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + const IOP::ServiceId CodeSets = 1U; - + // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + const IOP::ServiceId ChainBypassCheck = 2U; - + // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + const IOP::ServiceId ChainBypassInfo = 3U; - + // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + const IOP::ServiceId LogicalThreadId = 4U; - + // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + const IOP::ServiceId BI_DIR_IIOP = 5U; - + // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + const IOP::ServiceId SendingContextRunTime = 6U; - + // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + const IOP::ServiceId INVOCATION_POLICIES = 7U; - + // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + const IOP::ServiceId UnknownExceptionInfo = 9U; - + // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + const IOP::ServiceId RTCorbaPriority = 10U; - + // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + const IOP::ServiceId RTCorbaPriorityRange = 11U; - + // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + const IOP::ComponentId TAG_FT_GROUP = 27U; - + // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + const IOP::ComponentId TAG_FT_PRIMARY = 28U; - + // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + const IOP::ComponentId TAG_FT_HEARTBEAT_ENABLED = 29U; - + // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + const IOP::ServiceId FT_GROUP_VERSION = 12U; - + // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + const IOP::ServiceId FT_REQUEST = 13U; - + // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + const IOP::ProfileId TAG_UIPMC = 1413566220U; - + // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + const IOP::ComponentId TAG_GROUP = 1413566211U; - + // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 - + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 + const IOP::ComponentId TAG_GROUP_IIOP = 1413566212U; // 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 IOP +} // module IOP // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_ch.cpp:52 +// 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 TAO_Export void operator<<= (CORBA::Any &, const IOP::TaggedProfile &); // copying version TAO_Export void operator<<= (CORBA::Any &, IOP::TaggedProfile*); // noncopying version @@ -715,7 +724,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::TaggedProfile *& TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::TaggedProfile *&); // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_ch.cpp:52 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52 TAO_Export void operator<<= (CORBA::Any &, const IOP::IOR &); // copying version TAO_Export void operator<<= (CORBA::Any &, IOP::IOR*); // noncopying version @@ -723,7 +732,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::IOR *&); // depr TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::IOR *&); // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_ch.cpp:52 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52 TAO_Export void operator<<= (CORBA::Any &, const IOP::TaggedComponent &); // copying version TAO_Export void operator<<= (CORBA::Any &, IOP::TaggedComponent*); // noncopying version @@ -731,7 +740,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::TaggedComponent TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::TaggedComponent *&); // 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 IOP::MultipleComponentProfile &); // copying version TAO_Export void operator<<= (CORBA::Any &, IOP::MultipleComponentProfile*); // noncopying version @@ -739,7 +748,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::MultipleComponen TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::MultipleComponentProfile *&); // 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 IOP::TaggedComponentList &); // copying version TAO_Export void operator<<= (CORBA::Any &, IOP::TaggedComponentList*); // noncopying version @@ -747,7 +756,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::TaggedComponentL TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::TaggedComponentList *&); // 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 IOP::TaggedComponentSeq &); // copying version TAO_Export void operator<<= (CORBA::Any &, IOP::TaggedComponentSeq*); // noncopying version @@ -755,7 +764,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::TaggedComponentS TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::TaggedComponentSeq *&); // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_ch.cpp:52 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52 TAO_Export void operator<<= (CORBA::Any &, const IOP::ServiceContext &); // copying version TAO_Export void operator<<= (CORBA::Any &, IOP::ServiceContext*); // noncopying version @@ -763,7 +772,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::ServiceContext * TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::ServiceContext *&); // 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 IOP::ServiceContextList &); // copying version TAO_Export void operator<<= (CORBA::Any &, IOP::ServiceContextList*); // noncopying version @@ -771,47 +780,47 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::ServiceContextLi TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::ServiceContextList *&); // 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_structure/cdr_op_ch.cpp:53 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:53 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::TaggedProfile &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::TaggedProfile &); // TAO_IDL - Generated from -// be/be_visitor_structure/cdr_op_ch.cpp:53 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:53 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::IOR &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::IOR &); // 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_IOP_IOR__tao_seq_TaggedProfile_profiles_H_ -#define _TAO_CDR_OP_IOP_IOR__tao_seq_TaggedProfile_profiles_H_ +#if !defined _TAO_CDR_OP_IOP_IOR__tao_seq_IOP_TaggedProfile__H_ +#define _TAO_CDR_OP_IOP_IOR__tao_seq_IOP_TaggedProfile__H_ TAO_Export CORBA::Boolean operator<< ( TAO_OutputCDR &, - const IOP::IOR::_tao_seq_TaggedProfile_profiles & + const IOP::IOR::_tao_seq_IOP_TaggedProfile_ & ); TAO_Export CORBA::Boolean operator>> ( TAO_InputCDR &, - IOP::IOR::_tao_seq_TaggedProfile_profiles & + IOP::IOR::_tao_seq_IOP_TaggedProfile_ & ); -#endif /* _TAO_CDR_OP_IOP_IOR__tao_seq_TaggedProfile_profiles_H_ */ +#endif /* _TAO_CDR_OP_IOP_IOR__tao_seq_IOP_TaggedProfile__H_ */ // TAO_IDL - Generated from -// be/be_visitor_structure/cdr_op_ch.cpp:53 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:53 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::TaggedComponent &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::TaggedComponent &); // 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_IOP_MultipleComponentProfile_H_ #define _TAO_CDR_OP_IOP_MultipleComponentProfile_H_ @@ -828,7 +837,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_IOP_MultipleComponentProfile_H_ */ // 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_IOP_TaggedComponentList_H_ #define _TAO_CDR_OP_IOP_TaggedComponentList_H_ @@ -845,7 +854,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_IOP_TaggedComponentList_H_ */ // 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_IOP_TaggedComponentSeq_H_ #define _TAO_CDR_OP_IOP_TaggedComponentSeq_H_ @@ -862,30 +871,30 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_IOP_TaggedComponentSeq_H_ */ // TAO_IDL - Generated from -// be/be_visitor_structure/cdr_op_ch.cpp:53 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:53 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::ServiceContext &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::ServiceContext &); // 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_IOP_ServiceContext__tao_seq_Octet_context_data_H_ -#define _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_context_data_H_ +#if !defined _TAO_CDR_OP_IOP_ServiceContext__tao_seq_CORBA_Octet__H_ +#define _TAO_CDR_OP_IOP_ServiceContext__tao_seq_CORBA_Octet__H_ TAO_Export CORBA::Boolean operator<< ( TAO_OutputCDR &, - const IOP::ServiceContext::_tao_seq_Octet_context_data & + const IOP::ServiceContext::_tao_seq_CORBA_Octet_ & ); TAO_Export CORBA::Boolean operator>> ( TAO_InputCDR &, - IOP::ServiceContext::_tao_seq_Octet_context_data & + IOP::ServiceContext::_tao_seq_CORBA_Octet_ & ); -#endif /* _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_context_data_H_ */ +#endif /* _TAO_CDR_OP_IOP_ServiceContext__tao_seq_CORBA_Octet__H_ */ // 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_IOP_ServiceContextList_H_ #define _TAO_CDR_OP_IOP_ServiceContextList_H_ @@ -902,12 +911,12 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_IOP_ServiceContextList_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 "IOP_IORC.i" @@ -921,5 +930,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/IOP_IORC.i b/TAO/tao/IOP_IORC.i index cfdd9ccb662..da782b8b6a5 100644 --- a/TAO/tao/IOP_IORC.i +++ b/TAO/tao/IOP_IORC.i @@ -27,7 +27,7 @@ // TAO_IDL - Generated from -// be/be_visitor_structure/cdr_op_ci.cpp:70 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:70 ACE_INLINE CORBA::Boolean operator<< ( @@ -52,25 +52,25 @@ CORBA::Boolean operator>> ( } // 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_IOP_IOR__tao_seq_TaggedProfile_profiles_I_ -#define _TAO_CDR_OP_IOP_IOR__tao_seq_TaggedProfile_profiles_I_ +#if !defined _TAO_CDR_OP_IOP_IOR__tao_seq_IOP_TaggedProfile__I_ +#define _TAO_CDR_OP_IOP_IOR__tao_seq_IOP_TaggedProfile__I_ CORBA::Boolean TAO_Export operator<< ( TAO_OutputCDR &, - const IOP::IOR::_tao_seq_TaggedProfile_profiles & + const IOP::IOR::_tao_seq_IOP_TaggedProfile_ & ); CORBA::Boolean TAO_Export operator>> ( TAO_InputCDR &, - IOP::IOR::_tao_seq_TaggedProfile_profiles & + IOP::IOR::_tao_seq_IOP_TaggedProfile_ & ); -#endif /* _TAO_CDR_OP_IOP_IOR__tao_seq_TaggedProfile_profiles_I_ */ +#endif /* _TAO_CDR_OP_IOP_IOR__tao_seq_IOP_TaggedProfile__I_ */ // TAO_IDL - Generated from -// be/be_visitor_structure/cdr_op_ci.cpp:70 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:70 ACE_INLINE CORBA::Boolean operator<< ( @@ -95,7 +95,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be/be_visitor_structure/cdr_op_ci.cpp:70 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:70 ACE_INLINE CORBA::Boolean operator<< ( @@ -120,7 +120,7 @@ CORBA::Boolean operator>> ( } // 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_IOP_MultipleComponentProfile_I_ #define _TAO_CDR_OP_IOP_MultipleComponentProfile_I_ @@ -138,7 +138,7 @@ CORBA::Boolean TAO_Export operator>> ( #endif /* _TAO_CDR_OP_IOP_MultipleComponentProfile_I_ */ // 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_IOP_TaggedComponentList_I_ #define _TAO_CDR_OP_IOP_TaggedComponentList_I_ @@ -156,7 +156,7 @@ CORBA::Boolean TAO_Export operator>> ( #endif /* _TAO_CDR_OP_IOP_TaggedComponentList_I_ */ // 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_IOP_TaggedComponentSeq_I_ #define _TAO_CDR_OP_IOP_TaggedComponentSeq_I_ @@ -174,25 +174,25 @@ CORBA::Boolean TAO_Export operator>> ( #endif /* _TAO_CDR_OP_IOP_TaggedComponentSeq_I_ */ // 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_IOP_ServiceContext__tao_seq_Octet_context_data_I_ -#define _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_context_data_I_ +#if !defined _TAO_CDR_OP_IOP_ServiceContext__tao_seq_CORBA_Octet__I_ +#define _TAO_CDR_OP_IOP_ServiceContext__tao_seq_CORBA_Octet__I_ CORBA::Boolean TAO_Export operator<< ( TAO_OutputCDR &, - const IOP::ServiceContext::_tao_seq_Octet_context_data & + const IOP::ServiceContext::_tao_seq_CORBA_Octet_ & ); CORBA::Boolean TAO_Export operator>> ( TAO_InputCDR &, - IOP::ServiceContext::_tao_seq_Octet_context_data & + IOP::ServiceContext::_tao_seq_CORBA_Octet_ & ); -#endif /* _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_context_data_I_ */ +#endif /* _TAO_CDR_OP_IOP_ServiceContext__tao_seq_CORBA_Octet__I_ */ // TAO_IDL - Generated from -// be/be_visitor_structure/cdr_op_ci.cpp:70 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:70 ACE_INLINE CORBA::Boolean operator<< ( @@ -217,7 +217,7 @@ CORBA::Boolean operator>> ( } // 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_IOP_ServiceContextList_I_ #define _TAO_CDR_OP_IOP_ServiceContextList_I_ diff --git a/TAO/tao/Messaging_PolicyValue.pidl b/TAO/tao/Messaging_PolicyValue.pidl index aaa3b727093..1d7991e4664 100644 --- a/TAO/tao/Messaging_PolicyValue.pidl +++ b/TAO/tao/Messaging_PolicyValue.pidl @@ -9,7 +9,7 @@ * The command used to generate code from this file is: * * 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" @@ -44,6 +44,7 @@ module Messaging CORBA::PolicyType ptype; sequence<octet> pvalue; }; + typedef sequence<PolicyValue> PolicyValueSeq; const IOP::ComponentId TAG_POLICIES = 2; diff --git a/TAO/tao/Messaging_PolicyValueC.cpp b/TAO/tao/Messaging_PolicyValueC.cpp index 84794a32b3e..5bb3beedee0 100644 --- a/TAO/tao/Messaging_PolicyValueC.cpp +++ b/TAO/tao/Messaging_PolicyValueC.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 "Messaging_PolicyValueC.h" @@ -35,52 +41,60 @@ #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_Messaging_PolicyValue[] = { TAO_ENCAP_BYTE_ORDER, // byte order 38, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d657373), - ACE_NTOHL (0x6167696e), - ACE_NTOHL (0x672f506f), - ACE_NTOHL (0x6c696379), - ACE_NTOHL (0x56616c75), - ACE_NTOHL (0x653a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d657373), + ACE_NTOHL (0x6167696e), + ACE_NTOHL (0x672f506f), + ACE_NTOHL (0x6c696379), + ACE_NTOHL (0x56616c75), + ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/Messaging/PolicyValue:1.0 12, - ACE_NTOHL (0x506f6c69), - ACE_NTOHL (0x63795661), + ACE_NTOHL (0x506f6c69), + ACE_NTOHL (0x63795661), ACE_NTOHL (0x6c756500), // name = PolicyValue 2, // member count 6, - ACE_NTOHL (0x70747970), + ACE_NTOHL (0x70747970), ACE_NTOHL (0x65000000), // name = ptype CORBA::tk_alias, // typecode kind for typedefs 64, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 33, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f506f), - ACE_NTOHL (0x6c696379), - ACE_NTOHL (0x54797065), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f506f), + ACE_NTOHL (0x6c696379), + ACE_NTOHL (0x54797065), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/PolicyType:1.0 11, - ACE_NTOHL (0x506f6c69), - ACE_NTOHL (0x63795479), + ACE_NTOHL (0x506f6c69), + ACE_NTOHL (0x63795479), ACE_NTOHL (0x70650000), // name = PolicyType CORBA::tk_ulong, 7, - ACE_NTOHL (0x7076616c), + ACE_NTOHL (0x7076616c), ACE_NTOHL (0x75650000), // name = pvalue CORBA::tk_sequence, // typecode kind 12, // encapsulation length @@ -99,41 +113,47 @@ static CORBA::TypeCode _tc_TAO_tc_Messaging_PolicyValue ( sizeof (Messaging::PolicyValue) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (Messaging) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_PolicyValue, - &_tc_TAO_tc_Messaging_PolicyValue - ) -TAO_NAMESPACE_END +namespace Messaging +{ + ::CORBA::TypeCode_ptr _tc_PolicyValue = + &_tc_TAO_tc_Messaging_PolicyValue; +} -// TAO_IDL - Generated from +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 -void Messaging::PolicyValue::_tao_any_destructor (void *_tao_void_pointer) +void +Messaging::PolicyValue::_tao_any_destructor ( + void *_tao_void_pointer + ) { - PolicyValue *tmp = ACE_static_cast (PolicyValue*, _tao_void_pointer); - delete tmp; + PolicyValue *_tao_tmp_pointer = + ACE_static_cast (PolicyValue *, _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 (_MESSAGING_POLICYVALUE__TAO_SEQ_CORBA_OCTET__CS_) +#define _MESSAGING_POLICYVALUE__TAO_SEQ_CORBA_OCTET__CS_ -Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (void) +Messaging::PolicyValue::_tao_seq_CORBA_Octet_::_tao_seq_CORBA_Octet_ (void) {} -Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) +Messaging::PolicyValue::_tao_seq_CORBA_Octet_::_tao_seq_CORBA_Octet_ ( + CORBA::ULong max + ) : TAO_Unbounded_Sequence< CORBA::Octet > (max) {} -Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet ( +Messaging::PolicyValue::_tao_seq_CORBA_Octet_::_tao_seq_CORBA_Octet_ ( CORBA::ULong max, CORBA::ULong length, - CORBA::Octet *buffer, + CORBA::Octet * buffer, CORBA::Boolean release ) : TAO_Unbounded_Sequence< @@ -142,60 +162,41 @@ Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet ( (max, length, buffer, release) {} -Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) +Messaging::PolicyValue::_tao_seq_CORBA_Octet_::_tao_seq_CORBA_Octet_ ( + const _tao_seq_CORBA_Octet_ &seq + ) : TAO_Unbounded_Sequence< CORBA::Octet > (seq) {} -Messaging::PolicyValue::_tao_seq_Octet::~_tao_seq_Octet (void) +Messaging::PolicyValue::_tao_seq_CORBA_Octet_::~_tao_seq_CORBA_Octet_ (void) {} -void Messaging::PolicyValue::_tao_seq_Octet::_tao_any_destructor (void *_tao_void_pointer) +void Messaging::PolicyValue::_tao_seq_CORBA_Octet_::_tao_any_destructor ( + void * _tao_void_pointer + ) { - _tao_seq_Octet *tmp = ACE_static_cast (_tao_seq_Octet*, _tao_void_pointer); - delete tmp; + _tao_seq_CORBA_Octet_ * _tao_tmp_pointer = + ACE_static_cast (_tao_seq_CORBA_Octet_ *, _tao_void_pointer); + delete _tao_tmp_pointer; } -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274 +#endif /* end #if !defined */ -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:66 -template class - TAO_Var_Var_T< - Messaging::PolicyValue - >; - -template class - TAO_Out_T< - Messaging::PolicyValue, - Messaging::PolicyValue_var - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO_Var_Var_T< \ - Messaging::PolicyValue \ - > - -# pragma instantiate \ - TAO_Out_T< \ - Messaging::PolicyValue, \ - Messaging::PolicyValue_var \ - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50 +#if !defined (_MESSAGING_POLICYVALUESEQ_CS_) +#define _MESSAGING_POLICYVALUESEQ_CS_ Messaging::PolicyValueSeq::PolicyValueSeq (void) {} -Messaging::PolicyValueSeq::PolicyValueSeq (CORBA::ULong max) +Messaging::PolicyValueSeq::PolicyValueSeq ( + CORBA::ULong max + ) : TAO_Unbounded_Sequence< Messaging::PolicyValue > @@ -205,7 +206,7 @@ Messaging::PolicyValueSeq::PolicyValueSeq (CORBA::ULong max) Messaging::PolicyValueSeq::PolicyValueSeq ( CORBA::ULong max, CORBA::ULong length, - Messaging::PolicyValue *buffer, + Messaging::PolicyValue * buffer, CORBA::Boolean release ) : TAO_Unbounded_Sequence< @@ -214,7 +215,9 @@ Messaging::PolicyValueSeq::PolicyValueSeq ( (max, length, buffer, release) {} -Messaging::PolicyValueSeq::PolicyValueSeq (const PolicyValueSeq &seq) +Messaging::PolicyValueSeq::PolicyValueSeq ( + const PolicyValueSeq &seq + ) : TAO_Unbounded_Sequence< Messaging::PolicyValue > @@ -224,51 +227,16 @@ Messaging::PolicyValueSeq::PolicyValueSeq (const PolicyValueSeq &seq) Messaging::PolicyValueSeq::~PolicyValueSeq (void) {} -void Messaging::PolicyValueSeq::_tao_any_destructor (void *_tao_void_pointer) +void Messaging::PolicyValueSeq::_tao_any_destructor ( + void * _tao_void_pointer + ) { - PolicyValueSeq *tmp = ACE_static_cast (PolicyValueSeq*, _tao_void_pointer); - delete tmp; + PolicyValueSeq * _tao_tmp_pointer = + ACE_static_cast (PolicyValueSeq *, _tao_void_pointer); + delete _tao_tmp_pointer; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class - TAO_VarSeq_Var_T< - Messaging::PolicyValueSeq, - Messaging::PolicyValue - >; - -template class TAO_Unbounded_Sequence<Messaging::PolicyValue>; -template class TAO_Var_Base_T<Messaging::PolicyValue>; -template class TAO_Seq_Var_Base_T<Messaging::PolicyValueSeq, - Messaging::PolicyValue>; -template class - TAO_Seq_Out_T< - Messaging::PolicyValueSeq, - Messaging::PolicyValueSeq_var, - Messaging::PolicyValue - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO_VarSeq_Var_T< \ - Messaging::PolicyValueSeq, \ - Messaging::PolicyValue \ - > - -#pragma instantiate TAO_Seq_Var_Base_T<Messaging::PolicyValueSeq, - Messaging::PolicyValue> -#pragma instantiate TAO_Unbounded_Sequence<Messaging::PolicyValue> -#pragma instantiate TAO_Var_Base_T<Messaging::PolicyValue>; -# pragma instantiate \ - TAO_Seq_Out_T< \ - Messaging::PolicyValueSeq, \ - Messaging::PolicyValueSeq_var, \ - Messaging::PolicyValue \ - > - -#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 @@ -277,21 +245,21 @@ static const CORBA::Long _oc_Messaging_PolicyValueSeq[] = { TAO_ENCAP_BYTE_ORDER, // byte order 41, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d657373), - ACE_NTOHL (0x6167696e), - ACE_NTOHL (0x672f506f), - ACE_NTOHL (0x6c696379), - ACE_NTOHL (0x56616c75), - ACE_NTOHL (0x65536571), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d657373), + ACE_NTOHL (0x6167696e), + ACE_NTOHL (0x672f506f), + ACE_NTOHL (0x6c696379), + ACE_NTOHL (0x56616c75), + ACE_NTOHL (0x65536571), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/Messaging/PolicyValueSeq:1.0 15, - ACE_NTOHL (0x506f6c69), - ACE_NTOHL (0x63795661), - ACE_NTOHL (0x6c756553), + ACE_NTOHL (0x506f6c69), + ACE_NTOHL (0x63795661), + ACE_NTOHL (0x6c756553), ACE_NTOHL (0x65710000), // name = PolicyValueSeq CORBA::tk_sequence, // typecode kind 200, // encapsulation length @@ -300,46 +268,46 @@ static const CORBA::Long _oc_Messaging_PolicyValueSeq[] = 184, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 38, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d657373), - ACE_NTOHL (0x6167696e), - ACE_NTOHL (0x672f506f), - ACE_NTOHL (0x6c696379), - ACE_NTOHL (0x56616c75), - ACE_NTOHL (0x653a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d657373), + ACE_NTOHL (0x6167696e), + ACE_NTOHL (0x672f506f), + ACE_NTOHL (0x6c696379), + ACE_NTOHL (0x56616c75), + ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/Messaging/PolicyValue:1.0 12, - ACE_NTOHL (0x506f6c69), - ACE_NTOHL (0x63795661), + ACE_NTOHL (0x506f6c69), + ACE_NTOHL (0x63795661), ACE_NTOHL (0x6c756500), // name = PolicyValue 2, // member count 6, - ACE_NTOHL (0x70747970), + ACE_NTOHL (0x70747970), ACE_NTOHL (0x65000000), // name = ptype CORBA::tk_alias, // typecode kind for typedefs 64, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 33, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f506f), - ACE_NTOHL (0x6c696379), - ACE_NTOHL (0x54797065), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f506f), + ACE_NTOHL (0x6c696379), + ACE_NTOHL (0x54797065), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/PolicyType:1.0 11, - ACE_NTOHL (0x506f6c69), - ACE_NTOHL (0x63795479), + ACE_NTOHL (0x506f6c69), + ACE_NTOHL (0x63795479), ACE_NTOHL (0x70650000), // name = PolicyType CORBA::tk_ulong, 7, - ACE_NTOHL (0x7076616c), + ACE_NTOHL (0x7076616c), ACE_NTOHL (0x75650000), // name = pvalue CORBA::tk_sequence, // typecode kind 12, // encapsulation length @@ -361,16 +329,13 @@ static CORBA::TypeCode _tc_TAO_tc_Messaging_PolicyValueSeq ( sizeof (Messaging::PolicyValueSeq) ); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (Messaging) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_PolicyValueSeq, - &_tc_TAO_tc_Messaging_PolicyValueSeq - ) -TAO_NAMESPACE_END +namespace Messaging +{ + ::CORBA::TypeCode_ptr _tc_PolicyValueSeq = + &_tc_TAO_tc_Messaging_PolicyValueSeq; +} -// 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. @@ -428,14 +393,7 @@ CORBA::Boolean operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) -template class TAO::Any_Dual_Impl_T<Messaging::PolicyValue>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<Messaging::PolicyValue> -#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. @@ -493,56 +451,49 @@ CORBA::Boolean operator>>= ( ); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<Messaging::PolicyValueSeq>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Any_Dual_Impl_T<Messaging::PolicyValueSeq> -#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_Messaging_PolicyValue__tao_seq_Octet_CPP_ -#define _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_CPP_ +#if !defined _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_CORBA_Octet__CPP_ +#define _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_CORBA_Octet__CPP_ CORBA::Boolean operator<< ( TAO_OutputCDR &strm, - const Messaging::PolicyValue::_tao_seq_Octet &_tao_sequence + const Messaging::PolicyValue::_tao_seq_CORBA_Octet_ &_tao_sequence ) { CORBA::ULong _tao_seq_len = _tao_sequence.length (); - + if (strm << _tao_seq_len) { // Encode all elements. - + #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) { - TAO_Unbounded_Sequence<CORBA::Octet> *oseq = - ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (Messaging::PolicyValue::_tao_seq_Octet *)&_tao_sequence); + TAO_Unbounded_Sequence<CORBA::Octet> *oseq = + ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (Messaging::PolicyValue::_tao_seq_CORBA_Octet_ *)&_tao_sequence); if (oseq->mb ()) return strm.write_octet_array_mb (oseq->mb ()); else return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); } - + #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); - + #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ } - + return 0; } CORBA::Boolean operator>> ( TAO_InputCDR &strm, - Messaging::PolicyValue::_tao_seq_Octet &_tao_sequence + Messaging::PolicyValue::_tao_seq_CORBA_Octet_ &_tao_sequence ) { CORBA::ULong _tao_seq_len; - + if (strm >> _tao_seq_len) { // Add a check to the length of the sequence @@ -552,18 +503,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)) @@ -573,7 +524,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); @@ -584,17 +535,21 @@ 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_Messaging_PolicyValue__tao_seq_Octet_CPP_ */ +#endif /* _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_CORBA_Octet__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_Messaging_PolicyValueSeq_CPP_ +#define _TAO_CDR_OP_Messaging_PolicyValueSeq_CPP_ CORBA::Boolean operator<< ( TAO_OutputCDR &strm, @@ -602,20 +557,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]); } - + return _tao_marshal_flag; } - + return 0; } @@ -625,7 +580,7 @@ CORBA::Boolean operator>> ( ) { CORBA::ULong _tao_seq_len; - + if (strm >> _tao_seq_len) { // Add a check to the length of the sequence @@ -635,26 +590,259 @@ 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_Messaging_PolicyValueSeq_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::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 + >; + + 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 + >; + + template class + TAO::Any_Dual_Impl_T< + IOP::CodecFactory::UnknownEncoding + >; + + template class + TAO::Any_Dual_Impl_T< + Messaging::PolicyValue::_tao_seq_CORBA_Octet_ + >; + + template class + TAO_Var_Var_T< + Messaging::PolicyValue + >; + + template class + TAO_Var_Base_T< + Messaging::PolicyValue + >; + + template class + TAO_Out_T< + Messaging::PolicyValue, + Messaging::PolicyValue_var + >; + + template class + TAO::Any_Dual_Impl_T< + Messaging::PolicyValue + >; + + template class + TAO_VarSeq_Var_T< + Messaging::PolicyValueSeq, + Messaging::PolicyValue + >; + + template class + TAO_Seq_Var_Base_T< + Messaging::PolicyValueSeq, + Messaging::PolicyValue + >; + + template class + TAO_Seq_Out_T< + Messaging::PolicyValueSeq, + Messaging::PolicyValueSeq_var, + Messaging::PolicyValue + >; + +#if !defined (_MESSAGING_POLICYVALUESEQ_CS_) +#define _MESSAGING_POLICYVALUESEQ_CS_ + + template class + TAO_Unbounded_Sequence< + Messaging::PolicyValue + >; + +#endif /* end #if !defined */ + + template class + TAO::Any_Dual_Impl_T< + Messaging::PolicyValueSeq + >; + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +# 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 \ + > + +# 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 \ + > + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + IOP::CodecFactory::UnknownEncoding \ + > + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + Messaging::PolicyValue::_tao_seq_CORBA_Octet_ \ + > + +# pragma instantiate \ + TAO_Var_Var_T< \ + Messaging::PolicyValue \ + > + +# pragma instantiate \ + TAO_Var_Base_T< \ + Messaging::PolicyValue \ + > + +# pragma instantiate \ + TAO_Out_T< \ + Messaging::PolicyValue, \ + Messaging::PolicyValue_var \ + > + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + Messaging::PolicyValue \ + > + +# pragma instantiate \ + TAO_VarSeq_Var_T< \ + Messaging::PolicyValueSeq, \ + Messaging::PolicyValue \ + > + +# pragma instantiate \ + TAO_Seq_Var_Base_T< \ + Messaging::PolicyValueSeq, \ + Messaging::PolicyValue \ + > + +# pragma instantiate \ + TAO_Seq_Out_T< \ + Messaging::PolicyValueSeq, \ + Messaging::PolicyValueSeq_var, \ + Messaging::PolicyValue \ + > + +#if !defined (_MESSAGING_POLICYVALUESEQ_CS_) +#define _MESSAGING_POLICYVALUESEQ_CS_ + +# pragma instantiate \ + TAO_Unbounded_Sequence< \ + Messaging::PolicyValue \ + > + +#endif /* end #if !defined */ + +# pragma instantiate \ + TAO::Any_Dual_Impl_T< \ + Messaging::PolicyValueSeq \ + > + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/Messaging_PolicyValueC.h b/TAO/tao/Messaging_PolicyValueC.h index e5b874459c1..b393dd75fcd 100644 --- a/TAO/tao/Messaging_PolicyValueC.h +++ b/TAO/tao/Messaging_PolicyValueC.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 @@ -25,20 +31,21 @@ #ifndef _TAO_IDL_ORIG_MESSAGING_POLICYVALUEC_H_ #define _TAO_IDL_ORIG_MESSAGING_POLICYVALUEC_H_ -#include /**/ "ace/pre.h" +#include "ace/pre.h" + #include "IOP_IORC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/PolicyC.h" + #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO #endif #define TAO_EXPORT_MACRO TAO_Export -#include "tao/PolicyC.h" - #if defined (TAO_EXPORT_NESTED_CLASSES) # if defined (TAO_EXPORT_NESTED_MACRO) # undef TAO_EXPORT_NESTED_MACRO @@ -57,68 +64,79 @@ #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; +} + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48 -TAO_NAMESPACE Messaging +namespace Messaging { - + // 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 PolicyValue; - + typedef TAO_Var_Var_T< PolicyValue > PolicyValue_var; - + typedef TAO_Out_T< PolicyValue, PolicyValue_var > PolicyValue_out; - + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52 - + struct TAO_Export PolicyValue { typedef PolicyValue_var _var_type; - + static void _tao_any_destructor (void *); CORBA::PolicyType ptype; - - + + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75 + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101 - class TAO_Export _tao_seq_Octet +#if !defined (_MESSAGING_POLICYVALUE__TAO_SEQ_CORBA_OCTET__CH_) +#define _MESSAGING_POLICYVALUE__TAO_SEQ_CORBA_OCTET__CH_ + + class TAO_Export _tao_seq_CORBA_Octet_ : public TAO_Unbounded_Sequence< CORBA::Octet > { public: - _tao_seq_Octet (void); - _tao_seq_Octet (CORBA::ULong max); - _tao_seq_Octet ( + _tao_seq_CORBA_Octet_ (void); + _tao_seq_CORBA_Octet_ (CORBA::ULong max); + _tao_seq_CORBA_Octet_ ( CORBA::ULong max, CORBA::ULong length, - CORBA::Octet *buffer, + CORBA::Octet* buffer, CORBA::Boolean release = 0 ); - _tao_seq_Octet (const _tao_seq_Octet &); - ~_tao_seq_Octet (void); - + _tao_seq_CORBA_Octet_ (const _tao_seq_CORBA_Octet_ &); + ~_tao_seq_CORBA_Octet_ (void); + static void _tao_any_destructor (void *); - - + + #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) - _tao_seq_Octet ( + _tao_seq_CORBA_Octet_ ( CORBA::ULong length, const ACE_Message_Block* mb ) @@ -126,42 +144,47 @@ TAO_NAMESPACE Messaging #endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */ }; +#endif /* end #if !defined */ + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_field/field_ch.cpp:447 - - typedef _tao_seq_Octet _pvalue_seq; - _tao_seq_Octet pvalue; + // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_field/field_ch.cpp:453 + + typedef _tao_seq_CORBA_Octet_ _pvalue_seq; + _tao_seq_CORBA_Octet_ pvalue; }; - + // 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_PolicyValue; - + // 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 (_MESSAGING_POLICYVALUESEQ_CH_) +#define _MESSAGING_POLICYVALUESEQ_CH_ + class PolicyValueSeq; - + typedef TAO_VarSeq_Var_T< PolicyValueSeq, - Messaging::PolicyValue + PolicyValue > PolicyValueSeq_var; - + typedef TAO_Seq_Out_T< PolicyValueSeq, PolicyValueSeq_var, - Messaging::PolicyValue + PolicyValue > PolicyValueSeq_out; - + class TAO_Export PolicyValueSeq : public TAO_Unbounded_Sequence< - Messaging::PolicyValue + PolicyValue > { public: @@ -170,37 +193,46 @@ TAO_NAMESPACE Messaging PolicyValueSeq ( CORBA::ULong max, CORBA::ULong length, - PolicyValue *buffer, + PolicyValue* buffer, CORBA::Boolean release = 0 ); PolicyValueSeq (const PolicyValueSeq &); ~PolicyValueSeq (void); - + static void _tao_any_destructor (void *); - + typedef PolicyValueSeq_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_PolicyValueSeq; - + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - + const IOP::ComponentId TAG_POLICIES = 2U; - + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - + const IOP::ServiceId INVOCATION_POLICIES = 2U; // 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 Messaging +} // module Messaging + +// 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 @@ -224,30 +256,30 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Messaging::Poli #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 Messaging::PolicyValue &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::PolicyValue &); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:70 -#if !defined _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_H_ -#define _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_H_ +#if !defined _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_CORBA_Octet__H_ +#define _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_CORBA_Octet__H_ TAO_Export CORBA::Boolean operator<< ( TAO_OutputCDR &, - const Messaging::PolicyValue::_tao_seq_Octet & + const Messaging::PolicyValue::_tao_seq_CORBA_Octet_ & ); TAO_Export CORBA::Boolean operator>> ( TAO_InputCDR &, - Messaging::PolicyValue::_tao_seq_Octet & + Messaging::PolicyValue::_tao_seq_CORBA_Octet_ & ); -#endif /* _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_H_ */ +#endif /* _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_CORBA_Octet__H_ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:70 #if !defined _TAO_CDR_OP_Messaging_PolicyValueSeq_H_ #define _TAO_CDR_OP_Messaging_PolicyValueSeq_H_ @@ -269,7 +301,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 "Messaging_PolicyValueC.i" @@ -283,5 +315,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.i b/TAO/tao/Messaging_PolicyValueC.i index 3710f2372eb..06b0b9503c8 100644 --- a/TAO/tao/Messaging_PolicyValueC.i +++ b/TAO/tao/Messaging_PolicyValueC.i @@ -15,31 +15,37 @@ // 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_Messaging_PolicyValue__tao_seq_Octet_I_ -#define _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_I_ +#if !defined _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_CORBA_Octet__I_ +#define _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_CORBA_Octet__I_ CORBA::Boolean TAO_Export operator<< ( TAO_OutputCDR &, - const Messaging::PolicyValue::_tao_seq_Octet & + const Messaging::PolicyValue::_tao_seq_CORBA_Octet_ & ); CORBA::Boolean TAO_Export operator>> ( TAO_InputCDR &, - Messaging::PolicyValue::_tao_seq_Octet & + Messaging::PolicyValue::_tao_seq_CORBA_Octet_ & ); -#endif /* _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_I_ */ +#endif /* _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_CORBA_Octet__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<< ( @@ -47,17 +53,9 @@ CORBA::Boolean operator<< ( const Messaging::PolicyValue &_tao_aggregate ) { - if ( + return (strm << _tao_aggregate.ptype) && - (strm << _tao_aggregate.pvalue) - ) - { - return 1; - } - else - { - return 0; - } + (strm << _tao_aggregate.pvalue); } ACE_INLINE @@ -66,21 +64,13 @@ CORBA::Boolean operator>> ( Messaging::PolicyValue &_tao_aggregate ) { - if ( + return (strm >> _tao_aggregate.ptype) && - (strm >> _tao_aggregate.pvalue) - ) - { - return 1; - } - else - { - return 0; - } + (strm >> _tao_aggregate.pvalue); } // 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_Messaging_PolicyValueSeq_I_ #define _TAO_CDR_OP_Messaging_PolicyValueSeq_I_ diff --git a/TAO/tao/Messaging_SyncScope.pidl b/TAO/tao/Messaging_SyncScope.pidl index d4abd8b816f..58be455a99e 100644 --- a/TAO/tao/Messaging_SyncScope.pidl +++ b/TAO/tao/Messaging_SyncScope.pidl @@ -9,7 +9,7 @@ * The command used to generate code from this file is: * * tao_idl.exe - * -o orig -Gp -Gd + * -o orig -St * -Wb,export_macro=TAO_Export * -Wb,export_include=tao/corbafwd.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/Messaging_SyncScopeC.cpp b/TAO/tao/Messaging_SyncScopeC.cpp index 80ccfe3ecf5..37a14e30ccf 100644 --- a/TAO/tao/Messaging_SyncScopeC.cpp +++ b/TAO/tao/Messaging_SyncScopeC.cpp @@ -15,17 +15,21 @@ // 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 "Messaging_SyncScopeC.h" -#include "tao/Typecode.h" -#include "ace/OS.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig @@ -36,42 +40,10 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:59 -static const CORBA::Long _oc_Messaging_SyncScope[] = +// Arg traits specializations. +namespace TAO { - TAO_ENCAP_BYTE_ORDER, // byte order - 36, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d657373), - ACE_NTOHL (0x6167696e), - ACE_NTOHL (0x672f5379), - ACE_NTOHL (0x6e635363), - ACE_NTOHL (0x6f70653a), - ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/Messaging/SyncScope:1.0 - 10, - ACE_NTOHL (0x53796e63), - ACE_NTOHL (0x53636f70), - ACE_NTOHL (0x65000000), // name = SyncScope - CORBA::tk_short, - }; -static CORBA::TypeCode _tc_TAO_tc_Messaging_SyncScope ( - CORBA::tk_alias, - sizeof (_oc_Messaging_SyncScope), - (char *) &_oc_Messaging_SyncScope, - 0, - sizeof (Messaging::SyncScope) - ); - -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) -TAO_NAMESPACE_BEGIN (Messaging) -TAO_NAMESPACE_DEFINE ( - ::CORBA::TypeCode_ptr, - _tc_SyncScope, - &_tc_TAO_tc_Messaging_SyncScope - ) -TAO_NAMESPACE_END diff --git a/TAO/tao/Messaging_SyncScopeC.h b/TAO/tao/Messaging_SyncScopeC.h index 3451b52280d..6248e59ced6 100644 --- a/TAO/tao/Messaging_SyncScopeC.h +++ b/TAO/tao/Messaging_SyncScopeC.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 @@ -59,7 +65,7 @@ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48 -TAO_NAMESPACE Messaging +namespace Messaging { // TAO_IDL - Generated from @@ -69,11 +75,6 @@ TAO_NAMESPACE Messaging typedef CORBA::Short_out SyncScope_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_SyncScope; - - // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 const Messaging::SyncScope SYNC_NONE = 0; @@ -94,10 +95,17 @@ TAO_NAMESPACE Messaging const Messaging::SyncScope SYNC_WITH_TARGET = 3; // 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 Messaging +} // module Messaging + +// 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 @@ -110,7 +118,7 @@ TAO_NAMESPACE_CLOSE // module Messaging #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 "Messaging_SyncScopeC.i" @@ -124,6 +132,6 @@ TAO_NAMESPACE_CLOSE // module Messaging #pragma option pop #endif /* __BORLANDC__ */ -#include /**/ "ace/post.h" +#include "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/Messaging_SyncScopeC.i b/TAO/tao/Messaging_SyncScopeC.i index e86a7e25a26..38aa32569ba 100644 --- a/TAO/tao/Messaging_SyncScopeC.i +++ b/TAO/tao/Messaging_SyncScopeC.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 diff --git a/TAO/tao/ObjectIdList.pidl b/TAO/tao/ObjectIdList.pidl index 487d8051700..75233833f94 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 -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/Object_T.h b/TAO/tao/Object_T.h index 937e1521578..5b508eb5fe3 100644 --- a/TAO/tao/Object_T.h +++ b/TAO/tao/Object_T.h @@ -17,6 +17,8 @@ #include /**/ "ace/pre.h" +#include "ace/CORBA_macros.h" + namespace CORBA { class Object; diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp index 8ad0eb9a078..ca3321ad921 100644 --- a/TAO/tao/PolicyC.cpp +++ b/TAO/tao/PolicyC.cpp @@ -2337,6 +2337,16 @@ operator>>= ( ); } +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::Any_Impl_T<CORBA::Policy>::to_object ( + CORBA::Object_ptr &_tao_elem + ) const +{ + _tao_elem = CORBA::Object::_duplicate (this->value_); + 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>; diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h index 5a30c02d638..c291af14607 100644 --- a/TAO/tao/PolicyC.h +++ b/TAO/tao/PolicyC.h @@ -34,6 +34,7 @@ #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 diff --git a/TAO/tao/PolicyC.i b/TAO/tao/PolicyC.i index 9a7ef92de5e..0eff6cd5326 100644 --- a/TAO/tao/PolicyC.i +++ b/TAO/tao/PolicyC.i @@ -37,17 +37,6 @@ CORBA::Policy::Policy ( this->CORBA_Policy_setup_collocation (_tao_collocated); } -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Impl_T<CORBA::Policy>::to_object ( - CORBA::Object_ptr &_tao_elem - ) const -{ - _tao_elem = CORBA::Object::_duplicate (this->value_); - return 1; -} - #endif /* end #if !defined */ // TAO_IDL - Generated from diff --git a/TAO/tao/Tagged_Profile.cpp b/TAO/tao/Tagged_Profile.cpp index e7a258825d0..7d951a7d928 100644 --- a/TAO/tao/Tagged_Profile.cpp +++ b/TAO/tao/Tagged_Profile.cpp @@ -171,7 +171,7 @@ TAO_Tagged_Profile::unmarshall_ref_addr_i ( } // Unmarshall the sequnce of TaggedProfiles - IOP::IOR::_tao_seq_TaggedProfile_profiles ior_profiles; + IOP::IOR::_profiles_seq ior_profiles; hdr_status &= input >> ior_profiles; |