diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2003-04-25 03:09:17 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2003-04-25 03:09:17 +0000 |
| commit | 0cc8a33d7a9968c2e0da44ff345565e1dbe6c23f (patch) | |
| tree | d8221395b61053d544256b6534e7b36ca6ea4593 | |
| parent | 624e32c5d9142da4266700e5154442e4f750092f (diff) | |
| download | ATCD-0cc8a33d7a9968c2e0da44ff345565e1dbe6c23f.tar.gz | |
ChangeLogTag:Thu Apr 24 22:01:42 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
50 files changed, 2996 insertions, 2746 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 85f62820288..1235c7091a3 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,68 @@ +Thu Apr 24 22:01:42 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * tao/CONV_FRAMEC.cpp: + * tao/CurrentC.cpp: + * tao/DomainC.cpp: + * tao/DynamicC.cpp: + * tao/Dynamic_Adapter.cpp: + * tao/Dynamic_Adapter.h: + * tao/GIOPC.cpp: + * tao/IIOPC.cpp: + * tao/IOP_CodecC.cpp: + * tao/Messaging_PolicyValueC.cpp: + * tao/ORB.cpp: + * tao/Object.cpp: + * tao/ObjectIdListC.cpp: + * tao/ObjectReferenceTemplateC.cpp: + * tao/Object_KeyC.cpp: + * tao/Objref_VarOut_T.cpp: + * tao/OctetSeqC.cpp: + * tao/PolicyC.cpp: + * tao/Policy_ForwardC.cpp: + * tao/PortableInterceptorC.cpp: + * tao/Pseudo_Value_VarOut_T.inl: + * tao/Pseudo_VarOut_T.inl: + * tao/ServicesC.cpp: + * tao/StringSeqC.cpp: + * tao/TAOC.cpp: + * tao/TimeBaseC.cpp: + * tao/ValueBase.cpp: + * tao/ValueBase.h: + * tao/ValueFactory.cpp: + * tao/ValueFactory.h: + * tao/VarOut_T.cpp: + * tao/DynamicAny/DynamicAnyC.cpp: + * tao/DynamicInterface/Request.cpp: + * tao/IFR_Client/IFR_BaseC.cpp: + * tao/IORManipulation/IORC.cpp: + * tao/Messaging/MessagingC.cpp: + * tao/Messaging/Messaging_No_ImplC.cpp: + * tao/Messaging/Messaging_RT_PolicyC.cpp: + * tao/Messaging/Messaging_SyncScope_PolicyC.cpp: + * tao/Messaging/TAO_ExtC.cpp: + * tao/PortableServer/Default_ORTC.cpp: + * tao/PortableServer/ImR_LocatorC.cpp: + * tao/PortableServer/ImplRepoC.cpp: + * tao/PortableServer/PortableServerC.cpp: + * tao/RTCORBA/RTCORBAC.cpp: + * tao/RTCORBA/RTCORBAC.h: + * tao/RTCORBA/RTCORBAC.i: + * tao/RTPortableServer/RTPortableServerC.cpp: + * tao/TypeCodeFactory/TypeCodeFactoryC.cpp: First set of fixes for + explicit template instantiation problems. The fixes are not + complete since the instantiations generated by the IDL compiler + for the generated code is busted. Fixes to the IDL compiler over + the past couple of days havent helped the situation. This set of + fixes addresses + + - compilation issues arising in TAO and associated libraries + from the explicit template instantiations section. + - link errors while trying to link with TAO library. + + Applications linking to libraries other than TAO would still + experience linking errors. They will be fixed along with the IDL + compiler in the next couple of days. + Thu Apr 24 19:39:36 2003 Irfan Pyarali <irfan@oomworks.com> * tao\PortableServer\POA: @@ -1506,7 +1571,7 @@ Wed Apr 16 13:44:47 2003 Irfan Pyarali <irfan@oomworks.com> to the minimum priority supported by that scheduling policy. This method make sense on those platform (e.g., Linux) where - PTHREAD_SCOPE_SYSTEM is the only scheduling scope supported. On + PTHREAD_SCOPE_SYSTE* is the only scheduling scope supported. On other platforms, this method is a no-op since the only way to get the real-time threading behavior is to setup the PTHREAD_SCOPE_SYSTEM scheduling scope when a thread is being diff --git a/TAO/tao/CONV_FRAMEC.cpp b/TAO/tao/CONV_FRAMEC.cpp index dd6c13bc7f7..1e35a37bd98 100644 --- a/TAO/tao/CONV_FRAMEC.cpp +++ b/TAO/tao/CONV_FRAMEC.cpp @@ -41,19 +41,19 @@ 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, @@ -83,56 +83,56 @@ 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 @@ -160,7 +160,7 @@ TAO_NAMESPACE_DEFINE ( ) TAO_NAMESPACE_END -// 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) @@ -169,7 +169,7 @@ void CONV_FRAME::CodeSetComponent::_tao_any_destructor (void *_tao_void_pointer) delete tmp; } -// TAO_IDL - Generated from +// 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) @@ -217,29 +217,30 @@ void CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_any_destructor (void template class TAO_Var_Var_T< - CodeSetComponent + CONV_FRAME::CodeSetComponent >; +template class TAO_Var_Base_T<CONV_FRAME::CodeSetComponent>; template class TAO_Out_T< - CodeSetComponent, - CodeSetComponent_var + CONV_FRAME::CodeSetComponent, + CONV_FRAME::CodeSetComponent_var >; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ TAO_Var_Var_T< \ - CodeSetComponent \ + CONV_FRAME::CodeSetComponent \ > - +#pragma instantiate TAO_Var_Base_T<CONV_FRAME::CodeSetComponent> # pragma instantiate \ TAO_Out_T< \ - CodeSetComponent, \ - CodeSetComponent_var \ + CONV_FRAME::CodeSetComponent, \ + CONV_FRAME::CodeSetComponent_var \ > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -248,84 +249,84 @@ 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 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 @@ -336,9 +337,9 @@ static const CORBA::Long _oc_CONV_FRAME_CodeSetComponentInfo[] = 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) @@ -361,7 +362,7 @@ TAO_NAMESPACE_DEFINE ( ) TAO_NAMESPACE_END -// 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::CodeSetComponentInfo::_tao_any_destructor (void *_tao_void_pointer) @@ -377,29 +378,30 @@ void CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor (void *_tao_void_poin template class TAO_Var_Var_T< - CodeSetComponentInfo + CONV_FRAME::CodeSetComponentInfo >; +template class TAO_Var_Base_T<CONV_FRAME::CodeSetComponentInfo>; template class TAO_Out_T< - CodeSetComponentInfo, - CodeSetComponentInfo_var + CONV_FRAME::CodeSetComponentInfo, + CONV_FRAME::CodeSetComponentInfo_var >; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ TAO_Var_Var_T< \ - CodeSetComponentInfo \ + CONV_FRAME::CodeSetComponentInfo \ > - +#pragma instantiate TAO_Var_Base_T<CONV_FRAME::CodeSetComponentInfo> # pragma instantiate \ TAO_Out_T< \ - CodeSetComponentInfo, \ - CodeSetComponentInfo_var \ + CONV_FRAME::CodeSetComponentInfo, \ + CONV_FRAME::CodeSetComponentInfo_var \ > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -408,51 +410,51 @@ 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) @@ -475,7 +477,7 @@ TAO_NAMESPACE_DEFINE ( ) TAO_NAMESPACE_END -// 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::CodeSetContext::_tao_any_destructor (void *_tao_void_pointer) @@ -491,19 +493,19 @@ void CONV_FRAME::CodeSetContext::_tao_any_destructor (void *_tao_void_pointer) template class TAO_Fixed_Var_T< - CodeSetContext + CONV_FRAME::CodeSetContext >; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ TAO_Fixed_Var_T< \ - CodeSetContext \ + CONV_FRAME::CodeSetContext \ > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -568,7 +570,7 @@ CORBA::Boolean operator>>= ( # pragma instantiate TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponent> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -633,7 +635,7 @@ CORBA::Boolean operator>>= ( # pragma instantiate TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponentInfo> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -693,8 +695,10 @@ CORBA::Boolean operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetContext>; +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 */ @@ -710,13 +714,13 @@ CORBA::Boolean operator<< ( ) { 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; } @@ -726,7 +730,7 @@ CORBA::Boolean operator>> ( ) { CORBA::ULong _tao_seq_len; - + if (strm >> _tao_seq_len) { // Add a check to the length of the sequence @@ -736,22 +740,28 @@ 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_ */ +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ + defined (ACE_HAS_GNU_REPO) +template class TAO_Unbounded_Sequence<CONV_FRAME::CodeSetId>; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +#pragma instantiate TAO_Unbounded_Sequence<CONV_FRAME::CodeSetId> +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId_CPP_ */ diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp index 4b4f1bf3c2c..91b138c0961 100644 --- a/TAO/tao/CurrentC.cpp +++ b/TAO/tao/CurrentC.cpp @@ -300,9 +300,7 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<CORBA::Current,CORBA::Current_var>; template class TAO::Any_Impl_T<CORBA::Current>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<CORBA::Current, CORBA::Current_var> # pragma instantiate TAO::Any_Impl_T<CORBA::Current> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp index 9b76c20d02f..efc91a900d4 100644 --- a/TAO/tao/DomainC.cpp +++ b/TAO/tao/DomainC.cpp @@ -113,6 +113,12 @@ CORBA::tao_DomainManager_cast::tao_upcast ( 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< \ @@ -124,6 +130,12 @@ CORBA::tao_DomainManager_cast::tao_upcast ( 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 @@ -1603,9 +1615,13 @@ template class 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_Seq_Out_T< + TAO_MngSeq_Out_T< CORBA::DomainManagerList, CORBA::DomainManagerList_var, TAO_Object_Manager< @@ -1626,6 +1642,10 @@ template class 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< \ @@ -1763,10 +1783,10 @@ template class #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<CORBA::DomainManager,CORBA::DomainManager_var>; + 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> + # 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 */ @@ -1817,10 +1837,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<CORBA::ConstructionPolicy,CORBA::ConstructionPolicy_var>; + 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> +# 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 */ diff --git a/TAO/tao/DynamicAny/DynamicAnyC.cpp b/TAO/tao/DynamicAny/DynamicAnyC.cpp index e420aa142b4..a1743c469b7 100644 --- a/TAO/tao/DynamicAny/DynamicAnyC.cpp +++ b/TAO/tao/DynamicAny/DynamicAnyC.cpp @@ -778,26 +778,26 @@ DynamicAny::DynEnum::marshal (TAO_OutputCDR &) template class TAO_Var_Var_T< - NameValuePair + DynamicAny::NameValuePair >; template class TAO_Out_T< - NameValuePair, - NameValuePair_var + DynamicAny::NameValuePair, + DynamicAny::NameValuePair_var >; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ TAO_Var_Var_T< \ - NameValuePair \ + DynamicAny::NameValuePair \ > # pragma instantiate \ TAO_Out_T< \ - NameValuePair, \ - NameValuePair_var \ + DynamicAny::NameValuePair, \ + DynamicAny::NameValuePair_var \ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -843,14 +843,14 @@ DynamicAny::NameValuePairSeq::~NameValuePairSeq (void) template class TAO_VarSeq_Var_T< - NameValuePairSeq, + DynamicAny::NameValuePairSeq, DynamicAny::NameValuePair >; template class TAO_Seq_Out_T< - NameValuePairSeq, - NameValuePairSeq_var, + DynamicAny::NameValuePairSeq, + DynamicAny::NameValuePairSeq_var, DynamicAny::NameValuePair >; @@ -858,14 +858,14 @@ template class # pragma instantiate \ TAO_VarSeq_Var_T< \ - NameValuePairSeq, \ + DynamicAny::NameValuePairSeq, \ DynamicAny::NameValuePair \ > # pragma instantiate \ TAO_Seq_Out_T< \ - NameValuePairSeq, \ - NameValuePairSeq_var, \ + DynamicAny::NameValuePairSeq, \ + DynamicAny::NameValuePairSeq_var, \ DynamicAny::NameValuePair \ > @@ -883,26 +883,26 @@ template class template class TAO_Var_Var_T< - NameDynAnyPair + DynamicAny::NameDynAnyPair >; template class TAO_Out_T< - NameDynAnyPair, - NameDynAnyPair_var + DynamicAny::NameDynAnyPair, + DynamicAny::NameDynAnyPair_var >; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ TAO_Var_Var_T< \ - NameDynAnyPair \ + DynamicAny::NameDynAnyPair \ > # pragma instantiate \ TAO_Out_T< \ - NameDynAnyPair, \ - NameDynAnyPair_var \ + DynamicAny::NameDynAnyPair, \ + DynamicAny::NameDynAnyPair_var \ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -948,14 +948,14 @@ DynamicAny::NameDynAnyPairSeq::~NameDynAnyPairSeq (void) template class TAO_VarSeq_Var_T< - NameDynAnyPairSeq, + DynamicAny::NameDynAnyPairSeq, DynamicAny::NameDynAnyPair >; template class TAO_Seq_Out_T< - NameDynAnyPairSeq, - NameDynAnyPairSeq_var, + DynamicAny::NameDynAnyPairSeq, + DynamicAny::NameDynAnyPairSeq_var, DynamicAny::NameDynAnyPair >; @@ -1395,14 +1395,14 @@ DynamicAny::AnySeq::~AnySeq (void) template class TAO_VarSeq_Var_T< - AnySeq, + DynamicAny::AnySeq, CORBA::Any >; template class TAO_Seq_Out_T< - AnySeq, - AnySeq_var, + DynamicAny::AnySeq, + DynamicAny::AnySeq_var, CORBA::Any >; @@ -1410,14 +1410,14 @@ template class # pragma instantiate \ TAO_VarSeq_Var_T< \ - AnySeq, \ + DynamicAny::AnySeq, \ CORBA::Any \ > # pragma instantiate \ TAO_Seq_Out_T< \ - AnySeq, \ - AnySeq_var, \ + DynamicAny::AnySeq, \ + DynamicAny::AnySeq_var, \ CORBA::Any \ > @@ -1500,7 +1500,7 @@ template class >; template class - TAO_Seq_Out_T< + TAO_MngSeq_Out_T< DynamicAny::DynAnySeq, DynamicAny::DynAnySeq_var, TAO_Object_Manager< diff --git a/TAO/tao/DynamicC.cpp b/TAO/tao/DynamicC.cpp index 11655c250e8..d24175fadc0 100644 --- a/TAO/tao/DynamicC.cpp +++ b/TAO/tao/DynamicC.cpp @@ -130,26 +130,26 @@ void Dynamic::Parameter::_tao_any_destructor (void *_tao_void_pointer) template class TAO_Var_Var_T< - Parameter + Dynamic::Parameter >; template class TAO_Out_T< - Parameter, - Parameter_var + Dynamic::Parameter, + Dynamic::Parameter_var >; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ TAO_Var_Var_T< \ - Parameter \ + Dynamic::Parameter \ > # pragma instantiate \ TAO_Out_T< \ - Parameter, \ - Parameter_var \ + Dynamic::Parameter, \ + Dynamic::Parameter_var \ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -199,14 +199,14 @@ void Dynamic::ParameterList::_tao_any_destructor (void *_tao_void_pointer) template class TAO_VarSeq_Var_T< - ParameterList, + Dynamic::ParameterList, Dynamic::Parameter >; template class TAO_Seq_Out_T< - ParameterList, - ParameterList_var, + Dynamic::ParameterList, + Dynamic::ParameterList_var, Dynamic::Parameter >; @@ -214,14 +214,14 @@ template class # pragma instantiate \ TAO_VarSeq_Var_T< \ - ParameterList, \ + Dynamic::ParameterList, \ Dynamic::Parameter \ > # pragma instantiate \ TAO_Seq_Out_T< \ - ParameterList, \ - ParameterList_var, \ + Dynamic::ParameterList, \ + Dynamic::ParameterList_var, \ Dynamic::Parameter \ > @@ -484,7 +484,7 @@ void Dynamic::ExceptionList::_tao_any_destructor (void *_tao_void_pointer) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class - TAO_VarSeq_Var_T< + TAO_MngSeq_Var_T< Dynamic::ExceptionList, TAO_Pseudo_Object_Manager< Dynamic::TypeCode, @@ -492,8 +492,12 @@ template class > >; +template class TAO_Seq_Var_Base_T<Dynamic::ExceptionList, + TAO_Pseudo_Object_Manager<CORBA::TypeCode, + TAO_Pseudo_Var_T<CORBA::TypeCode> > >; + template class - TAO_Seq_Out_T< + TAO_MngSeq_Out_T< Dynamic::ExceptionList, Dynamic::ExceptionList_var, TAO_Pseudo_Object_Manager< @@ -502,6 +506,9 @@ template class > >; +template class TAO_Unbounded_Pseudo_Sequence<CORBA::TypeCode, + TAO_Pseudo_Var_T<CORBA::TypeCode> >; + #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ @@ -513,6 +520,11 @@ template class > \ > +#pragma instantiate TAO_Unbounded_Pseudo_Sequence<CORBA::TypeCode, + TAO_Pseudo_Var_T<CORBA::TypeCode> >; +#pragma instantiate TAO_Seq_Var_Base_T<Dynamic::ExceptionList, + TAO_Pseudo_Object_Manager<CORBA::TypeCode, + TAO_Pseudo_Var_T<CORBA::TypeCode> > > # pragma instantiate \ TAO_Seq_Out_T< \ Dynamic::ExceptionList, \ @@ -781,8 +793,17 @@ CORBA::Boolean operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<Dynamic::ParameterList>; +template class TAO_Seq_Var_Base_T<Dynamic::ParameterList, + Dynamic::Parameter>; +template class TAO_Var_Base_T<Dynamic::Parameter>; + +template class TAO_Unbounded_Sequence<Dynamic::Parameter>; +template class TAO::Any_Dual_Impl_T<Dynamic::ParameterList>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +#pragma instantiate TAO_Seq_Var_Base_T<Dynamic::ParameterList, + Dynamic::Parameter> +#pragma instantiate TAO_Var_Base_T<Dynamic::Parameter> +#pragma instantiate TAO_Unbounded_Sequence<Dynamic::Parameter> # pragma instantiate TAO::Any_Dual_Impl_T<Dynamic::ParameterList> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -846,7 +867,7 @@ CORBA::Boolean operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<Dynamic::ExceptionList>; +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 */ diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp index baafc096ada..5e7b94ec360 100644 --- a/TAO/tao/DynamicInterface/Request.cpp +++ b/TAO/tao/DynamicInterface/Request.cpp @@ -468,7 +468,7 @@ CORBA::Request::handle_response (TAO_InputCDR &incoming, CORBA::Request_var >; template class - TAO_VarSeq_Var_T< + TAO_MngSeq_Var_T< CORBA::ORB::RequestSeq, TAO_Pseudo_Object_Manager< CORBA::Request, @@ -476,7 +476,7 @@ CORBA::Request::handle_response (TAO_InputCDR &incoming, > >; template class - TAO_Seq_Out_T< + TAO_MngSeq_Out_T< CORBA::ORB::RequestSeq, CORBA::ORB::RequestSeq_var, TAO_Pseudo_Object_Manager< diff --git a/TAO/tao/Dynamic_Adapter.cpp b/TAO/tao/Dynamic_Adapter.cpp index 768ab931e5c..6885ccf151b 100644 --- a/TAO/tao/Dynamic_Adapter.cpp +++ b/TAO/tao/Dynamic_Adapter.cpp @@ -90,5 +90,3 @@ template class ACE_Dynamic_Service<TAO_Dynamic_Adapter>; #pragma instantiate ACE_Dynamic_Service<TAO_Dynamic_Adapter> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - - diff --git a/TAO/tao/Dynamic_Adapter.h b/TAO/tao/Dynamic_Adapter.h index 944ec885e74..70f0acfd028 100644 --- a/TAO/tao/Dynamic_Adapter.h +++ b/TAO/tao/Dynamic_Adapter.h @@ -77,5 +77,6 @@ public: ACE_ENV_ARG_DECL) = 0; }; + #include "ace/post.h" #endif /* TAO_DYNAMIC_ADAPTER_H */ diff --git a/TAO/tao/GIOPC.cpp b/TAO/tao/GIOPC.cpp index 47703e00f23..64913a181a6 100644 --- a/TAO/tao/GIOPC.cpp +++ b/TAO/tao/GIOPC.cpp @@ -50,23 +50,23 @@ static const CORBA::Long _oc_GIOP_AddressingDisposition[] = { TAO_ENCAP_BYTE_ORDER, // byte order 43, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x47494f50), - ACE_NTOHL (0x2f416464), - ACE_NTOHL (0x72657373), - ACE_NTOHL (0x696e6744), - ACE_NTOHL (0x6973706f), - ACE_NTOHL (0x73697469), - ACE_NTOHL (0x6f6e3a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x47494f50), + ACE_NTOHL (0x2f416464), + ACE_NTOHL (0x72657373), + ACE_NTOHL (0x696e6744), + ACE_NTOHL (0x6973706f), + ACE_NTOHL (0x73697469), + ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/GIOP/AddressingDisposition:1.0 22, - ACE_NTOHL (0x41646472), - ACE_NTOHL (0x65737369), - ACE_NTOHL (0x6e674469), - ACE_NTOHL (0x73706f73), - ACE_NTOHL (0x6974696f), + ACE_NTOHL (0x41646472), + ACE_NTOHL (0x65737369), + ACE_NTOHL (0x6e674469), + ACE_NTOHL (0x73706f73), + ACE_NTOHL (0x6974696f), ACE_NTOHL (0x6e000000), // name = AddressingDisposition CORBA::tk_short, @@ -96,25 +96,25 @@ static const CORBA::Long _oc_GIOP_Version[] = { TAO_ENCAP_BYTE_ORDER, // byte order 29, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x47494f50), - ACE_NTOHL (0x2f566572), - ACE_NTOHL (0x73696f6e), - ACE_NTOHL (0x3a312e30), + 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 8, - ACE_NTOHL (0x56657273), + ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e00), // name = Version 2, // member count 6, - ACE_NTOHL (0x6d616a6f), + ACE_NTOHL (0x6d616a6f), ACE_NTOHL (0x72000000), // name = major CORBA::tk_octet, 6, - ACE_NTOHL (0x6d696e6f), + ACE_NTOHL (0x6d696e6f), ACE_NTOHL (0x72000000), // name = minor CORBA::tk_octet, @@ -137,7 +137,7 @@ TAO_NAMESPACE_DEFINE ( ) TAO_NAMESPACE_END -// TAO_IDL - Generated from +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 void GIOP::Version::_tao_any_destructor (void *_tao_void_pointer) @@ -153,17 +153,20 @@ void GIOP::Version::_tao_any_destructor (void *_tao_void_pointer) template class TAO_Fixed_Var_T< - Version + GIOP::Version >; +template class TAO_Var_Base_T<GIOP::Version>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ TAO_Fixed_Var_T< \ - Version \ + GIOP::Version \ > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#pragma instantiate TAO_Var_Base_T<GIOP::Version> + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -172,29 +175,29 @@ static const CORBA::Long _oc_GIOP_IORAddressingInfo[] = { TAO_ENCAP_BYTE_ORDER, // byte order 39, - 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 (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 18, - ACE_NTOHL (0x494f5241), - ACE_NTOHL (0x64647265), - ACE_NTOHL (0x7373696e), - ACE_NTOHL (0x67496e66), + ACE_NTOHL (0x494f5241), + ACE_NTOHL (0x64647265), + ACE_NTOHL (0x7373696e), + ACE_NTOHL (0x67496e66), ACE_NTOHL (0x6f000000), // name = IORAddressingInfo 2, // member count 23, - ACE_NTOHL (0x73656c65), - ACE_NTOHL (0x63746564), - ACE_NTOHL (0x5f70726f), - ACE_NTOHL (0x66696c65), - ACE_NTOHL (0x5f696e64), + ACE_NTOHL (0x73656c65), + ACE_NTOHL (0x63746564), + ACE_NTOHL (0x5f70726f), + ACE_NTOHL (0x66696c65), + ACE_NTOHL (0x5f696e64), ACE_NTOHL (0x65780000), // name = selected_profile_index CORBA::tk_ulong, @@ -204,23 +207,23 @@ static const CORBA::Long _oc_GIOP_IORAddressingInfo[] = 288, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 24, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x494f523a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x494f523a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IOP/IOR:1.0 4, ACE_NTOHL (0x494f5200), // name = IOR 2, // member count 8, - ACE_NTOHL (0x74797065), + ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f696400), // name = type_id - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 9, - ACE_NTOHL (0x70726f66), - ACE_NTOHL (0x696c6573), + ACE_NTOHL (0x70726f66), + ACE_NTOHL (0x696c6573), ACE_NTOHL (0x0), // name = profiles CORBA::tk_sequence, // typecode kind 200, // encapsulation length @@ -229,19 +232,19 @@ static const CORBA::Long _oc_GIOP_IORAddressingInfo[] = 184, // 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 (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 (0x54616767), + ACE_NTOHL (0x65645072), + ACE_NTOHL (0x6f66696c), ACE_NTOHL (0x65000000), // name = TaggedProfile 2, // member count 4, @@ -250,25 +253,25 @@ static const CORBA::Long _oc_GIOP_IORAddressingInfo[] = 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 (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 (0x50726f66), + ACE_NTOHL (0x696c6549), ACE_NTOHL (0x64000000), // name = ProfileId CORBA::tk_ulong, 13, - ACE_NTOHL (0x70726f66), - ACE_NTOHL (0x696c655f), - ACE_NTOHL (0x64617461), + ACE_NTOHL (0x70726f66), + ACE_NTOHL (0x696c655f), + ACE_NTOHL (0x64617461), ACE_NTOHL (0x0), // name = profile_data CORBA::tk_sequence, // typecode kind 12, // encapsulation length @@ -300,7 +303,7 @@ TAO_NAMESPACE_DEFINE ( ) TAO_NAMESPACE_END -// TAO_IDL - Generated from +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 void GIOP::IORAddressingInfo::_tao_any_destructor (void *_tao_void_pointer) @@ -316,29 +319,31 @@ void GIOP::IORAddressingInfo::_tao_any_destructor (void *_tao_void_pointer) template class TAO_Var_Var_T< - IORAddressingInfo + GIOP::IORAddressingInfo >; template class TAO_Out_T< - IORAddressingInfo, - IORAddressingInfo_var + GIOP::IORAddressingInfo, + GIOP::IORAddressingInfo_var >; +template class TAO_Var_Base_T<GIOP::IORAddressingInfo>; + #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ TAO_Var_Var_T< \ - IORAddressingInfo \ + GIOP::IORAddressingInfo \ > - +#pragma instantiate template class TAO_Var_Base_T<GIOP::IORAddressingInfo> # pragma instantiate \ TAO_Out_T< \ - IORAddressingInfo, \ - IORAddressingInfo_var \ + GIOP::IORAddressingInfo, \ + GIOP::IORAddressingInfo_var \ > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/union_cs.cpp:91 @@ -424,10 +429,10 @@ GIOP::TargetAddress::operator= (const ::GIOP::TargetAddress &u) { return *this; } - + this->_reset (u.disc_, 0); this->disc_ = u.disc_; - + switch (this->disc_) { case 0: @@ -481,7 +486,7 @@ GIOP::TargetAddress::operator= (const ::GIOP::TargetAddress &u) default: break; } - + return *this; } @@ -514,19 +519,19 @@ static const CORBA::Long _oc_GIOP_TargetAddress[] = { TAO_ENCAP_BYTE_ORDER, // byte order 35, - 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 (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 14, - ACE_NTOHL (0x54617267), - ACE_NTOHL (0x65744164), - ACE_NTOHL (0x64726573), + ACE_NTOHL (0x54617267), + ACE_NTOHL (0x65744164), + ACE_NTOHL (0x64726573), ACE_NTOHL (0x73000000), // name = TargetAddress CORBA::tk_short, @@ -534,24 +539,24 @@ static const CORBA::Long _oc_GIOP_TargetAddress[] = 3, // member count ACE_IDL_NSTOHL (0x0000), // union case label (evaluated value) 11, - ACE_NTOHL (0x6f626a65), - ACE_NTOHL (0x63745f6b), + ACE_NTOHL (0x6f626a65), + ACE_NTOHL (0x63745f6b), ACE_NTOHL (0x65790000), // name = object_key CORBA::tk_alias, // typecode kind for typedefs 76, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 31, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f4f63), - ACE_NTOHL (0x74657453), - ACE_NTOHL (0x65713a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f4f63), + ACE_NTOHL (0x74657453), + ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0 9, - ACE_NTOHL (0x4f637465), - ACE_NTOHL (0x74536571), + ACE_NTOHL (0x4f637465), + ACE_NTOHL (0x74536571), ACE_NTOHL (0x0), // name = OctetSeq CORBA::tk_sequence, // typecode kind 12, // encapsulation length @@ -563,25 +568,25 @@ static const CORBA::Long _oc_GIOP_TargetAddress[] = ACE_IDL_NSTOHL (0x0001), // union case label (evaluated value) 8, - ACE_NTOHL (0x70726f66), + ACE_NTOHL (0x70726f66), ACE_NTOHL (0x696c6500), // name = profile CORBA::tk_struct, // typecode kind 184, // 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 (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 (0x54616767), + ACE_NTOHL (0x65645072), + ACE_NTOHL (0x6f66696c), ACE_NTOHL (0x65000000), // name = TaggedProfile 2, // member count 4, @@ -590,25 +595,25 @@ static const CORBA::Long _oc_GIOP_TargetAddress[] = 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 (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 (0x50726f66), + ACE_NTOHL (0x696c6549), ACE_NTOHL (0x64000000), // name = ProfileId CORBA::tk_ulong, 13, - ACE_NTOHL (0x70726f66), - ACE_NTOHL (0x696c655f), - ACE_NTOHL (0x64617461), + ACE_NTOHL (0x70726f66), + ACE_NTOHL (0x696c655f), + ACE_NTOHL (0x64617461), ACE_NTOHL (0x0), // name = profile_data CORBA::tk_sequence, // typecode kind 12, // encapsulation length @@ -625,29 +630,29 @@ static const CORBA::Long _oc_GIOP_TargetAddress[] = 228, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 39, - 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 (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 18, - ACE_NTOHL (0x494f5241), - ACE_NTOHL (0x64647265), - ACE_NTOHL (0x7373696e), - ACE_NTOHL (0x67496e66), + ACE_NTOHL (0x494f5241), + ACE_NTOHL (0x64647265), + ACE_NTOHL (0x7373696e), + ACE_NTOHL (0x67496e66), ACE_NTOHL (0x6f000000), // name = IORAddressingInfo 2, // member count 23, - ACE_NTOHL (0x73656c65), - ACE_NTOHL (0x63746564), - ACE_NTOHL (0x5f70726f), - ACE_NTOHL (0x66696c65), - ACE_NTOHL (0x5f696e64), + ACE_NTOHL (0x73656c65), + ACE_NTOHL (0x63746564), + ACE_NTOHL (0x5f70726f), + ACE_NTOHL (0x66696c65), + ACE_NTOHL (0x5f696e64), ACE_NTOHL (0x65780000), // name = selected_profile_index CORBA::tk_ulong, @@ -657,23 +662,23 @@ static const CORBA::Long _oc_GIOP_TargetAddress[] = 104, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 24, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x494f523a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x494f523a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IOP/IOR:1.0 4, ACE_NTOHL (0x494f5200), // name = IOR 2, // member count 8, - ACE_NTOHL (0x74797065), + ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f696400), // name = type_id - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 9, - ACE_NTOHL (0x70726f66), - ACE_NTOHL (0x696c6573), + ACE_NTOHL (0x70726f66), + ACE_NTOHL (0x696c6573), ACE_NTOHL (0x0), // name = profiles CORBA::tk_sequence, // typecode kind 16, // encapsulation length @@ -710,15 +715,16 @@ TAO_NAMESPACE_END template class TAO_Var_Var_T< - TargetAddress + GIOP::TargetAddress >; template class TAO_Out_T< - TargetAddress, - TargetAddress_var + GIOP::TargetAddress, + GIOP::TargetAddress_var >; +template class TAO_Var_Base_T<GIOP::TargetAddress>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ @@ -728,13 +734,14 @@ template class # pragma instantiate \ TAO_Out_T< \ - TargetAddress, \ - TargetAddress_var \ + GIOP::TargetAddress, \ + GIOP::TargetAddress_var \ > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#pragma instantiate TAO_Var_Base_T<GIOP::TargetAddress> +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -799,7 +806,7 @@ CORBA::Boolean operator>>= ( # pragma instantiate TAO::Any_Dual_Impl_T<GIOP::Version> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -864,7 +871,7 @@ CORBA::Boolean operator>>= ( # pragma instantiate TAO::Any_Dual_Impl_T<GIOP::IORAddressingInfo> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_union/any_op_cs.cpp:54 // Copying insertion. @@ -928,4 +935,3 @@ CORBA::Boolean operator>>= ( #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate TAO::Any_Dual_Impl_T<GIOP::TargetAddress> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - diff --git a/TAO/tao/IFR_Client/IFR_BaseC.cpp b/TAO/tao/IFR_Client/IFR_BaseC.cpp index bcd88113aed..beaa63f7b6e 100644 --- a/TAO/tao/IFR_Client/IFR_BaseC.cpp +++ b/TAO/tao/IFR_Client/IFR_BaseC.cpp @@ -5397,26 +5397,26 @@ void CORBA::Contained::Description::_tao_any_destructor (void *_tao_void_pointer template class TAO_Var_Var_T< - Description + CORBA::Contained::Description >; template class TAO_Out_T< - Description, - Description_var + CORBA::Contained::Description, + CORBA::Contained::Description_var >; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ TAO_Var_Var_T< \ - Description \ + CORBA::Contained::Description \ > # pragma instantiate \ TAO_Out_T< \ - Description, \ - Description_var \ + CORBA::Contained::Description, \ + CORBA::Contained::Description_var \ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -5568,7 +5568,7 @@ template class >; template class - TAO_Seq_Out_T< + TAO_MngSeq_Out_T< CORBA::InterfaceDefSeq, CORBA::InterfaceDefSeq_var, TAO_Object_Manager< @@ -5731,7 +5731,7 @@ template class >; template class - TAO_Seq_Out_T< + TAO_MngSeq_Out_T< CORBA::ValueDefSeq, CORBA::ValueDefSeq_var, TAO_Object_Manager< @@ -5890,7 +5890,7 @@ template class >; template class - TAO_Seq_Out_T< + TAO_MngSeq_Out_T< CORBA::AbstractInterfaceDefSeq, CORBA::AbstractInterfaceDefSeq_var, TAO_Object_Manager< @@ -6061,7 +6061,7 @@ template class >; template class - TAO_Seq_Out_T< + TAO_MngSeq_Out_T< CORBA::LocalInterfaceDefSeq, CORBA::LocalInterfaceDefSeq_var, TAO_Object_Manager< @@ -6229,7 +6229,7 @@ template class >; template class - TAO_Seq_Out_T< + TAO_MngSeq_Out_T< CORBA::ExtInterfaceDefSeq, CORBA::ExtInterfaceDefSeq_var, TAO_Object_Manager< @@ -6395,7 +6395,7 @@ template class >; template class - TAO_Seq_Out_T< + TAO_MngSeq_Out_T< CORBA::ExtValueDefSeq, CORBA::ExtValueDefSeq_var, TAO_Object_Manager< @@ -6418,7 +6418,7 @@ template class > # pragma instantiate \ - TAO_Seq_Out_T< \ + TAO_MngSeq_Out_T< \ CORBA::ExtValueDefSeq, \ CORBA::ExtValueDefSeq_var, \ TAO_Object_Manager< \ @@ -6557,7 +6557,7 @@ template class >; template class - TAO_Seq_Out_T< + TAO_MngSeq_Out_T< CORBA::ExtAbstractInterfaceDefSeq, CORBA::ExtAbstractInterfaceDefSeq_var, TAO_Object_Manager< @@ -6580,7 +6580,7 @@ template class > # pragma instantiate \ - TAO_Seq_Out_T< \ + TAO_MngSeq_Out_T< \ CORBA::ExtAbstractInterfaceDefSeq, \ CORBA::ExtAbstractInterfaceDefSeq_var, \ TAO_Object_Manager< \ @@ -6731,7 +6731,7 @@ template class >; template class - TAO_Seq_Out_T< + TAO_MngSeq_Out_T< CORBA::ExtLocalInterfaceDefSeq, CORBA::ExtLocalInterfaceDefSeq_var, TAO_Object_Manager< @@ -6754,7 +6754,7 @@ template class > # pragma instantiate \ - TAO_Seq_Out_T< \ + TAO_MngSeq_Out_T< \ CORBA::ExtLocalInterfaceDefSeq, \ CORBA::ExtLocalInterfaceDefSeq_var, \ TAO_Object_Manager< \ @@ -6902,7 +6902,7 @@ template class >; template class - TAO_Seq_Out_T< + TAO_MngSeq_Out_T< CORBA::ContainedSeq, CORBA::ContainedSeq_var, TAO_Object_Manager< @@ -6925,7 +6925,7 @@ template class > # pragma instantiate \ - TAO_Seq_Out_T< \ + TAO_MngSeq_Out_T< \ CORBA::ContainedSeq, \ CORBA::ContainedSeq_var, \ TAO_Object_Manager< \ @@ -7104,26 +7104,26 @@ template class template class TAO_Var_Var_T< - StructMember + CORBA::StructMember >; template class TAO_Out_T< - StructMember, - StructMember_var + CORBA::StructMember, + CORBA::StructMember_var >; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ TAO_Var_Var_T< \ - StructMember \ + CORBA::StructMember \ > # pragma instantiate \ TAO_Out_T< \ - StructMember, \ - StructMember_var \ + CORBA::StructMember, \ + CORBA::StructMember_var \ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -7173,14 +7173,14 @@ template class template class TAO_VarSeq_Var_T< - StructMemberSeq, + CORBA::StructMemberSeq, CORBA::StructMember >; template class TAO_Seq_Out_T< - StructMemberSeq, - StructMemberSeq_var, + CORBA::StructMemberSeq, + CORBA::StructMemberSeq_var, CORBA::StructMember >; @@ -7188,14 +7188,14 @@ template class # pragma instantiate \ TAO_VarSeq_Var_T< \ - StructMemberSeq, \ + CORBA::StructMemberSeq, \ CORBA::StructMember \ > # pragma instantiate \ TAO_Seq_Out_T< \ - StructMemberSeq, \ - StructMemberSeq_var, \ + CORBA::StructMemberSeq, \ + CORBA::StructMemberSeq_var, \ CORBA::StructMember \ > @@ -7472,26 +7472,26 @@ template class template class TAO_Var_Var_T< - Initializer + CORBA::Initializer >; template class TAO_Out_T< - Initializer, - Initializer_var + CORBA::Initializer, + CORBA::Initializer_var >; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ TAO_Var_Var_T< \ - Initializer \ + CORBA::Initializer \ > # pragma instantiate \ TAO_Out_T< \ - Initializer, \ - Initializer_var \ + CORBA::Initializer, \ + CORBA::Initializer_var \ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -7541,14 +7541,14 @@ template class template class TAO_VarSeq_Var_T< - InitializerSeq, + CORBA::InitializerSeq, CORBA::Initializer >; template class TAO_Seq_Out_T< - InitializerSeq, - InitializerSeq_var, + CORBA::InitializerSeq, + CORBA::InitializerSeq_var, CORBA::Initializer >; @@ -7556,14 +7556,14 @@ template class # pragma instantiate \ TAO_VarSeq_Var_T< \ - InitializerSeq, \ + CORBA::InitializerSeq, \ CORBA::Initializer \ > # pragma instantiate \ TAO_Seq_Out_T< \ - InitializerSeq, \ - InitializerSeq_var, \ + CORBA::InitializerSeq, \ + CORBA::InitializerSeq_var, \ CORBA::Initializer \ > @@ -7876,26 +7876,26 @@ template class template class TAO_Var_Var_T< - ExceptionDescription + CORBA::ExceptionDescription >; template class TAO_Out_T< - ExceptionDescription, - ExceptionDescription_var + CORBA::ExceptionDescription, + CORBA::ExceptionDescription_var >; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ TAO_Var_Var_T< \ - ExceptionDescription \ + CORBA::ExceptionDescription \ > # pragma instantiate \ TAO_Out_T< \ - ExceptionDescription, \ - ExceptionDescription_var \ + CORBA::ExceptionDescription, \ + CORBA::ExceptionDescription_var \ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -7945,14 +7945,14 @@ template class template class TAO_VarSeq_Var_T< - ExcDescriptionSeq, + CORBA::ExcDescriptionSeq, CORBA::ExceptionDescription >; template class TAO_Seq_Out_T< - ExcDescriptionSeq, - ExcDescriptionSeq_var, + CORBA::ExcDescriptionSeq, + CORBA::ExcDescriptionSeq_var, CORBA::ExceptionDescription >; @@ -7960,14 +7960,14 @@ template class # pragma instantiate \ TAO_VarSeq_Var_T< \ - ExcDescriptionSeq, \ + CORBA::ExcDescriptionSeq, \ CORBA::ExceptionDescription \ > # pragma instantiate \ TAO_Seq_Out_T< \ - ExcDescriptionSeq, \ - ExcDescriptionSeq_var, \ + CORBA::ExcDescriptionSeq, \ + CORBA::ExcDescriptionSeq_var, \ CORBA::ExceptionDescription \ > @@ -8399,26 +8399,26 @@ template class template class TAO_Var_Var_T< - ExtInitializer + CORBA::ExtInitializer >; template class TAO_Out_T< - ExtInitializer, - ExtInitializer_var + CORBA::ExtInitializer, + CORBA::ExtInitializer_var >; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ TAO_Var_Var_T< \ - ExtInitializer \ + CORBA::ExtInitializer \ > # pragma instantiate \ TAO_Out_T< \ - ExtInitializer, \ - ExtInitializer_var \ + CORBA::ExtInitializer, \ + CORBA::ExtInitializer_var \ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -8468,14 +8468,14 @@ template class template class TAO_VarSeq_Var_T< - ExtInitializerSeq, + CORBA::ExtInitializerSeq, CORBA::ExtInitializer >; template class TAO_Seq_Out_T< - ExtInitializerSeq, - ExtInitializerSeq_var, + CORBA::ExtInitializerSeq, + CORBA::ExtInitializerSeq_var, CORBA::ExtInitializer >; @@ -8483,14 +8483,14 @@ template class # pragma instantiate \ TAO_VarSeq_Var_T< \ - ExtInitializerSeq, \ + CORBA::ExtInitializerSeq, \ CORBA::ExtInitializer \ > # pragma instantiate \ TAO_Seq_Out_T< \ - ExtInitializerSeq, \ - ExtInitializerSeq_var, \ + CORBA::ExtInitializerSeq, \ + CORBA::ExtInitializerSeq_var, \ CORBA::ExtInitializer \ > @@ -8890,26 +8890,26 @@ template class template class TAO_Var_Var_T< - UnionMember + CORBA::UnionMember >; template class TAO_Out_T< - UnionMember, - UnionMember_var + CORBA::UnionMember, + CORBA::UnionMember_var >; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ TAO_Var_Var_T< \ - UnionMember \ + CORBA::UnionMember \ > # pragma instantiate \ TAO_Out_T< \ - UnionMember, \ - UnionMember_var \ + CORBA::UnionMember, \ + CORBA::UnionMember_var \ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -8959,14 +8959,14 @@ template class template class TAO_VarSeq_Var_T< - UnionMemberSeq, + CORBA::UnionMemberSeq, CORBA::UnionMember >; template class TAO_Seq_Out_T< - UnionMemberSeq, - UnionMemberSeq_var, + CORBA::UnionMemberSeq, + CORBA::UnionMemberSeq_var, CORBA::UnionMember >; @@ -8974,14 +8974,14 @@ template class # pragma instantiate \ TAO_VarSeq_Var_T< \ - UnionMemberSeq, \ + CORBA::UnionMemberSeq, \ CORBA::UnionMember \ > # pragma instantiate \ TAO_Seq_Out_T< \ - UnionMemberSeq, \ - UnionMemberSeq_var, \ + CORBA::UnionMemberSeq, \ + CORBA::UnionMemberSeq_var, \ CORBA::UnionMember \ > @@ -9149,7 +9149,7 @@ template class >; template class - TAO_Seq_Out_T< + TAO_MngSeq_Out_T< CORBA::EnumMemberSeq, CORBA::EnumMemberSeq_var, TAO_SeqElem_String_Manager @@ -9164,7 +9164,7 @@ template class > # pragma instantiate \ - TAO_Seq_Out_T< \ + TAO_MngSeq_Out_T< \ CORBA::EnumMemberSeq, \ CORBA::EnumMemberSeq_var, \ TAO_SeqElem_String_Manager \ @@ -16358,26 +16358,26 @@ void CORBA::Container::Description::_tao_any_destructor (void *_tao_void_pointer template class TAO_Var_Var_T< - Description + CORBA::Container::Description >; template class TAO_Out_T< - Description, - Description_var + CORBA::Container::Description, + CORBA::Container::Description_var >; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ TAO_Var_Var_T< \ - Description \ + CORBA::Container::Description \ > # pragma instantiate \ TAO_Out_T< \ - Description, \ - Description_var \ + CORBA::Container::Description, \ + CORBA::Container::Description_var \ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -16427,14 +16427,14 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (void *_tao_void_poin template class TAO_VarSeq_Var_T< - DescriptionSeq, + CORBA::Container::DescriptionSeq, CORBA::Container::Description >; template class TAO_Seq_Out_T< - DescriptionSeq, - DescriptionSeq_var, + CORBA::Container::DescriptionSeq, + CORBA::Container::DescriptionSeq_var, CORBA::Container::Description >; @@ -16442,14 +16442,14 @@ template class # pragma instantiate \ TAO_VarSeq_Var_T< \ - DescriptionSeq, \ + CORBA::Container::DescriptionSeq, \ CORBA::Container::Description \ > # pragma instantiate \ TAO_Seq_Out_T< \ - DescriptionSeq, \ - DescriptionSeq_var, \ + CORBA::Container::DescriptionSeq, \ + CORBA::Container::DescriptionSeq_var, \ CORBA::Container::Description \ > @@ -18530,26 +18530,26 @@ void CORBA::TypeDescription::_tao_any_destructor (void *_tao_void_pointer) template class TAO_Var_Var_T< - TypeDescription + CORBA::TypeDescription >; template class TAO_Out_T< - TypeDescription, - TypeDescription_var + CORBA::TypeDescription, + CORBA::TypeDescription_var >; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ TAO_Var_Var_T< \ - TypeDescription \ + CORBA::TypeDescription \ > # pragma instantiate \ TAO_Out_T< \ - TypeDescription, \ - TypeDescription_var \ + CORBA::TypeDescription, \ + CORBA::TypeDescription_var \ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -18636,10 +18636,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<CORBA::IRObject,CORBA::IRObject_var>; +// template class TAO_Object_Manager<CORBA::IRObject,CORBA::IRObject_var>; template class TAO::Any_Impl_T<CORBA::IRObject>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<CORBA::IRObject, CORBA::IRObject_var> +// # pragma instantiate TAO_Object_Manager<CORBA::IRObject, CORBA::IRObject_var> # pragma instantiate TAO::Any_Impl_T<CORBA::IRObject> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -18690,10 +18690,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<CORBA::Contained,CORBA::Contained_var>; +// template class TAO_Object_Manager<CORBA::Contained,CORBA::Contained_var>; template class TAO::Any_Impl_T<CORBA::Contained>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<CORBA::Contained, CORBA::Contained_var> +// # pragma instantiate TAO_Object_Manager<CORBA::Contained, CORBA::Contained_var> # pragma instantiate TAO::Any_Impl_T<CORBA::Contained> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -20119,10 +20119,10 @@ TAO::Any_Impl_T<CORBA::Container>::to_object ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<CORBA::Container,CORBA::Container_var>; +// template class TAO_Object_Manager<CORBA::Container,CORBA::Container_var>; template class TAO::Any_Impl_T<CORBA::Container>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<CORBA::Container, CORBA::Container_var> +// # pragma instantiate TAO_Object_Manager<CORBA::Container, CORBA::Container_var> # pragma instantiate TAO::Any_Impl_T<CORBA::Container> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -20303,10 +20303,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<CORBA::IDLType,CORBA::IDLType_var>; +// template class TAO_Object_Manager<CORBA::IDLType,CORBA::IDLType_var>; template class TAO::Any_Impl_T<CORBA::IDLType>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<CORBA::IDLType, CORBA::IDLType_var> +// # pragma instantiate TAO_Object_Manager<CORBA::IDLType, CORBA::IDLType_var> # pragma instantiate TAO::Any_Impl_T<CORBA::IDLType> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -20357,10 +20357,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<CORBA::TypedefDef,CORBA::TypedefDef_var>; +// template class TAO_Object_Manager<CORBA::TypedefDef,CORBA::TypedefDef_var>; template class TAO::Any_Impl_T<CORBA::TypedefDef>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<CORBA::TypedefDef, CORBA::TypedefDef_var> +// # pragma instantiate TAO_Object_Manager<CORBA::TypedefDef, CORBA::TypedefDef_var> # pragma instantiate TAO::Any_Impl_T<CORBA::TypedefDef> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/IIOPC.cpp b/TAO/tao/IIOPC.cpp index 0d2bfb94925..caaa3c73ef6 100644 --- a/TAO/tao/IIOPC.cpp +++ b/TAO/tao/IIOPC.cpp @@ -101,26 +101,32 @@ void IIOP::ListenPoint::_tao_any_destructor (void *_tao_void_pointer) template class TAO_Var_Var_T< - ListenPoint + IIOP::ListenPoint >; +template class TAO_Var_Base_T<IIOP::ListenPoint>; +template class TAO_Unbounded_Sequence<IIOP::ListenPoint>; template class TAO_Out_T< - ListenPoint, - ListenPoint_var + IIOP::ListenPoint, + IIOP::ListenPoint_var >; +template class TAO_Seq_Var_Base_T<IIOP::ListenPointList, IIOP::ListenPoint>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ TAO_Var_Var_T< \ - ListenPoint \ + 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< \ - ListenPoint, \ - ListenPoint_var \ + IIOP::ListenPoint, \ + IIOP::ListenPoint_var \ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -170,14 +176,14 @@ void IIOP::ListenPointList::_tao_any_destructor (void *_tao_void_pointer) template class TAO_VarSeq_Var_T< - ListenPointList, + IIOP::ListenPointList, IIOP::ListenPoint >; template class TAO_Seq_Out_T< - ListenPointList, - ListenPointList_var, + IIOP::ListenPointList, + IIOP::ListenPointList_var, IIOP::ListenPoint >; @@ -185,7 +191,7 @@ template class # pragma instantiate \ TAO_VarSeq_Var_T< \ - ListenPointList, \ + IIOP::ListenPointList, \ IIOP::ListenPoint \ > @@ -394,26 +400,28 @@ void IIOP::BiDirIIOPServiceContext::_tao_any_destructor (void *_tao_void_pointer template class TAO_Var_Var_T< - BiDirIIOPServiceContext + IIOP::BiDirIIOPServiceContext >; +template class TAO_Var_Base_T<IIOP::BiDirIIOPServiceContext>; template class TAO_Out_T< - BiDirIIOPServiceContext, - BiDirIIOPServiceContext_var + IIOP::BiDirIIOPServiceContext, + IIOP::BiDirIIOPServiceContext_var >; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ TAO_Var_Var_T< \ - BiDirIIOPServiceContext \ + IIOP::BiDirIIOPServiceContext \ > +#pragms instantiate TAO_Var_Base_T<IIOP::BiDirIIOPServiceContext> # pragma instantiate \ TAO_Out_T< \ - BiDirIIOPServiceContext, \ - BiDirIIOPServiceContext_var \ + IIOP::BiDirIIOPServiceContext, \ + IIOP::BiDirIIOPServiceContext_var \ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/IOP_CodecC.cpp b/TAO/tao/IOP_CodecC.cpp index 970603842e5..0bcc114751d 100644 --- a/TAO/tao/IOP_CodecC.cpp +++ b/TAO/tao/IOP_CodecC.cpp @@ -151,7 +151,7 @@ IOP::Codec_var::operator const ::IOP::Codec_ptr &() const // cast return this->ptr_; } -IOP::Codec_var::operator ::IOP::Codec_ptr &() // cast +IOP::Codec_var::operator ::IOP::Codec_ptr &() // cast { return this->ptr_; } @@ -288,7 +288,7 @@ IOP::Codec_out::operator-> (void) return this->ptr_; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_visitor_interface/interface_cs.cpp:236 IOP::Codec::Codec (void) @@ -297,7 +297,7 @@ IOP::Codec::Codec (void) IOP::Codec::~Codec (void) {} -void +void IOP::Codec::_tao_any_destructor (void *_tao_void_pointer) { Codec *tmp = ACE_static_cast (Codec *, _tao_void_pointer); @@ -313,7 +313,7 @@ IOP::Codec::_narrow ( return Codec::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -IOP::Codec_ptr +IOP::Codec_ptr IOP::Codec::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED @@ -323,7 +323,7 @@ IOP::Codec::_unchecked_narrow ( { return Codec::_nil (); } - + return ACE_reinterpret_cast ( Codec_ptr, @@ -343,14 +343,14 @@ IOP::Codec::_duplicate (Codec_ptr obj) { obj->_add_ref (); } - + return obj; } void *IOP::Codec::_tao_QueryInterface (ptr_arith_t type) { void *retv = 0; - + if (type == ACE_reinterpret_cast ( ptr_arith_t, &ACE_NESTED_CLASS (::IOP, Codec)::_tao_class_id) @@ -369,12 +369,12 @@ void *IOP::Codec::_tao_QueryInterface (ptr_arith_t type) ACE_static_cast (CORBA::Object_ptr, this) ); } - + if (retv != 0) { this->_add_ref (); } - + return retv; } @@ -389,7 +389,7 @@ IOP::Codec::marshal (TAO_OutputCDR &) return 0; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_visitor_exception/exception_cs.cpp:63 IOP::Codec::InvalidTypeForEncoding::InvalidTypeForEncoding (void) @@ -491,25 +491,25 @@ static const CORBA::Long _oc_IOP_Codec_InvalidTypeForEncoding[] = { TAO_ENCAP_BYTE_ORDER, // byte order 49, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x436f6465), - ACE_NTOHL (0x632f496e), - ACE_NTOHL (0x76616c69), - ACE_NTOHL (0x64547970), - ACE_NTOHL (0x65466f72), - ACE_NTOHL (0x456e636f), - ACE_NTOHL (0x64696e67), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x436f6465), + ACE_NTOHL (0x632f496e), + ACE_NTOHL (0x76616c69), + ACE_NTOHL (0x64547970), + ACE_NTOHL (0x65466f72), + ACE_NTOHL (0x456e636f), + ACE_NTOHL (0x64696e67), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IOP/Codec/InvalidTypeForEncoding:1.0 23, - ACE_NTOHL (0x496e7661), - ACE_NTOHL (0x6c696454), - ACE_NTOHL (0x79706546), - ACE_NTOHL (0x6f72456e), - ACE_NTOHL (0x636f6469), + ACE_NTOHL (0x496e7661), + ACE_NTOHL (0x6c696454), + ACE_NTOHL (0x79706546), + ACE_NTOHL (0x6f72456e), + ACE_NTOHL (0x636f6469), ACE_NTOHL (0x6e670000), // name = InvalidTypeForEncoding 0, // member count }; @@ -525,7 +525,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_InvalidTypeForEncoding ( ::CORBA::TypeCode_ptr IOP::Codec::_tc_InvalidTypeForEncoding = &_tc_TAO_tc_IOP_Codec_InvalidTypeForEncoding; -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_visitor_exception/exception_cs.cpp:63 IOP::Codec::FormatMismatch::FormatMismatch (void) @@ -627,21 +627,21 @@ static const CORBA::Long _oc_IOP_Codec_FormatMismatch[] = { TAO_ENCAP_BYTE_ORDER, // byte order 41, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x436f6465), - ACE_NTOHL (0x632f466f), - ACE_NTOHL (0x726d6174), - ACE_NTOHL (0x4d69736d), - ACE_NTOHL (0x61746368), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x436f6465), + ACE_NTOHL (0x632f466f), + ACE_NTOHL (0x726d6174), + ACE_NTOHL (0x4d69736d), + ACE_NTOHL (0x61746368), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IOP/Codec/FormatMismatch:1.0 15, - ACE_NTOHL (0x466f726d), - ACE_NTOHL (0x61744d69), - ACE_NTOHL (0x736d6174), + ACE_NTOHL (0x466f726d), + ACE_NTOHL (0x61744d69), + ACE_NTOHL (0x736d6174), ACE_NTOHL (0x63680000), // name = FormatMismatch 0, // member count }; @@ -657,7 +657,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_FormatMismatch ( ::CORBA::TypeCode_ptr IOP::Codec::_tc_FormatMismatch = &_tc_TAO_tc_IOP_Codec_FormatMismatch; -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_visitor_exception/exception_cs.cpp:63 IOP::Codec::TypeMismatch::TypeMismatch (void) @@ -759,20 +759,20 @@ static const CORBA::Long _oc_IOP_Codec_TypeMismatch[] = { TAO_ENCAP_BYTE_ORDER, // byte order 39, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x436f6465), - ACE_NTOHL (0x632f5479), - ACE_NTOHL (0x70654d69), - ACE_NTOHL (0x736d6174), - ACE_NTOHL (0x63683a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x436f6465), + ACE_NTOHL (0x632f5479), + ACE_NTOHL (0x70654d69), + ACE_NTOHL (0x736d6174), + ACE_NTOHL (0x63683a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IOP/Codec/TypeMismatch:1.0 13, - ACE_NTOHL (0x54797065), - ACE_NTOHL (0x4d69736d), - ACE_NTOHL (0x61746368), + ACE_NTOHL (0x54797065), + ACE_NTOHL (0x4d69736d), + ACE_NTOHL (0x61746368), ACE_NTOHL (0x0), // name = TypeMismatch 0, // member count }; @@ -795,15 +795,15 @@ static const CORBA::Long _oc_IOP_Codec[] = { TAO_ENCAP_BYTE_ORDER, // byte order 26, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x436f6465), - ACE_NTOHL (0x633a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x436f6465), + ACE_NTOHL (0x633a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IOP/Codec:1.0 6, - ACE_NTOHL (0x436f6465), + ACE_NTOHL (0x436f6465), ACE_NTOHL (0x63000000), // name = Codec }; @@ -831,19 +831,19 @@ static const CORBA::Long _oc_IOP_EncodingFormat[] = { TAO_ENCAP_BYTE_ORDER, // byte order 35, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x456e636f), - ACE_NTOHL (0x64696e67), - ACE_NTOHL (0x466f726d), - ACE_NTOHL (0x61743a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x456e636f), + ACE_NTOHL (0x64696e67), + ACE_NTOHL (0x466f726d), + ACE_NTOHL (0x61743a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IOP/EncodingFormat:1.0 15, - ACE_NTOHL (0x456e636f), - ACE_NTOHL (0x64696e67), - ACE_NTOHL (0x466f726d), + ACE_NTOHL (0x456e636f), + ACE_NTOHL (0x64696e67), + ACE_NTOHL (0x466f726d), ACE_NTOHL (0x61740000), // name = EncodingFormat CORBA::tk_short, @@ -873,54 +873,54 @@ static const CORBA::Long _oc_IOP_Encoding[] = { TAO_ENCAP_BYTE_ORDER, // byte order 29, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x456e636f), - ACE_NTOHL (0x64696e67), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x456e636f), + ACE_NTOHL (0x64696e67), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IOP/Encoding:1.0 9, - ACE_NTOHL (0x456e636f), - ACE_NTOHL (0x64696e67), + ACE_NTOHL (0x456e636f), + ACE_NTOHL (0x64696e67), ACE_NTOHL (0x0), // name = Encoding 3, // member count 7, - ACE_NTOHL (0x666f726d), + ACE_NTOHL (0x666f726d), ACE_NTOHL (0x61740000), // name = format CORBA::tk_alias, // typecode kind for typedefs 68, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 35, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x456e636f), - ACE_NTOHL (0x64696e67), - ACE_NTOHL (0x466f726d), - ACE_NTOHL (0x61743a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x456e636f), + ACE_NTOHL (0x64696e67), + ACE_NTOHL (0x466f726d), + ACE_NTOHL (0x61743a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IOP/EncodingFormat:1.0 15, - ACE_NTOHL (0x456e636f), - ACE_NTOHL (0x64696e67), - ACE_NTOHL (0x466f726d), + ACE_NTOHL (0x456e636f), + ACE_NTOHL (0x64696e67), + ACE_NTOHL (0x466f726d), ACE_NTOHL (0x61740000), // name = EncodingFormat CORBA::tk_short, 14, - ACE_NTOHL (0x6d616a6f), - ACE_NTOHL (0x725f7665), - ACE_NTOHL (0x7273696f), + ACE_NTOHL (0x6d616a6f), + ACE_NTOHL (0x725f7665), + ACE_NTOHL (0x7273696f), ACE_NTOHL (0x6e000000), // name = major_version CORBA::tk_octet, 14, - ACE_NTOHL (0x6d696e6f), - ACE_NTOHL (0x725f7665), - ACE_NTOHL (0x7273696f), + ACE_NTOHL (0x6d696e6f), + ACE_NTOHL (0x725f7665), + ACE_NTOHL (0x7273696f), ACE_NTOHL (0x6e000000), // name = minor_version CORBA::tk_octet, @@ -943,7 +943,7 @@ TAO_NAMESPACE_DEFINE ( ) TAO_NAMESPACE_END -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_visitor_structure/structure_cs.cpp:66 void IOP::Encoding::_tao_any_destructor (void *_tao_void_pointer) @@ -1060,7 +1060,7 @@ IOP::CodecFactory_var::operator const ::IOP::CodecFactory_ptr &() const // cast return this->ptr_; } -IOP::CodecFactory_var::operator ::IOP::CodecFactory_ptr &() // cast +IOP::CodecFactory_var::operator ::IOP::CodecFactory_ptr &() // cast { return this->ptr_; } @@ -1197,7 +1197,7 @@ IOP::CodecFactory_out::operator-> (void) return this->ptr_; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_visitor_interface/interface_cs.cpp:236 IOP::CodecFactory::CodecFactory (void) @@ -1206,7 +1206,7 @@ IOP::CodecFactory::CodecFactory (void) IOP::CodecFactory::~CodecFactory (void) {} -void +void IOP::CodecFactory::_tao_any_destructor (void *_tao_void_pointer) { CodecFactory *tmp = ACE_static_cast (CodecFactory *, _tao_void_pointer); @@ -1222,7 +1222,7 @@ IOP::CodecFactory::_narrow ( return CodecFactory::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -IOP::CodecFactory_ptr +IOP::CodecFactory_ptr IOP::CodecFactory::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED @@ -1232,7 +1232,7 @@ IOP::CodecFactory::_unchecked_narrow ( { return CodecFactory::_nil (); } - + return ACE_reinterpret_cast ( CodecFactory_ptr, @@ -1252,14 +1252,14 @@ IOP::CodecFactory::_duplicate (CodecFactory_ptr obj) { obj->_add_ref (); } - + return obj; } void *IOP::CodecFactory::_tao_QueryInterface (ptr_arith_t type) { void *retv = 0; - + if (type == ACE_reinterpret_cast ( ptr_arith_t, &ACE_NESTED_CLASS (::IOP, CodecFactory)::_tao_class_id) @@ -1278,12 +1278,12 @@ void *IOP::CodecFactory::_tao_QueryInterface (ptr_arith_t type) ACE_static_cast (CORBA::Object_ptr, this) ); } - + if (retv != 0) { this->_add_ref (); } - + return retv; } @@ -1298,7 +1298,7 @@ IOP::CodecFactory::marshal (TAO_OutputCDR &) return 0; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_visitor_exception/exception_cs.cpp:63 IOP::CodecFactory::UnknownEncoding::UnknownEncoding (void) @@ -1400,23 +1400,23 @@ static const CORBA::Long _oc_IOP_CodecFactory_UnknownEncoding[] = { TAO_ENCAP_BYTE_ORDER, // byte order 49, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x436f6465), - ACE_NTOHL (0x63466163), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f556e6b), - ACE_NTOHL (0x6e6f776e), - ACE_NTOHL (0x456e636f), - ACE_NTOHL (0x64696e67), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x436f6465), + ACE_NTOHL (0x63466163), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f556e6b), + ACE_NTOHL (0x6e6f776e), + ACE_NTOHL (0x456e636f), + ACE_NTOHL (0x64696e67), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0 16, - ACE_NTOHL (0x556e6b6e), - ACE_NTOHL (0x6f776e45), - ACE_NTOHL (0x6e636f64), + ACE_NTOHL (0x556e6b6e), + ACE_NTOHL (0x6f776e45), + ACE_NTOHL (0x6e636f64), ACE_NTOHL (0x696e6700), // name = UnknownEncoding 0, // member count }; @@ -1439,19 +1439,19 @@ static const CORBA::Long _oc_IOP_CodecFactory[] = { TAO_ENCAP_BYTE_ORDER, // byte order 33, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x436f6465), - ACE_NTOHL (0x63466163), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x494f502f), + ACE_NTOHL (0x436f6465), + ACE_NTOHL (0x63466163), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IOP/CodecFactory:1.0 13, - ACE_NTOHL (0x436f6465), - ACE_NTOHL (0x63466163), - ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x436f6465), + ACE_NTOHL (0x63466163), + ACE_NTOHL (0x746f7279), ACE_NTOHL (0x0), // name = CodecFactory }; @@ -1519,14 +1519,12 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<IOP::Codec,IOP::Codec_var>; template class TAO::Any_Impl_T<IOP::Codec>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<IOP::Codec, IOP::Codec_var> # pragma instantiate TAO::Any_Impl_T<IOP::Codec> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -1638,10 +1636,7 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<IOP::CodecFactory,IOP::CodecFactory_var>; template class TAO::Any_Impl_T<IOP::CodecFactory>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<IOP::CodecFactory, IOP::CodecFactory_var> # pragma instantiate TAO::Any_Impl_T<IOP::CodecFactory> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - diff --git a/TAO/tao/IORManipulation/IORC.cpp b/TAO/tao/IORManipulation/IORC.cpp index f16bc80a0b9..01709ad2ff4 100644 --- a/TAO/tao/IORManipulation/IORC.cpp +++ b/TAO/tao/IORManipulation/IORC.cpp @@ -1226,7 +1226,7 @@ template class >; template class - TAO_Seq_Out_T< + TAO_MngSeq_Out_T< TAO_IOP::TAO_IOR_Manipulation::IORList, TAO_IOP::TAO_IOR_Manipulation::IORList_var, TAO_Pseudo_Object_Manager< @@ -1247,7 +1247,7 @@ template class > # pragma instantiate \ - TAO_Seq_Out_T< \ + TAO_MngSeq_Out_T< \ TAO_IOP::TAO_IOR_Manipulation::IORList, \ TAO_IOP::TAO_IOR_Manipulation::IORList_var, \ TAO_Pseudo_Object_Manager< \ @@ -1729,10 +1729,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<TAO_IOP::TAO_IOR_Property,TAO_IOP::TAO_IOR_Property_var>; - template class TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Property>; +template class TAO_Object_Manager<TAO_IOP::TAO_IOR_Property,TAO_IOP::TAO_IOR_Property_var,TAO_IOP::tao_TAO_IOR_Property_life>; +template class TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Property>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<TAO_IOP::TAO_IOR_Property, TAO_IOP::TAO_IOR_Property_var> +# pragma instantiate TAO_Object_Manager<TAO_IOP::TAO_IOR_Property, TAO_IOP::TAO_IOR_Property_var,TAO_IOP::tao_TAO_IOR_Property_life> # pragma instantiate TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Property> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -1783,9 +1783,9 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<TAO_IOP::TAO_IOR_Manipulation,TAO_IOP::TAO_IOR_Manipulation_var>; + template class TAO_Object_Manager<TAO_IOP::TAO_IOR_Manipulation,TAO_IOP::TAO_IOR_Manipulation_var,TAO_IOP::tao_TAO_IOR_Manipulation_life>; template class TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<TAO_IOP::TAO_IOR_Manipulation, TAO_IOP::TAO_IOR_Manipulation_var> +# pragma instantiate TAO_Object_Manager<TAO_IOP::TAO_IOR_Manipulation, TAO_IOP::TAO_IOR_Manipulation_var,TAO_IOP::tao_TAO_IOR_Manipulation_life> # pragma instantiate TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Messaging/MessagingC.cpp b/TAO/tao/Messaging/MessagingC.cpp index 5b579469081..2b9eca3c149 100644 --- a/TAO/tao/Messaging/MessagingC.cpp +++ b/TAO/tao/Messaging/MessagingC.cpp @@ -844,10 +844,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Valuetype_Manager<Messaging::ExceptionHolder, Messaging::ExceptionHolder_var>; +template class TAO_Valuetype_Manager<Messaging::ExceptionHolder, Messaging::ExceptionHolder_var,Messaging::tao_ExceptionHolder_life>; template class TAO::Any_Impl_T<Messaging::ExceptionHolder>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Valuetype_Manager<Messaging::ExceptionHolder, Messaging::ExceptionHolder_var> +# pragma instantiate TAO_Valuetype_Manager<Messaging::ExceptionHolder, Messaging::ExceptionHolder_var,Messaging::tao_ExceptionHolder_life> # pragma instantiate TAO::Any_Impl_T<Messaging::ExceptionHolder> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -898,10 +898,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<Messaging::ReplyHandler,Messaging::ReplyHandler_var>; + template class TAO_Object_Manager<Messaging::ReplyHandler,Messaging::ReplyHandler_var,Messaging::tao_ReplyHandler_life>; template class TAO::Any_Impl_T<Messaging::ReplyHandler>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<Messaging::ReplyHandler, Messaging::ReplyHandler_var> +# pragma instantiate TAO_Object_Manager<Messaging::ReplyHandler, Messaging::ReplyHandler_var,Messaging::tao_ReplyHandler_life> # pragma instantiate TAO::Any_Impl_T<Messaging::ReplyHandler> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.cpp b/TAO/tao/Messaging/Messaging_No_ImplC.cpp index d130f844c39..dbe800464c5 100644 --- a/TAO/tao/Messaging/Messaging_No_ImplC.cpp +++ b/TAO/tao/Messaging/Messaging_No_ImplC.cpp @@ -520,14 +520,14 @@ void Messaging::PriorityRange::_tao_any_destructor (void *_tao_void_pointer) template class TAO_Fixed_Var_T< - PriorityRange + Messaging::PriorityRange >; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ TAO_Fixed_Var_T< \ - PriorityRange \ + Messaging::PriorityRange \ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -2309,14 +2309,14 @@ void Messaging::RoutingTypeRange::_tao_any_destructor (void *_tao_void_pointer) template class TAO_Fixed_Var_T< - RoutingTypeRange + Messaging::RoutingTypeRange >; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ TAO_Fixed_Var_T< \ - RoutingTypeRange \ + Messaging::RoutingTypeRange \ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -3081,7 +3081,7 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<Messaging::RebindPolicy,Messaging::RebindPolicy_var>; + template class TAO_Object_Manager<Messaging::RebindPolicy,Messaging::RebindPolicy_var,Messaging::tao_RebindPolicy_life>; template class TAO::Any_Impl_T<Messaging::RebindPolicy>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate TAO_Object_Manager<Messaging::RebindPolicy, Messaging::RebindPolicy_var> @@ -3200,10 +3200,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<Messaging::RequestPriorityPolicy,Messaging::RequestPriorityPolicy_var>; + template class TAO_Object_Manager<Messaging::RequestPriorityPolicy,Messaging::RequestPriorityPolicy_var,Messaging::tao_RequestPriorityPolicy_life>; template class TAO::Any_Impl_T<Messaging::RequestPriorityPolicy>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<Messaging::RequestPriorityPolicy, Messaging::RequestPriorityPolicy_var> +# pragma instantiate TAO_Object_Manager<Messaging::RequestPriorityPolicy, Messaging::RequestPriorityPolicy_var,Messaging::tao_RequestPriorityPolicy_life> # pragma instantiate TAO::Any_Impl_T<Messaging::RequestPriorityPolicy> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -3254,10 +3254,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<Messaging::ReplyPriorityPolicy,Messaging::ReplyPriorityPolicy_var>; + template class TAO_Object_Manager<Messaging::ReplyPriorityPolicy,Messaging::ReplyPriorityPolicy_var,Messaging::tao_ReplyPriorityPolicy_life>; template class TAO::Any_Impl_T<Messaging::ReplyPriorityPolicy>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<Messaging::ReplyPriorityPolicy, Messaging::ReplyPriorityPolicy_var> +# pragma instantiate TAO_Object_Manager<Messaging::ReplyPriorityPolicy, Messaging::ReplyPriorityPolicy_var,Messaging::tao_ReplyPriorityPolicy_life> # pragma instantiate TAO::Any_Impl_T<Messaging::ReplyPriorityPolicy> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -3308,10 +3308,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<Messaging::RequestStartTimePolicy,Messaging::RequestStartTimePolicy_var>; - template class TAO::Any_Impl_T<Messaging::RequestStartTimePolicy>; +// template class TAO_Object_Manager<Messaging::RequestStartTimePolicy,Messaging::RequestStartTimePolicy_var,Messaging::tao_ReplyStartTimePolicy_life>; +template class TAO::Any_Impl_T<Messaging::RequestStartTimePolicy>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<Messaging::RequestStartTimePolicy, Messaging::RequestStartTimePolicy_var> +// # pragma instantiate TAO_Object_Manager<Messaging::RequestStartTimePolicy, Messaging::RequestStartTimePolicy_var,Messaging::tao_ReplyStartTimePolicy_life> # pragma instantiate TAO::Any_Impl_T<Messaging::RequestStartTimePolicy> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -3362,10 +3362,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<Messaging::RequestEndTimePolicy,Messaging::RequestEndTimePolicy_var>; - template class TAO::Any_Impl_T<Messaging::RequestEndTimePolicy>; +template class TAO_Object_Manager<Messaging::RequestEndTimePolicy,Messaging::RequestEndTimePolicy_var,Messaging::tao_RequestEndTimePolicy_life>; +template class TAO::Any_Impl_T<Messaging::RequestEndTimePolicy>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<Messaging::RequestEndTimePolicy, Messaging::RequestEndTimePolicy_var> +# pragma instantiate TAO_Object_Manager<Messaging::RequestEndTimePolicy, Messaging::RequestEndTimePolicy_var,Messaging::tao_RequestEndTimePolicy_life> # pragma instantiate TAO::Any_Impl_T<Messaging::RequestEndTimePolicy> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -3416,10 +3416,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<Messaging::ReplyStartTimePolicy,Messaging::ReplyStartTimePolicy_var>; +template class TAO_Object_Manager<Messaging::ReplyStartTimePolicy,Messaging::ReplyStartTimePolicy_var,Messaging::tao_ReplyStartTimePolicy_life>; template class TAO::Any_Impl_T<Messaging::ReplyStartTimePolicy>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<Messaging::ReplyStartTimePolicy, Messaging::ReplyStartTimePolicy_var> +# pragma instantiate TAO_Object_Manager<Messaging::ReplyStartTimePolicy, Messaging::ReplyStartTimePolicy_var,Messaging::tao_ReplyStartTimePolicy_life> # pragma instantiate TAO::Any_Impl_T<Messaging::ReplyStartTimePolicy> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -3470,10 +3470,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<Messaging::ReplyEndTimePolicy,Messaging::ReplyEndTimePolicy_var>; - template class TAO::Any_Impl_T<Messaging::ReplyEndTimePolicy>; +template class TAO_Object_Manager<Messaging::ReplyEndTimePolicy,Messaging::ReplyEndTimePolicy_var,Messaging::tao_ReplyEndTimePolicy_life>; +template class TAO::Any_Impl_T<Messaging::ReplyEndTimePolicy>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<Messaging::ReplyEndTimePolicy, Messaging::ReplyEndTimePolicy_var> +# pragma instantiate TAO_Object_Manager<Messaging::ReplyEndTimePolicy, Messaging::ReplyEndTimePolicy_var,Messaging::tao_ReplyEndTimePolicy_life> # pragma instantiate TAO::Any_Impl_T<Messaging::ReplyEndTimePolicy> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -3524,10 +3524,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<Messaging::RelativeRequestTimeoutPolicy,Messaging::RelativeRequestTimeoutPolicy_var>; - template class TAO::Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>; +template class TAO_Object_Manager<Messaging::RelativeRequestTimeoutPolicy,Messaging::RelativeRequestTimeoutPolicy_var,Messaging::tao_RelativeRequestTimeoutPolicy_life>; +template class TAO::Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<Messaging::RelativeRequestTimeoutPolicy, Messaging::RelativeRequestTimeoutPolicy_var> +# pragma instantiate TAO_Object_Manager<Messaging::RelativeRequestTimeoutPolicy, Messaging::RelativeRequestTimeoutPolicy_var,Messaging::tao_RelativeRequestTimeoutPolicy_life> # pragma instantiate TAO::Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -3643,10 +3643,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<Messaging::RoutingPolicy,Messaging::RoutingPolicy_var>; - template class TAO::Any_Impl_T<Messaging::RoutingPolicy>; +template class TAO_Object_Manager<Messaging::RoutingPolicy,Messaging::RoutingPolicy_var,Messaging::tao_RoutingPolicy_life>; +template class TAO::Any_Impl_T<Messaging::RoutingPolicy>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<Messaging::RoutingPolicy, Messaging::RoutingPolicy_var> +# pragma instantiate TAO_Object_Manager<Messaging::RoutingPolicy, Messaging::RoutingPolicy_var,Messaging::tao_RoutingPolicy_life> # pragma instantiate TAO::Any_Impl_T<Messaging::RoutingPolicy> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -3697,10 +3697,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<Messaging::MaxHopsPolicy,Messaging::MaxHopsPolicy_var>; + template class TAO_Object_Manager<Messaging::MaxHopsPolicy,Messaging::MaxHopsPolicy_var,Messaging::tao_MaxHopsPolicy_life>; template class TAO::Any_Impl_T<Messaging::MaxHopsPolicy>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<Messaging::MaxHopsPolicy, Messaging::MaxHopsPolicy_var> +# pragma instantiate TAO_Object_Manager<Messaging::MaxHopsPolicy, Messaging::MaxHopsPolicy_var,Messaging::tao_MaxHopsPolicy_life> # pragma instantiate TAO::Any_Impl_T<Messaging::MaxHopsPolicy> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -3751,9 +3751,9 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<Messaging::QueueOrderPolicy,Messaging::QueueOrderPolicy_var>; - template class TAO::Any_Impl_T<Messaging::QueueOrderPolicy>; +template class TAO_Object_Manager<Messaging::QueueOrderPolicy,Messaging::QueueOrderPolicy_var,Messaging::tao_QueueOrderPolicy_life>; +template class TAO::Any_Impl_T<Messaging::QueueOrderPolicy>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<Messaging::QueueOrderPolicy, Messaging::QueueOrderPolicy_var> +# pragma instantiate TAO_Object_Manager<Messaging::QueueOrderPolicy, Messaging::QueueOrderPolicy_var,Messaging::tao_QueueOrderPolicy_life> # pragma instantiate TAO::Any_Impl_T<Messaging::QueueOrderPolicy> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp index c237fae6364..49fa65e3db7 100644 --- a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp +++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp @@ -382,9 +382,9 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<Messaging::RelativeRoundtripTimeoutPolicy,Messaging::RelativeRoundtripTimeoutPolicy_var>; - template class TAO::Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>; +template class TAO_Object_Manager<Messaging::RelativeRoundtripTimeoutPolicy,Messaging::RelativeRoundtripTimeoutPolicy_var,Messaging::tao_RelativeRoundtripTimeoutPolicy_life>; +template class TAO::Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<Messaging::RelativeRoundtripTimeoutPolicy, Messaging::RelativeRoundtripTimeoutPolicy_var> +# pragma instantiate TAO_Object_Manager<Messaging::RelativeRoundtripTimeoutPolicy, Messaging::RelativeRoundtripTimeoutPolicy_var,Messaging::tao_RelativeRoundtripTimeoutPolicy_life> # pragma instantiate TAO::Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp index b075ac15833..fb9571f2861 100644 --- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp +++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp @@ -319,9 +319,9 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<Messaging::SyncScopePolicy,Messaging::SyncScopePolicy_var>; - template class TAO::Any_Impl_T<Messaging::SyncScopePolicy>; +template class TAO_Object_Manager<Messaging::SyncScopePolicy,Messaging::SyncScopePolicy_var,Messaging::tao_SyncScopePolicy_life>; +template class TAO::Any_Impl_T<Messaging::SyncScopePolicy>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<Messaging::SyncScopePolicy, Messaging::SyncScopePolicy_var> +# pragma instantiate TAO_Object_Manager<Messaging::SyncScopePolicy, Messaging::SyncScopePolicy_var,Messaging::tao_SyncScopePolicy_life> # pragma instantiate TAO::Any_Impl_T<Messaging::SyncScopePolicy> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Messaging/TAO_ExtC.cpp b/TAO/tao/Messaging/TAO_ExtC.cpp index ed0759ed148..f86393a66b2 100644 --- a/TAO/tao/Messaging/TAO_ExtC.cpp +++ b/TAO/tao/Messaging/TAO_ExtC.cpp @@ -319,9 +319,9 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<TAO::ConnectionTimeoutPolicy,TAO::ConnectionTimeoutPolicy_var>; +// template class TAO_Object_Manager<TAO::ConnectionTimeoutPolicy,TAO::ConnectionTimeoutPolicy_var>; template class TAO::Any_Impl_T<TAO::ConnectionTimeoutPolicy>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<TAO::ConnectionTimeoutPolicy, TAO::ConnectionTimeoutPolicy_var> +//# pragma instantiate TAO_Object_Manager<TAO::ConnectionTimeoutPolicy, TAO::ConnectionTimeoutPolicy_var> # pragma instantiate TAO::Any_Impl_T<TAO::ConnectionTimeoutPolicy> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Messaging_PolicyValueC.cpp b/TAO/tao/Messaging_PolicyValueC.cpp index 5feef2e22ec..84794a32b3e 100644 --- a/TAO/tao/Messaging_PolicyValueC.cpp +++ b/TAO/tao/Messaging_PolicyValueC.cpp @@ -165,26 +165,26 @@ void Messaging::PolicyValue::_tao_seq_Octet::_tao_any_destructor (void *_tao_voi template class TAO_Var_Var_T< - PolicyValue + Messaging::PolicyValue >; template class TAO_Out_T< - PolicyValue, - PolicyValue_var + Messaging::PolicyValue, + Messaging::PolicyValue_var >; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ TAO_Var_Var_T< \ - PolicyValue \ + Messaging::PolicyValue \ > # pragma instantiate \ TAO_Out_T< \ - PolicyValue, \ - PolicyValue_var \ + Messaging::PolicyValue, \ + Messaging::PolicyValue_var \ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -234,14 +234,18 @@ void Messaging::PolicyValueSeq::_tao_any_destructor (void *_tao_void_pointer) template class TAO_VarSeq_Var_T< - PolicyValueSeq, + 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< - PolicyValueSeq, - PolicyValueSeq_var, + Messaging::PolicyValueSeq, + Messaging::PolicyValueSeq_var, Messaging::PolicyValue >; @@ -249,14 +253,18 @@ template class # pragma instantiate \ TAO_VarSeq_Var_T< \ - PolicyValueSeq, \ + 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< \ - PolicyValueSeq, \ - PolicyValueSeq_var, \ + Messaging::PolicyValueSeq, \ + Messaging::PolicyValueSeq_var, \ Messaging::PolicyValue \ > @@ -422,7 +430,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>; +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 */ diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index 4e77a23767e..fc9a8bee1a6 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -2099,64 +2099,3 @@ CORBA::ORB::lookup_value_factory (const char *repository_id return 0; // %! raise exception ! } } - -#if (TAO_HAS_MINIMUM_CORBA == 0) - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class TAO_Pseudo_Var_T<CORBA::Request>; - template class TAO_Pseudo_Out_T<CORBA::Request, CORBA::Request_var>; - template class - TAO_Unbounded_Pseudo_Sequence< - CORBA::Request, - CORBA::Request_var - >; - template class - TAO_VarSeq_Var_T< - CORBA::ORB::RequestSeq, - TAO_Pseudo_Object_Manager< - CORBA::Request, - CORBA::Request_var - > - >; - template class - TAO_Seq_Out_T< - CORBA::ORB::RequestSeq, - CORBA::ORB::RequestSeq_var, - TAO_Pseudo_Object_Manager< - CORBA::Request, - CORBA::Request_var - > - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate TAO_Pseudo_Var_T<CORBA::Request> -# pragma instantiate TAO_Pseudo_Out_T<CORBA::Request, CORBA::Request_var> -# pragma instantiate \ - TAO_Unbounded_Pseudo_Sequence< \ - CORBA::Request, \ - CORBA::Request_var \ - > -# pragma instantiate \ - TAO_VarSeq_Var_T< \ - CORBA::ORB::RequestSeq, \ - TAO_Pseudo_Object_Manager< \ - CORBA::Request, \ - CORBA::Request_var \ - > \ - > -# pragma instantiate \ - TAO_Seq_Out_T< \ - CORBA::ORB::RequestSeq, \ - CORBA::ORB::RequestSeq_var, \ - TAO_Pseudo_Object_Manager< \ - CORBA::Request, \ - CORBA::Request_var \ - > \ - > - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -#endif /* TAO_HAS_MINIMUM_CORBA */ - diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index 014b0120065..0630a64a26f 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -977,13 +977,13 @@ TAO_Object_Proxy_Broker * (*_TAO_collocation_Object_Proxy_Broker_Factory_functio #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class TAO_Object_Manager<CORBA::Object, CORBA::Object_var>; +// template class TAO_Object_Manager<CORBA::Object, CORBA::Object_var>; template class TAO_Pseudo_Var_T<CORBA::Object>; template class TAO_Pseudo_Out_T<CORBA::Object, CORBA::Object_var>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate TAO_Object_Manager<CORBA::Object, CORBA::Object_var> +// #pragma instantiate TAO_Object_Manager<CORBA::Object, CORBA::Object_var> #pragma instantiate TAO_Pseudo_Var_T<CORBA::Object> #pragma instantiate TAO_Pseudo_Out_T<CORBA::Object, CORBA::Object_var> diff --git a/TAO/tao/ObjectIdListC.cpp b/TAO/tao/ObjectIdListC.cpp index 3d16bda541f..446fd512690 100644 --- a/TAO/tao/ObjectIdListC.cpp +++ b/TAO/tao/ObjectIdListC.cpp @@ -41,21 +41,21 @@ static const CORBA::Long _oc_CORBA_ORB_ObjectId[] = { TAO_ENCAP_BYTE_ORDER, // byte order 35, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f4f52), - ACE_NTOHL (0x425f4f62), - ACE_NTOHL (0x6a656374), - ACE_NTOHL (0x49643a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f4f52), + ACE_NTOHL (0x425f4f62), + ACE_NTOHL (0x6a656374), + ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/ORB_ObjectId:1.0 13, - ACE_NTOHL (0x4f52425f), - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63744964), + ACE_NTOHL (0x4f52425f), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63744964), ACE_NTOHL (0x0), // name = ORB_ObjectId - CORBA::tk_string, + CORBA::tk_string, 0U, // string length }; @@ -76,7 +76,7 @@ TAO_NAMESPACE_DEFINE ( ) TAO_NAMESPACE_END -// TAO_IDL - Generated from +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50 CORBA::ORB_ObjectIdList::ORB_ObjectIdList (void) @@ -115,8 +115,10 @@ template class TAO_SeqElem_String_Manager >; +template class TAO_Seq_Var_Base_T<CORBA::ORB_ObjectIdList, TAO_SeqElem_String_Manager>; + template class - TAO_Seq_Out_T< + TAO_MngSeq_Out_T< CORBA::ORB_ObjectIdList, CORBA::ORB_ObjectIdList_var, TAO_SeqElem_String_Manager @@ -129,7 +131,7 @@ template class CORBA::ORB_ObjectIdList, \ TAO_SeqElem_String_Manager \ > - +#pragms instantiate TAO_Seq_Var_Base_T<CORBA::ORB_ObjectIdList, TAO_SeqElem_String_Manager> # pragma instantiate \ TAO_Seq_Out_T< \ CORBA::ORB_ObjectIdList, \ @@ -137,7 +139,7 @@ template class TAO_SeqElem_String_Manager \ > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -146,21 +148,21 @@ static const CORBA::Long _oc_CORBA_ORB_ObjectIdList[] = { TAO_ENCAP_BYTE_ORDER, // byte order 39, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f4f52), - ACE_NTOHL (0x425f4f62), - ACE_NTOHL (0x6a656374), - ACE_NTOHL (0x49644c69), - ACE_NTOHL (0x73743a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f4f52), + ACE_NTOHL (0x425f4f62), + ACE_NTOHL (0x6a656374), + ACE_NTOHL (0x49644c69), + ACE_NTOHL (0x73743a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/ORB_ObjectIdList:1.0 17, - ACE_NTOHL (0x4f52425f), - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63744964), - ACE_NTOHL (0x4c697374), + ACE_NTOHL (0x4f52425f), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63744964), + ACE_NTOHL (0x4c697374), ACE_NTOHL (0x0), // name = ORB_ObjectIdList CORBA::tk_sequence, // typecode kind 88, // encapsulation length @@ -169,21 +171,21 @@ static const CORBA::Long _oc_CORBA_ORB_ObjectIdList[] = 72, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 35, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f4f52), - ACE_NTOHL (0x425f4f62), - ACE_NTOHL (0x6a656374), - ACE_NTOHL (0x49643a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f4f52), + ACE_NTOHL (0x425f4f62), + ACE_NTOHL (0x6a656374), + ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/ORB_ObjectId:1.0 13, - ACE_NTOHL (0x4f52425f), - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63744964), + ACE_NTOHL (0x4f52425f), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63744964), ACE_NTOHL (0x0), // name = ORB_ObjectId - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 0U, @@ -216,20 +218,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; } @@ -239,7 +241,7 @@ CORBA::Boolean operator>> ( ) { CORBA::ULong _tao_seq_len; - + if (strm >> _tao_seq_len) { // Add a check to the length of the sequence @@ -249,27 +251,26 @@ 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; } - diff --git a/TAO/tao/ObjectReferenceTemplateC.cpp b/TAO/tao/ObjectReferenceTemplateC.cpp index b7eb9dac798..55c62cf0703 100644 --- a/TAO/tao/ObjectReferenceTemplateC.cpp +++ b/TAO/tao/ObjectReferenceTemplateC.cpp @@ -703,8 +703,18 @@ template class > >; +template class TAO_Seq_Var_Base_T<PortableInterceptor::ObjectReferenceTemplateSeq, + TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate, + TAO_Value_Var_T<PortableInterceptor::ObjectReferenceTemplate, + PortableInterceptor::tao_ObjectReferenceTemplate_life>, + PortableInterceptor::tao_ObjectReferenceTemplate_life> >; +template class TAO_Unbounded_Valuetype_Sequence<PortableInterceptor::ObjectReferenceTemplate, + TAO_Value_Var_T<PortableInterceptor::ObjectReferenceTemplate, + PortableInterceptor::tao_ObjectReferenceTemplate_life>, + PortableInterceptor::tao_ObjectReferenceTemplate_life>; + template class - TAO_Seq_Out_T< + TAO_MngSeq_Out_T< PortableInterceptor::ObjectReferenceTemplateSeq, PortableInterceptor::ObjectReferenceTemplateSeq_var, TAO_Valuetype_Manager< @@ -726,6 +736,11 @@ template class > \ > +#pragma instantiate TAO_Unbounded_Valuetype_Sequence<PortableInterceptor::ObjectReferenceTemplate, +TAO_Value_Var_T<PortableInterceptor::ObjectReferenceTemplate, + PortableInterceptor::tao_ObjectReferenceTemplate_life>, + PortableInterceptor::tao_ObjectReferenceTemplate_life>; + # pragma instantiate \ TAO_Seq_Out_T< \ PortableInterceptor::ObjectReferenceTemplateSeq, \ @@ -737,6 +752,11 @@ template class > \ > +#pragms instantiate TAO_Seq_Var_Base_T<PortableInterceptor::ObjectReferenceTemplateSeq, + TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate, + TAO_Value_Var_T<PortableInterceptor::ObjectReferenceTemplate, + PortableInterceptor::tao_ObjectReferenceTemplate_life>, + PortableInterceptor::tao_ObjectReferenceTemplate_life> >; #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from @@ -965,10 +985,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceFactory, PortableInterceptor::ObjectReferenceFactory_var>; + template class TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceFactory, PortableInterceptor::ObjectReferenceFactory_var, PortableInterceptor::tao_ObjectReferenceFactory_life>; template class TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceFactory>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceFactory, PortableInterceptor::ObjectReferenceFactory_var> +# pragma instantiate TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceFactory, PortableInterceptor::ObjectReferenceFactory_var, PortableInterceptor::tao_ObjectReferenceFactory_life> # pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceFactory> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -1029,10 +1049,10 @@ TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceTemplate>::to_value ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate, PortableInterceptor::ObjectReferenceTemplate_var>; + template class TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate, PortableInterceptor::ObjectReferenceTemplate_var, PortableInterceptor::tao_ObjectReferenceTemplate_life>; template class TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceTemplate>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate, PortableInterceptor::ObjectReferenceTemplate_var> +# pragma instantiate TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate, PortableInterceptor::ObjectReferenceTemplate_var, PortableInterceptor::tao_ObjectReferenceTemplate_life> # pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceTemplate> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp index fa3835d197d..f5b45a666c5 100644 --- a/TAO/tao/Object_KeyC.cpp +++ b/TAO/tao/Object_KeyC.cpp @@ -179,14 +179,17 @@ TAO::ObjectKey::decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> template class TAO_FixedSeq_Var_T< - ObjectKey, + TAO::ObjectKey, CORBA::Octet >; +template class TAO_Seq_Var_Base_T<TAO::ObjectKey, + CORBA::Octet>; + template class TAO_Seq_Out_T< - ObjectKey, - ObjectKey_var, + TAO::ObjectKey, + TAO::ObjectKey_var, CORBA::Octet >; @@ -194,17 +197,20 @@ template class # pragma instantiate \ TAO_FixedSeq_Var_T< \ - ObjectKey, \ + TAO::ObjectKey, \ CORBA::Octet \ > # pragma instantiate \ TAO_Seq_Out_T< \ - ObjectKey, \ - ObjectKey_var, \ + TAO::ObjectKey, \ + TAO::ObjectKey_var, \ CORBA::Octet \ > +#pragma instantiate TAO_Seq_Var_Base_T<TAO::ObjectKey, + CORBA::Octet>; + #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from diff --git a/TAO/tao/Objref_VarOut_T.cpp b/TAO/tao/Objref_VarOut_T.cpp index cd9c7464503..8f0b2572a67 100644 --- a/TAO/tao/Objref_VarOut_T.cpp +++ b/TAO/tao/Objref_VarOut_T.cpp @@ -68,7 +68,7 @@ TAO_Objref_Var_T<T, T_life>::operator-> (void) const template <typename T, typename T_life> TAO_Objref_Var_T<T, T_life>::operator const T *& () const { - return this->ptr_; + return ACE_const_cast (const T *, this->ptr_); } template <typename T, typename T_life> diff --git a/TAO/tao/OctetSeqC.cpp b/TAO/tao/OctetSeqC.cpp index 751b981ca78..caecff8135d 100644 --- a/TAO/tao/OctetSeqC.cpp +++ b/TAO/tao/OctetSeqC.cpp @@ -79,14 +79,16 @@ void CORBA::OctetSeq::_tao_any_destructor (void *_tao_void_pointer) template class TAO_FixedSeq_Var_T< - OctetSeq, + CORBA::OctetSeq, CORBA::Octet >; +template class TAO_Seq_Var_Base_T<CORBA::OctetSeq, CORBA::Octet>; + template class TAO_Seq_Out_T< - OctetSeq, - OctetSeq_var, + CORBA::OctetSeq, + CORBA::OctetSeq_var, CORBA::Octet >; @@ -97,6 +99,7 @@ template class OctetSeq, \ CORBA::Octet \ > +#pragma TAO_Seq_Var_Base_T<CORBA::OctetSeq, CORBA::Octet> # pragma instantiate \ TAO_Seq_Out_T< \ diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp index 2de33dfc907..d79cf220059 100644 --- a/TAO/tao/PolicyC.cpp +++ b/TAO/tao/PolicyC.cpp @@ -550,17 +550,32 @@ CORBA::tao_Policy_cast::tao_upcast ( CORBA::Policy, CORBA::tao_Policy_life >; - template class - TAO_Objref_Out_T< - CORBA::Policy, - CORBA::tao_Policy_life - >; +template class TAO_Unbounded_Sequence<CORBA::UShort>; + +template class +TAO_Objref_Out_T< + CORBA::Policy, + CORBA::tao_Policy_life + >; + +template class TAO_Unbounded_Object_Sequence<CORBA::Policy, + TAO_Objref_Var_T<CORBA::Policy, + CORBA::tao_Policy_life>, + CORBA::tao_Policy_life, + CORBA::tao_Policy_cast>; + #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ TAO_Objref_Var_T< \ CORBA::Policy, \ CORBA::tao_Policy_life \ > +# pragma instantiate TAO_Unbounded_Sequence<CORBA::UShort> +# pragma instantiate TAO_Unbounded_Object_Sequence<CORBA::Policy, +TAO_Objref_Var_T<CORBA::Policy, + CORBA::tao_Policy_life>, + CORBA::tao_Policy_life, + CORBA::tao_Policy_cast> # pragma instantiate \ TAO_Objref_Out_T< \ CORBA::Policy, \ @@ -2462,10 +2477,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<CORBA::Policy,CORBA::Policy_var>; + template class TAO_Object_Manager<CORBA::Policy,CORBA::Policy_var, CORBA::tao_Policy_life>; template class TAO::Any_Impl_T<CORBA::Policy>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<CORBA::Policy, CORBA::Policy_var> +# pragma instantiate TAO_Object_Manager<CORBA::Policy, CORBA::Policy_var, CORBA::tao_Policy_life> # pragma instantiate TAO::Any_Impl_T<CORBA::Policy> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -2516,10 +2531,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<CORBA::PolicyManager,CORBA::PolicyManager_var>; + template class TAO_Object_Manager<CORBA::PolicyManager,CORBA::PolicyManager_var, CORBA::tao_PolicyManager_life>; template class TAO::Any_Impl_T<CORBA::PolicyManager>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<CORBA::PolicyManager, CORBA::PolicyManager_var> +# pragma instantiate TAO_Object_Manager<CORBA::PolicyManager, CORBA::PolicyManager_var, CORBA::tao_PolicyManager_life> # pragma instantiate TAO::Any_Impl_T<CORBA::PolicyManager> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -2570,10 +2585,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<CORBA::PolicyCurrent,CORBA::PolicyCurrent_var>; + template class TAO_Object_Manager<CORBA::PolicyCurrent,CORBA::PolicyCurrent_var, CORBA::tao_PolicyCurrent_life>; template class TAO::Any_Impl_T<CORBA::PolicyCurrent>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<CORBA::PolicyCurrent, CORBA::PolicyCurrent_var> +# pragma instantiate TAO_Object_Manager<CORBA::PolicyCurrent, CORBA::PolicyCurrent_var, CORBA::tao_PolicyCurrent_life> # pragma instantiate TAO::Any_Impl_T<CORBA::PolicyCurrent> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Policy_ForwardC.cpp b/TAO/tao/Policy_ForwardC.cpp index 35b8c3fd867..7d25acf0c14 100644 --- a/TAO/tao/Policy_ForwardC.cpp +++ b/TAO/tao/Policy_ForwardC.cpp @@ -138,7 +138,7 @@ template class >; template class - TAO_Seq_Out_T< + TAO_MngSeq_Out_T< CORBA::PolicyList, CORBA::PolicyList_var, TAO_Object_Manager< @@ -148,6 +148,17 @@ template class > >; +template class TAO_Seq_Var_Base_T<CORBA::PolicyList, + TAO_Object_Manager<CORBA::Policy, + TAO_Objref_Var_T<CORBA::Policy, + CORBA::tao_Policy_life>, + CORBA::tao_Policy_life> >; + +template class TAO_Unbounded_Object_Sequence<CORBA::Policy, + TAO_Objref_Var_T<CORBA::Policy, CORBA::tao_Policy_life>, + CORBA::tao_Policy_life, + CORBA::tao_Policy_cast>; + #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ @@ -160,6 +171,16 @@ template class > \ > +#pragma instantiate TAO_Unbounded_Object_Sequence<CORBA::Policy, + TAO_Objref_Var_T<CORBA::Policy, CORBA::tao_Policy_life>, + CORBA::tao_Policy_life, + CORBA::tao_Policy_cast> + +#pragms instantiate TAO_Seq_Var_Base_T<CORBA::PolicyList, + TAO_Object_Manager<CORBA::Policy, + TAO_Objref_Var_T<CORBA::Policy, + CORBA::tao_Policy_life>, + CORBA::tao_Policy_life> > # pragma instantiate \ TAO_Seq_Out_T< \ CORBA::PolicyList, \ @@ -278,32 +299,38 @@ template class template class TAO_FixedSeq_Var_T< - PolicyTypeSeq, + CORBA::PolicyTypeSeq, CORBA::PolicyType >; template class TAO_Seq_Out_T< - PolicyTypeSeq, - PolicyTypeSeq_var, + CORBA::PolicyTypeSeq, + CORBA::PolicyTypeSeq_var, CORBA::PolicyType >; +template class TAO_Seq_Var_Base_T<CORBA::PolicyTypeSeq, + CORBA::PolicyType>; + #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - # pragma instantiate \ +# pragma instantiate \ TAO_FixedSeq_Var_T< \ PolicyTypeSeq, \ CORBA::PolicyType \ > - # pragma instantiate \ +# pragma instantiate \ TAO_Seq_Out_T< \ PolicyTypeSeq, \ PolicyTypeSeq_var, \ CORBA::PolicyType \ > +#pragms instantiate TAO_Seq_Var_Base_T<CORBA::PolicyTypeSeq, + CORBA::PolicyType> + #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp index e299ce1c9ce..9a4d391b014 100644 --- a/TAO/tao/PortableInterceptorC.cpp +++ b/TAO/tao/PortableInterceptorC.cpp @@ -3665,10 +3665,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<PortableInterceptor::Interceptor,PortableInterceptor::Interceptor_var>; + template class TAO_Object_Manager<PortableInterceptor::Interceptor,PortableInterceptor::Interceptor_var, PortableInterceptor::tao_Interceptor_life>; template class TAO::Any_Impl_T<PortableInterceptor::Interceptor>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<PortableInterceptor::Interceptor, PortableInterceptor::Interceptor_var> +# pragma instantiate TAO_Object_Manager<PortableInterceptor::Interceptor, PortableInterceptor::Interceptor_var, PortableInterceptor::tao_Interceptor_life> # pragma instantiate TAO::Any_Impl_T<PortableInterceptor::Interceptor> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -3849,10 +3849,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<PortableInterceptor::Current,PortableInterceptor::Current_var>; + template class TAO_Object_Manager<PortableInterceptor::Current,PortableInterceptor::Current_var,PortableInterceptor::tao_Current_life>; template class TAO::Any_Impl_T<PortableInterceptor::Current>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<PortableInterceptor::Current, PortableInterceptor::Current_var> +# pragma instantiate TAO_Object_Manager<PortableInterceptor::Current, PortableInterceptor::Current_var, PortableInterceptor::tao_Current_life> # pragma instantiate TAO::Any_Impl_T<PortableInterceptor::Current> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -3903,10 +3903,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<PortableInterceptor::RequestInfo,PortableInterceptor::RequestInfo_var>; + template class TAO_Object_Manager<PortableInterceptor::RequestInfo,PortableInterceptor::RequestInfo_var,PortableInterceptor::tao_RequestInfo_life>; template class TAO::Any_Impl_T<PortableInterceptor::RequestInfo>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<PortableInterceptor::RequestInfo, PortableInterceptor::RequestInfo_var> +# pragma instantiate TAO_Object_Manager<PortableInterceptor::RequestInfo, PortableInterceptor::RequestInfo_var,PortableInterceptor::tao_RequestInfo_life> # pragma instantiate TAO::Any_Impl_T<PortableInterceptor::RequestInfo> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -3957,10 +3957,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<PortableInterceptor::ClientRequestInfo,PortableInterceptor::ClientRequestInfo_var>; + template class TAO_Object_Manager<PortableInterceptor::ClientRequestInfo,PortableInterceptor::ClientRequestInfo_var, PortableInterceptor::tao_ClientRequestInfo_life>; template class TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<PortableInterceptor::ClientRequestInfo, PortableInterceptor::ClientRequestInfo_var> +# pragma instantiate TAO_Object_Manager<PortableInterceptor::ClientRequestInfo, PortableInterceptor::ClientRequestInfo_var,PortableInterceptor::tao_ClientRequestInfo_life> # pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -4011,10 +4011,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<PortableInterceptor::ServerRequestInfo,PortableInterceptor::ServerRequestInfo_var>; + template class TAO_Object_Manager<PortableInterceptor::ServerRequestInfo,PortableInterceptor::ServerRequestInfo_var,PortableInterceptor::tao_ServerRequestInfo_life>; template class TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<PortableInterceptor::ServerRequestInfo, PortableInterceptor::ServerRequestInfo_var> +# pragma instantiate TAO_Object_Manager<PortableInterceptor::ServerRequestInfo, PortableInterceptor::ServerRequestInfo_var,PortableInterceptor::tao_ServerRequestInfo_life> # pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -4065,10 +4065,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<PortableInterceptor::ClientRequestInterceptor,PortableInterceptor::ClientRequestInterceptor_var>; + template class TAO_Object_Manager<PortableInterceptor::ClientRequestInterceptor,PortableInterceptor::ClientRequestInterceptor_var,PortableInterceptor::tao_ClientRequestInterceptor_life>; template class TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<PortableInterceptor::ClientRequestInterceptor, PortableInterceptor::ClientRequestInterceptor_var> +# pragma instantiate TAO_Object_Manager<PortableInterceptor::ClientRequestInterceptor, PortableInterceptor::ClientRequestInterceptor_var, PortableInterceptor::tao_ClientRequestInterceptor_life> # pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -4119,10 +4119,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<PortableInterceptor::ServerRequestInterceptor,PortableInterceptor::ServerRequestInterceptor_var>; + template class TAO_Object_Manager<PortableInterceptor::ServerRequestInterceptor,PortableInterceptor::ServerRequestInterceptor_var,PortableInterceptor::tao_ServerRequestInterceptor_life>; template class TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<PortableInterceptor::ServerRequestInterceptor, PortableInterceptor::ServerRequestInterceptor_var> +# pragma instantiate TAO_Object_Manager<PortableInterceptor::ServerRequestInterceptor, PortableInterceptor::ServerRequestInterceptor_var, PortableInterceptor::tao_ServerRequestInterceptor_life> # pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -4173,10 +4173,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<PortableInterceptor::IORInfo,PortableInterceptor::IORInfo_var>; + template class TAO_Object_Manager<PortableInterceptor::IORInfo,PortableInterceptor::IORInfo_var,PortableInterceptor::tao_IORInfo_life>; template class TAO::Any_Impl_T<PortableInterceptor::IORInfo>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<PortableInterceptor::IORInfo, PortableInterceptor::IORInfo_var> +# pragma instantiate TAO_Object_Manager<PortableInterceptor::IORInfo, PortableInterceptor::IORInfo_var,PortableInterceptor::tao_IORInfo_life> # pragma instantiate TAO::Any_Impl_T<PortableInterceptor::IORInfo> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -4227,10 +4227,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<PortableInterceptor::IORInterceptor,PortableInterceptor::IORInterceptor_var>; + template class TAO_Object_Manager<PortableInterceptor::IORInterceptor,PortableInterceptor::IORInterceptor_var,PortableInterceptor::tao_IORInterceptor_life>; template class TAO::Any_Impl_T<PortableInterceptor::IORInterceptor>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<PortableInterceptor::IORInterceptor, PortableInterceptor::IORInterceptor_var> +# pragma instantiate TAO_Object_Manager<PortableInterceptor::IORInterceptor, PortableInterceptor::IORInterceptor_var,PortableInterceptor::tao_IORInterceptor_life> # pragma instantiate TAO::Any_Impl_T<PortableInterceptor::IORInterceptor> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -4281,10 +4281,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<PortableInterceptor::PolicyFactory,PortableInterceptor::PolicyFactory_var>; + template class TAO_Object_Manager<PortableInterceptor::PolicyFactory,PortableInterceptor::PolicyFactory_var,PortableInterceptor::tao_PolicyFactory_life>; template class TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<PortableInterceptor::PolicyFactory, PortableInterceptor::PolicyFactory_var> +# pragma instantiate TAO_Object_Manager<PortableInterceptor::PolicyFactory, PortableInterceptor::PolicyFactory_var,PortableInterceptor::tao_PolicyFactory_life> # pragma instantiate TAO::Any_Impl_T<PortableInterceptor::PolicyFactory> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -4335,10 +4335,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<PortableInterceptor::ORBInitInfo,PortableInterceptor::ORBInitInfo_var>; + template class TAO_Object_Manager<PortableInterceptor::ORBInitInfo,PortableInterceptor::ORBInitInfo_var,PortableInterceptor::tao_ORBInitInfo_life>; template class TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<PortableInterceptor::ORBInitInfo, PortableInterceptor::ORBInitInfo_var> +# pragma instantiate TAO_Object_Manager<PortableInterceptor::ORBInitInfo, PortableInterceptor::ORBInitInfo_var,PortableInterceptor::tao_ORBInitInfo_life> # pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -4389,9 +4389,9 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<PortableInterceptor::ORBInitializer,PortableInterceptor::ORBInitializer_var>; + template class TAO_Object_Manager<PortableInterceptor::ORBInitializer,PortableInterceptor::ORBInitializer_var,PortableInterceptor::tao_ORBInitializer_life>; template class TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<PortableInterceptor::ORBInitializer, PortableInterceptor::ORBInitializer_var> +# pragma instantiate TAO_Object_Manager<PortableInterceptor::ORBInitializer, PortableInterceptor::ORBInitializer_var,PortableInterceptor::tao_ORBInitializer_life> # pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ORBInitializer> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/Default_ORTC.cpp b/TAO/tao/PortableServer/Default_ORTC.cpp index b4d635d182b..56a3107327f 100644 --- a/TAO/tao/PortableServer/Default_ORTC.cpp +++ b/TAO/tao/PortableServer/Default_ORTC.cpp @@ -307,10 +307,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Valuetype_Manager<TAO_Default_ORT::ObjectReferenceTemplate, TAO_Default_ORT::ObjectReferenceTemplate_var>; - template class TAO::Any_Impl_T<TAO_Default_ORT::ObjectReferenceTemplate>; +template class TAO_Valuetype_Manager<TAO_Default_ORT::ObjectReferenceTemplate, TAO_Default_ORT::ObjectReferenceTemplate_var,TAO_Default_ORT::tao_ObjectReferenceTemplate_life>; +template class TAO::Any_Impl_T<TAO_Default_ORT::ObjectReferenceTemplate>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Valuetype_Manager<TAO_Default_ORT::ObjectReferenceTemplate, TAO_Default_ORT::ObjectReferenceTemplate_var> +# pragma instantiate TAO_Valuetype_Manager<TAO_Default_ORT::ObjectReferenceTemplate, TAO_Default_ORT::ObjectReferenceTemplate_var,TAO_Default_ORT::tao_ObjectReferenceTemplate_life> # pragma instantiate TAO::Any_Impl_T<TAO_Default_ORT::ObjectReferenceTemplate> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/ImR_LocatorC.cpp b/TAO/tao/PortableServer/ImR_LocatorC.cpp index 583864cbd8f..2d47acbe8f1 100644 --- a/TAO/tao/PortableServer/ImR_LocatorC.cpp +++ b/TAO/tao/PortableServer/ImR_LocatorC.cpp @@ -152,7 +152,7 @@ ImplementationRepository::Locator_var::operator const ::ImplementationRepository return this->ptr_; } -ImplementationRepository::Locator_var::operator ::ImplementationRepository::Locator_ptr &() // cast +ImplementationRepository::Locator_var::operator ::ImplementationRepository::Locator_ptr &() // cast { return this->ptr_; } @@ -309,10 +309,10 @@ public: 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)); @@ -322,16 +322,16 @@ public: const char * server_; const char * location_; }; - + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378 - + TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_location::TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_location ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * server, const char * location - ACE_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), server_ (server), @@ -346,19 +346,19 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_locati 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; (*parameter_list)[len].argument <<= server_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + (*parameter_list)[len].argument <<= location_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -370,15 +370,15 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_locati Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ExceptionList_var safe_exception_list = exception_list; - - static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_activate_server_in_location_exceptiondata[] = + + static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_activate_server_in_location_exceptiondata[] = { ImplementationRepository::_tc_NotFound, ImplementationRepository::_tc_CannotActivate }; - + exception_list->length (2); for (CORBA::ULong i = 0; i < 2; ++i) { @@ -390,7 +390,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_locati return safe_exception_list._retn (); } -CORBA::Any * +CORBA::Any * TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_location::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -399,7 +399,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_locati CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return result_any; } @@ -420,10 +420,10 @@ public: 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)); @@ -433,16 +433,16 @@ public: const char * server_; const char * location_; }; - + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378 - + TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location::TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * server, const char * location - ACE_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), server_ (server), @@ -457,19 +457,19 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location 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; (*parameter_list)[len].argument <<= server_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + (*parameter_list)[len].argument <<= location_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -481,14 +481,14 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ExceptionList_var safe_exception_list = exception_list; - - static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_remove_server_in_location_exceptiondata[] = + + static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_remove_server_in_location_exceptiondata[] = { ImplementationRepository::_tc_NotFound }; - + exception_list->length (1); for (CORBA::ULong i = 0; i < 1; ++i) { @@ -500,7 +500,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location return safe_exception_list._retn (); } -CORBA::Any * +CORBA::Any * TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -509,7 +509,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return result_any; } @@ -530,10 +530,10 @@ public: 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)); @@ -543,16 +543,16 @@ public: const char * server_; const char * location_; }; - + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378 - + TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location::TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * server, const char * location - ACE_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), server_ (server), @@ -567,19 +567,19 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_locati 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; (*parameter_list)[len].argument <<= server_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + (*parameter_list)[len].argument <<= location_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -591,14 +591,14 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_locati Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ExceptionList_var safe_exception_list = exception_list; - - static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_shutdown_server_in_location_exceptiondata[] = + + static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_shutdown_server_in_location_exceptiondata[] = { ImplementationRepository::_tc_NotFound }; - + exception_list->length (1); for (CORBA::ULong i = 0; i < 1; ++i) { @@ -610,7 +610,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_locati return safe_exception_list._retn (); } -CORBA::Any * +CORBA::Any * TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -619,7 +619,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_locati CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return result_any; } @@ -640,10 +640,10 @@ public: 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)); @@ -653,16 +653,16 @@ public: const char * server_; const char * location_; }; - + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378 - + TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location::TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * server, const char * location - ACE_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), server_ (server), @@ -677,19 +677,19 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_i 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; (*parameter_list)[len].argument <<= server_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + (*parameter_list)[len].argument <<= location_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -701,14 +701,14 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_i Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ExceptionList_var safe_exception_list = exception_list; - - static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_server_is_shutting_down_in_location_exceptiondata[] = + + static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_server_is_shutting_down_in_location_exceptiondata[] = { ImplementationRepository::_tc_NotFound }; - + exception_list->length (1); for (CORBA::ULong i = 0; i < 1; ++i) { @@ -720,7 +720,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_i return safe_exception_list._retn (); } -CORBA::Any * +CORBA::Any * TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -729,7 +729,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_i CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return result_any; } @@ -750,33 +750,33 @@ public: virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); void result (::CORBA::ULong result); - + private: TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator (const TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator &); void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator &); const char * location_; CORBA::Object_ptr object_ref_; - + ::CORBA::ULong _result; }; - + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378 - + TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator::TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * location, CORBA::Object_ptr object_ref - ACE_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), location_ (location), @@ -791,19 +791,19 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator::argum 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; (*parameter_list)[len].argument <<= location_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + (*parameter_list)[len].argument <<= object_ref_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -815,14 +815,14 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator::excep Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ExceptionList_var safe_exception_list = exception_list; - - static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_register_activator_exceptiondata[] = + + static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_register_activator_exceptiondata[] = { ImplementationRepository::_tc_AlreadyRegistered }; - + exception_list->length (1); for (CORBA::ULong i = 0; i < 1; ++i) { @@ -834,7 +834,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator::excep return safe_exception_list._retn (); } -CORBA::Any * +CORBA::Any * TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -843,17 +843,17 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator::resul CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; return safe_result_any._retn (); } -void +void TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator::result (CORBA::ULong result) { - // Update the result. + // Update the result. this->_result = result; } @@ -872,33 +872,33 @@ public: virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); void result (::CORBA::ULong result); - + private: TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator (const TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator &); void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator &); const char * location_; CORBA::Object_ptr object_ref_; - + ::CORBA::ULong _result; }; - + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_cs.cpp:378 - + TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator::TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, const char * location, CORBA::Object_ptr object_ref - ACE_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), location_ (location), @@ -913,19 +913,19 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator::arg 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; (*parameter_list)[len].argument <<= location_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + (*parameter_list)[len].argument <<= object_ref_; (*parameter_list)[len].mode = CORBA::PARAM_IN; len++; - + return safe_parameter_list._retn (); } @@ -937,14 +937,14 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator::exc Dynamic::ExceptionList *exception_list = TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + Dynamic::ExceptionList_var safe_exception_list = exception_list; - - static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_unregister_activator_exceptiondata[] = + + static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_unregister_activator_exceptiondata[] = { ImplementationRepository::_tc_NotFound }; - + exception_list->length (1); for (CORBA::ULong i = 0; i < 1; ++i) { @@ -956,7 +956,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator::exc return safe_exception_list._retn (); } -CORBA::Any * +CORBA::Any * TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator::result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -965,17 +965,17 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator::res CORBA::Any *result_any = TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + CORBA::Any_var safe_result_any = result_any; - + (*result_any) <<= this->_result; return safe_result_any._retn (); } -void +void TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator::result (CORBA::ULong result) { - // Update the result. + // Update the result. this->_result = result; } @@ -985,7 +985,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator::res // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/remote_proxy_impl_cs.cpp:31 /////////////////////////////////////////////////////////////////////// -// Base & Remote Proxy Implementation. +// Base & Remote Proxy Implementation. // ImplementationRepository::_TAO_Locator_Proxy_Impl::_TAO_Locator_Proxy_Impl (void) @@ -1011,7 +1011,7 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::activate_server_i , ImplementationRepository::CannotActivate )) { - static TAO_Exception_Data _tao_ImplementationRepository_Locator_activate_server_in_location_exceptiondata [] = + static TAO_Exception_Data _tao_ImplementationRepository_Locator_activate_server_in_location_exceptiondata [] = { { "IDL:ImplementationRepository/NotFound:1.0", @@ -1024,12 +1024,12 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::activate_server_i }; TAO_Stub *istub = _collocated_tao_target_->_stubobj (); - + if (istub == 0) { ACE_THROW (CORBA::INTERNAL ()); } - + TAO_GIOP_Twoway_Invocation _tao_call ( istub, "activate_server_in_location", @@ -1037,22 +1037,22 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj (); 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 */ - + for (;;) { _invoke_status = TAO_INVOKE_EXCEPTION; - + #if TAO_HAS_INTERCEPTORS == 1 TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_location _tao_ri ( &_tao_call, @@ -1062,14 +1062,14 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj (); ACE_ENV_ARG_PARAMETER ); 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 ( @@ -1077,15 +1077,15 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj (); ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + if (_invoke_status == TAO_INVOKE_RESTART) { _tao_call.restart_flag (1); continue; } - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; @@ -1096,7 +1096,7 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj (); TAO_INTERCEPTOR_CHECK; TAO_OutputCDR &_tao_out = _tao_call.out_stream (); - + if (!( (_tao_out << server) && (_tao_out << location) @@ -1104,11 +1104,11 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj (); { TAO_INTERCEPTOR_THROW ( CORBA::MARSHAL ( - + ) ); } - + _invoke_status = _tao_call.invoke (_tao_ImplementationRepository_Locator_activate_server_in_location_exceptiondata, 2 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; @@ -1131,11 +1131,11 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj (); ); ACE_TRY_CHECK; ) - + continue; } #if TAO_HAS_INTERCEPTORS == 1 - + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &_tao_ri @@ -1151,55 +1151,55 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj (); ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + 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; - + 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; - + 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) { continue; } - + #endif /* TAO_HAS_INTERCEPTORS */ - + break; } } @@ -1218,7 +1218,7 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::remove_server_in_ , ImplementationRepository::NotFound )) { - static TAO_Exception_Data _tao_ImplementationRepository_Locator_remove_server_in_location_exceptiondata [] = + static TAO_Exception_Data _tao_ImplementationRepository_Locator_remove_server_in_location_exceptiondata [] = { { "IDL:ImplementationRepository/NotFound:1.0", @@ -1227,12 +1227,12 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::remove_server_in_ }; TAO_Stub *istub = _collocated_tao_target_->_stubobj (); - + if (istub == 0) { ACE_THROW (CORBA::INTERNAL ()); } - + TAO_GIOP_Twoway_Invocation _tao_call ( istub, "remove_server_in_location", @@ -1240,22 +1240,22 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj (); 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 */ - + for (;;) { _invoke_status = TAO_INVOKE_EXCEPTION; - + #if TAO_HAS_INTERCEPTORS == 1 TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location _tao_ri ( &_tao_call, @@ -1265,14 +1265,14 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj (); ACE_ENV_ARG_PARAMETER ); 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 ( @@ -1280,15 +1280,15 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj (); ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + if (_invoke_status == TAO_INVOKE_RESTART) { _tao_call.restart_flag (1); continue; } - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; @@ -1299,7 +1299,7 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj (); TAO_INTERCEPTOR_CHECK; TAO_OutputCDR &_tao_out = _tao_call.out_stream (); - + if (!( (_tao_out << server) && (_tao_out << location) @@ -1307,11 +1307,11 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj (); { TAO_INTERCEPTOR_THROW ( CORBA::MARSHAL ( - + ) ); } - + _invoke_status = _tao_call.invoke (_tao_ImplementationRepository_Locator_remove_server_in_location_exceptiondata, 1 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; @@ -1334,11 +1334,11 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj (); ); ACE_TRY_CHECK; ) - + continue; } #if TAO_HAS_INTERCEPTORS == 1 - + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &_tao_ri @@ -1354,55 +1354,55 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj (); ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + 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; - + 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; - + 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) { continue; } - + #endif /* TAO_HAS_INTERCEPTORS */ - + break; } } @@ -1421,7 +1421,7 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::shutdown_server_i , ImplementationRepository::NotFound )) { - static TAO_Exception_Data _tao_ImplementationRepository_Locator_shutdown_server_in_location_exceptiondata [] = + static TAO_Exception_Data _tao_ImplementationRepository_Locator_shutdown_server_in_location_exceptiondata [] = { { "IDL:ImplementationRepository/NotFound:1.0", @@ -1430,12 +1430,12 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::shutdown_server_i }; TAO_Stub *istub = _collocated_tao_target_->_stubobj (); - + if (istub == 0) { ACE_THROW (CORBA::INTERNAL ()); } - + TAO_GIOP_Twoway_Invocation _tao_call ( istub, "shutdown_server_in_location", @@ -1443,22 +1443,22 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj (); 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 */ - + for (;;) { _invoke_status = TAO_INVOKE_EXCEPTION; - + #if TAO_HAS_INTERCEPTORS == 1 TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location _tao_ri ( &_tao_call, @@ -1468,14 +1468,14 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj (); ACE_ENV_ARG_PARAMETER ); 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 ( @@ -1483,15 +1483,15 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj (); ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + if (_invoke_status == TAO_INVOKE_RESTART) { _tao_call.restart_flag (1); continue; } - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; @@ -1502,7 +1502,7 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj (); TAO_INTERCEPTOR_CHECK; TAO_OutputCDR &_tao_out = _tao_call.out_stream (); - + if (!( (_tao_out << server) && (_tao_out << location) @@ -1510,11 +1510,11 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj (); { TAO_INTERCEPTOR_THROW ( CORBA::MARSHAL ( - + ) ); } - + _invoke_status = _tao_call.invoke (_tao_ImplementationRepository_Locator_shutdown_server_in_location_exceptiondata, 1 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; @@ -1537,11 +1537,11 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj (); ); ACE_TRY_CHECK; ) - + continue; } #if TAO_HAS_INTERCEPTORS == 1 - + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &_tao_ri @@ -1557,55 +1557,55 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj (); ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + 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; - + 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; - + 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) { continue; } - + #endif /* TAO_HAS_INTERCEPTORS */ - + break; } } @@ -1624,7 +1624,7 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::server_is_shuttin , ImplementationRepository::NotFound )) { - static TAO_Exception_Data _tao_ImplementationRepository_Locator_server_is_shutting_down_in_location_exceptiondata [] = + static TAO_Exception_Data _tao_ImplementationRepository_Locator_server_is_shutting_down_in_location_exceptiondata [] = { { "IDL:ImplementationRepository/NotFound:1.0", @@ -1633,12 +1633,12 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::server_is_shuttin }; TAO_Stub *istub = _collocated_tao_target_->_stubobj (); - + if (istub == 0) { ACE_THROW (CORBA::INTERNAL ()); } - + TAO_GIOP_Twoway_Invocation _tao_call ( istub, "server_is_shutting_down_in_location", @@ -1646,22 +1646,22 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj (); 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 */ - + for (;;) { _invoke_status = TAO_INVOKE_EXCEPTION; - + #if TAO_HAS_INTERCEPTORS == 1 TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location _tao_ri ( &_tao_call, @@ -1671,14 +1671,14 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj (); ACE_ENV_ARG_PARAMETER ); 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 ( @@ -1686,15 +1686,15 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj (); ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + if (_invoke_status == TAO_INVOKE_RESTART) { _tao_call.restart_flag (1); continue; } - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; @@ -1705,7 +1705,7 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj (); TAO_INTERCEPTOR_CHECK; TAO_OutputCDR &_tao_out = _tao_call.out_stream (); - + if (!( (_tao_out << server) && (_tao_out << location) @@ -1713,11 +1713,11 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj (); { TAO_INTERCEPTOR_THROW ( CORBA::MARSHAL ( - + ) ); } - + _invoke_status = _tao_call.invoke (_tao_ImplementationRepository_Locator_server_is_shutting_down_in_location_exceptiondata, 1 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK; @@ -1740,11 +1740,11 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj (); ); ACE_TRY_CHECK; ) - + continue; } #if TAO_HAS_INTERCEPTORS == 1 - + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &_tao_ri @@ -1760,55 +1760,55 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj (); ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + 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; - + 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; - + 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) { continue; } - + #endif /* TAO_HAS_INTERCEPTORS */ - + break; } } @@ -1827,7 +1827,7 @@ CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::register_ , ImplementationRepository::AlreadyRegistered )) { - static TAO_Exception_Data _tao_ImplementationRepository_Locator_register_activator_exceptiondata [] = + static TAO_Exception_Data _tao_ImplementationRepository_Locator_register_activator_exceptiondata [] = { { "IDL:ImplementationRepository/AlreadyRegistered:1.0", @@ -1837,12 +1837,12 @@ CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::register_ CORBA::ULong _tao_retval = 0; TAO_Stub *istub = _collocated_tao_target_->_stubobj (); - + if (istub == 0) { ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval); } - + TAO_GIOP_Twoway_Invocation _tao_call ( istub, "register_activator", @@ -1850,22 +1850,22 @@ CORBA::ULong _tao_retval = 0; 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 */ - + for (;;) { _invoke_status = TAO_INVOKE_EXCEPTION; - + #if TAO_HAS_INTERCEPTORS == 1 TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator _tao_ri ( &_tao_call, @@ -1875,14 +1875,14 @@ CORBA::ULong _tao_retval = 0; ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); - + #endif /* TAO_HAS_INTERCEPTORS */ - + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; TAO_INTERCEPTOR (_tao_ri.response_expected (1)); - + #if TAO_HAS_INTERCEPTORS == 1 - + ACE_TRY { _tao_vfr.send_request ( @@ -1890,15 +1890,15 @@ CORBA::ULong _tao_retval = 0; ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + if (_invoke_status == TAO_INVOKE_RESTART) { _tao_call.restart_flag (1); continue; } - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); @@ -1909,7 +1909,7 @@ CORBA::ULong _tao_retval = 0; TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); TAO_OutputCDR &_tao_out = _tao_call.out_stream (); - + if (!( (_tao_out << location) && (_tao_out << object_ref) @@ -1917,12 +1917,12 @@ CORBA::ULong _tao_retval = 0; { TAO_INTERCEPTOR_THROW_RETURN ( CORBA::MARSHAL ( - + ), _tao_retval ); } - + _invoke_status = _tao_call.invoke (_tao_ImplementationRepository_Locator_register_activator_exceptiondata, 1 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); @@ -1946,12 +1946,12 @@ CORBA::ULong _tao_retval = 0; ); ACE_TRY_CHECK; ) - + continue; } - + TAO_InputCDR &_tao_in = _tao_call.inp_stream (); - + if (!( (_tao_in >> _tao_retval) )) @@ -1963,12 +1963,12 @@ CORBA::ULong _tao_retval = 0; _tao_retval ); } - + #if TAO_HAS_INTERCEPTORS == 1 CORBA::ULong _tao_retval_info = _tao_retval; _tao_ri.result (_tao_retval_info); - + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &_tao_ri @@ -1984,58 +1984,58 @@ CORBA::ULong _tao_retval = 0; ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + 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; - + 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); - + PortableInterceptor::ReplyStatus _tao_status = _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval); - + if (_tao_status == PortableInterceptor::LOCATION_FORWARD || _tao_status == PortableInterceptor::TRANSPORT_RETRY) { continue; } - + #endif /* TAO_HAS_INTERCEPTORS */ - + break; } - + return _tao_retval; } @@ -2053,7 +2053,7 @@ CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::unregiste , ImplementationRepository::NotFound )) { - static TAO_Exception_Data _tao_ImplementationRepository_Locator_unregister_activator_exceptiondata [] = + static TAO_Exception_Data _tao_ImplementationRepository_Locator_unregister_activator_exceptiondata [] = { { "IDL:ImplementationRepository/NotFound:1.0", @@ -2063,12 +2063,12 @@ CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::unregiste CORBA::ULong _tao_retval = 0; TAO_Stub *istub = _collocated_tao_target_->_stubobj (); - + if (istub == 0) { ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval); } - + TAO_GIOP_Twoway_Invocation _tao_call ( istub, "unregister_activator", @@ -2076,22 +2076,22 @@ CORBA::ULong _tao_retval = 0; 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 */ - + for (;;) { _invoke_status = TAO_INVOKE_EXCEPTION; - + #if TAO_HAS_INTERCEPTORS == 1 TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator _tao_ri ( &_tao_call, @@ -2101,14 +2101,14 @@ CORBA::ULong _tao_retval = 0; ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (_tao_retval); - + #endif /* TAO_HAS_INTERCEPTORS */ - + CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG; TAO_INTERCEPTOR (_tao_ri.response_expected (1)); - + #if TAO_HAS_INTERCEPTORS == 1 - + ACE_TRY { _tao_vfr.send_request ( @@ -2116,15 +2116,15 @@ CORBA::ULong _tao_retval = 0; ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + if (_invoke_status == TAO_INVOKE_RESTART) { _tao_call.restart_flag (1); continue; } - + #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); @@ -2135,7 +2135,7 @@ CORBA::ULong _tao_retval = 0; TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); TAO_OutputCDR &_tao_out = _tao_call.out_stream (); - + if (!( (_tao_out << location) && (_tao_out << object_ref) @@ -2143,12 +2143,12 @@ CORBA::ULong _tao_retval = 0; { TAO_INTERCEPTOR_THROW_RETURN ( CORBA::MARSHAL ( - + ), _tao_retval ); } - + _invoke_status = _tao_call.invoke (_tao_ImplementationRepository_Locator_unregister_activator_exceptiondata, 1 ACE_ENV_ARG_PARAMETER); TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); @@ -2172,12 +2172,12 @@ CORBA::ULong _tao_retval = 0; ); ACE_TRY_CHECK; ) - + continue; } - + TAO_InputCDR &_tao_in = _tao_call.inp_stream (); - + if (!( (_tao_in >> _tao_retval) )) @@ -2189,12 +2189,12 @@ CORBA::ULong _tao_retval = 0; _tao_retval ); } - + #if TAO_HAS_INTERCEPTORS == 1 CORBA::ULong _tao_retval_info = _tao_retval; _tao_ri.result (_tao_retval_info); - + _tao_ri.reply_status (_invoke_status); _tao_vfr.receive_reply ( &_tao_ri @@ -2210,63 +2210,63 @@ CORBA::ULong _tao_retval = 0; ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + 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; - + 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); - + PortableInterceptor::ReplyStatus _tao_status = _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (_tao_retval); - + if (_tao_status == PortableInterceptor::LOCATION_FORWARD || _tao_status == PortableInterceptor::TRANSPORT_RETRY) { continue; } - + #endif /* TAO_HAS_INTERCEPTORS */ - + break; } - + return _tao_retval; } // -// End Base & Remote Proxy Implemeentation. +// End Base & Remote Proxy Implemeentation. /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from @@ -2317,7 +2317,7 @@ ImplementationRepository::_TAO_Locator_Remote_Proxy_Broker::select_proxy ( // End Remote & Base Proxy Broker Implementation /////////////////////////////////////////////////////////////////////// -// TAO_IDL - Generated from +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:235 ImplementationRepository::Locator::Locator (int collocated) @@ -2334,14 +2334,14 @@ ImplementationRepository::Locator::ImplementationRepository_Locator_setup_colloc else this->the_TAO_Locator_Proxy_Broker_ = ::ImplementationRepository::_TAO_Locator_Remote_Proxy_Broker::the_TAO_Locator_Remote_Proxy_Broker (); - + this->ImplementationRepository_Administration_setup_collocation (collocated); } ImplementationRepository::Locator::~Locator (void) {} -void +void ImplementationRepository::Locator::_tao_any_destructor (void *_tao_void_pointer) { Locator *tmp = ACE_static_cast (Locator *, _tao_void_pointer); @@ -2358,7 +2358,7 @@ ImplementationRepository::Locator::_narrow ( { return Locator::_nil (); } - + if (! obj->_is_local ()) { CORBA::Boolean is_a = @@ -2367,17 +2367,17 @@ ImplementationRepository::Locator::_narrow ( ACE_ENV_ARG_PARAMETER ); ACE_CHECK_RETURN (Locator::_nil ()); - + if (is_a == 0) { return Locator::_nil (); } } - + return Locator::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } -ImplementationRepository::Locator_ptr +ImplementationRepository::Locator_ptr ImplementationRepository::Locator::_unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED @@ -2387,18 +2387,18 @@ ImplementationRepository::Locator::_unchecked_narrow ( { return Locator::_nil (); } - + if (! obj->_is_local ()) { TAO_Stub* stub = obj->_stubobj (); - + if (stub != 0) { stub->_incr_refcnt (); } - + Locator_ptr default_proxy = Locator::_nil (); - + if ( !CORBA::is_nil (stub->servant_orb_var ().ptr ()) && stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () && @@ -2416,7 +2416,7 @@ ImplementationRepository::Locator::_unchecked_narrow ( Locator::_nil () ); } - + if (CORBA::is_nil (default_proxy)) { ACE_NEW_RETURN ( @@ -2429,10 +2429,10 @@ ImplementationRepository::Locator::_unchecked_narrow ( Locator::_nil () ); } - + return default_proxy; } - else + else return ACE_reinterpret_cast ( Locator_ptr, @@ -2452,7 +2452,7 @@ ImplementationRepository::Locator::_duplicate (Locator_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -2491,7 +2491,7 @@ ImplementationRepository::Locator::_is_a ( void *ImplementationRepository::Locator::_tao_QueryInterface (ptr_arith_t type) { void *retv = 0; - + if (type == ACE_reinterpret_cast ( ptr_arith_t, &ACE_NESTED_CLASS (::ImplementationRepository, Locator)::_tao_class_id) @@ -2524,12 +2524,12 @@ void *ImplementationRepository::Locator::_tao_QueryInterface (ptr_arith_t type) ACE_static_cast (CORBA::Object_ptr, this) ); } - + if (retv != 0) { this->_add_ref (); } - + return retv; } @@ -2552,10 +2552,10 @@ void ImplementationRepository::Locator::activate_server_in_location ( , ImplementationRepository::CannotActivate )) { - _TAO_Locator_Proxy_Impl &proxy = + _TAO_Locator_Proxy_Impl &proxy = this->the_TAO_Locator_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - + proxy.activate_server_in_location ( this, server, @@ -2577,10 +2577,10 @@ void ImplementationRepository::Locator::remove_server_in_location ( , ImplementationRepository::NotFound )) { - _TAO_Locator_Proxy_Impl &proxy = + _TAO_Locator_Proxy_Impl &proxy = this->the_TAO_Locator_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - + proxy.remove_server_in_location ( this, server, @@ -2602,10 +2602,10 @@ void ImplementationRepository::Locator::shutdown_server_in_location ( , ImplementationRepository::NotFound )) { - _TAO_Locator_Proxy_Impl &proxy = + _TAO_Locator_Proxy_Impl &proxy = this->the_TAO_Locator_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - + proxy.shutdown_server_in_location ( this, server, @@ -2627,10 +2627,10 @@ void ImplementationRepository::Locator::server_is_shutting_down_in_location ( , ImplementationRepository::NotFound )) { - _TAO_Locator_Proxy_Impl &proxy = + _TAO_Locator_Proxy_Impl &proxy = this->the_TAO_Locator_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - + proxy.server_is_shutting_down_in_location ( this, server, @@ -2652,10 +2652,10 @@ CORBA::ULong ImplementationRepository::Locator::register_activator ( , ImplementationRepository::AlreadyRegistered )) { - _TAO_Locator_Proxy_Impl &proxy = + _TAO_Locator_Proxy_Impl &proxy = this->the_TAO_Locator_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return proxy.register_activator ( this, location, @@ -2677,10 +2677,10 @@ CORBA::ULong ImplementationRepository::Locator::unregister_activator ( , ImplementationRepository::NotFound )) { - _TAO_Locator_Proxy_Impl &proxy = + _TAO_Locator_Proxy_Impl &proxy = this->the_TAO_Locator_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + return proxy.unregister_activator ( this, location, @@ -2696,19 +2696,19 @@ static const CORBA::Long _oc_ImplementationRepository_Locator[] = { TAO_ENCAP_BYTE_ORDER, // byte order 41, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x496d706c), - ACE_NTOHL (0x656d656e), - ACE_NTOHL (0x74617469), - ACE_NTOHL (0x6f6e5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f4c6f63), - ACE_NTOHL (0x61746f72), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x496d706c), + ACE_NTOHL (0x656d656e), + ACE_NTOHL (0x74617469), + ACE_NTOHL (0x6f6e5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x2f4c6f63), + ACE_NTOHL (0x61746f72), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:ImplementationRepository/Locator:1.0 8, - ACE_NTOHL (0x4c6f6361), + ACE_NTOHL (0x4c6f6361), ACE_NTOHL (0x746f7200), // name = Locator }; @@ -2776,10 +2776,8 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<ImplementationRepository::Locator,ImplementationRepository::Locator_var>; - template class TAO::Any_Impl_T<ImplementationRepository::Locator>; +template class TAO::Any_Impl_T<ImplementationRepository::Locator>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<ImplementationRepository::Locator, ImplementationRepository::Locator_var> # pragma instantiate TAO::Any_Impl_T<ImplementationRepository::Locator> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -2803,12 +2801,12 @@ CORBA::Boolean operator>> ( ACE_TRY_NEW_ENV { CORBA::Object_var obj; - + if ((strm >> obj.inout ()) == 0) { return 0; } - + // Narrow to the right type. _tao_objref = ImplementationRepository::Locator::_unchecked_narrow ( diff --git a/TAO/tao/PortableServer/ImplRepoC.cpp b/TAO/tao/PortableServer/ImplRepoC.cpp index a8717b51b68..fc9e9e08143 100644 --- a/TAO/tao/PortableServer/ImplRepoC.cpp +++ b/TAO/tao/PortableServer/ImplRepoC.cpp @@ -1546,26 +1546,26 @@ void ImplementationRepository::EnvironmentVariable::_tao_any_destructor (void *_ template class TAO_Var_Var_T< - EnvironmentVariable + ImplementationRepository::EnvironmentVariable >; template class TAO_Out_T< - EnvironmentVariable, - EnvironmentVariable_var + ImplementationRepository::EnvironmentVariable, + ImplementationRepository::EnvironmentVariable_var >; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ TAO_Var_Var_T< \ - EnvironmentVariable \ + ImplementationRepository::EnvironmentVariable \ > # pragma instantiate \ TAO_Out_T< \ - EnvironmentVariable, \ - EnvironmentVariable_var \ + ImplementationRepository::EnvironmentVariable, \ + ImplementationRepository::EnvironmentVariable_var \ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -1657,14 +1657,14 @@ void ImplementationRepository::EnvironmentList::_tao_any_destructor (void *_tao_ template class TAO_VarSeq_Var_T< - EnvironmentList, + ImplementationRepository::EnvironmentList, ImplementationRepository::EnvironmentVariable >; template class TAO_Seq_Out_T< - EnvironmentList, - EnvironmentList_var, + ImplementationRepository::EnvironmentList, + ImplementationRepository::EnvironmentList_var, ImplementationRepository::EnvironmentVariable >; @@ -2018,13 +2018,13 @@ void ImplementationRepository::StartupOptions::_tao_any_destructor (void *_tao_v template class TAO_Var_Var_T< - StartupOptions + ImplementationRepository::StartupOptions >; template class TAO_Out_T< - StartupOptions, - StartupOptions_var + ImplementationRepository::StartupOptions, + ImplementationRepository::StartupOptions_var >; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) @@ -2297,26 +2297,26 @@ void ImplementationRepository::ServerInformation::_tao_any_destructor (void *_ta template class TAO_Var_Var_T< - ServerInformation + ImplementationRepository::ServerInformation >; template class TAO_Out_T< - ServerInformation, - ServerInformation_var + ImplementationRepository::ServerInformation, + ImplementationRepository::ServerInformation_var >; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ TAO_Var_Var_T< \ - ServerInformation \ + ImplementationRepository::ServerInformation \ > # pragma instantiate \ TAO_Out_T< \ - ServerInformation, \ - ServerInformation_var \ + ImplementationRepository::ServerInformation, \ + ImplementationRepository::ServerInformation_var \ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -2366,14 +2366,14 @@ void ImplementationRepository::ServerInformationList::_tao_any_destructor (void template class TAO_VarSeq_Var_T< - ServerInformationList, + ImplementationRepository::ServerInformationList, ImplementationRepository::ServerInformation >; template class TAO_Seq_Out_T< - ServerInformationList, - ServerInformationList_var, + ImplementationRepository::ServerInformationList, + ImplementationRepository::ServerInformationList_var, ImplementationRepository::ServerInformation >; @@ -7589,10 +7589,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<ImplementationRepository::ServerObject,ImplementationRepository::ServerObject_var>; + template class TAO_Object_Manager<ImplementationRepository::ServerObject,ImplementationRepository::ServerObject_var, ImplementationRepository::tao_ServerObject_life>; template class TAO::Any_Impl_T<ImplementationRepository::ServerObject>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<ImplementationRepository::ServerObject, ImplementationRepository::ServerObject_var> +# pragma instantiate TAO_Object_Manager<ImplementationRepository::ServerObject, ImplementationRepository::ServerObject_var,ImplementationRepository::tao_ServerObject_life> # pragma instantiate TAO::Any_Impl_T<ImplementationRepository::ServerObject> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -8198,10 +8198,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<ImplementationRepository::Administration,ImplementationRepository::Administration_var>; + template class TAO_Object_Manager<ImplementationRepository::Administration,ImplementationRepository::Administration_var,ImplementationRepository::tao_Administration_life>; template class TAO::Any_Impl_T<ImplementationRepository::Administration>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<ImplementationRepository::Administration, ImplementationRepository::Administration_var> +# pragma instantiate TAO_Object_Manager<ImplementationRepository::Administration, ImplementationRepository::Administration_var,ImplementationRepository::tao_Administration_life> # pragma instantiate TAO::Any_Impl_T<ImplementationRepository::Administration> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -8252,10 +8252,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<ImplementationRepository::ServerInformationIterator,ImplementationRepository::ServerInformationIterator_var>; + template class TAO_Object_Manager<ImplementationRepository::ServerInformationIterator,ImplementationRepository::ServerInformationIterator_var,ImplementationRepository::tao_ServerInformationIterator_life>; template class TAO::Any_Impl_T<ImplementationRepository::ServerInformationIterator>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<ImplementationRepository::ServerInformationIterator, ImplementationRepository::ServerInformationIterator_var> +# pragma instantiate TAO_Object_Manager<ImplementationRepository::ServerInformationIterator, ImplementationRepository::ServerInformationIterator_var,ImplementationRepository::tao_ServerInformationIterator_life> # pragma instantiate TAO::Any_Impl_T<ImplementationRepository::ServerInformationIterator> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp index 3dc56e1922e..b8d8941785a 100644 --- a/TAO/tao/PortableServer/PortableServerC.cpp +++ b/TAO/tao/PortableServer/PortableServerC.cpp @@ -131,7 +131,7 @@ template class >; template class - TAO_Seq_Out_T< + TAO_MngSeq_Out_T< PortableServer::POAList, PortableServer::POAList_var, TAO_Object_Manager< @@ -678,14 +678,14 @@ void PortableServer::IDs::_tao_any_destructor (void *_tao_void_pointer) template class TAO_VarSeq_Var_T< - IDs, + PortableServer::IDs, PortableServer::ObjectId >; template class TAO_Seq_Out_T< - IDs, - IDs_var, + PortableServer::IDs, + PortableServer::IDs_var, PortableServer::ObjectId >; @@ -693,14 +693,14 @@ template class # pragma instantiate \ TAO_VarSeq_Var_T< \ - IDs, \ + PortableServer::IDs, \ PortableServer::ObjectId \ > # pragma instantiate \ TAO_Seq_Out_T< \ - IDs, \ - IDs_var, \ + PortableServer::IDs, \ + PortableServer::IDs_var, \ PortableServer::ObjectId \ > @@ -6526,10 +6526,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<PortableServer::ThreadPolicy,PortableServer::ThreadPolicy_var>; + template class TAO_Object_Manager<PortableServer::ThreadPolicy,PortableServer::ThreadPolicy_var,PortableServer::tao_ThreadPolicy_life>; template class TAO::Any_Impl_T<PortableServer::ThreadPolicy>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<PortableServer::ThreadPolicy, PortableServer::ThreadPolicy_var> +# pragma instantiate TAO_Object_Manager<PortableServer::ThreadPolicy, PortableServer::ThreadPolicy_var,PortableServer::tao_ThreadPolicy_life> # pragma instantiate TAO::Any_Impl_T<PortableServer::ThreadPolicy> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -6617,10 +6617,8 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<PortableServer::LifespanPolicy,PortableServer::LifespanPolicy_var>; template class TAO::Any_Impl_T<PortableServer::LifespanPolicy>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<PortableServer::LifespanPolicy, PortableServer::LifespanPolicy_var> # pragma instantiate TAO::Any_Impl_T<PortableServer::LifespanPolicy> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -6706,11 +6704,11 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<PortableServer::IdUniquenessPolicy,PortableServer::IdUniquenessPolicy_var>; + template class TAO_Object_Manager<PortableServer::IdUniquenessPolicy,PortableServer::IdUniquenessPolicy_var,PortableServer::tao_IdUniquenessPolicy_life>; template class TAO::Any_Impl_T<PortableServer::IdUniquenessPolicy>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<PortableServer::IdUniquenessPolicy, PortableServer::IdUniquenessPolicy_var> -# pragma instantiate TAO::Any_Impl_T<PortableServer::IdUniquenessPolicy> +# pragma instantiate TAO_Object_Manager<PortableServer::IdUniquenessPolicy, PortableServer::IdUniquenessPolicy_var,> +# pragma instantiate TAO::Any_Impl_T<PortableServer::LifespanPolicy> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from @@ -6795,13 +6793,19 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<PortableServer::IdAssignmentPolicy,PortableServer::IdAssignmentPolicy_var>; - template class TAO::Any_Impl_T<PortableServer::IdAssignmentPolicy>; +template class TAO_Object_Manager<PortableServer::IdAssignmentPolicy,PortableServer::IdAssignmentPolicy_var,PortableServer::tao_IdAssignmentPolicy_life>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<PortableServer::IdAssignmentPolicy, PortableServer::IdAssignmentPolicy_var> -# pragma instantiate TAO::Any_Impl_T<PortableServer::IdAssignmentPolicy> +#pragma instantiate TAO_Object_Manager<PortableServer::IdAssignmentPolicy,PortableServer::IdAssignmentPolicy_var,PortableServer::tao_IdAssignmentPolicy_life> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ + defined (ACE_HAS_GNU_REPO) +template class TAO::Any_Impl_T<PortableServer::IdAssignmentPolicy>; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +# pragma instantiate TAO::Any_Impl_T<PortableServer::LifespanPolicy> +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + + #if (TAO_HAS_MINIMUM_POA == 0) // TAO_IDL - Generated from @@ -6886,10 +6890,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<PortableServer::ImplicitActivationPolicy,PortableServer::ImplicitActivationPolicy_var>; + template class TAO_Object_Manager<PortableServer::ImplicitActivationPolicy,PortableServer::ImplicitActivationPolicy_var,PortableServer::tao_ImplicitActivationPolicy_life>; template class TAO::Any_Impl_T<PortableServer::ImplicitActivationPolicy>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<PortableServer::ImplicitActivationPolicy, PortableServer::ImplicitActivationPolicy_var> +# pragma instantiate TAO_Object_Manager<PortableServer::ImplicitActivationPolicy, PortableServer::ImplicitActivationPolicy_var,PortableServer::tao_ImplicitActivationPolicy_life> # pragma instantiate TAO::Any_Impl_T<PortableServer::ImplicitActivationPolicy> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -6975,10 +6979,8 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<PortableServer::ServantRetentionPolicy,PortableServer::ServantRetentionPolicy_var>; template class TAO::Any_Impl_T<PortableServer::ServantRetentionPolicy>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<PortableServer::ServantRetentionPolicy, PortableServer::ServantRetentionPolicy_var> # pragma instantiate TAO::Any_Impl_T<PortableServer::ServantRetentionPolicy> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -7064,10 +7066,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<PortableServer::RequestProcessingPolicy,PortableServer::RequestProcessingPolicy_var>; + template class TAO_Object_Manager<PortableServer::RequestProcessingPolicy,PortableServer::RequestProcessingPolicy_var,PortableServer::tao_RequestProcessingPolicy_life>; template class TAO::Any_Impl_T<PortableServer::RequestProcessingPolicy>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<PortableServer::RequestProcessingPolicy, PortableServer::RequestProcessingPolicy_var> +# pragma instantiate TAO_Object_Manager<PortableServer::RequestProcessingPolicy, PortableServer::RequestProcessingPolicy_var,PortableServer::tao_RequestProcessingPolicy_life> # pragma instantiate TAO::Any_Impl_T<PortableServer::RequestProcessingPolicy> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -7120,7 +7122,7 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<PortableServer::POAManager,PortableServer::POAManager_var>; + template class TAO_Object_Manager<PortableServer::POAManager,PortableServer::POAManager_var,PortableServer::tao_POAManager_life>; template class TAO::Any_Impl_T<PortableServer::POAManager>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate TAO_Object_Manager<PortableServer::POAManager, PortableServer::POAManager_var> @@ -7176,10 +7178,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<PortableServer::AdapterActivator,PortableServer::AdapterActivator_var>; + template class TAO_Object_Manager<PortableServer::AdapterActivator,PortableServer::AdapterActivator_var,PortableServer::tao_AdapterActivator_life>; template class TAO::Any_Impl_T<PortableServer::AdapterActivator>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<PortableServer::AdapterActivator, PortableServer::AdapterActivator_var> +# pragma instantiate TAO_Object_Manager<PortableServer::AdapterActivator, PortableServer::AdapterActivator_var,PortableServer::tao_AdapterActivator_life> # pragma instantiate TAO::Any_Impl_T<PortableServer::AdapterActivator> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -7230,10 +7232,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<PortableServer::ServantManager,PortableServer::ServantManager_var>; + template class TAO_Object_Manager<PortableServer::ServantManager,PortableServer::ServantManager_var,PortableServer::tao_ServantManager_life>; template class TAO::Any_Impl_T<PortableServer::ServantManager>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<PortableServer::ServantManager, PortableServer::ServantManager_var> +# pragma instantiate TAO_Object_Manager<PortableServer::ServantManager, PortableServer::ServantManager_var,PortableServer::tao_ServantManager_life> # pragma instantiate TAO::Any_Impl_T<PortableServer::ServantManager> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -7284,10 +7286,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<PortableServer::ServantActivator,PortableServer::ServantActivator_var>; + template class TAO_Object_Manager<PortableServer::ServantActivator,PortableServer::ServantActivator_var,PortableServer::tao_ServantActivator_life>; template class TAO::Any_Impl_T<PortableServer::ServantActivator>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<PortableServer::ServantActivator, PortableServer::ServantActivator_var> +# pragma instantiate TAO_Object_Manager<PortableServer::ServantActivator, PortableServer::ServantActivator_var, PortableServer::tao_ServantActivator_life> # pragma instantiate TAO::Any_Impl_T<PortableServer::ServantActivator> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -7338,10 +7340,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<PortableServer::ServantLocator,PortableServer::ServantLocator_var>; + template class TAO_Object_Manager<PortableServer::ServantLocator,PortableServer::ServantLocator_var,PortableServer::tao_ServantLocator_life>; template class TAO::Any_Impl_T<PortableServer::ServantLocator>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<PortableServer::ServantLocator, PortableServer::ServantLocator_var> +# pragma instantiate TAO_Object_Manager<PortableServer::ServantLocator, PortableServer::ServantLocator_var,PortableServer::tao_ServantLocator_life> # pragma instantiate TAO::Any_Impl_T<PortableServer::ServantLocator> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -7394,10 +7396,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<PortableServer::POA,PortableServer::POA_var>; - template class TAO::Any_Impl_T<PortableServer::POA>; +template class TAO_Object_Manager<PortableServer::POA,PortableServer::POA_var,PortableServer::tao_POA_life>; +template class TAO::Any_Impl_T<PortableServer::POA>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<PortableServer::POA, PortableServer::POA_var> +# pragma instantiate TAO_Object_Manager<PortableServer::POA, PortableServer::POA_var,PortableServer::tao_POA_life> # pragma instantiate TAO::Any_Impl_T<PortableServer::POA> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -7448,10 +7450,10 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<PortableServer::Current,PortableServer::Current_var>; - template class TAO::Any_Impl_T<PortableServer::Current>; +template class TAO_Object_Manager<PortableServer::Current,PortableServer::Current_var, PortableServer::tao_Current_life>; +template class TAO::Any_Impl_T<PortableServer::Current>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<PortableServer::Current, PortableServer::Current_var> +# pragma instantiate TAO_Object_Manager<PortableServer::Current, PortableServer::Current_var,PortableServer::tao_Current_life> # pragma instantiate TAO::Any_Impl_T<PortableServer::Current> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Pseudo_Value_VarOut_T.inl b/TAO/tao/Pseudo_Value_VarOut_T.inl index cd9849797a0..48467ad926a 100644 --- a/TAO/tao/Pseudo_Value_VarOut_T.inl +++ b/TAO/tao/Pseudo_Value_VarOut_T.inl @@ -28,7 +28,7 @@ TAO_Pseudo_Value_Var_T<T>::~TAO_Pseudo_Value_Var_T (void) } template <typename T> -ACE_INLINE +ACE_INLINE TAO_Pseudo_Value_Var_T<T> & TAO_Pseudo_Value_Var_T<T>::operator= (T * p) { @@ -38,7 +38,7 @@ TAO_Pseudo_Value_Var_T<T>::operator= (T * p) } template <typename T> -ACE_INLINE +ACE_INLINE TAO_Pseudo_Value_Var_T<T> & TAO_Pseudo_Value_Var_T<T>::operator= (const TAO_Pseudo_Value_Var_T<T> & p) { @@ -56,7 +56,7 @@ template <typename T> ACE_INLINE TAO_Pseudo_Value_Var_T<T>::operator const T *& () const { - return this->ptr_; + return ACE_const_cast (const T*, this->ptr_); } template <typename T> @@ -67,7 +67,7 @@ TAO_Pseudo_Value_Var_T<T>::operator T *& () } template <typename T> -ACE_INLINE +ACE_INLINE T * TAO_Pseudo_Value_Var_T<T>::operator-> (void) const { @@ -75,7 +75,7 @@ TAO_Pseudo_Value_Var_T<T>::operator-> (void) const } template <typename T> -ACE_INLINE +ACE_INLINE T * TAO_Pseudo_Value_Var_T<T>::in (void) const { @@ -83,7 +83,7 @@ TAO_Pseudo_Value_Var_T<T>::in (void) const } template <typename T> -ACE_INLINE +ACE_INLINE T *& TAO_Pseudo_Value_Var_T<T>::inout (void) { @@ -91,7 +91,7 @@ TAO_Pseudo_Value_Var_T<T>::inout (void) } template <typename T> -ACE_INLINE +ACE_INLINE T *& TAO_Pseudo_Value_Var_T<T>::out (void) { @@ -101,7 +101,7 @@ TAO_Pseudo_Value_Var_T<T>::out (void) } template <typename T> -ACE_INLINE +ACE_INLINE T * TAO_Pseudo_Value_Var_T<T>::_retn (void) { @@ -111,7 +111,7 @@ TAO_Pseudo_Value_Var_T<T>::_retn (void) } template <typename T> -ACE_INLINE +ACE_INLINE T * TAO_Pseudo_Value_Var_T<T>::ptr (void) const { @@ -146,7 +146,7 @@ TAO_Pseudo_Value_Out_T<T,T_var>::TAO_Pseudo_Value_Out_T ( {} template <typename T, typename T_var> -ACE_INLINE +ACE_INLINE TAO_Pseudo_Value_Out_T<T,T_var> & TAO_Pseudo_Value_Out_T<T,T_var>::operator= ( const TAO_Pseudo_Value_Out_T<T,T_var> & p @@ -157,7 +157,7 @@ TAO_Pseudo_Value_Out_T<T,T_var>::operator= ( } template <typename T, typename T_var> -ACE_INLINE +ACE_INLINE TAO_Pseudo_Value_Out_T<T,T_var> & TAO_Pseudo_Value_Out_T<T,T_var>::operator= (T * p) { @@ -173,7 +173,7 @@ TAO_Pseudo_Value_Out_T<T,T_var>::operator T *& () } template <typename T, typename T_var> -ACE_INLINE +ACE_INLINE T *& TAO_Pseudo_Value_Out_T<T,T_var>::ptr (void) { @@ -181,7 +181,7 @@ TAO_Pseudo_Value_Out_T<T,T_var>::ptr (void) } template <typename T, typename T_var> -ACE_INLINE +ACE_INLINE T * TAO_Pseudo_Value_Out_T<T,T_var>::operator-> (void) { diff --git a/TAO/tao/Pseudo_VarOut_T.inl b/TAO/tao/Pseudo_VarOut_T.inl index bcbd4e8b4dd..44358d2b089 100644 --- a/TAO/tao/Pseudo_VarOut_T.inl +++ b/TAO/tao/Pseudo_VarOut_T.inl @@ -26,7 +26,7 @@ TAO_Pseudo_Var_T<T>::~TAO_Pseudo_Var_T (void) } template <typename T> -ACE_INLINE +ACE_INLINE TAO_Pseudo_Var_T<T> & TAO_Pseudo_Var_T<T>::operator= (T * p) { @@ -36,7 +36,7 @@ TAO_Pseudo_Var_T<T>::operator= (T * p) } template <typename T> -ACE_INLINE +ACE_INLINE TAO_Pseudo_Var_T<T> & TAO_Pseudo_Var_T<T>::operator= (const TAO_Pseudo_Var_T<T> & p) { @@ -53,7 +53,7 @@ template <typename T> ACE_INLINE TAO_Pseudo_Var_T<T>::operator const T *& () const { - return this->ptr_; + return ACE_const_cast (const T*, this->ptr_); } template <typename T> @@ -64,7 +64,7 @@ TAO_Pseudo_Var_T<T>::operator T *& () } template <typename T> -ACE_INLINE +ACE_INLINE T * TAO_Pseudo_Var_T<T>::operator-> (void) const { @@ -72,7 +72,7 @@ TAO_Pseudo_Var_T<T>::operator-> (void) const } template <typename T> -ACE_INLINE +ACE_INLINE T * TAO_Pseudo_Var_T<T>::in (void) const { @@ -80,7 +80,7 @@ TAO_Pseudo_Var_T<T>::in (void) const } template <typename T> -ACE_INLINE +ACE_INLINE T *& TAO_Pseudo_Var_T<T>::inout (void) { @@ -88,7 +88,7 @@ TAO_Pseudo_Var_T<T>::inout (void) } template <typename T> -ACE_INLINE +ACE_INLINE T *& TAO_Pseudo_Var_T<T>::out (void) { @@ -98,7 +98,7 @@ TAO_Pseudo_Var_T<T>::out (void) } template <typename T> -ACE_INLINE +ACE_INLINE T * TAO_Pseudo_Var_T<T>::_retn (void) { @@ -108,7 +108,7 @@ TAO_Pseudo_Var_T<T>::_retn (void) } template <typename T> -ACE_INLINE +ACE_INLINE T * TAO_Pseudo_Var_T<T>::ptr (void) const { @@ -143,7 +143,7 @@ TAO_Pseudo_Out_T<T,T_var>::TAO_Pseudo_Out_T ( {} template <typename T, typename T_var> -ACE_INLINE +ACE_INLINE TAO_Pseudo_Out_T<T,T_var> & TAO_Pseudo_Out_T<T,T_var>::operator= (const TAO_Pseudo_Out_T<T,T_var> & p) { @@ -152,7 +152,7 @@ TAO_Pseudo_Out_T<T,T_var>::operator= (const TAO_Pseudo_Out_T<T,T_var> & p) } template <typename T, typename T_var> -ACE_INLINE +ACE_INLINE TAO_Pseudo_Out_T<T,T_var> & TAO_Pseudo_Out_T<T,T_var>::operator= (T * p) { @@ -168,7 +168,7 @@ TAO_Pseudo_Out_T<T,T_var>::operator T *& () } template <typename T, typename T_var> -ACE_INLINE +ACE_INLINE T *& TAO_Pseudo_Out_T<T,T_var>::ptr (void) { @@ -176,7 +176,7 @@ TAO_Pseudo_Out_T<T,T_var>::ptr (void) } template <typename T, typename T_var> -ACE_INLINE +ACE_INLINE T * TAO_Pseudo_Out_T<T,T_var>::operator-> (void) { diff --git a/TAO/tao/RTCORBA/RTCORBAC.cpp b/TAO/tao/RTCORBA/RTCORBAC.cpp index 1ac374edbc8..d6bb5be2af1 100644 --- a/TAO/tao/RTCORBA/RTCORBAC.cpp +++ b/TAO/tao/RTCORBA/RTCORBAC.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 +// be/be_codegen.cpp:314 #include "RTCORBA.h" @@ -59,7 +65,7 @@ RTCORBA::ProtocolProperties::_tao_decode (TAO_InputCDR &) } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 +// be/be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_RTCORBA_NativePriority[] = { @@ -102,7 +108,7 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 +// be/be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_RTCORBA_Priority[] = { @@ -143,7 +149,7 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 +// be/be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_RTCORBA_NetworkPriority[] = { @@ -186,7 +192,7 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 +// be/be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_RTCORBA_ThreadpoolId[] = { @@ -229,7 +235,7 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 +// be/be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_RTCORBA_ThreadpoolLane[] = { @@ -310,7 +316,7 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 +// be/be_visitor_structure/structure_cs.cpp:66 void RTCORBA::ThreadpoolLane::_tao_any_destructor (void *_tao_void_pointer) { @@ -319,31 +325,36 @@ void RTCORBA::ThreadpoolLane::_tao_any_destructor (void *_tao_void_pointer) } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274 +// be/be_type.cpp:292 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class TAO_Fixed_Var_T< - ThreadpoolLane + RTCORBA::ThreadpoolLane >; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ TAO_Fixed_Var_T< \ - ThreadpoolLane \ + RTCORBA::ThreadpoolLane \ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49 +// be/be_visitor_sequence/sequence_cs.cpp:70 + +#if !defined (_RTCORBA_THREADPOOLLANES_CS_) +#define _RTCORBA_THREADPOOLLANES_CS_ RTCORBA::ThreadpoolLanes::ThreadpoolLanes (void) {} -RTCORBA::ThreadpoolLanes::ThreadpoolLanes (CORBA::ULong max) +RTCORBA::ThreadpoolLanes::ThreadpoolLanes ( + CORBA::ULong max + ) : TAO_Unbounded_Sequence< RTCORBA::ThreadpoolLane > @@ -353,7 +364,7 @@ RTCORBA::ThreadpoolLanes::ThreadpoolLanes (CORBA::ULong max) RTCORBA::ThreadpoolLanes::ThreadpoolLanes ( CORBA::ULong max, CORBA::ULong length, - RTCORBA::ThreadpoolLane* buffer, + RTCORBA::ThreadpoolLane * buffer, CORBA::Boolean release ) : TAO_Unbounded_Sequence< @@ -362,7 +373,9 @@ RTCORBA::ThreadpoolLanes::ThreadpoolLanes ( (max, length, buffer, release) {} -RTCORBA::ThreadpoolLanes::ThreadpoolLanes (const ThreadpoolLanes &seq) +RTCORBA::ThreadpoolLanes::ThreadpoolLanes ( + const ThreadpoolLanes &seq + ) : TAO_Unbounded_Sequence< RTCORBA::ThreadpoolLane > @@ -372,9 +385,15 @@ RTCORBA::ThreadpoolLanes::ThreadpoolLanes (const ThreadpoolLanes &seq) RTCORBA::ThreadpoolLanes::~ThreadpoolLanes (void) {} -void RTCORBA::ThreadpoolLanes::_tao_any_destructor (void *_tao_void_pointer) +void RTCORBA::ThreadpoolLanes::_tao_any_destructor ( + void * _tao_void_pointer + ) { - ThreadpoolLanes *tmp = ACE_static_cast (ThreadpoolLanes*, _tao_void_pointer); + ThreadpoolLanes * tmp = + ACE_static_cast ( + ThreadpoolLanes *, + _tao_void_pointer + ); delete tmp; } @@ -382,14 +401,14 @@ void RTCORBA::ThreadpoolLanes::_tao_any_destructor (void *_tao_void_pointer) template class TAO_FixedSeq_Var_T< - ThreadpoolLanes, + RTCORBA::ThreadpoolLanes, RTCORBA::ThreadpoolLane >; template class TAO_Seq_Out_T< - ThreadpoolLanes, - ThreadpoolLanes_var, + RTCORBA::ThreadpoolLanes, + RTCORBA::ThreadpoolLanes_var, RTCORBA::ThreadpoolLane >; @@ -410,8 +429,10 @@ template class #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 +// be/be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_RTCORBA_ThreadpoolLanes[] = { @@ -517,7 +538,7 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 +// be/be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_RTCORBA_PriorityModel[] = { @@ -570,21 +591,21 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61 +// be/be_visitor_interface/interface_cs.cpp:57 int RTCORBA::PriorityModelPolicy::_tao_class_id = 0; RTCORBA::PriorityModelPolicy_ptr RTCORBA::tao_PriorityModelPolicy_life::tao_duplicate ( - RTCORBA::PriorityModelPolicy_ptr p + PriorityModelPolicy_ptr p ) { - return RTCORBA::PriorityModelPolicy::_duplicate (p); + return PriorityModelPolicy::_duplicate (p); } void RTCORBA::tao_PriorityModelPolicy_life::tao_release ( - RTCORBA::PriorityModelPolicy_ptr p + PriorityModelPolicy_ptr p ) { CORBA::release (p); @@ -595,12 +616,12 @@ RTCORBA::tao_PriorityModelPolicy_life::tao_nil ( void ) { - return RTCORBA::PriorityModelPolicy::_nil (); + return PriorityModelPolicy::_nil (); } CORBA::Boolean RTCORBA::tao_PriorityModelPolicy_life::tao_marshal ( - RTCORBA::PriorityModelPolicy_ptr p, + PriorityModelPolicy_ptr p, TAO_OutputCDR &cdr ) { @@ -613,7 +634,7 @@ RTCORBA::tao_PriorityModelPolicy_cast::tao_narrow ( ACE_ENV_ARG_DECL ) { - return RTCORBA::PriorityModelPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); + return PriorityModelPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -621,8 +642,8 @@ RTCORBA::tao_PriorityModelPolicy_cast::tao_upcast ( void *src ) { - RTCORBA::PriorityModelPolicy **tmp = - ACE_static_cast (RTCORBA::PriorityModelPolicy **, src); + PriorityModelPolicy **tmp = + ACE_static_cast (PriorityModelPolicy **, src); return *tmp; } @@ -651,7 +672,7 @@ RTCORBA::tao_PriorityModelPolicy_cast::tao_upcast ( #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 +// be/be_visitor_interface/interface_cs.cpp:239 RTCORBA::PriorityModelPolicy::PriorityModelPolicy (void) {} @@ -766,7 +787,7 @@ RTCORBA::PriorityModelPolicy::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 +// be/be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_RTCORBA_PriorityModelPolicy[] = { @@ -809,21 +830,21 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61 +// be/be_visitor_interface/interface_cs.cpp:57 int RTCORBA::ThreadpoolPolicy::_tao_class_id = 0; RTCORBA::ThreadpoolPolicy_ptr RTCORBA::tao_ThreadpoolPolicy_life::tao_duplicate ( - RTCORBA::ThreadpoolPolicy_ptr p + ThreadpoolPolicy_ptr p ) { - return RTCORBA::ThreadpoolPolicy::_duplicate (p); + return ThreadpoolPolicy::_duplicate (p); } void RTCORBA::tao_ThreadpoolPolicy_life::tao_release ( - RTCORBA::ThreadpoolPolicy_ptr p + ThreadpoolPolicy_ptr p ) { CORBA::release (p); @@ -834,12 +855,12 @@ RTCORBA::tao_ThreadpoolPolicy_life::tao_nil ( void ) { - return RTCORBA::ThreadpoolPolicy::_nil (); + return ThreadpoolPolicy::_nil (); } CORBA::Boolean RTCORBA::tao_ThreadpoolPolicy_life::tao_marshal ( - RTCORBA::ThreadpoolPolicy_ptr p, + ThreadpoolPolicy_ptr p, TAO_OutputCDR &cdr ) { @@ -852,7 +873,7 @@ RTCORBA::tao_ThreadpoolPolicy_cast::tao_narrow ( ACE_ENV_ARG_DECL ) { - return RTCORBA::ThreadpoolPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); + return ThreadpoolPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -860,8 +881,8 @@ RTCORBA::tao_ThreadpoolPolicy_cast::tao_upcast ( void *src ) { - RTCORBA::ThreadpoolPolicy **tmp = - ACE_static_cast (RTCORBA::ThreadpoolPolicy **, src); + ThreadpoolPolicy **tmp = + ACE_static_cast (ThreadpoolPolicy **, src); return *tmp; } @@ -890,7 +911,7 @@ RTCORBA::tao_ThreadpoolPolicy_cast::tao_upcast ( #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 +// be/be_visitor_interface/interface_cs.cpp:239 RTCORBA::ThreadpoolPolicy::ThreadpoolPolicy (void) {} @@ -1005,7 +1026,7 @@ RTCORBA::ThreadpoolPolicy::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 +// be/be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_RTCORBA_ThreadpoolPolicy[] = { @@ -1048,21 +1069,21 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61 +// be/be_visitor_interface/interface_cs.cpp:57 int RTCORBA::ProtocolProperties::_tao_class_id = 0; RTCORBA::ProtocolProperties_ptr RTCORBA::tao_ProtocolProperties_life::tao_duplicate ( - RTCORBA::ProtocolProperties_ptr p + ProtocolProperties_ptr p ) { - return RTCORBA::ProtocolProperties::_duplicate (p); + return ProtocolProperties::_duplicate (p); } void RTCORBA::tao_ProtocolProperties_life::tao_release ( - RTCORBA::ProtocolProperties_ptr p + ProtocolProperties_ptr p ) { CORBA::release (p); @@ -1073,12 +1094,12 @@ RTCORBA::tao_ProtocolProperties_life::tao_nil ( void ) { - return RTCORBA::ProtocolProperties::_nil (); + return ProtocolProperties::_nil (); } CORBA::Boolean RTCORBA::tao_ProtocolProperties_life::tao_marshal ( - RTCORBA::ProtocolProperties_ptr p, + ProtocolProperties_ptr p, TAO_OutputCDR &cdr ) { @@ -1091,7 +1112,7 @@ RTCORBA::tao_ProtocolProperties_cast::tao_narrow ( ACE_ENV_ARG_DECL ) { - return RTCORBA::ProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER); + return ProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1099,8 +1120,8 @@ RTCORBA::tao_ProtocolProperties_cast::tao_upcast ( void *src ) { - RTCORBA::ProtocolProperties **tmp = - ACE_static_cast (RTCORBA::ProtocolProperties **, src); + ProtocolProperties **tmp = + ACE_static_cast (ProtocolProperties **, src); return *tmp; } @@ -1129,7 +1150,7 @@ RTCORBA::tao_ProtocolProperties_cast::tao_upcast ( #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 +// be/be_visitor_interface/interface_cs.cpp:239 RTCORBA::ProtocolProperties::ProtocolProperties (void) {} @@ -1230,7 +1251,7 @@ RTCORBA::ProtocolProperties::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 +// be/be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_RTCORBA_ProtocolProperties[] = { @@ -1273,7 +1294,7 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 +// be/be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_RTCORBA_Protocol[] = { @@ -1377,7 +1398,7 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 +// be/be_visitor_structure/structure_cs.cpp:66 void RTCORBA::Protocol::_tao_any_destructor (void *_tao_void_pointer) { @@ -1386,43 +1407,48 @@ void RTCORBA::Protocol::_tao_any_destructor (void *_tao_void_pointer) } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274 +// be/be_type.cpp:292 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class TAO_Var_Var_T< - Protocol + RTCORBA::Protocol >; template class TAO_Out_T< - Protocol, - Protocol_var + RTCORBA::Protocol, + RTCORBA::Protocol_var >; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ TAO_Var_Var_T< \ - Protocol \ + RTCORBA::Protocol \ > # pragma instantiate \ TAO_Out_T< \ - Protocol, \ - Protocol_var \ + RTCORBA::Protocol, \ + RTCORBA::Protocol_var \ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49 +// be/be_visitor_sequence/sequence_cs.cpp:70 + +#if !defined (_RTCORBA_PROTOCOLLIST_CS_) +#define _RTCORBA_PROTOCOLLIST_CS_ RTCORBA::ProtocolList::ProtocolList (void) {} -RTCORBA::ProtocolList::ProtocolList (CORBA::ULong max) +RTCORBA::ProtocolList::ProtocolList ( + CORBA::ULong max + ) : TAO_Unbounded_Sequence< RTCORBA::Protocol > @@ -1432,7 +1458,7 @@ RTCORBA::ProtocolList::ProtocolList (CORBA::ULong max) RTCORBA::ProtocolList::ProtocolList ( CORBA::ULong max, CORBA::ULong length, - RTCORBA::Protocol* buffer, + RTCORBA::Protocol * buffer, CORBA::Boolean release ) : TAO_Unbounded_Sequence< @@ -1441,7 +1467,9 @@ RTCORBA::ProtocolList::ProtocolList ( (max, length, buffer, release) {} -RTCORBA::ProtocolList::ProtocolList (const ProtocolList &seq) +RTCORBA::ProtocolList::ProtocolList ( + const ProtocolList &seq + ) : TAO_Unbounded_Sequence< RTCORBA::Protocol > @@ -1451,9 +1479,15 @@ RTCORBA::ProtocolList::ProtocolList (const ProtocolList &seq) RTCORBA::ProtocolList::~ProtocolList (void) {} -void RTCORBA::ProtocolList::_tao_any_destructor (void *_tao_void_pointer) +void RTCORBA::ProtocolList::_tao_any_destructor ( + void * _tao_void_pointer + ) { - ProtocolList *tmp = ACE_static_cast (ProtocolList*, _tao_void_pointer); + ProtocolList * tmp = + ACE_static_cast ( + ProtocolList *, + _tao_void_pointer + ); delete tmp; } @@ -1461,14 +1495,14 @@ void RTCORBA::ProtocolList::_tao_any_destructor (void *_tao_void_pointer) template class TAO_VarSeq_Var_T< - ProtocolList, + RTCORBA::ProtocolList, RTCORBA::Protocol >; template class TAO_Seq_Out_T< - ProtocolList, - ProtocolList_var, + RTCORBA::ProtocolList, + RTCORBA::ProtocolList_var, RTCORBA::Protocol >; @@ -1489,8 +1523,10 @@ template class #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 +// be/be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_RTCORBA_ProtocolList[] = { @@ -1619,21 +1655,21 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61 +// be/be_visitor_interface/interface_cs.cpp:57 int RTCORBA::ServerProtocolPolicy::_tao_class_id = 0; RTCORBA::ServerProtocolPolicy_ptr RTCORBA::tao_ServerProtocolPolicy_life::tao_duplicate ( - RTCORBA::ServerProtocolPolicy_ptr p + ServerProtocolPolicy_ptr p ) { - return RTCORBA::ServerProtocolPolicy::_duplicate (p); + return ServerProtocolPolicy::_duplicate (p); } void RTCORBA::tao_ServerProtocolPolicy_life::tao_release ( - RTCORBA::ServerProtocolPolicy_ptr p + ServerProtocolPolicy_ptr p ) { CORBA::release (p); @@ -1644,12 +1680,12 @@ RTCORBA::tao_ServerProtocolPolicy_life::tao_nil ( void ) { - return RTCORBA::ServerProtocolPolicy::_nil (); + return ServerProtocolPolicy::_nil (); } CORBA::Boolean RTCORBA::tao_ServerProtocolPolicy_life::tao_marshal ( - RTCORBA::ServerProtocolPolicy_ptr p, + ServerProtocolPolicy_ptr p, TAO_OutputCDR &cdr ) { @@ -1662,7 +1698,7 @@ RTCORBA::tao_ServerProtocolPolicy_cast::tao_narrow ( ACE_ENV_ARG_DECL ) { - return RTCORBA::ServerProtocolPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); + return ServerProtocolPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1670,8 +1706,8 @@ RTCORBA::tao_ServerProtocolPolicy_cast::tao_upcast ( void *src ) { - RTCORBA::ServerProtocolPolicy **tmp = - ACE_static_cast (RTCORBA::ServerProtocolPolicy **, src); + ServerProtocolPolicy **tmp = + ACE_static_cast (ServerProtocolPolicy **, src); return *tmp; } @@ -1700,7 +1736,7 @@ RTCORBA::tao_ServerProtocolPolicy_cast::tao_upcast ( #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 +// be/be_visitor_interface/interface_cs.cpp:239 RTCORBA::ServerProtocolPolicy::ServerProtocolPolicy (void) {} @@ -1815,7 +1851,7 @@ RTCORBA::ServerProtocolPolicy::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 +// be/be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_RTCORBA_ServerProtocolPolicy[] = { @@ -1860,21 +1896,21 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61 +// be/be_visitor_interface/interface_cs.cpp:57 int RTCORBA::ClientProtocolPolicy::_tao_class_id = 0; RTCORBA::ClientProtocolPolicy_ptr RTCORBA::tao_ClientProtocolPolicy_life::tao_duplicate ( - RTCORBA::ClientProtocolPolicy_ptr p + ClientProtocolPolicy_ptr p ) { - return RTCORBA::ClientProtocolPolicy::_duplicate (p); + return ClientProtocolPolicy::_duplicate (p); } void RTCORBA::tao_ClientProtocolPolicy_life::tao_release ( - RTCORBA::ClientProtocolPolicy_ptr p + ClientProtocolPolicy_ptr p ) { CORBA::release (p); @@ -1885,12 +1921,12 @@ RTCORBA::tao_ClientProtocolPolicy_life::tao_nil ( void ) { - return RTCORBA::ClientProtocolPolicy::_nil (); + return ClientProtocolPolicy::_nil (); } CORBA::Boolean RTCORBA::tao_ClientProtocolPolicy_life::tao_marshal ( - RTCORBA::ClientProtocolPolicy_ptr p, + ClientProtocolPolicy_ptr p, TAO_OutputCDR &cdr ) { @@ -1903,7 +1939,7 @@ RTCORBA::tao_ClientProtocolPolicy_cast::tao_narrow ( ACE_ENV_ARG_DECL ) { - return RTCORBA::ClientProtocolPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); + return ClientProtocolPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -1911,8 +1947,8 @@ RTCORBA::tao_ClientProtocolPolicy_cast::tao_upcast ( void *src ) { - RTCORBA::ClientProtocolPolicy **tmp = - ACE_static_cast (RTCORBA::ClientProtocolPolicy **, src); + ClientProtocolPolicy **tmp = + ACE_static_cast (ClientProtocolPolicy **, src); return *tmp; } @@ -1941,7 +1977,7 @@ RTCORBA::tao_ClientProtocolPolicy_cast::tao_upcast ( #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 +// be/be_visitor_interface/interface_cs.cpp:239 RTCORBA::ClientProtocolPolicy::ClientProtocolPolicy (void) {} @@ -2056,7 +2092,7 @@ RTCORBA::ClientProtocolPolicy::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 +// be/be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_RTCORBA_ClientProtocolPolicy[] = { @@ -2101,21 +2137,21 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61 +// be/be_visitor_interface/interface_cs.cpp:57 int RTCORBA::PrivateConnectionPolicy::_tao_class_id = 0; RTCORBA::PrivateConnectionPolicy_ptr RTCORBA::tao_PrivateConnectionPolicy_life::tao_duplicate ( - RTCORBA::PrivateConnectionPolicy_ptr p + PrivateConnectionPolicy_ptr p ) { - return RTCORBA::PrivateConnectionPolicy::_duplicate (p); + return PrivateConnectionPolicy::_duplicate (p); } void RTCORBA::tao_PrivateConnectionPolicy_life::tao_release ( - RTCORBA::PrivateConnectionPolicy_ptr p + PrivateConnectionPolicy_ptr p ) { CORBA::release (p); @@ -2126,12 +2162,12 @@ RTCORBA::tao_PrivateConnectionPolicy_life::tao_nil ( void ) { - return RTCORBA::PrivateConnectionPolicy::_nil (); + return PrivateConnectionPolicy::_nil (); } CORBA::Boolean RTCORBA::tao_PrivateConnectionPolicy_life::tao_marshal ( - RTCORBA::PrivateConnectionPolicy_ptr p, + PrivateConnectionPolicy_ptr p, TAO_OutputCDR &cdr ) { @@ -2144,7 +2180,7 @@ RTCORBA::tao_PrivateConnectionPolicy_cast::tao_narrow ( ACE_ENV_ARG_DECL ) { - return RTCORBA::PrivateConnectionPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); + return PrivateConnectionPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2152,8 +2188,8 @@ RTCORBA::tao_PrivateConnectionPolicy_cast::tao_upcast ( void *src ) { - RTCORBA::PrivateConnectionPolicy **tmp = - ACE_static_cast (RTCORBA::PrivateConnectionPolicy **, src); + PrivateConnectionPolicy **tmp = + ACE_static_cast (PrivateConnectionPolicy **, src); return *tmp; } @@ -2182,7 +2218,7 @@ RTCORBA::tao_PrivateConnectionPolicy_cast::tao_upcast ( #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 +// be/be_visitor_interface/interface_cs.cpp:239 RTCORBA::PrivateConnectionPolicy::PrivateConnectionPolicy (void) {} @@ -2297,7 +2333,7 @@ RTCORBA::PrivateConnectionPolicy::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 +// be/be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_RTCORBA_PrivateConnectionPolicy[] = { @@ -2342,21 +2378,21 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61 +// be/be_visitor_interface/interface_cs.cpp:57 int RTCORBA::TCPProtocolProperties::_tao_class_id = 0; RTCORBA::TCPProtocolProperties_ptr RTCORBA::tao_TCPProtocolProperties_life::tao_duplicate ( - RTCORBA::TCPProtocolProperties_ptr p + TCPProtocolProperties_ptr p ) { - return RTCORBA::TCPProtocolProperties::_duplicate (p); + return TCPProtocolProperties::_duplicate (p); } void RTCORBA::tao_TCPProtocolProperties_life::tao_release ( - RTCORBA::TCPProtocolProperties_ptr p + TCPProtocolProperties_ptr p ) { CORBA::release (p); @@ -2367,12 +2403,12 @@ RTCORBA::tao_TCPProtocolProperties_life::tao_nil ( void ) { - return RTCORBA::TCPProtocolProperties::_nil (); + return TCPProtocolProperties::_nil (); } CORBA::Boolean RTCORBA::tao_TCPProtocolProperties_life::tao_marshal ( - RTCORBA::TCPProtocolProperties_ptr p, + TCPProtocolProperties_ptr p, TAO_OutputCDR &cdr ) { @@ -2385,7 +2421,7 @@ RTCORBA::tao_TCPProtocolProperties_cast::tao_narrow ( ACE_ENV_ARG_DECL ) { - return RTCORBA::TCPProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER); + return TCPProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2393,8 +2429,8 @@ RTCORBA::tao_TCPProtocolProperties_cast::tao_upcast ( void *src ) { - RTCORBA::TCPProtocolProperties **tmp = - ACE_static_cast (RTCORBA::TCPProtocolProperties **, src); + TCPProtocolProperties **tmp = + ACE_static_cast (TCPProtocolProperties **, src); return *tmp; } @@ -2423,7 +2459,7 @@ RTCORBA::tao_TCPProtocolProperties_cast::tao_upcast ( #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 +// be/be_visitor_interface/interface_cs.cpp:239 RTCORBA::TCPProtocolProperties::TCPProtocolProperties (void) {} @@ -2538,7 +2574,7 @@ RTCORBA::TCPProtocolProperties::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 +// be/be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_RTCORBA_TCPProtocolProperties[] = { @@ -2583,21 +2619,21 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61 +// be/be_visitor_interface/interface_cs.cpp:57 int RTCORBA::GIOPProtocolProperties::_tao_class_id = 0; RTCORBA::GIOPProtocolProperties_ptr RTCORBA::tao_GIOPProtocolProperties_life::tao_duplicate ( - RTCORBA::GIOPProtocolProperties_ptr p + GIOPProtocolProperties_ptr p ) { - return RTCORBA::GIOPProtocolProperties::_duplicate (p); + return GIOPProtocolProperties::_duplicate (p); } void RTCORBA::tao_GIOPProtocolProperties_life::tao_release ( - RTCORBA::GIOPProtocolProperties_ptr p + GIOPProtocolProperties_ptr p ) { CORBA::release (p); @@ -2608,12 +2644,12 @@ RTCORBA::tao_GIOPProtocolProperties_life::tao_nil ( void ) { - return RTCORBA::GIOPProtocolProperties::_nil (); + return GIOPProtocolProperties::_nil (); } CORBA::Boolean RTCORBA::tao_GIOPProtocolProperties_life::tao_marshal ( - RTCORBA::GIOPProtocolProperties_ptr p, + GIOPProtocolProperties_ptr p, TAO_OutputCDR &cdr ) { @@ -2626,7 +2662,7 @@ RTCORBA::tao_GIOPProtocolProperties_cast::tao_narrow ( ACE_ENV_ARG_DECL ) { - return RTCORBA::GIOPProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER); + return GIOPProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2634,8 +2670,8 @@ RTCORBA::tao_GIOPProtocolProperties_cast::tao_upcast ( void *src ) { - RTCORBA::GIOPProtocolProperties **tmp = - ACE_static_cast (RTCORBA::GIOPProtocolProperties **, src); + GIOPProtocolProperties **tmp = + ACE_static_cast (GIOPProtocolProperties **, src); return *tmp; } @@ -2664,7 +2700,7 @@ RTCORBA::tao_GIOPProtocolProperties_cast::tao_upcast ( #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 +// be/be_visitor_interface/interface_cs.cpp:239 RTCORBA::GIOPProtocolProperties::GIOPProtocolProperties (void) {} @@ -2779,7 +2815,7 @@ RTCORBA::GIOPProtocolProperties::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 +// be/be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_RTCORBA_GIOPProtocolProperties[] = { @@ -2824,21 +2860,21 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61 +// be/be_visitor_interface/interface_cs.cpp:57 int RTCORBA::UnixDomainProtocolProperties::_tao_class_id = 0; RTCORBA::UnixDomainProtocolProperties_ptr RTCORBA::tao_UnixDomainProtocolProperties_life::tao_duplicate ( - RTCORBA::UnixDomainProtocolProperties_ptr p + UnixDomainProtocolProperties_ptr p ) { - return RTCORBA::UnixDomainProtocolProperties::_duplicate (p); + return UnixDomainProtocolProperties::_duplicate (p); } void RTCORBA::tao_UnixDomainProtocolProperties_life::tao_release ( - RTCORBA::UnixDomainProtocolProperties_ptr p + UnixDomainProtocolProperties_ptr p ) { CORBA::release (p); @@ -2849,12 +2885,12 @@ RTCORBA::tao_UnixDomainProtocolProperties_life::tao_nil ( void ) { - return RTCORBA::UnixDomainProtocolProperties::_nil (); + return UnixDomainProtocolProperties::_nil (); } CORBA::Boolean RTCORBA::tao_UnixDomainProtocolProperties_life::tao_marshal ( - RTCORBA::UnixDomainProtocolProperties_ptr p, + UnixDomainProtocolProperties_ptr p, TAO_OutputCDR &cdr ) { @@ -2867,7 +2903,7 @@ RTCORBA::tao_UnixDomainProtocolProperties_cast::tao_narrow ( ACE_ENV_ARG_DECL ) { - return RTCORBA::UnixDomainProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER); + return UnixDomainProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -2875,8 +2911,8 @@ RTCORBA::tao_UnixDomainProtocolProperties_cast::tao_upcast ( void *src ) { - RTCORBA::UnixDomainProtocolProperties **tmp = - ACE_static_cast (RTCORBA::UnixDomainProtocolProperties **, src); + UnixDomainProtocolProperties **tmp = + ACE_static_cast (UnixDomainProtocolProperties **, src); return *tmp; } @@ -2905,7 +2941,7 @@ RTCORBA::tao_UnixDomainProtocolProperties_cast::tao_upcast ( #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 +// be/be_visitor_interface/interface_cs.cpp:239 RTCORBA::UnixDomainProtocolProperties::UnixDomainProtocolProperties (void) {} @@ -3020,7 +3056,7 @@ RTCORBA::UnixDomainProtocolProperties::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 +// be/be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_RTCORBA_UnixDomainProtocolProperties[] = { @@ -3069,21 +3105,21 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61 +// be/be_visitor_interface/interface_cs.cpp:57 int RTCORBA::SharedMemoryProtocolProperties::_tao_class_id = 0; RTCORBA::SharedMemoryProtocolProperties_ptr RTCORBA::tao_SharedMemoryProtocolProperties_life::tao_duplicate ( - RTCORBA::SharedMemoryProtocolProperties_ptr p + SharedMemoryProtocolProperties_ptr p ) { - return RTCORBA::SharedMemoryProtocolProperties::_duplicate (p); + return SharedMemoryProtocolProperties::_duplicate (p); } void RTCORBA::tao_SharedMemoryProtocolProperties_life::tao_release ( - RTCORBA::SharedMemoryProtocolProperties_ptr p + SharedMemoryProtocolProperties_ptr p ) { CORBA::release (p); @@ -3094,12 +3130,12 @@ RTCORBA::tao_SharedMemoryProtocolProperties_life::tao_nil ( void ) { - return RTCORBA::SharedMemoryProtocolProperties::_nil (); + return SharedMemoryProtocolProperties::_nil (); } CORBA::Boolean RTCORBA::tao_SharedMemoryProtocolProperties_life::tao_marshal ( - RTCORBA::SharedMemoryProtocolProperties_ptr p, + SharedMemoryProtocolProperties_ptr p, TAO_OutputCDR &cdr ) { @@ -3112,7 +3148,7 @@ RTCORBA::tao_SharedMemoryProtocolProperties_cast::tao_narrow ( ACE_ENV_ARG_DECL ) { - return RTCORBA::SharedMemoryProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER); + return SharedMemoryProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -3120,8 +3156,8 @@ RTCORBA::tao_SharedMemoryProtocolProperties_cast::tao_upcast ( void *src ) { - RTCORBA::SharedMemoryProtocolProperties **tmp = - ACE_static_cast (RTCORBA::SharedMemoryProtocolProperties **, src); + SharedMemoryProtocolProperties **tmp = + ACE_static_cast (SharedMemoryProtocolProperties **, src); return *tmp; } @@ -3150,7 +3186,7 @@ RTCORBA::tao_SharedMemoryProtocolProperties_cast::tao_upcast ( #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 +// be/be_visitor_interface/interface_cs.cpp:239 RTCORBA::SharedMemoryProtocolProperties::SharedMemoryProtocolProperties (void) {} @@ -3265,7 +3301,7 @@ RTCORBA::SharedMemoryProtocolProperties::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 +// be/be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_RTCORBA_SharedMemoryProtocolProperties[] = { @@ -3314,7 +3350,7 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 +// be/be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_RTCORBA_PriorityBand[] = { @@ -3383,7 +3419,7 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 +// be/be_visitor_structure/structure_cs.cpp:66 void RTCORBA::PriorityBand::_tao_any_destructor (void *_tao_void_pointer) { @@ -3392,31 +3428,36 @@ void RTCORBA::PriorityBand::_tao_any_destructor (void *_tao_void_pointer) } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:274 +// be/be_type.cpp:292 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class TAO_Fixed_Var_T< - PriorityBand + RTCORBA::PriorityBand >; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ TAO_Fixed_Var_T< \ - PriorityBand \ + RTCORBA::PriorityBand \ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49 +// be/be_visitor_sequence/sequence_cs.cpp:70 + +#if !defined (_RTCORBA_PRIORITYBANDS_CS_) +#define _RTCORBA_PRIORITYBANDS_CS_ RTCORBA::PriorityBands::PriorityBands (void) {} -RTCORBA::PriorityBands::PriorityBands (CORBA::ULong max) +RTCORBA::PriorityBands::PriorityBands ( + CORBA::ULong max + ) : TAO_Unbounded_Sequence< RTCORBA::PriorityBand > @@ -3426,7 +3467,7 @@ RTCORBA::PriorityBands::PriorityBands (CORBA::ULong max) RTCORBA::PriorityBands::PriorityBands ( CORBA::ULong max, CORBA::ULong length, - RTCORBA::PriorityBand* buffer, + RTCORBA::PriorityBand * buffer, CORBA::Boolean release ) : TAO_Unbounded_Sequence< @@ -3435,7 +3476,9 @@ RTCORBA::PriorityBands::PriorityBands ( (max, length, buffer, release) {} -RTCORBA::PriorityBands::PriorityBands (const PriorityBands &seq) +RTCORBA::PriorityBands::PriorityBands ( + const PriorityBands &seq + ) : TAO_Unbounded_Sequence< RTCORBA::PriorityBand > @@ -3445,9 +3488,15 @@ RTCORBA::PriorityBands::PriorityBands (const PriorityBands &seq) RTCORBA::PriorityBands::~PriorityBands (void) {} -void RTCORBA::PriorityBands::_tao_any_destructor (void *_tao_void_pointer) +void RTCORBA::PriorityBands::_tao_any_destructor ( + void * _tao_void_pointer + ) { - PriorityBands *tmp = ACE_static_cast (PriorityBands*, _tao_void_pointer); + PriorityBands * tmp = + ACE_static_cast ( + PriorityBands *, + _tao_void_pointer + ); delete tmp; } @@ -3455,14 +3504,14 @@ void RTCORBA::PriorityBands::_tao_any_destructor (void *_tao_void_pointer) template class TAO_FixedSeq_Var_T< - PriorityBands, + RTCORBA::PriorityBands, RTCORBA::PriorityBand >; template class TAO_Seq_Out_T< - PriorityBands, - PriorityBands_var, + RTCORBA::PriorityBands, + RTCORBA::PriorityBands_var, RTCORBA::PriorityBand >; @@ -3483,8 +3532,10 @@ template class #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 +// be/be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_RTCORBA_PriorityBands[] = { @@ -3578,21 +3629,21 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61 +// be/be_visitor_interface/interface_cs.cpp:57 int RTCORBA::PriorityBandedConnectionPolicy::_tao_class_id = 0; RTCORBA::PriorityBandedConnectionPolicy_ptr RTCORBA::tao_PriorityBandedConnectionPolicy_life::tao_duplicate ( - RTCORBA::PriorityBandedConnectionPolicy_ptr p + PriorityBandedConnectionPolicy_ptr p ) { - return RTCORBA::PriorityBandedConnectionPolicy::_duplicate (p); + return PriorityBandedConnectionPolicy::_duplicate (p); } void RTCORBA::tao_PriorityBandedConnectionPolicy_life::tao_release ( - RTCORBA::PriorityBandedConnectionPolicy_ptr p + PriorityBandedConnectionPolicy_ptr p ) { CORBA::release (p); @@ -3603,12 +3654,12 @@ RTCORBA::tao_PriorityBandedConnectionPolicy_life::tao_nil ( void ) { - return RTCORBA::PriorityBandedConnectionPolicy::_nil (); + return PriorityBandedConnectionPolicy::_nil (); } CORBA::Boolean RTCORBA::tao_PriorityBandedConnectionPolicy_life::tao_marshal ( - RTCORBA::PriorityBandedConnectionPolicy_ptr p, + PriorityBandedConnectionPolicy_ptr p, TAO_OutputCDR &cdr ) { @@ -3621,7 +3672,7 @@ RTCORBA::tao_PriorityBandedConnectionPolicy_cast::tao_narrow ( ACE_ENV_ARG_DECL ) { - return RTCORBA::PriorityBandedConnectionPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); + return PriorityBandedConnectionPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -3629,8 +3680,8 @@ RTCORBA::tao_PriorityBandedConnectionPolicy_cast::tao_upcast ( void *src ) { - RTCORBA::PriorityBandedConnectionPolicy **tmp = - ACE_static_cast (RTCORBA::PriorityBandedConnectionPolicy **, src); + PriorityBandedConnectionPolicy **tmp = + ACE_static_cast (PriorityBandedConnectionPolicy **, src); return *tmp; } @@ -3659,7 +3710,7 @@ RTCORBA::tao_PriorityBandedConnectionPolicy_cast::tao_upcast ( #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 +// be/be_visitor_interface/interface_cs.cpp:239 RTCORBA::PriorityBandedConnectionPolicy::PriorityBandedConnectionPolicy (void) {} @@ -3774,7 +3825,7 @@ RTCORBA::PriorityBandedConnectionPolicy::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 +// be/be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_RTCORBA_PriorityBandedConnectionPolicy[] = { @@ -3823,21 +3874,21 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61 +// be/be_visitor_interface/interface_cs.cpp:57 int RTCORBA::Current::_tao_class_id = 0; RTCORBA::Current_ptr RTCORBA::tao_Current_life::tao_duplicate ( - RTCORBA::Current_ptr p + Current_ptr p ) { - return RTCORBA::Current::_duplicate (p); + return Current::_duplicate (p); } void RTCORBA::tao_Current_life::tao_release ( - RTCORBA::Current_ptr p + Current_ptr p ) { CORBA::release (p); @@ -3848,12 +3899,12 @@ RTCORBA::tao_Current_life::tao_nil ( void ) { - return RTCORBA::Current::_nil (); + return Current::_nil (); } CORBA::Boolean RTCORBA::tao_Current_life::tao_marshal ( - RTCORBA::Current_ptr p, + Current_ptr p, TAO_OutputCDR &cdr ) { @@ -3866,7 +3917,7 @@ RTCORBA::tao_Current_cast::tao_narrow ( ACE_ENV_ARG_DECL ) { - return RTCORBA::Current::_narrow (p ACE_ENV_ARG_PARAMETER); + return Current::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -3874,8 +3925,8 @@ RTCORBA::tao_Current_cast::tao_upcast ( void *src ) { - RTCORBA::Current **tmp = - ACE_static_cast (RTCORBA::Current **, src); + Current **tmp = + ACE_static_cast (Current **, src); return *tmp; } @@ -3904,7 +3955,7 @@ RTCORBA::tao_Current_cast::tao_upcast ( #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 +// be/be_visitor_interface/interface_cs.cpp:239 RTCORBA::Current::Current (void) {} @@ -4019,7 +4070,7 @@ RTCORBA::Current::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 +// be/be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_RTCORBA_Current[] = { @@ -4056,21 +4107,21 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61 +// be/be_visitor_interface/interface_cs.cpp:57 int RTCORBA::Mutex::_tao_class_id = 0; RTCORBA::Mutex_ptr RTCORBA::tao_Mutex_life::tao_duplicate ( - RTCORBA::Mutex_ptr p + Mutex_ptr p ) { - return RTCORBA::Mutex::_duplicate (p); + return Mutex::_duplicate (p); } void RTCORBA::tao_Mutex_life::tao_release ( - RTCORBA::Mutex_ptr p + Mutex_ptr p ) { CORBA::release (p); @@ -4081,12 +4132,12 @@ RTCORBA::tao_Mutex_life::tao_nil ( void ) { - return RTCORBA::Mutex::_nil (); + return Mutex::_nil (); } CORBA::Boolean RTCORBA::tao_Mutex_life::tao_marshal ( - RTCORBA::Mutex_ptr p, + Mutex_ptr p, TAO_OutputCDR &cdr ) { @@ -4099,7 +4150,7 @@ RTCORBA::tao_Mutex_cast::tao_narrow ( ACE_ENV_ARG_DECL ) { - return RTCORBA::Mutex::_narrow (p ACE_ENV_ARG_PARAMETER); + return Mutex::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -4107,8 +4158,8 @@ RTCORBA::tao_Mutex_cast::tao_upcast ( void *src ) { - RTCORBA::Mutex **tmp = - ACE_static_cast (RTCORBA::Mutex **, src); + Mutex **tmp = + ACE_static_cast (Mutex **, src); return *tmp; } @@ -4137,7 +4188,7 @@ RTCORBA::tao_Mutex_cast::tao_upcast ( #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 +// be/be_visitor_interface/interface_cs.cpp:239 RTCORBA::Mutex::Mutex (void) {} @@ -4238,7 +4289,7 @@ RTCORBA::Mutex::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 +// be/be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_RTCORBA_Mutex[] = { @@ -4275,21 +4326,21 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61 +// be/be_visitor_interface/interface_cs.cpp:57 int RTCORBA::RTORB::_tao_class_id = 0; RTCORBA::RTORB_ptr RTCORBA::tao_RTORB_life::tao_duplicate ( - RTCORBA::RTORB_ptr p + RTORB_ptr p ) { - return RTCORBA::RTORB::_duplicate (p); + return RTORB::_duplicate (p); } void RTCORBA::tao_RTORB_life::tao_release ( - RTCORBA::RTORB_ptr p + RTORB_ptr p ) { CORBA::release (p); @@ -4300,12 +4351,12 @@ RTCORBA::tao_RTORB_life::tao_nil ( void ) { - return RTCORBA::RTORB::_nil (); + return RTORB::_nil (); } CORBA::Boolean RTCORBA::tao_RTORB_life::tao_marshal ( - RTCORBA::RTORB_ptr p, + RTORB_ptr p, TAO_OutputCDR &cdr ) { @@ -4318,7 +4369,7 @@ RTCORBA::tao_RTORB_cast::tao_narrow ( ACE_ENV_ARG_DECL ) { - return RTCORBA::RTORB::_narrow (p ACE_ENV_ARG_PARAMETER); + return RTORB::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -4326,8 +4377,8 @@ RTCORBA::tao_RTORB_cast::tao_upcast ( void *src ) { - RTCORBA::RTORB **tmp = - ACE_static_cast (RTCORBA::RTORB **, src); + RTORB **tmp = + ACE_static_cast (RTORB **, src); return *tmp; } @@ -4356,7 +4407,7 @@ RTCORBA::tao_RTORB_cast::tao_upcast ( #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232 +// be/be_visitor_interface/interface_cs.cpp:239 RTCORBA::RTORB::RTORB (void) {} @@ -4457,7 +4508,7 @@ RTCORBA::RTORB::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63 +// be/be_visitor_exception/exception_cs.cpp:63 RTCORBA::RTORB::MutexNotFound::MutexNotFound (void) : CORBA::UserException ( @@ -4552,7 +4603,7 @@ CORBA::TypeCode_ptr RTCORBA::RTORB::MutexNotFound::_type (void) const } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 +// be/be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_RTCORBA_RTORB_MutexNotFound[] = { @@ -4589,7 +4640,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_RTORB_MutexNotFound ( &_tc_TAO_tc_RTCORBA_RTORB_MutexNotFound; // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63 +// be/be_visitor_exception/exception_cs.cpp:63 RTCORBA::RTORB::InvalidThreadpool::InvalidThreadpool (void) : CORBA::UserException ( @@ -4684,7 +4735,7 @@ CORBA::TypeCode_ptr RTCORBA::RTORB::InvalidThreadpool::_type (void) const } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 +// be/be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_RTCORBA_RTORB_InvalidThreadpool[] = { @@ -4723,7 +4774,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_RTORB_InvalidThreadpool ( &_tc_TAO_tc_RTCORBA_RTORB_InvalidThreadpool; // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 +// be/be_visitor_typecode/typecode_defn.cpp:284 static const CORBA::Long _oc_RTCORBA_RTORB[] = { @@ -4760,7 +4811,7 @@ TAO_NAMESPACE_DEFINE ( TAO_NAMESPACE_END // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54 +// be/be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -4825,7 +4876,7 @@ CORBA::Boolean operator>>= ( #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 +// be/be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -4890,7 +4941,7 @@ CORBA::Boolean operator>>= ( #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_cs.cpp:52 +// be/be_visitor_enum/any_op_cs.cpp:52 void operator<<= ( CORBA::Any &_tao_any, @@ -4925,7 +4976,7 @@ CORBA::Boolean operator>>= ( #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 +// be/be_visitor_interface/any_op_cs.cpp:50 // Copying insertion. void @@ -4971,15 +5022,13 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<RTCORBA::PriorityModelPolicy,RTCORBA::PriorityModelPolicy_var>; template class TAO::Any_Impl_T<RTCORBA::PriorityModelPolicy>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<RTCORBA::PriorityModelPolicy, RTCORBA::PriorityModelPolicy_var> # pragma instantiate TAO::Any_Impl_T<RTCORBA::PriorityModelPolicy> #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 +// be/be_visitor_interface/any_op_cs.cpp:50 // Copying insertion. void @@ -5023,18 +5072,15 @@ operator>>= ( ); } - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<RTCORBA::ThreadpoolPolicy,RTCORBA::ThreadpoolPolicy_var>; template class TAO::Any_Impl_T<RTCORBA::ThreadpoolPolicy>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<RTCORBA::ThreadpoolPolicy, RTCORBA::ThreadpoolPolicy_var> # pragma instantiate TAO::Any_Impl_T<RTCORBA::ThreadpoolPolicy> #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 +// be/be_visitor_interface/any_op_cs.cpp:50 // Copying insertion. void @@ -5080,15 +5126,13 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<RTCORBA::ProtocolProperties,RTCORBA::ProtocolProperties_var>; template class TAO::Any_Impl_T<RTCORBA::ProtocolProperties>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<RTCORBA::ProtocolProperties, RTCORBA::ProtocolProperties_var> # pragma instantiate TAO::Any_Impl_T<RTCORBA::ProtocolProperties> #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 +// be/be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -5153,7 +5197,7 @@ CORBA::Boolean operator>>= ( #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 +// be/be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -5218,7 +5262,7 @@ CORBA::Boolean operator>>= ( #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 +// be/be_visitor_interface/any_op_cs.cpp:50 // Copying insertion. void @@ -5264,15 +5308,13 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<RTCORBA::ServerProtocolPolicy,RTCORBA::ServerProtocolPolicy_var>; template class TAO::Any_Impl_T<RTCORBA::ServerProtocolPolicy>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<RTCORBA::ServerProtocolPolicy, RTCORBA::ServerProtocolPolicy_var> # pragma instantiate TAO::Any_Impl_T<RTCORBA::ServerProtocolPolicy> #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 +// be/be_visitor_interface/any_op_cs.cpp:50 // Copying insertion. void @@ -5318,15 +5360,13 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<RTCORBA::ClientProtocolPolicy,RTCORBA::ClientProtocolPolicy_var>; template class TAO::Any_Impl_T<RTCORBA::ClientProtocolPolicy>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<RTCORBA::ClientProtocolPolicy, RTCORBA::ClientProtocolPolicy_var> # pragma instantiate TAO::Any_Impl_T<RTCORBA::ClientProtocolPolicy> #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 +// be/be_visitor_interface/any_op_cs.cpp:50 // Copying insertion. void @@ -5372,15 +5412,13 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<RTCORBA::PrivateConnectionPolicy,RTCORBA::PrivateConnectionPolicy_var>; template class TAO::Any_Impl_T<RTCORBA::PrivateConnectionPolicy>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<RTCORBA::PrivateConnectionPolicy, RTCORBA::PrivateConnectionPolicy_var> # pragma instantiate TAO::Any_Impl_T<RTCORBA::PrivateConnectionPolicy> #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 +// be/be_visitor_interface/any_op_cs.cpp:50 // Copying insertion. void @@ -5426,15 +5464,13 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<RTCORBA::TCPProtocolProperties,RTCORBA::TCPProtocolProperties_var>; template class TAO::Any_Impl_T<RTCORBA::TCPProtocolProperties>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<RTCORBA::TCPProtocolProperties, RTCORBA::TCPProtocolProperties_var> # pragma instantiate TAO::Any_Impl_T<RTCORBA::TCPProtocolProperties> #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 +// be/be_visitor_interface/any_op_cs.cpp:50 // Copying insertion. void @@ -5480,15 +5516,13 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<RTCORBA::GIOPProtocolProperties,RTCORBA::GIOPProtocolProperties_var>; template class TAO::Any_Impl_T<RTCORBA::GIOPProtocolProperties>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<RTCORBA::GIOPProtocolProperties, RTCORBA::GIOPProtocolProperties_var> # pragma instantiate TAO::Any_Impl_T<RTCORBA::GIOPProtocolProperties> #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 +// be/be_visitor_interface/any_op_cs.cpp:50 // Copying insertion. void @@ -5534,15 +5568,13 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<RTCORBA::UnixDomainProtocolProperties,RTCORBA::UnixDomainProtocolProperties_var>; template class TAO::Any_Impl_T<RTCORBA::UnixDomainProtocolProperties>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<RTCORBA::UnixDomainProtocolProperties, RTCORBA::UnixDomainProtocolProperties_var> # pragma instantiate TAO::Any_Impl_T<RTCORBA::UnixDomainProtocolProperties> #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 +// be/be_visitor_interface/any_op_cs.cpp:50 // Copying insertion. void @@ -5588,15 +5620,13 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<RTCORBA::SharedMemoryProtocolProperties,RTCORBA::SharedMemoryProtocolProperties_var>; template class TAO::Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<RTCORBA::SharedMemoryProtocolProperties, RTCORBA::SharedMemoryProtocolProperties_var> # pragma instantiate TAO::Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties> #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 +// be/be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -5661,7 +5691,7 @@ CORBA::Boolean operator>>= ( #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 +// be/be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -5726,7 +5756,7 @@ CORBA::Boolean operator>>= ( #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 +// be/be_visitor_interface/any_op_cs.cpp:50 // Copying insertion. void @@ -5772,15 +5802,13 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<RTCORBA::PriorityBandedConnectionPolicy,RTCORBA::PriorityBandedConnectionPolicy_var>; template class TAO::Any_Impl_T<RTCORBA::PriorityBandedConnectionPolicy>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<RTCORBA::PriorityBandedConnectionPolicy, RTCORBA::PriorityBandedConnectionPolicy_var> # pragma instantiate TAO::Any_Impl_T<RTCORBA::PriorityBandedConnectionPolicy> #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 +// be/be_visitor_interface/any_op_cs.cpp:50 // Copying insertion. void @@ -5826,15 +5854,13 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<RTCORBA::Current,RTCORBA::Current_var>; template class TAO::Any_Impl_T<RTCORBA::Current>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<RTCORBA::Current, RTCORBA::Current_var> # pragma instantiate TAO::Any_Impl_T<RTCORBA::Current> #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 +// be/be_visitor_interface/any_op_cs.cpp:50 // Copying insertion. void @@ -5880,15 +5906,13 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<RTCORBA::Mutex,RTCORBA::Mutex_var>; template class TAO::Any_Impl_T<RTCORBA::Mutex>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<RTCORBA::Mutex, RTCORBA::Mutex_var> # pragma instantiate TAO::Any_Impl_T<RTCORBA::Mutex> #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 +// be/be_visitor_interface/any_op_cs.cpp:50 // Copying insertion. void @@ -5934,15 +5958,16 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<RTCORBA::RTORB,RTCORBA::RTORB_var>; template class TAO::Any_Impl_T<RTCORBA::RTORB>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<RTCORBA::RTORB, RTCORBA::RTORB_var> # pragma instantiate TAO::Any_Impl_T<RTCORBA::RTORB> #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 +// be/be_visitor_sequence/cdr_op_cs.cpp:80 + +#if !defined _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_CPP_ +#define _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_CPP_ CORBA::Boolean operator<< ( TAO_OutputCDR &strm, @@ -6002,13 +6027,58 @@ CORBA::Boolean operator>> ( } return _tao_marshal_flag; + } return 0; } +#endif /* _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_CPP_ */ + // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93 +// be/be_visitor_sequence/cdr_op_cs.cpp:80 + +#if !defined _TAO_CDR_OP_RTCORBA_ProtocolList_CPP_ +#define _TAO_CDR_OP_RTCORBA_ProtocolList_CPP_ + +CORBA::Boolean operator<< ( + TAO_OutputCDR &strm, + const RTCORBA::ProtocolList &_tao_sequence + ) +{ + CORBA::ULong _tao_seq_len = _tao_sequence.length (); + + if (strm << _tao_seq_len) + { + // Encode all elements. + CORBA::Boolean _tao_marshal_flag = 1; + + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) + { + _tao_marshal_flag = (strm << _tao_sequence[i]); + } + + return _tao_marshal_flag; + } + + return 0; +} + +CORBA::Boolean operator>> ( + TAO_InputCDR &, + RTCORBA::ProtocolList & + ) +{ + return 0; +} + +#endif /* _TAO_CDR_OP_RTCORBA_ProtocolList_CPP_ */ + +// TAO_IDL - Generated from +// be/be_visitor_sequence/cdr_op_cs.cpp:80 + +#if !defined _TAO_CDR_OP_RTCORBA_PriorityBands_CPP_ +#define _TAO_CDR_OP_RTCORBA_PriorityBands_CPP_ CORBA::Boolean operator<< ( TAO_OutputCDR &strm, @@ -6068,7 +6138,10 @@ CORBA::Boolean operator>> ( } return _tao_marshal_flag; + } return 0; } + +#endif /* _TAO_CDR_OP_RTCORBA_PriorityBands_CPP_ */ diff --git a/TAO/tao/RTCORBA/RTCORBAC.h b/TAO/tao/RTCORBA/RTCORBAC.h index 3b0cb027373..0178d4a2f11 100644 --- a/TAO/tao/RTCORBA/RTCORBAC.h +++ b/TAO/tao/RTCORBA/RTCORBAC.h @@ -15,27 +15,36 @@ // 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:151 +// be/be_codegen.cpp:151 #ifndef _TAO_IDL_ORIG_RTCORBAC_H_ #define _TAO_IDL_ORIG_RTCORBAC_H_ - #include "ace/pre.h" -#include "tao/orbconf.h" +#include "rtcorba_export.h" + #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "rtcorba_export.h" -#include "tao/IOPC.h" -#include "tao/TimeBaseC.h" +#include "tao/corbafwd.h" +#include "tao/VarOut_T.h" +#include "tao/Seq_Var_T.h" +#include "tao/Seq_Out_T.h" +#include "tao/Sequence_T.h" #include "tao/PolicyC.h" +#include "tao/TimeBaseC.h" +#include "tao/Encodable.h" // Forward references. class TAO_Priority_Mapping_Manager; @@ -47,11 +56,12 @@ class TAO_Network_Priority_Mapping_Manager_var; class TAO_Network_Priority_Mapping_Manager_out; class TAO_Network_Priority_Mapping; -#if !defined(TAO_RTCORBA_SAFE_INCLUDE) && \ - !defined(ACE_VACPP_INSTANTIATING_TEMPLATES) +#ifndef TAO_RTCORBA_SAFE_INCLUDE #error "You should not include RTCORBAC.h directly, use RTCORBA.h" #endif /* !TAO_RTCORBA_SAFE_INCLUDE */ + + #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO #endif @@ -76,11 +86,11 @@ class TAO_Network_Priority_Mapping; #endif /* __BORLANDC__ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48 +// be/be_visitor_module/module_ch.cpp:48 TAO_NAMESPACE RTCORBA { - // TAO-specific + // TAO-specific typedef TAO_Priority_Mapping_Manager PriorityMappingManager; typedef TAO_Priority_Mapping_Manager *PriorityMappingManager_ptr; typedef TAO_Priority_Mapping_Manager_var PriorityMappingManager_var; @@ -98,104 +108,107 @@ TAO_NAMESPACE RTCORBA // End TAO-specific // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333 - + // be/be_visitor_typedef/typedef_ch.cpp:333 + typedef CORBA::Short NativePriority; typedef CORBA::Short_out NativePriority_out; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + // be/be_visitor_typecode/typecode_decl.cpp:44 + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NativePriority; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333 - + // be/be_visitor_typedef/typedef_ch.cpp:333 + typedef CORBA::Short Priority; typedef CORBA::Short_out Priority_out; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + // be/be_visitor_typecode/typecode_decl.cpp:44 + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Priority; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - + // be/be_visitor_constant/constant_ch.cpp:52 + const RTCORBA::Priority minPriority = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - + // be/be_visitor_constant/constant_ch.cpp:52 + const RTCORBA::Priority maxPriority = 32767; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333 - + // be/be_visitor_typedef/typedef_ch.cpp:333 + typedef CORBA::Long NetworkPriority; typedef CORBA::Long_out NetworkPriority_out; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + // be/be_visitor_typecode/typecode_decl.cpp:44 + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NetworkPriority; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333 - + // be/be_visitor_typedef/typedef_ch.cpp:333 + typedef CORBA::ULong ThreadpoolId; typedef CORBA::ULong_out ThreadpoolId_out; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + // be/be_visitor_typecode/typecode_decl.cpp:44 + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadpoolId; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231 - + // be/be_type.cpp:249 + struct ThreadpoolLane; - + typedef TAO_Fixed_Var_T< ThreadpoolLane > ThreadpoolLane_var; - + typedef ThreadpoolLane & ThreadpoolLane_out; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52 - + // be/be_visitor_structure/structure_ch.cpp:52 + struct TAO_RTCORBA_Export ThreadpoolLane { typedef ThreadpoolLane_var _var_type; - + static void _tao_any_destructor (void *); RTCORBA::Priority lane_priority; CORBA::ULong static_threads; CORBA::ULong dynamic_threads; }; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + // be/be_visitor_typecode/typecode_decl.cpp:44 + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadpoolLane; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75 - + // be/be_visitor_sequence/sequence_ch.cpp:89 + +#if !defined (_RTCORBA_THREADPOOLLANES_CH_) +#define _RTCORBA_THREADPOOLLANES_CH_ + class ThreadpoolLanes; - + typedef TAO_FixedSeq_Var_T< ThreadpoolLanes, ThreadpoolLane > ThreadpoolLanes_var; - + typedef TAO_Seq_Out_T< ThreadpoolLanes, @@ -203,7 +216,7 @@ TAO_NAMESPACE RTCORBA ThreadpoolLane > ThreadpoolLanes_out; - + class TAO_RTCORBA_Export ThreadpoolLanes : public TAO_Unbounded_Sequence< @@ -216,67 +229,69 @@ TAO_NAMESPACE RTCORBA ThreadpoolLanes ( CORBA::ULong max, CORBA::ULong length, - ThreadpoolLane* buffer, + ThreadpoolLane* buffer, CORBA::Boolean release = 0 ); ThreadpoolLanes (const ThreadpoolLanes &); ~ThreadpoolLanes (void); - + static void _tao_any_destructor (void *); - + typedef ThreadpoolLanes_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 - + // be/be_visitor_typecode/typecode_decl.cpp:44 + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadpoolLanes; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - + // be/be_visitor_constant/constant_ch.cpp:52 + const CORBA::PolicyType PRIORITY_MODEL_POLICY_TYPE = 40U; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57 - + // be/be_visitor_enum/enum_ch.cpp:57 + enum PriorityModel { CLIENT_PROPAGATED, SERVER_DECLARED }; - + typedef PriorityModel &PriorityModel_out; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + // be/be_visitor_typecode/typecode_decl.cpp:44 + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityModel; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567 + // be/be_interface.cpp:570 #if !defined (_RTCORBA_PRIORITYMODELPOLICY__ODDS_N_ENDS_CH_) #define _RTCORBA_PRIORITYMODELPOLICY__ODDS_N_ENDS_CH_ - + class PriorityModelPolicy; typedef PriorityModelPolicy *PriorityModelPolicy_ptr; struct tao_PriorityModelPolicy_life; - + typedef TAO_Objref_Var_T< PriorityModelPolicy, tao_PriorityModelPolicy_life > PriorityModelPolicy_var; - + typedef TAO_Objref_Out_T< PriorityModelPolicy, tao_PriorityModelPolicy_life > PriorityModelPolicy_out; - + struct TAO_RTCORBA_Export tao_PriorityModelPolicy_life { static PriorityModelPolicy_ptr tao_duplicate (PriorityModelPolicy_ptr); @@ -287,7 +302,7 @@ TAO_NAMESPACE RTCORBA TAO_OutputCDR & ); }; - + struct TAO_RTCORBA_Export tao_PriorityModelPolicy_cast { static PriorityModelPolicy_ptr tao_narrow ( @@ -298,13 +313,13 @@ TAO_NAMESPACE RTCORBA }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 + // be/be_visitor_interface/interface_ch.cpp:50 #if !defined (_RTCORBA_PRIORITYMODELPOLICY_CH_) #define _RTCORBA_PRIORITYMODELPOLICY_CH_ - + class TAO_RTCORBA_Export PriorityModelPolicy : public virtual CORBA::Policy { @@ -312,100 +327,100 @@ TAO_NAMESPACE RTCORBA typedef PriorityModelPolicy_ptr _ptr_type; typedef PriorityModelPolicy_var _var_type; static int _tao_class_id; - + // The static operations. static PriorityModelPolicy_ptr _duplicate (PriorityModelPolicy_ptr obj); - + static PriorityModelPolicy_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static PriorityModelPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static PriorityModelPolicy_ptr _nil (void) { return (PriorityModelPolicy_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 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual ::RTCORBA::PriorityModel priority_model ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual RTCORBA::Priority server_priority ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - + // be/be_visitor_interface/interface_ch.cpp:207 + virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: PriorityModelPolicy (void); virtual ~PriorityModelPolicy (void); - + private: PriorityModelPolicy (const PriorityModelPolicy &); void operator= (const PriorityModelPolicy &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + // be/be_visitor_typecode/typecode_decl.cpp:44 + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityModelPolicy; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - + // be/be_visitor_constant/constant_ch.cpp:52 + const CORBA::PolicyType THREADPOOL_POLICY_TYPE = 41U; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567 + // be/be_interface.cpp:570 #if !defined (_RTCORBA_THREADPOOLPOLICY__ODDS_N_ENDS_CH_) #define _RTCORBA_THREADPOOLPOLICY__ODDS_N_ENDS_CH_ - + class ThreadpoolPolicy; typedef ThreadpoolPolicy *ThreadpoolPolicy_ptr; struct tao_ThreadpoolPolicy_life; - + typedef TAO_Objref_Var_T< ThreadpoolPolicy, tao_ThreadpoolPolicy_life > ThreadpoolPolicy_var; - + typedef TAO_Objref_Out_T< ThreadpoolPolicy, tao_ThreadpoolPolicy_life > ThreadpoolPolicy_out; - + struct TAO_RTCORBA_Export tao_ThreadpoolPolicy_life { static ThreadpoolPolicy_ptr tao_duplicate (ThreadpoolPolicy_ptr); @@ -416,7 +431,7 @@ TAO_NAMESPACE RTCORBA TAO_OutputCDR & ); }; - + struct TAO_RTCORBA_Export tao_ThreadpoolPolicy_cast { static ThreadpoolPolicy_ptr tao_narrow ( @@ -427,13 +442,13 @@ TAO_NAMESPACE RTCORBA }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 + // be/be_visitor_interface/interface_ch.cpp:50 #if !defined (_RTCORBA_THREADPOOLPOLICY_CH_) #define _RTCORBA_THREADPOOLPOLICY_CH_ - + class TAO_RTCORBA_Export ThreadpoolPolicy : public virtual CORBA::Policy { @@ -441,85 +456,85 @@ TAO_NAMESPACE RTCORBA typedef ThreadpoolPolicy_ptr _ptr_type; typedef ThreadpoolPolicy_var _var_type; static int _tao_class_id; - + // The static operations. static ThreadpoolPolicy_ptr _duplicate (ThreadpoolPolicy_ptr obj); - + static ThreadpoolPolicy_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ThreadpoolPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ThreadpoolPolicy_ptr _nil (void) { return (ThreadpoolPolicy_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 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual RTCORBA::ThreadpoolId threadpool ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - + // be/be_visitor_interface/interface_ch.cpp:207 + virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: ThreadpoolPolicy (void); virtual ~ThreadpoolPolicy (void); - + private: ThreadpoolPolicy (const ThreadpoolPolicy &); void operator= (const ThreadpoolPolicy &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + // be/be_visitor_typecode/typecode_decl.cpp:44 + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadpoolPolicy; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567 + // be/be_interface.cpp:570 #if !defined (_RTCORBA_PROTOCOLPROPERTIES__ODDS_N_ENDS_CH_) #define _RTCORBA_PROTOCOLPROPERTIES__ODDS_N_ENDS_CH_ - + class ProtocolProperties; typedef ProtocolProperties *ProtocolProperties_ptr; struct tao_ProtocolProperties_life; - + typedef TAO_Objref_Var_T< ProtocolProperties, tao_ProtocolProperties_life > ProtocolProperties_var; - + typedef TAO_Objref_Out_T< ProtocolProperties, tao_ProtocolProperties_life > ProtocolProperties_out; - + struct TAO_RTCORBA_Export tao_ProtocolProperties_life { static ProtocolProperties_ptr tao_duplicate (ProtocolProperties_ptr); @@ -530,7 +545,7 @@ TAO_NAMESPACE RTCORBA TAO_OutputCDR & ); }; - + struct TAO_RTCORBA_Export tao_ProtocolProperties_cast { static ProtocolProperties_ptr tao_narrow ( @@ -541,118 +556,121 @@ TAO_NAMESPACE RTCORBA }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 + // be/be_visitor_interface/interface_ch.cpp:50 #if !defined (_RTCORBA_PROTOCOLPROPERTIES_CH_) #define _RTCORBA_PROTOCOLPROPERTIES_CH_ - + class TAO_RTCORBA_Export ProtocolProperties : public virtual CORBA::Object + , public TAO_Encodable { public: typedef ProtocolProperties_ptr _ptr_type; typedef ProtocolProperties_var _var_type; static int _tao_class_id; - + // The static operations. static ProtocolProperties_ptr _duplicate (ProtocolProperties_ptr obj); - + static ProtocolProperties_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ProtocolProperties_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ProtocolProperties_ptr _nil (void) { return (ProtocolProperties_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 - + // be/be_visitor_interface/interface_ch.cpp:207 + virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - - // CDR Encoder/Decoder methods. + // CDR Encoder/Decoder methods. virtual CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr); virtual CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr); protected: ProtocolProperties (void); virtual ~ProtocolProperties (void); - + private: ProtocolProperties (const ProtocolProperties &); void operator= (const ProtocolProperties &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + // be/be_visitor_typecode/typecode_decl.cpp:44 + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ProtocolProperties; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231 - + // be/be_type.cpp:249 + struct Protocol; - + typedef TAO_Var_Var_T< Protocol > Protocol_var; - + typedef TAO_Out_T< Protocol, Protocol_var > Protocol_out; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52 - + // be/be_visitor_structure/structure_ch.cpp:52 + struct TAO_RTCORBA_Export Protocol { typedef Protocol_var _var_type; - + static void _tao_any_destructor (void *); IOP::ProfileId protocol_type; RTCORBA::ProtocolProperties_var orb_protocol_properties; RTCORBA::ProtocolProperties_var transport_protocol_properties; }; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + // be/be_visitor_typecode/typecode_decl.cpp:44 + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Protocol; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75 - + // be/be_visitor_sequence/sequence_ch.cpp:89 + +#if !defined (_RTCORBA_PROTOCOLLIST_CH_) +#define _RTCORBA_PROTOCOLLIST_CH_ + class ProtocolList; - + typedef TAO_VarSeq_Var_T< ProtocolList, Protocol > ProtocolList_var; - + typedef TAO_Seq_Out_T< ProtocolList, @@ -660,7 +678,7 @@ TAO_NAMESPACE RTCORBA Protocol > ProtocolList_out; - + class TAO_RTCORBA_Export ProtocolList : public TAO_Unbounded_Sequence< @@ -673,51 +691,53 @@ TAO_NAMESPACE RTCORBA ProtocolList ( CORBA::ULong max, CORBA::ULong length, - Protocol* buffer, + Protocol* buffer, CORBA::Boolean release = 0 ); ProtocolList (const ProtocolList &); ~ProtocolList (void); - + static void _tao_any_destructor (void *); - + typedef ProtocolList_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 - + // be/be_visitor_typecode/typecode_decl.cpp:44 + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ProtocolList; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - + // be/be_visitor_constant/constant_ch.cpp:52 + const CORBA::PolicyType SERVER_PROTOCOL_POLICY_TYPE = 42U; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567 + // be/be_interface.cpp:570 #if !defined (_RTCORBA_SERVERPROTOCOLPOLICY__ODDS_N_ENDS_CH_) #define _RTCORBA_SERVERPROTOCOLPOLICY__ODDS_N_ENDS_CH_ - + class ServerProtocolPolicy; typedef ServerProtocolPolicy *ServerProtocolPolicy_ptr; struct tao_ServerProtocolPolicy_life; - + typedef TAO_Objref_Var_T< ServerProtocolPolicy, tao_ServerProtocolPolicy_life > ServerProtocolPolicy_var; - + typedef TAO_Objref_Out_T< ServerProtocolPolicy, tao_ServerProtocolPolicy_life > ServerProtocolPolicy_out; - + struct TAO_RTCORBA_Export tao_ServerProtocolPolicy_life { static ServerProtocolPolicy_ptr tao_duplicate (ServerProtocolPolicy_ptr); @@ -728,7 +748,7 @@ TAO_NAMESPACE RTCORBA TAO_OutputCDR & ); }; - + struct TAO_RTCORBA_Export tao_ServerProtocolPolicy_cast { static ServerProtocolPolicy_ptr tao_narrow ( @@ -739,13 +759,13 @@ TAO_NAMESPACE RTCORBA }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 + // be/be_visitor_interface/interface_ch.cpp:50 #if !defined (_RTCORBA_SERVERPROTOCOLPOLICY_CH_) #define _RTCORBA_SERVERPROTOCOLPOLICY_CH_ - + class TAO_RTCORBA_Export ServerProtocolPolicy : public virtual CORBA::Policy { @@ -753,90 +773,90 @@ TAO_NAMESPACE RTCORBA typedef ServerProtocolPolicy_ptr _ptr_type; typedef ServerProtocolPolicy_var _var_type; static int _tao_class_id; - + // The static operations. static ServerProtocolPolicy_ptr _duplicate (ServerProtocolPolicy_ptr obj); - + static ServerProtocolPolicy_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ServerProtocolPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ServerProtocolPolicy_ptr _nil (void) { return (ServerProtocolPolicy_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 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual ::RTCORBA::ProtocolList * protocols ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - + // be/be_visitor_interface/interface_ch.cpp:207 + virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: ServerProtocolPolicy (void); virtual ~ServerProtocolPolicy (void); - + private: ServerProtocolPolicy (const ServerProtocolPolicy &); void operator= (const ServerProtocolPolicy &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + // be/be_visitor_typecode/typecode_decl.cpp:44 + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerProtocolPolicy; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - + // be/be_visitor_constant/constant_ch.cpp:52 + const CORBA::PolicyType CLIENT_PROTOCOL_POLICY_TYPE = 43U; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567 + // be/be_interface.cpp:570 #if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY__ODDS_N_ENDS_CH_) #define _RTCORBA_CLIENTPROTOCOLPOLICY__ODDS_N_ENDS_CH_ - + class ClientProtocolPolicy; typedef ClientProtocolPolicy *ClientProtocolPolicy_ptr; struct tao_ClientProtocolPolicy_life; - + typedef TAO_Objref_Var_T< ClientProtocolPolicy, tao_ClientProtocolPolicy_life > ClientProtocolPolicy_var; - + typedef TAO_Objref_Out_T< ClientProtocolPolicy, tao_ClientProtocolPolicy_life > ClientProtocolPolicy_out; - + struct TAO_RTCORBA_Export tao_ClientProtocolPolicy_life { static ClientProtocolPolicy_ptr tao_duplicate (ClientProtocolPolicy_ptr); @@ -847,7 +867,7 @@ TAO_NAMESPACE RTCORBA TAO_OutputCDR & ); }; - + struct TAO_RTCORBA_Export tao_ClientProtocolPolicy_cast { static ClientProtocolPolicy_ptr tao_narrow ( @@ -858,13 +878,13 @@ TAO_NAMESPACE RTCORBA }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 + // be/be_visitor_interface/interface_ch.cpp:50 #if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY_CH_) #define _RTCORBA_CLIENTPROTOCOLPOLICY_CH_ - + class TAO_RTCORBA_Export ClientProtocolPolicy : public virtual CORBA::Policy { @@ -872,90 +892,90 @@ TAO_NAMESPACE RTCORBA typedef ClientProtocolPolicy_ptr _ptr_type; typedef ClientProtocolPolicy_var _var_type; static int _tao_class_id; - + // The static operations. static ClientProtocolPolicy_ptr _duplicate (ClientProtocolPolicy_ptr obj); - + static ClientProtocolPolicy_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ClientProtocolPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static ClientProtocolPolicy_ptr _nil (void) { return (ClientProtocolPolicy_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 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual ::RTCORBA::ProtocolList * protocols ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - + // be/be_visitor_interface/interface_ch.cpp:207 + virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: ClientProtocolPolicy (void); virtual ~ClientProtocolPolicy (void); - + private: ClientProtocolPolicy (const ClientProtocolPolicy &); void operator= (const ClientProtocolPolicy &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + // be/be_visitor_typecode/typecode_decl.cpp:44 + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ClientProtocolPolicy; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - + // be/be_visitor_constant/constant_ch.cpp:52 + const CORBA::PolicyType PRIVATE_CONNECTION_POLICY_TYPE = 44U; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567 + // be/be_interface.cpp:570 #if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY__ODDS_N_ENDS_CH_) #define _RTCORBA_PRIVATECONNECTIONPOLICY__ODDS_N_ENDS_CH_ - + class PrivateConnectionPolicy; typedef PrivateConnectionPolicy *PrivateConnectionPolicy_ptr; struct tao_PrivateConnectionPolicy_life; - + typedef TAO_Objref_Var_T< PrivateConnectionPolicy, tao_PrivateConnectionPolicy_life > PrivateConnectionPolicy_var; - + typedef TAO_Objref_Out_T< PrivateConnectionPolicy, tao_PrivateConnectionPolicy_life > PrivateConnectionPolicy_out; - + struct TAO_RTCORBA_Export tao_PrivateConnectionPolicy_life { static PrivateConnectionPolicy_ptr tao_duplicate (PrivateConnectionPolicy_ptr); @@ -966,7 +986,7 @@ TAO_NAMESPACE RTCORBA TAO_OutputCDR & ); }; - + struct TAO_RTCORBA_Export tao_PrivateConnectionPolicy_cast { static PrivateConnectionPolicy_ptr tao_narrow ( @@ -977,13 +997,13 @@ TAO_NAMESPACE RTCORBA }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 + // be/be_visitor_interface/interface_ch.cpp:50 #if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY_CH_) #define _RTCORBA_PRIVATECONNECTIONPOLICY_CH_ - + class TAO_RTCORBA_Export PrivateConnectionPolicy : public virtual CORBA::Policy { @@ -991,75 +1011,75 @@ TAO_NAMESPACE RTCORBA typedef PrivateConnectionPolicy_ptr _ptr_type; typedef PrivateConnectionPolicy_var _var_type; static int _tao_class_id; - + // The static operations. static PrivateConnectionPolicy_ptr _duplicate (PrivateConnectionPolicy_ptr obj); - + static PrivateConnectionPolicy_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static PrivateConnectionPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static PrivateConnectionPolicy_ptr _nil (void) { return (PrivateConnectionPolicy_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 - + // be/be_visitor_interface/interface_ch.cpp:207 + virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: PrivateConnectionPolicy (void); virtual ~PrivateConnectionPolicy (void); - + private: PrivateConnectionPolicy (const PrivateConnectionPolicy &); void operator= (const PrivateConnectionPolicy &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + // be/be_visitor_typecode/typecode_decl.cpp:44 + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PrivateConnectionPolicy; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567 + // be/be_interface.cpp:570 #if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES__ODDS_N_ENDS_CH_) #define _RTCORBA_TCPPROTOCOLPROPERTIES__ODDS_N_ENDS_CH_ - + class TCPProtocolProperties; typedef TCPProtocolProperties *TCPProtocolProperties_ptr; struct tao_TCPProtocolProperties_life; - + typedef TAO_Objref_Var_T< TCPProtocolProperties, tao_TCPProtocolProperties_life > TCPProtocolProperties_var; - + typedef TAO_Objref_Out_T< TCPProtocolProperties, tao_TCPProtocolProperties_life > TCPProtocolProperties_out; - + struct TAO_RTCORBA_Export tao_TCPProtocolProperties_life { static TCPProtocolProperties_ptr tao_duplicate (TCPProtocolProperties_ptr); @@ -1070,7 +1090,7 @@ TAO_NAMESPACE RTCORBA TAO_OutputCDR & ); }; - + struct TAO_RTCORBA_Export tao_TCPProtocolProperties_cast { static TCPProtocolProperties_ptr tao_narrow ( @@ -1081,13 +1101,13 @@ TAO_NAMESPACE RTCORBA }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 + // be/be_visitor_interface/interface_ch.cpp:50 #if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES_CH_) #define _RTCORBA_TCPPROTOCOLPROPERTIES_CH_ - + class TAO_RTCORBA_Export TCPProtocolProperties : public virtual RTCORBA::ProtocolProperties { @@ -1095,40 +1115,40 @@ TAO_NAMESPACE RTCORBA typedef TCPProtocolProperties_ptr _ptr_type; typedef TCPProtocolProperties_var _var_type; static int _tao_class_id; - + // The static operations. static TCPProtocolProperties_ptr _duplicate (TCPProtocolProperties_ptr obj); - + static TCPProtocolProperties_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static TCPProtocolProperties_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static TCPProtocolProperties_ptr _nil (void) { return (TCPProtocolProperties_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 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual CORBA::Long send_buffer_size ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual void send_buffer_size ( CORBA::Long send_buffer_size ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1136,20 +1156,20 @@ TAO_NAMESPACE RTCORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual CORBA::Long recv_buffer_size ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual void recv_buffer_size ( CORBA::Long recv_buffer_size ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1157,20 +1177,20 @@ TAO_NAMESPACE RTCORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual CORBA::Boolean keep_alive ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual void keep_alive ( CORBA::Boolean keep_alive ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1178,20 +1198,20 @@ TAO_NAMESPACE RTCORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual CORBA::Boolean dont_route ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual void dont_route ( CORBA::Boolean dont_route ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1199,20 +1219,20 @@ TAO_NAMESPACE RTCORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual CORBA::Boolean no_delay ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual void no_delay ( CORBA::Boolean no_delay ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1220,20 +1240,20 @@ TAO_NAMESPACE RTCORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual CORBA::Boolean enable_network_priority ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual void enable_network_priority ( CORBA::Boolean enable_network_priority ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1241,55 +1261,55 @@ TAO_NAMESPACE RTCORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - + // be/be_visitor_interface/interface_ch.cpp:207 + virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: TCPProtocolProperties (void); virtual ~TCPProtocolProperties (void); - + private: TCPProtocolProperties (const TCPProtocolProperties &); void operator= (const TCPProtocolProperties &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + // be/be_visitor_typecode/typecode_decl.cpp:44 + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TCPProtocolProperties; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567 + // be/be_interface.cpp:570 #if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES__ODDS_N_ENDS_CH_) #define _RTCORBA_GIOPPROTOCOLPROPERTIES__ODDS_N_ENDS_CH_ - + class GIOPProtocolProperties; typedef GIOPProtocolProperties *GIOPProtocolProperties_ptr; struct tao_GIOPProtocolProperties_life; - + typedef TAO_Objref_Var_T< GIOPProtocolProperties, tao_GIOPProtocolProperties_life > GIOPProtocolProperties_var; - + typedef TAO_Objref_Out_T< GIOPProtocolProperties, tao_GIOPProtocolProperties_life > GIOPProtocolProperties_out; - + struct TAO_RTCORBA_Export tao_GIOPProtocolProperties_life { static GIOPProtocolProperties_ptr tao_duplicate (GIOPProtocolProperties_ptr); @@ -1300,7 +1320,7 @@ TAO_NAMESPACE RTCORBA TAO_OutputCDR & ); }; - + struct TAO_RTCORBA_Export tao_GIOPProtocolProperties_cast { static GIOPProtocolProperties_ptr tao_narrow ( @@ -1311,13 +1331,13 @@ TAO_NAMESPACE RTCORBA }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 + // be/be_visitor_interface/interface_ch.cpp:50 #if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES_CH_) #define _RTCORBA_GIOPPROTOCOLPROPERTIES_CH_ - + class TAO_RTCORBA_Export GIOPProtocolProperties : public virtual RTCORBA::ProtocolProperties { @@ -1325,75 +1345,75 @@ TAO_NAMESPACE RTCORBA typedef GIOPProtocolProperties_ptr _ptr_type; typedef GIOPProtocolProperties_var _var_type; static int _tao_class_id; - + // The static operations. static GIOPProtocolProperties_ptr _duplicate (GIOPProtocolProperties_ptr obj); - + static GIOPProtocolProperties_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static GIOPProtocolProperties_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static GIOPProtocolProperties_ptr _nil (void) { return (GIOPProtocolProperties_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 - + // be/be_visitor_interface/interface_ch.cpp:207 + virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: GIOPProtocolProperties (void); virtual ~GIOPProtocolProperties (void); - + private: GIOPProtocolProperties (const GIOPProtocolProperties &); void operator= (const GIOPProtocolProperties &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + // be/be_visitor_typecode/typecode_decl.cpp:44 + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_GIOPProtocolProperties; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567 + // be/be_interface.cpp:570 #if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES__ODDS_N_ENDS_CH_) #define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES__ODDS_N_ENDS_CH_ - + class UnixDomainProtocolProperties; typedef UnixDomainProtocolProperties *UnixDomainProtocolProperties_ptr; struct tao_UnixDomainProtocolProperties_life; - + typedef TAO_Objref_Var_T< UnixDomainProtocolProperties, tao_UnixDomainProtocolProperties_life > UnixDomainProtocolProperties_var; - + typedef TAO_Objref_Out_T< UnixDomainProtocolProperties, tao_UnixDomainProtocolProperties_life > UnixDomainProtocolProperties_out; - + struct TAO_RTCORBA_Export tao_UnixDomainProtocolProperties_life { static UnixDomainProtocolProperties_ptr tao_duplicate (UnixDomainProtocolProperties_ptr); @@ -1404,7 +1424,7 @@ TAO_NAMESPACE RTCORBA TAO_OutputCDR & ); }; - + struct TAO_RTCORBA_Export tao_UnixDomainProtocolProperties_cast { static UnixDomainProtocolProperties_ptr tao_narrow ( @@ -1415,13 +1435,13 @@ TAO_NAMESPACE RTCORBA }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 + // be/be_visitor_interface/interface_ch.cpp:50 #if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES_CH_) #define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES_CH_ - + class TAO_RTCORBA_Export UnixDomainProtocolProperties : public virtual RTCORBA::ProtocolProperties { @@ -1429,40 +1449,40 @@ TAO_NAMESPACE RTCORBA typedef UnixDomainProtocolProperties_ptr _ptr_type; typedef UnixDomainProtocolProperties_var _var_type; static int _tao_class_id; - + // The static operations. static UnixDomainProtocolProperties_ptr _duplicate (UnixDomainProtocolProperties_ptr obj); - + static UnixDomainProtocolProperties_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static UnixDomainProtocolProperties_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static UnixDomainProtocolProperties_ptr _nil (void) { return (UnixDomainProtocolProperties_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 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual CORBA::Long send_buffer_size ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual void send_buffer_size ( CORBA::Long send_buffer_size ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1470,20 +1490,20 @@ TAO_NAMESPACE RTCORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual CORBA::Long recv_buffer_size ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual void recv_buffer_size ( CORBA::Long recv_buffer_size ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1491,55 +1511,55 @@ TAO_NAMESPACE RTCORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - + // be/be_visitor_interface/interface_ch.cpp:207 + virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: UnixDomainProtocolProperties (void); virtual ~UnixDomainProtocolProperties (void); - + private: UnixDomainProtocolProperties (const UnixDomainProtocolProperties &); void operator= (const UnixDomainProtocolProperties &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + // be/be_visitor_typecode/typecode_decl.cpp:44 + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UnixDomainProtocolProperties; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567 + // be/be_interface.cpp:570 #if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES__ODDS_N_ENDS_CH_) #define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES__ODDS_N_ENDS_CH_ - + class SharedMemoryProtocolProperties; typedef SharedMemoryProtocolProperties *SharedMemoryProtocolProperties_ptr; struct tao_SharedMemoryProtocolProperties_life; - + typedef TAO_Objref_Var_T< SharedMemoryProtocolProperties, tao_SharedMemoryProtocolProperties_life > SharedMemoryProtocolProperties_var; - + typedef TAO_Objref_Out_T< SharedMemoryProtocolProperties, tao_SharedMemoryProtocolProperties_life > SharedMemoryProtocolProperties_out; - + struct TAO_RTCORBA_Export tao_SharedMemoryProtocolProperties_life { static SharedMemoryProtocolProperties_ptr tao_duplicate (SharedMemoryProtocolProperties_ptr); @@ -1550,7 +1570,7 @@ TAO_NAMESPACE RTCORBA TAO_OutputCDR & ); }; - + struct TAO_RTCORBA_Export tao_SharedMemoryProtocolProperties_cast { static SharedMemoryProtocolProperties_ptr tao_narrow ( @@ -1561,13 +1581,13 @@ TAO_NAMESPACE RTCORBA }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 + // be/be_visitor_interface/interface_ch.cpp:50 #if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES_CH_) #define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES_CH_ - + class TAO_RTCORBA_Export SharedMemoryProtocolProperties : public virtual RTCORBA::ProtocolProperties { @@ -1575,40 +1595,40 @@ TAO_NAMESPACE RTCORBA typedef SharedMemoryProtocolProperties_ptr _ptr_type; typedef SharedMemoryProtocolProperties_var _var_type; static int _tao_class_id; - + // The static operations. static SharedMemoryProtocolProperties_ptr _duplicate (SharedMemoryProtocolProperties_ptr obj); - + static SharedMemoryProtocolProperties_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static SharedMemoryProtocolProperties_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static SharedMemoryProtocolProperties_ptr _nil (void) { return (SharedMemoryProtocolProperties_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 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual CORBA::Long preallocate_buffer_size ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual void preallocate_buffer_size ( CORBA::Long preallocate_buffer_size ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1616,20 +1636,20 @@ TAO_NAMESPACE RTCORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual char * mmap_filename ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual void mmap_filename ( const char * mmap_filename ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1637,20 +1657,20 @@ TAO_NAMESPACE RTCORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual char * mmap_lockname ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual void mmap_lockname ( const char * mmap_lockname ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1658,75 +1678,78 @@ TAO_NAMESPACE RTCORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - + // be/be_visitor_interface/interface_ch.cpp:207 + virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: SharedMemoryProtocolProperties (void); virtual ~SharedMemoryProtocolProperties (void); - + private: SharedMemoryProtocolProperties (const SharedMemoryProtocolProperties &); void operator= (const SharedMemoryProtocolProperties &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + // be/be_visitor_typecode/typecode_decl.cpp:44 + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_SharedMemoryProtocolProperties; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:231 - + // be/be_type.cpp:249 + struct PriorityBand; - + typedef TAO_Fixed_Var_T< PriorityBand > PriorityBand_var; - + typedef PriorityBand & PriorityBand_out; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52 - + // be/be_visitor_structure/structure_ch.cpp:52 + struct TAO_RTCORBA_Export PriorityBand { typedef PriorityBand_var _var_type; - + static void _tao_any_destructor (void *); RTCORBA::Priority low; RTCORBA::Priority high; }; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + // be/be_visitor_typecode/typecode_decl.cpp:44 + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityBand; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75 - + // be/be_visitor_sequence/sequence_ch.cpp:89 + +#if !defined (_RTCORBA_PRIORITYBANDS_CH_) +#define _RTCORBA_PRIORITYBANDS_CH_ + class PriorityBands; - + typedef TAO_FixedSeq_Var_T< PriorityBands, PriorityBand > PriorityBands_var; - + typedef TAO_Seq_Out_T< PriorityBands, @@ -1734,7 +1757,7 @@ TAO_NAMESPACE RTCORBA PriorityBand > PriorityBands_out; - + class TAO_RTCORBA_Export PriorityBands : public TAO_Unbounded_Sequence< @@ -1747,51 +1770,53 @@ TAO_NAMESPACE RTCORBA PriorityBands ( CORBA::ULong max, CORBA::ULong length, - PriorityBand* buffer, + PriorityBand* buffer, CORBA::Boolean release = 0 ); PriorityBands (const PriorityBands &); ~PriorityBands (void); - + static void _tao_any_destructor (void *); - + typedef PriorityBands_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 - + // be/be_visitor_typecode/typecode_decl.cpp:44 + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityBands; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52 - + // be/be_visitor_constant/constant_ch.cpp:52 + const CORBA::PolicyType PRIORITY_BANDED_CONNECTION_POLICY_TYPE = 45U; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567 + // be/be_interface.cpp:570 #if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY__ODDS_N_ENDS_CH_) #define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY__ODDS_N_ENDS_CH_ - + class PriorityBandedConnectionPolicy; typedef PriorityBandedConnectionPolicy *PriorityBandedConnectionPolicy_ptr; struct tao_PriorityBandedConnectionPolicy_life; - + typedef TAO_Objref_Var_T< PriorityBandedConnectionPolicy, tao_PriorityBandedConnectionPolicy_life > PriorityBandedConnectionPolicy_var; - + typedef TAO_Objref_Out_T< PriorityBandedConnectionPolicy, tao_PriorityBandedConnectionPolicy_life > PriorityBandedConnectionPolicy_out; - + struct TAO_RTCORBA_Export tao_PriorityBandedConnectionPolicy_life { static PriorityBandedConnectionPolicy_ptr tao_duplicate (PriorityBandedConnectionPolicy_ptr); @@ -1802,7 +1827,7 @@ TAO_NAMESPACE RTCORBA TAO_OutputCDR & ); }; - + struct TAO_RTCORBA_Export tao_PriorityBandedConnectionPolicy_cast { static PriorityBandedConnectionPolicy_ptr tao_narrow ( @@ -1813,13 +1838,13 @@ TAO_NAMESPACE RTCORBA }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 + // be/be_visitor_interface/interface_ch.cpp:50 #if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY_CH_) #define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY_CH_ - + class TAO_RTCORBA_Export PriorityBandedConnectionPolicy : public virtual CORBA::Policy { @@ -1827,85 +1852,85 @@ TAO_NAMESPACE RTCORBA typedef PriorityBandedConnectionPolicy_ptr _ptr_type; typedef PriorityBandedConnectionPolicy_var _var_type; static int _tao_class_id; - + // The static operations. static PriorityBandedConnectionPolicy_ptr _duplicate (PriorityBandedConnectionPolicy_ptr obj); - + static PriorityBandedConnectionPolicy_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static PriorityBandedConnectionPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static PriorityBandedConnectionPolicy_ptr _nil (void) { return (PriorityBandedConnectionPolicy_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 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual ::RTCORBA::PriorityBands * priority_bands ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - + // be/be_visitor_interface/interface_ch.cpp:207 + virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: PriorityBandedConnectionPolicy (void); virtual ~PriorityBandedConnectionPolicy (void); - + private: PriorityBandedConnectionPolicy (const PriorityBandedConnectionPolicy &); void operator= (const PriorityBandedConnectionPolicy &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + // be/be_visitor_typecode/typecode_decl.cpp:44 + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityBandedConnectionPolicy; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567 + // be/be_interface.cpp:570 #if !defined (_RTCORBA_CURRENT__ODDS_N_ENDS_CH_) #define _RTCORBA_CURRENT__ODDS_N_ENDS_CH_ - + class Current; typedef Current *Current_ptr; struct tao_Current_life; - + typedef TAO_Objref_Var_T< Current, tao_Current_life > Current_var; - + typedef TAO_Objref_Out_T< Current, tao_Current_life > Current_out; - + struct TAO_RTCORBA_Export tao_Current_life { static Current_ptr tao_duplicate (Current_ptr); @@ -1916,7 +1941,7 @@ TAO_NAMESPACE RTCORBA TAO_OutputCDR & ); }; - + struct TAO_RTCORBA_Export tao_Current_cast { static Current_ptr tao_narrow ( @@ -1927,13 +1952,13 @@ TAO_NAMESPACE RTCORBA }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 + // be/be_visitor_interface/interface_ch.cpp:50 #if !defined (_RTCORBA_CURRENT_CH_) #define _RTCORBA_CURRENT_CH_ - + class TAO_RTCORBA_Export Current : public virtual CORBA::Current { @@ -1941,40 +1966,40 @@ TAO_NAMESPACE RTCORBA 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_operation/operation_ch.cpp:46 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual RTCORBA::Priority the_priority ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual void the_priority ( RTCORBA::Priority the_priority ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1982,55 +2007,55 @@ TAO_NAMESPACE RTCORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - + // be/be_visitor_interface/interface_ch.cpp:207 + virtual void *_tao_QueryInterface (ptr_arith_t type); - + 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 - + // 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_interface.cpp:567 + // be/be_interface.cpp:570 #if !defined (_RTCORBA_MUTEX__ODDS_N_ENDS_CH_) #define _RTCORBA_MUTEX__ODDS_N_ENDS_CH_ - + class Mutex; typedef Mutex *Mutex_ptr; struct tao_Mutex_life; - + typedef TAO_Objref_Var_T< Mutex, tao_Mutex_life > Mutex_var; - + typedef TAO_Objref_Out_T< Mutex, tao_Mutex_life > Mutex_out; - + struct TAO_RTCORBA_Export tao_Mutex_life { static Mutex_ptr tao_duplicate (Mutex_ptr); @@ -2041,7 +2066,7 @@ TAO_NAMESPACE RTCORBA TAO_OutputCDR & ); }; - + struct TAO_RTCORBA_Export tao_Mutex_cast { static Mutex_ptr tao_narrow ( @@ -2052,13 +2077,13 @@ TAO_NAMESPACE RTCORBA }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 + // be/be_visitor_interface/interface_ch.cpp:50 #if !defined (_RTCORBA_MUTEX_CH_) #define _RTCORBA_MUTEX_CH_ - + class TAO_RTCORBA_Export Mutex : public virtual CORBA::Object { @@ -2066,50 +2091,50 @@ TAO_NAMESPACE RTCORBA typedef Mutex_ptr _ptr_type; typedef Mutex_var _var_type; static int _tao_class_id; - + // The static operations. static Mutex_ptr _duplicate (Mutex_ptr obj); - + static Mutex_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Mutex_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Mutex_ptr _nil (void) { return (Mutex_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 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual void lock ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual void unlock ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual CORBA::Boolean try_lock ( TimeBase::TimeT max_wait ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -2117,55 +2142,55 @@ TAO_NAMESPACE RTCORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - + // be/be_visitor_interface/interface_ch.cpp:207 + virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: Mutex (void); virtual ~Mutex (void); - + private: Mutex (const Mutex &); void operator= (const Mutex &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + // be/be_visitor_typecode/typecode_decl.cpp:44 + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Mutex; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567 + // be/be_interface.cpp:570 #if !defined (_RTCORBA_RTORB__ODDS_N_ENDS_CH_) #define _RTCORBA_RTORB__ODDS_N_ENDS_CH_ - + class RTORB; typedef RTORB *RTORB_ptr; struct tao_RTORB_life; - + typedef TAO_Objref_Var_T< RTORB, tao_RTORB_life > RTORB_var; - + typedef TAO_Objref_Out_T< RTORB, tao_RTORB_life > RTORB_out; - + struct TAO_RTCORBA_Export tao_RTORB_life { static RTORB_ptr tao_duplicate (RTORB_ptr); @@ -2176,7 +2201,7 @@ TAO_NAMESPACE RTCORBA TAO_OutputCDR & ); }; - + struct TAO_RTCORBA_Export tao_RTORB_cast { static RTORB_ptr tao_narrow ( @@ -2187,13 +2212,13 @@ TAO_NAMESPACE RTCORBA }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54 + // be/be_visitor_interface/interface_ch.cpp:50 #if !defined (_RTCORBA_RTORB_CH_) #define _RTCORBA_RTORB_CH_ - + class TAO_RTCORBA_Export RTORB : public virtual CORBA::Object { @@ -2201,40 +2226,40 @@ TAO_NAMESPACE RTCORBA typedef RTORB_ptr _ptr_type; typedef RTORB_var _var_type; static int _tao_class_id; - + // The static operations. static RTORB_ptr _duplicate (RTORB_ptr obj); - + static RTORB_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static RTORB_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static RTORB_ptr _nil (void) { return (RTORB_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 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual ::RTCORBA::Mutex_ptr create_mutex ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual void destroy_mutex ( RTCORBA::Mutex_ptr the_mutex ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -2242,25 +2267,25 @@ TAO_NAMESPACE RTCORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51 + // be/be_visitor_exception/exception_ch.cpp:51 #if !defined (_RTCORBA_RTORB_MUTEXNOTFOUND_CH_) #define _RTCORBA_RTORB_MUTEXNOTFOUND_CH_ - + class TAO_RTCORBA_Export MutexNotFound : public CORBA::UserException { public: - + MutexNotFound (void); MutexNotFound (const MutexNotFound &); ~MutexNotFound (void); MutexNotFound &operator= (const MutexNotFound &); - + static void _tao_any_destructor (void *); - + static MutexNotFound *_downcast (CORBA::Exception *); static CORBA::Exception *_alloc (void); @@ -2272,28 +2297,28 @@ TAO_NAMESPACE RTCORBA TAO_OutputCDR & ACE_ENV_ARG_DECL_NOT_USED ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL_NOT_USED ); - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125 - + // be/be_visitor_exception/exception_ch.cpp:125 + virtual CORBA::TypeCode_ptr _type (void) const; }; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + // be/be_visitor_typecode/typecode_decl.cpp:44 + static ::CORBA::TypeCode_ptr _tc_MutexNotFound; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual ::RTCORBA::Mutex_ptr create_named_mutex ( const char * name, CORBA::Boolean_out created_flag @@ -2302,10 +2327,10 @@ TAO_NAMESPACE RTCORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual ::RTCORBA::Mutex_ptr open_named_mutex ( const char * name ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -2314,10 +2339,10 @@ TAO_NAMESPACE RTCORBA CORBA::SystemException , RTCORBA::RTORB::MutexNotFound )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual ::RTCORBA::TCPProtocolProperties_ptr create_tcp_protocol_properties ( CORBA::Long send_buffer_size, CORBA::Long recv_buffer_size, @@ -2330,25 +2355,25 @@ TAO_NAMESPACE RTCORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51 + // be/be_visitor_exception/exception_ch.cpp:51 #if !defined (_RTCORBA_RTORB_INVALIDTHREADPOOL_CH_) #define _RTCORBA_RTORB_INVALIDTHREADPOOL_CH_ - + class TAO_RTCORBA_Export InvalidThreadpool : public CORBA::UserException { public: - + InvalidThreadpool (void); InvalidThreadpool (const InvalidThreadpool &); ~InvalidThreadpool (void); InvalidThreadpool &operator= (const InvalidThreadpool &); - + static void _tao_any_destructor (void *); - + static InvalidThreadpool *_downcast (CORBA::Exception *); static CORBA::Exception *_alloc (void); @@ -2360,28 +2385,28 @@ TAO_NAMESPACE RTCORBA TAO_OutputCDR & ACE_ENV_ARG_DECL_NOT_USED ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL_NOT_USED ); - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125 - + // be/be_visitor_exception/exception_ch.cpp:125 + virtual CORBA::TypeCode_ptr _type (void) const; }; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + // be/be_visitor_typecode/typecode_decl.cpp:44 + static ::CORBA::TypeCode_ptr _tc_InvalidThreadpool; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual RTCORBA::ThreadpoolId create_threadpool ( CORBA::ULong stacksize, CORBA::ULong static_threads, @@ -2395,10 +2420,10 @@ TAO_NAMESPACE RTCORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual RTCORBA::ThreadpoolId create_threadpool_with_lanes ( CORBA::ULong stacksize, const RTCORBA::ThreadpoolLanes & lanes, @@ -2411,10 +2436,10 @@ TAO_NAMESPACE RTCORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual void destroy_threadpool ( RTCORBA::ThreadpoolId threadpool ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -2423,10 +2448,10 @@ TAO_NAMESPACE RTCORBA CORBA::SystemException , RTCORBA::RTORB::InvalidThreadpool )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual ::RTCORBA::PriorityModelPolicy_ptr create_priority_model_policy ( RTCORBA::PriorityModel priority_model, RTCORBA::Priority server_priority @@ -2435,10 +2460,10 @@ TAO_NAMESPACE RTCORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual ::RTCORBA::ThreadpoolPolicy_ptr create_threadpool_policy ( RTCORBA::ThreadpoolId threadpool ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -2446,10 +2471,10 @@ TAO_NAMESPACE RTCORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual ::RTCORBA::PriorityBandedConnectionPolicy_ptr create_priority_banded_connection_policy ( const RTCORBA::PriorityBands & priority_bands ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -2457,10 +2482,10 @@ TAO_NAMESPACE RTCORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual ::RTCORBA::ServerProtocolPolicy_ptr create_server_protocol_policy ( const RTCORBA::ProtocolList & protocols ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -2468,10 +2493,10 @@ TAO_NAMESPACE RTCORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual ::RTCORBA::ClientProtocolPolicy_ptr create_client_protocol_policy ( const RTCORBA::ProtocolList & protocols ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -2479,49 +2504,49 @@ TAO_NAMESPACE RTCORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46 - + // be/be_visitor_operation/operation_ch.cpp:46 + virtual ::RTCORBA::PrivateConnectionPolicy_ptr create_private_connection_policy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - + // be/be_visitor_interface/interface_ch.cpp:207 + virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: RTORB (void); virtual ~RTORB (void); - + private: RTORB (const RTORB &); void operator= (const RTORB &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from - // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44 - + // be/be_visitor_typecode/typecode_decl.cpp:44 + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RTORB; // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67 +// be/be_visitor_module/module_ch.cpp:67 } TAO_NAMESPACE_CLOSE // module RTCORBA // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52 +// be/be_visitor_structure/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::ThreadpoolLane &); // copying version TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ThreadpoolLane*); // noncopying version @@ -2529,7 +2554,7 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Thre TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::ThreadpoolLane *&); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52 +// be/be_visitor_sequence/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::ThreadpoolLanes &); // copying version TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ThreadpoolLanes*); // noncopying version @@ -2537,34 +2562,34 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Thre TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::ThreadpoolLanes *&); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_ch.cpp:51 +// be/be_visitor_enum/any_op_ch.cpp:51 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityModel); TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::PriorityModel &); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52 +// be/be_visitor_interface/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityModelPolicy_ptr); // copying TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityModelPolicy_ptr *); // non-copying TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::PriorityModelPolicy_ptr &); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52 +// be/be_visitor_interface/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ThreadpoolPolicy_ptr); // copying TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ThreadpoolPolicy_ptr *); // non-copying TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::ThreadpoolPolicy_ptr &); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52 +// be/be_visitor_interface/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ProtocolProperties_ptr); // copying TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ProtocolProperties_ptr *); // non-copying TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::ProtocolProperties_ptr &); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52 +// be/be_visitor_structure/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::Protocol &); // copying version TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::Protocol*); // noncopying version @@ -2572,7 +2597,7 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Prot TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::Protocol *&); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52 +// be/be_visitor_sequence/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::ProtocolList &); // copying version TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ProtocolList*); // noncopying version @@ -2580,56 +2605,56 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Prot TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::ProtocolList *&); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52 +// be/be_visitor_interface/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ServerProtocolPolicy_ptr); // copying TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ServerProtocolPolicy_ptr *); // non-copying TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::ServerProtocolPolicy_ptr &); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52 +// be/be_visitor_interface/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ClientProtocolPolicy_ptr); // copying TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ClientProtocolPolicy_ptr *); // non-copying TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::ClientProtocolPolicy_ptr &); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52 +// be/be_visitor_interface/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PrivateConnectionPolicy_ptr); // copying TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PrivateConnectionPolicy_ptr *); // non-copying TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::PrivateConnectionPolicy_ptr &); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52 +// be/be_visitor_interface/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::TCPProtocolProperties_ptr); // copying TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::TCPProtocolProperties_ptr *); // non-copying TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::TCPProtocolProperties_ptr &); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52 +// be/be_visitor_interface/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::GIOPProtocolProperties_ptr); // copying TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::GIOPProtocolProperties_ptr *); // non-copying TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::GIOPProtocolProperties_ptr &); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52 +// be/be_visitor_interface/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::UnixDomainProtocolProperties_ptr); // copying TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::UnixDomainProtocolProperties_ptr *); // non-copying TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::UnixDomainProtocolProperties_ptr &); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52 +// be/be_visitor_interface/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::SharedMemoryProtocolProperties_ptr); // copying TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::SharedMemoryProtocolProperties_ptr *); // non-copying TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::SharedMemoryProtocolProperties_ptr &); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52 +// be/be_visitor_structure/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::PriorityBand &); // copying version TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityBand*); // noncopying version @@ -2637,7 +2662,7 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Prio TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::PriorityBand *&); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52 +// be/be_visitor_sequence/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::PriorityBands &); // copying version TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityBands*); // noncopying version @@ -2645,35 +2670,35 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Prio TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::PriorityBands *&); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52 +// be/be_visitor_interface/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityBandedConnectionPolicy_ptr); // copying TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityBandedConnectionPolicy_ptr *); // non-copying TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::PriorityBandedConnectionPolicy_ptr &); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52 +// be/be_visitor_interface/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::Current_ptr); // copying TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::Current_ptr *); // non-copying TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Current_ptr &); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52 +// be/be_visitor_interface/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::Mutex_ptr); // copying TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::Mutex_ptr *); // non-copying TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Mutex_ptr &); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52 +// be/be_visitor_interface/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::RTORB_ptr); // copying TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::RTORB_ptr *); // non-copying TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::RTORB_ptr &); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52 +// be/be_visitor_exception/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::RTORB::MutexNotFound &); // copying version TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::RTORB::MutexNotFound*); // noncopying version @@ -2681,7 +2706,7 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::RTOR TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::RTORB::MutexNotFound *&); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52 +// be/be_visitor_exception/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::RTORB::InvalidThreadpool &); // copying version TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::RTORB::InvalidThreadpool*); // noncopying version @@ -2689,18 +2714,18 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::RTOR TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::RTORB::InvalidThreadpool *&); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48 +// be/be_visitor_root/cdr_op.cpp:48 #ifndef __ACE_INLINE__ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54 +// be/be_visitor_structure/cdr_op_ch.cpp:53 TAO_RTCORBA_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const RTCORBA::ThreadpoolLane &); TAO_RTCORBA_Export CORBA::Boolean operator>> (TAO_InputCDR &, RTCORBA::ThreadpoolLane &); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57 +// be/be_visitor_sequence/cdr_op_ch.cpp:70 #if !defined _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_H_ #define _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_H_ @@ -2717,19 +2742,42 @@ TAO_RTCORBA_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_H_ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ch.cpp:50 +// be/be_visitor_enum/cdr_op_ch.cpp:50 TAO_RTCORBA_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const RTCORBA::PriorityModel &); TAO_RTCORBA_Export CORBA::Boolean operator>> (TAO_InputCDR &, RTCORBA::PriorityModel &); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:54 +// be/be_visitor_structure/cdr_op_ch.cpp:53 + +TAO_RTCORBA_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const RTCORBA::Protocol &); +TAO_RTCORBA_Export CORBA::Boolean operator>> (TAO_InputCDR &, RTCORBA::Protocol &); + +// TAO_IDL - Generated from +// be/be_visitor_sequence/cdr_op_ch.cpp:70 + +#if !defined _TAO_CDR_OP_RTCORBA_ProtocolList_H_ +#define _TAO_CDR_OP_RTCORBA_ProtocolList_H_ + +TAO_RTCORBA_Export CORBA::Boolean operator<< ( + TAO_OutputCDR &, + const RTCORBA::ProtocolList & + ); +TAO_RTCORBA_Export CORBA::Boolean operator>> ( + TAO_InputCDR &, + RTCORBA::ProtocolList & + ); + +#endif /* _TAO_CDR_OP_RTCORBA_ProtocolList_H_ */ + +// TAO_IDL - Generated from +// be/be_visitor_structure/cdr_op_ch.cpp:53 TAO_RTCORBA_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const RTCORBA::PriorityBand &); TAO_RTCORBA_Export CORBA::Boolean operator>> (TAO_InputCDR &, RTCORBA::PriorityBand &); // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57 +// be/be_visitor_sequence/cdr_op_ch.cpp:70 #if !defined _TAO_CDR_OP_RTCORBA_PriorityBands_H_ #define _TAO_CDR_OP_RTCORBA_PriorityBands_H_ @@ -2746,12 +2794,12 @@ TAO_RTCORBA_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_RTCORBA_PriorityBands_H_ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64 +// be/be_visitor_root/cdr_op.cpp:64 #endif /* __ACE_INLINE__ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018 +// be/be_codegen.cpp:1018 #if defined (__ACE_INLINE__) #include "RTCORBAC.i" @@ -2767,4 +2815,3 @@ TAO_RTCORBA_Export CORBA::Boolean operator>> ( #include "ace/post.h" #endif /* ifndef */ - diff --git a/TAO/tao/RTCORBA/RTCORBAC.i b/TAO/tao/RTCORBA/RTCORBAC.i index 20d3c167064..0277ede6167 100644 --- a/TAO/tao/RTCORBA/RTCORBAC.i +++ b/TAO/tao/RTCORBA/RTCORBAC.i @@ -15,17 +15,23 @@ // Irvine, CA // USA // http://doc.ece.uci.edu/ +// and +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ // // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68 +// be/be_visitor_interface/interface_ci.cpp:63 #if !defined (_RTCORBA_PRIORITYMODELPOLICY___CI_) #define _RTCORBA_PRIORITYMODELPOLICY___CI_ + template<> ACE_INLINE CORBA::Boolean @@ -56,10 +62,11 @@ TAO::Any_Impl_T<RTCORBA::PriorityModelPolicy>::demarshal_value (TAO_InputCDR &) #endif /* end #if !defined */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68 +// be/be_visitor_interface/interface_ci.cpp:63 #if !defined (_RTCORBA_THREADPOOLPOLICY___CI_) #define _RTCORBA_THREADPOOLPOLICY___CI_ + template<> ACE_INLINE CORBA::Boolean @@ -90,7 +97,7 @@ TAO::Any_Impl_T<RTCORBA::ThreadpoolPolicy>::demarshal_value (TAO_InputCDR &) #endif /* end #if !defined */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68 +// be/be_visitor_interface/interface_ci.cpp:63 #if !defined (_RTCORBA_PROTOCOLPROPERTIES___CI_) #define _RTCORBA_PROTOCOLPROPERTIES___CI_ @@ -124,41 +131,8 @@ TAO::Any_Impl_T<RTCORBA::ProtocolProperties>::demarshal_value (TAO_InputCDR &) #endif /* end #if !defined */ -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Dual_Impl_T<RTCORBA::Protocol>::marshal_value (TAO_OutputCDR &) -{ - return 0; -} - -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Dual_Impl_T<RTCORBA::Protocol>::demarshal_value (TAO_InputCDR &) -{ - return 0; -} - - -ACE_INLINE -CORBA::Boolean -TAO::Any_Dual_Impl_T<RTCORBA::ProtocolList>::marshal_value (TAO_OutputCDR &) -{ - return 0; -} - -template<> -ACE_INLINE -CORBA::Boolean -TAO::Any_Dual_Impl_T<RTCORBA::ProtocolList>::demarshal_value (TAO_InputCDR &) -{ - return 0; -} - - // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68 +// be/be_visitor_interface/interface_ci.cpp:63 #if !defined (_RTCORBA_SERVERPROTOCOLPOLICY___CI_) #define _RTCORBA_SERVERPROTOCOLPOLICY___CI_ @@ -193,7 +167,7 @@ TAO::Any_Impl_T<RTCORBA::ServerProtocolPolicy>::demarshal_value (TAO_InputCDR &) #endif /* end #if !defined */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68 +// be/be_visitor_interface/interface_ci.cpp:63 #if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY___CI_) #define _RTCORBA_CLIENTPROTOCOLPOLICY___CI_ @@ -228,7 +202,7 @@ TAO::Any_Impl_T<RTCORBA::ClientProtocolPolicy>::demarshal_value (TAO_InputCDR &) #endif /* end #if !defined */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68 +// be/be_visitor_interface/interface_ci.cpp:63 #if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY___CI_) #define _RTCORBA_PRIVATECONNECTIONPOLICY___CI_ @@ -263,10 +237,11 @@ TAO::Any_Impl_T<RTCORBA::PrivateConnectionPolicy>::demarshal_value (TAO_InputCDR #endif /* end #if !defined */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68 +// be/be_visitor_interface/interface_ci.cpp:63 #if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES___CI_) #define _RTCORBA_TCPPROTOCOLPROPERTIES___CI_ + template<> ACE_INLINE CORBA::Boolean @@ -297,7 +272,7 @@ TAO::Any_Impl_T<RTCORBA::TCPProtocolProperties>::demarshal_value (TAO_InputCDR & #endif /* end #if !defined */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68 +// be/be_visitor_interface/interface_ci.cpp:63 #if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES___CI_) #define _RTCORBA_GIOPPROTOCOLPROPERTIES___CI_ @@ -332,7 +307,7 @@ TAO::Any_Impl_T<RTCORBA::GIOPProtocolProperties>::demarshal_value (TAO_InputCDR #endif /* end #if !defined */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68 +// be/be_visitor_interface/interface_ci.cpp:63 #if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___CI_) #define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___CI_ @@ -367,10 +342,11 @@ TAO::Any_Impl_T<RTCORBA::UnixDomainProtocolProperties>::demarshal_value (TAO_Inp #endif /* end #if !defined */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68 +// be/be_visitor_interface/interface_ci.cpp:63 #if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___CI_) #define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___CI_ + template<> ACE_INLINE CORBA::Boolean @@ -381,6 +357,7 @@ TAO::Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties>::to_object ( _tao_elem = CORBA::Object::_duplicate (this->value_); return 1; } + template<> ACE_INLINE CORBA::Boolean @@ -400,79 +377,7 @@ TAO::Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties>::demarshal_value (TAO_I #endif /* end #if !defined */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68 - -#if !defined (_RTCORBA_THREADPOOLPOLICY___CI_) -#define _RTCORBA_THREADPOOLPOLICY___CI_ - -#endif /* end #if !defined */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68 - -#if !defined (_RTCORBA_PROTOCOLPROPERTIES___CI_) -#define _RTCORBA_PROTOCOLPROPERTIES___CI_ - -#endif /* end #if !defined */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68 - -#if !defined (_RTCORBA_SERVERPROTOCOLPOLICY___CI_) -#define _RTCORBA_SERVERPROTOCOLPOLICY___CI_ - -#endif /* end #if !defined */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68 - -#if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY___CI_) -#define _RTCORBA_CLIENTPROTOCOLPOLICY___CI_ - -#endif /* end #if !defined */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68 - -#if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY___CI_) -#define _RTCORBA_PRIVATECONNECTIONPOLICY___CI_ - -#endif /* end #if !defined */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68 - -#if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES___CI_) -#define _RTCORBA_TCPPROTOCOLPROPERTIES___CI_ - -#endif /* end #if !defined */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68 - -#if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES___CI_) -#define _RTCORBA_GIOPPROTOCOLPROPERTIES___CI_ - -#endif /* end #if !defined */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68 - -#if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___CI_) -#define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___CI_ - -#endif /* end #if !defined */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68 - -#if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___CI_) -#define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___CI_ - -#endif /* end #if !defined */ - -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68 +// be/be_visitor_interface/interface_ci.cpp:63 #if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___CI_) #define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___CI_ @@ -488,9 +393,6 @@ TAO::Any_Impl_T<RTCORBA::PriorityBandedConnectionPolicy>::to_object ( return 1; } -// TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:60 - template<> ACE_INLINE CORBA::Boolean @@ -510,7 +412,7 @@ TAO::Any_Impl_T<RTCORBA::PriorityBandedConnectionPolicy>::demarshal_value (TAO_I #endif /* end #if !defined */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68 +// be/be_visitor_interface/interface_ci.cpp:63 #if !defined (_RTCORBA_CURRENT___CI_) #define _RTCORBA_CURRENT___CI_ @@ -545,7 +447,7 @@ TAO::Any_Impl_T<RTCORBA::Current>::demarshal_value (TAO_InputCDR &) #endif /* end #if !defined */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68 +// be/be_visitor_interface/interface_ci.cpp:63 #if !defined (_RTCORBA_MUTEX___CI_) #define _RTCORBA_MUTEX___CI_ @@ -579,8 +481,40 @@ TAO::Any_Impl_T<RTCORBA::Mutex>::demarshal_value (TAO_InputCDR &) #endif /* end #if !defined */ +template<> +ACE_INLINE +CORBA::Boolean +TAO::Any_Dual_Impl_T<RTCORBA::RTORB::MutexNotFound>::marshal_value (TAO_OutputCDR &) +{ + return 0; +} + +template<> +ACE_INLINE +CORBA::Boolean +TAO::Any_Dual_Impl_T<RTCORBA::RTORB::MutexNotFound>::demarshal_value (TAO_InputCDR &) +{ + return 0; +} + +template<> +ACE_INLINE +CORBA::Boolean +TAO::Any_Dual_Impl_T<RTCORBA::RTORB::InvalidThreadpool>::marshal_value (TAO_OutputCDR &) +{ + return 0; +} + +template<> +ACE_INLINE +CORBA::Boolean +TAO::Any_Dual_Impl_T<RTCORBA::RTORB::InvalidThreadpool>::demarshal_value (TAO_InputCDR &) +{ + return 0; +} + // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68 +// be/be_visitor_interface/interface_ci.cpp:63 #if !defined (_RTCORBA_RTORB___CI_) #define _RTCORBA_RTORB___CI_ @@ -615,7 +549,7 @@ TAO::Any_Impl_T<RTCORBA::RTORB>::demarshal_value (TAO_InputCDR &) #endif /* end #if !defined */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71 +// be/be_visitor_structure/cdr_op_ci.cpp:70 ACE_INLINE CORBA::Boolean operator<< ( @@ -623,18 +557,10 @@ CORBA::Boolean operator<< ( const RTCORBA::ThreadpoolLane &_tao_aggregate ) { - if ( + return (strm << _tao_aggregate.lane_priority) && (strm << _tao_aggregate.static_threads) && - (strm << _tao_aggregate.dynamic_threads) - ) - { - return 1; - } - else - { - return 0; - } + (strm << _tao_aggregate.dynamic_threads); } ACE_INLINE @@ -643,22 +569,14 @@ CORBA::Boolean operator>> ( RTCORBA::ThreadpoolLane &_tao_aggregate ) { - if ( + return (strm >> _tao_aggregate.lane_priority) && (strm >> _tao_aggregate.static_threads) && - (strm >> _tao_aggregate.dynamic_threads) - ) - { - return 1; - } - else - { - return 0; - } + (strm >> _tao_aggregate.dynamic_threads); } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84 +// be/be_visitor_sequence/cdr_op_ci.cpp:81 #if !defined _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_I_ #define _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_I_ @@ -676,7 +594,7 @@ CORBA::Boolean TAO_RTCORBA_Export operator>> ( #endif /* _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_I_ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ci.cpp:51 +// be/be_visitor_enum/cdr_op_ci.cpp:51 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const RTCORBA::PriorityModel &_tao_enumval) @@ -690,17 +608,65 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, RTCORBA::PriorityModel &_tao_enum { CORBA::ULong _tao_temp = 0; CORBA::Boolean _tao_result = strm >> _tao_temp; - + if (_tao_result == 1) { _tao_enumval = ACE_static_cast (RTCORBA::PriorityModel, _tao_temp); } - + return _tao_result; } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71 +// be/be_visitor_structure/cdr_op_ci.cpp:70 + +ACE_INLINE +CORBA::Boolean operator<< ( + TAO_OutputCDR &strm, + const RTCORBA::Protocol &_tao_aggregate + ) +{ + return + (strm << _tao_aggregate.protocol_type) && + CORBA::Object::marshal ( + _tao_aggregate.orb_protocol_properties.in (), + strm + ) && + CORBA::Object::marshal ( + _tao_aggregate.transport_protocol_properties.in (), + strm + ); +} + +ACE_INLINE +CORBA::Boolean operator>> ( + TAO_InputCDR &, + RTCORBA::Protocol & + ) +{ + return 0; +} + +// TAO_IDL - Generated from +// be/be_visitor_sequence/cdr_op_ci.cpp:81 + +#if !defined _TAO_CDR_OP_RTCORBA_ProtocolList_I_ +#define _TAO_CDR_OP_RTCORBA_ProtocolList_I_ + +CORBA::Boolean TAO_RTCORBA_Export operator<< ( + TAO_OutputCDR &, + const RTCORBA::ProtocolList & + ); + +CORBA::Boolean TAO_RTCORBA_Export operator>> ( + TAO_InputCDR &, + RTCORBA::ProtocolList & + ); + +#endif /* _TAO_CDR_OP_RTCORBA_ProtocolList_I_ */ + +// TAO_IDL - Generated from +// be/be_visitor_structure/cdr_op_ci.cpp:70 ACE_INLINE CORBA::Boolean operator<< ( @@ -708,17 +674,9 @@ CORBA::Boolean operator<< ( const RTCORBA::PriorityBand &_tao_aggregate ) { - if ( + return (strm << _tao_aggregate.low) && - (strm << _tao_aggregate.high) - ) - { - return 1; - } - else - { - return 0; - } + (strm << _tao_aggregate.high); } ACE_INLINE @@ -727,21 +685,13 @@ CORBA::Boolean operator>> ( RTCORBA::PriorityBand &_tao_aggregate ) { - if ( + return (strm >> _tao_aggregate.low) && - (strm >> _tao_aggregate.high) - ) - { - return 1; - } - else - { - return 0; - } + (strm >> _tao_aggregate.high); } // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84 +// be/be_visitor_sequence/cdr_op_ci.cpp:81 #if !defined _TAO_CDR_OP_RTCORBA_PriorityBands_I_ #define _TAO_CDR_OP_RTCORBA_PriorityBands_I_ @@ -757,3 +707,4 @@ CORBA::Boolean TAO_RTCORBA_Export operator>> ( ); #endif /* _TAO_CDR_OP_RTCORBA_PriorityBands_I_ */ + diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.cpp b/TAO/tao/RTPortableServer/RTPortableServerC.cpp index ef77b727460..567ed181824 100644 --- a/TAO/tao/RTPortableServer/RTPortableServerC.cpp +++ b/TAO/tao/RTPortableServer/RTPortableServerC.cpp @@ -314,9 +314,9 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<RTPortableServer::POA,RTPortableServer::POA_var>; +// template class TAO_Object_Manager<RTPortableServer::POA,RTPortableServer::POA_var>; template class TAO::Any_Impl_T<RTPortableServer::POA>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<RTPortableServer::POA, RTPortableServer::POA_var> +// # pragma instantiate TAO_Object_Manager<RTPortableServer::POA, RTPortableServer::POA_var> # pragma instantiate TAO::Any_Impl_T<RTPortableServer::POA> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/ServicesC.cpp b/TAO/tao/ServicesC.cpp index a2146b28d32..514fcf05f27 100644 --- a/TAO/tao/ServicesC.cpp +++ b/TAO/tao/ServicesC.cpp @@ -43,18 +43,18 @@ static const CORBA::Long _oc_CORBA_ServiceType[] = { TAO_ENCAP_BYTE_ORDER, // byte order 34, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f5365), - ACE_NTOHL (0x72766963), - ACE_NTOHL (0x65547970), - ACE_NTOHL (0x653a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f5365), + ACE_NTOHL (0x72766963), + ACE_NTOHL (0x65547970), + ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CORBA/ServiceType:1.0 12, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x69636554), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x69636554), ACE_NTOHL (0x79706500), // name = ServiceType CORBA::tk_ushort, @@ -84,19 +84,19 @@ static const CORBA::Long _oc_CORBA_ServiceOption[] = { TAO_ENCAP_BYTE_ORDER, // byte order 36, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f5365), - ACE_NTOHL (0x72766963), - ACE_NTOHL (0x654f7074), - ACE_NTOHL (0x696f6e3a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f5365), + ACE_NTOHL (0x72766963), + ACE_NTOHL (0x654f7074), + ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/ServiceOption:1.0 14, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x6963654f), - ACE_NTOHL (0x7074696f), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x6963654f), + ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e000000), // name = ServiceOption CORBA::tk_ulong, @@ -126,21 +126,21 @@ static const CORBA::Long _oc_CORBA_ServiceDetailType[] = { TAO_ENCAP_BYTE_ORDER, // byte order 40, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f5365), - ACE_NTOHL (0x72766963), - ACE_NTOHL (0x65446574), - ACE_NTOHL (0x61696c54), - ACE_NTOHL (0x7970653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f5365), + ACE_NTOHL (0x72766963), + ACE_NTOHL (0x65446574), + ACE_NTOHL (0x61696c54), + ACE_NTOHL (0x7970653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0 18, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x69636544), - ACE_NTOHL (0x65746169), - ACE_NTOHL (0x6c547970), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x69636544), + ACE_NTOHL (0x65746169), + ACE_NTOHL (0x6c547970), ACE_NTOHL (0x65000000), // name = ServiceDetailType CORBA::tk_ulong, @@ -170,70 +170,70 @@ static const CORBA::Long _oc_CORBA_ServiceDetail[] = { TAO_ENCAP_BYTE_ORDER, // byte order 36, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f5365), - ACE_NTOHL (0x72766963), - ACE_NTOHL (0x65446574), - ACE_NTOHL (0x61696c3a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f5365), + ACE_NTOHL (0x72766963), + ACE_NTOHL (0x65446574), + ACE_NTOHL (0x61696c3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/ServiceDetail:1.0 14, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x69636544), - ACE_NTOHL (0x65746169), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x69636544), + ACE_NTOHL (0x65746169), ACE_NTOHL (0x6c000000), // name = ServiceDetail 2, // member count 20, - ACE_NTOHL (0x73657276), - ACE_NTOHL (0x6963655f), - ACE_NTOHL (0x64657461), - ACE_NTOHL (0x696c5f74), + ACE_NTOHL (0x73657276), + ACE_NTOHL (0x6963655f), + ACE_NTOHL (0x64657461), + ACE_NTOHL (0x696c5f74), ACE_NTOHL (0x79706500), // name = service_detail_type CORBA::tk_alias, // typecode kind for typedefs 76, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 40, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f5365), - ACE_NTOHL (0x72766963), - ACE_NTOHL (0x65446574), - ACE_NTOHL (0x61696c54), - ACE_NTOHL (0x7970653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f5365), + ACE_NTOHL (0x72766963), + ACE_NTOHL (0x65446574), + ACE_NTOHL (0x61696c54), + ACE_NTOHL (0x7970653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0 18, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x69636544), - ACE_NTOHL (0x65746169), - ACE_NTOHL (0x6c547970), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x69636544), + ACE_NTOHL (0x65746169), + ACE_NTOHL (0x6c547970), ACE_NTOHL (0x65000000), // name = ServiceDetailType CORBA::tk_ulong, 15, - ACE_NTOHL (0x73657276), - ACE_NTOHL (0x6963655f), - ACE_NTOHL (0x64657461), + ACE_NTOHL (0x73657276), + ACE_NTOHL (0x6963655f), + ACE_NTOHL (0x64657461), ACE_NTOHL (0x696c0000), // name = service_detail CORBA::tk_alias, // typecode kind for typedefs 76, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 31, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f4f63), - ACE_NTOHL (0x74657453), - ACE_NTOHL (0x65713a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f4f63), + ACE_NTOHL (0x74657453), + ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0 9, - ACE_NTOHL (0x4f637465), - ACE_NTOHL (0x74536571), + ACE_NTOHL (0x4f637465), + ACE_NTOHL (0x74536571), ACE_NTOHL (0x0), // name = OctetSeq CORBA::tk_sequence, // typecode kind 12, // encapsulation length @@ -262,7 +262,7 @@ TAO_NAMESPACE_DEFINE ( ) TAO_NAMESPACE_END -// TAO_IDL - Generated from +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 void CORBA::ServiceDetail::_tao_any_destructor (void *_tao_void_pointer) @@ -278,29 +278,35 @@ void CORBA::ServiceDetail::_tao_any_destructor (void *_tao_void_pointer) template class TAO_Var_Var_T< - ServiceDetail + CORBA::ServiceDetail >; +template class TAO_Unbounded_Sequence<CORBA::ServiceDetail>; + template class TAO_Out_T< - ServiceDetail, - ServiceDetail_var + CORBA::ServiceDetail, + CORBA::ServiceDetail_var >; +template class TAO_Var_Base_T<CORBA::ServiceDetail>; + #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ TAO_Var_Var_T< \ - ServiceDetail \ + CORBA::ServiceDetail \ > - +#pragma instantiate TAO_Unbounded_Sequence<CORBA::ServiceDetail> +#pragms instantiate TAO_Var_Base_T<CORBA::ServiceDetail> # pragma instantiate \ TAO_Out_T< \ - ServiceDetail, \ - ServiceDetail_var \ + CORBA::ServiceDetail, \ + CORBA::ServiceDetail_var \ > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -309,28 +315,28 @@ static const CORBA::Long _oc_CORBA_ServiceInformation[] = { TAO_ENCAP_BYTE_ORDER, // byte order 41, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f5365), - ACE_NTOHL (0x72766963), - ACE_NTOHL (0x65496e66), - ACE_NTOHL (0x6f726d61), - ACE_NTOHL (0x74696f6e), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f5365), + ACE_NTOHL (0x72766963), + ACE_NTOHL (0x65496e66), + ACE_NTOHL (0x6f726d61), + ACE_NTOHL (0x74696f6e), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/ServiceInformation:1.0 19, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x69636549), - ACE_NTOHL (0x6e666f72), - ACE_NTOHL (0x6d617469), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x69636549), + ACE_NTOHL (0x6e666f72), + ACE_NTOHL (0x6d617469), ACE_NTOHL (0x6f6e0000), // name = ServiceInformation 2, // member count 16, - ACE_NTOHL (0x73657276), - ACE_NTOHL (0x6963655f), - ACE_NTOHL (0x6f707469), + ACE_NTOHL (0x73657276), + ACE_NTOHL (0x6963655f), + ACE_NTOHL (0x6f707469), ACE_NTOHL (0x6f6e7300), // name = service_options CORBA::tk_sequence, // typecode kind 84, // encapsulation length @@ -339,19 +345,19 @@ static const CORBA::Long _oc_CORBA_ServiceInformation[] = 68, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 36, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f5365), - ACE_NTOHL (0x72766963), - ACE_NTOHL (0x654f7074), - ACE_NTOHL (0x696f6e3a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f5365), + ACE_NTOHL (0x72766963), + ACE_NTOHL (0x654f7074), + ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/ServiceOption:1.0 14, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x6963654f), - ACE_NTOHL (0x7074696f), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x6963654f), + ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e000000), // name = ServiceOption CORBA::tk_ulong, @@ -359,9 +365,9 @@ static const CORBA::Long _oc_CORBA_ServiceInformation[] = 0U, 16, - ACE_NTOHL (0x73657276), - ACE_NTOHL (0x6963655f), - ACE_NTOHL (0x64657461), + ACE_NTOHL (0x73657276), + ACE_NTOHL (0x6963655f), + ACE_NTOHL (0x64657461), ACE_NTOHL (0x696c7300), // name = service_details CORBA::tk_sequence, // typecode kind 296, // encapsulation length @@ -370,70 +376,70 @@ static const CORBA::Long _oc_CORBA_ServiceInformation[] = 280, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 36, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f5365), - ACE_NTOHL (0x72766963), - ACE_NTOHL (0x65446574), - ACE_NTOHL (0x61696c3a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f5365), + ACE_NTOHL (0x72766963), + ACE_NTOHL (0x65446574), + ACE_NTOHL (0x61696c3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/ServiceDetail:1.0 14, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x69636544), - ACE_NTOHL (0x65746169), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x69636544), + ACE_NTOHL (0x65746169), ACE_NTOHL (0x6c000000), // name = ServiceDetail 2, // member count 20, - ACE_NTOHL (0x73657276), - ACE_NTOHL (0x6963655f), - ACE_NTOHL (0x64657461), - ACE_NTOHL (0x696c5f74), + ACE_NTOHL (0x73657276), + ACE_NTOHL (0x6963655f), + ACE_NTOHL (0x64657461), + ACE_NTOHL (0x696c5f74), ACE_NTOHL (0x79706500), // name = service_detail_type CORBA::tk_alias, // typecode kind for typedefs 76, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 40, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f5365), - ACE_NTOHL (0x72766963), - ACE_NTOHL (0x65446574), - ACE_NTOHL (0x61696c54), - ACE_NTOHL (0x7970653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f5365), + ACE_NTOHL (0x72766963), + ACE_NTOHL (0x65446574), + ACE_NTOHL (0x61696c54), + ACE_NTOHL (0x7970653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0 18, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x69636544), - ACE_NTOHL (0x65746169), - ACE_NTOHL (0x6c547970), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x69636544), + ACE_NTOHL (0x65746169), + ACE_NTOHL (0x6c547970), ACE_NTOHL (0x65000000), // name = ServiceDetailType CORBA::tk_ulong, 15, - ACE_NTOHL (0x73657276), - ACE_NTOHL (0x6963655f), - ACE_NTOHL (0x64657461), + ACE_NTOHL (0x73657276), + ACE_NTOHL (0x6963655f), + ACE_NTOHL (0x64657461), ACE_NTOHL (0x696c0000), // name = service_detail CORBA::tk_alias, // typecode kind for typedefs 76, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 31, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f4f63), - ACE_NTOHL (0x74657453), - ACE_NTOHL (0x65713a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f4f63), + ACE_NTOHL (0x74657453), + ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0 9, - ACE_NTOHL (0x4f637465), - ACE_NTOHL (0x74536571), + ACE_NTOHL (0x4f637465), + ACE_NTOHL (0x74536571), ACE_NTOHL (0x0), // name = OctetSeq CORBA::tk_sequence, // typecode kind 12, // encapsulation length @@ -465,7 +471,7 @@ TAO_NAMESPACE_DEFINE ( ) TAO_NAMESPACE_END -// TAO_IDL - Generated from +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 void CORBA::ServiceInformation::_tao_any_destructor (void *_tao_void_pointer) @@ -474,7 +480,7 @@ void CORBA::ServiceInformation::_tao_any_destructor (void *_tao_void_pointer) delete tmp; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50 CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_seq_ServiceOption (void) @@ -515,7 +521,7 @@ void CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_any_destructor (voi delete tmp; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50 CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_seq_ServiceDetail (void) @@ -563,31 +569,33 @@ void CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_any_destructor (voi template class TAO_Var_Var_T< - ServiceInformation + CORBA::ServiceInformation >; +template class TAO_Var_Base_T<CORBA::ServiceInformation>; + template class TAO_Out_T< - ServiceInformation, - ServiceInformation_var + CORBA::ServiceInformation, + CORBA::ServiceInformation_var >; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ TAO_Var_Var_T< \ - ServiceInformation \ + CORBA::ServiceInformation \ > - +#pragma instantiate TAO_Var_Base_T<CORBA::ServiceInformation> # pragma instantiate \ TAO_Out_T< \ - ServiceInformation, \ - ServiceInformation_var \ + CORBA::ServiceInformation, \ + CORBA::ServiceInformation_var \ > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -652,7 +660,7 @@ CORBA::Boolean operator>>= ( # pragma instantiate TAO::Any_Dual_Impl_T<CORBA::ServiceDetail> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -729,13 +737,13 @@ CORBA::Boolean operator<< ( ) { 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; } @@ -745,7 +753,7 @@ CORBA::Boolean operator>> ( ) { CORBA::ULong _tao_seq_len; - + if (strm >> _tao_seq_len) { // Add a check to the length of the sequence @@ -755,20 +763,20 @@ 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; } @@ -786,20 +794,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; } @@ -809,7 +817,7 @@ CORBA::Boolean operator>> ( ) { CORBA::ULong _tao_seq_len; - + if (strm >> _tao_seq_len) { // Add a check to the length of the sequence @@ -819,29 +827,28 @@ CORBA::Boolean operator>> ( { return 0; } - + // Set the length of the sequence. _tao_sequence.length (_tao_seq_len); - + // If length is 0 we return true. - if (0 >= _tao_seq_len) + if (0 >= _tao_seq_len) { return 1; } - + // Retrieve all the elements. CORBA::Boolean _tao_marshal_flag = 1; - + for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i) { _tao_marshal_flag = (strm >> _tao_sequence[i]); } - + return _tao_marshal_flag; } - + return 0; } #endif /* _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_ServiceDetail_CPP_ */ - diff --git a/TAO/tao/StringSeqC.cpp b/TAO/tao/StringSeqC.cpp index d1b4be0b1b5..7e63c126ffe 100644 --- a/TAO/tao/StringSeqC.cpp +++ b/TAO/tao/StringSeqC.cpp @@ -79,12 +79,14 @@ template class >; template class - TAO_Seq_Out_T< + TAO_MngSeq_Out_T< CORBA::StringSeq, CORBA::StringSeq_var, TAO_SeqElem_String_Manager >; +template class TAO_Seq_Var_Base_T<CORBA::StringSeq, TAO_SeqElem_String_Manager>; + #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ @@ -100,6 +102,8 @@ template class TAO_SeqElem_String_Manager \ > +#pragma instantiate TAO_Seq_Var_Base_T<CORBA::StringSeq, + TAO_SeqElem_String_Manager> #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from @@ -190,13 +194,15 @@ template class TAO_SeqElem_WString_Manager >; +template class TAO_Seq_Var_Base_T<CORBA::WStringSeq, TAO_SeqElem_WString_Manager>; template class - TAO_Seq_Out_T< + TAO_MngSeq_Out_T< CORBA::WStringSeq, CORBA::WStringSeq_var, TAO_SeqElem_WString_Manager >; + #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ @@ -204,7 +210,7 @@ template class CORBA::WStringSeq, \ TAO_SeqElem_WString_Manager \ > - +#pragma instantiate TAO_Seq_Var_Base_T<CORBA::WStringSeq, TAO_SeqElem_WString_Manager> # pragma instantiate \ TAO_Seq_Out_T< \ CORBA::WStringSeq, \ diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp index ee779b40b87..407fb3fd21e 100644 --- a/TAO/tao/TAOC.cpp +++ b/TAO/tao/TAOC.cpp @@ -198,14 +198,23 @@ void TAO::BufferingConstraint::_tao_any_destructor (void *_tao_void_pointer) template class TAO_Fixed_Var_T< - BufferingConstraint + TAO::BufferingConstraint + >; +template class + TAO_Var_Base_T< + TAO::BufferingConstraint >; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ TAO_Fixed_Var_T< \ - BufferingConstraint \ + TAO::BufferingConstraint \ + > + +# pragma instantiate \ + TAO_Var_Base_T< \ + TAO::BufferingConstraint \ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -563,9 +572,9 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<TAO::BufferingConstraintPolicy,TAO::BufferingConstraintPolicy_var>; + template class TAO_Object_Manager<TAO::BufferingConstraintPolicy,TAO::BufferingConstraintPolicy_var,TAO::tao_BufferingConstraintPolicy_life>; template class TAO::Any_Impl_T<TAO::BufferingConstraintPolicy>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<TAO::BufferingConstraintPolicy, TAO::BufferingConstraintPolicy_var> +# pragma instantiate TAO_Object_Manager<TAO::BufferingConstraintPolicy, TAO::BufferingConstraintPolicy_var,TAO::tao_BufferingConstraintPolicy_life> # pragma instantiate TAO::Any_Impl_T<TAO::BufferingConstraintPolicy> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/TimeBaseC.cpp b/TAO/tao/TimeBaseC.cpp index 335360ceab2..41461a32fe6 100644 --- a/TAO/tao/TimeBaseC.cpp +++ b/TAO/tao/TimeBaseC.cpp @@ -46,16 +46,16 @@ static const CORBA::Long _oc_TimeBase_TimeT[] = { TAO_ENCAP_BYTE_ORDER, // byte order 31, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x54696d65), - ACE_NTOHL (0x42617365), - ACE_NTOHL (0x2f54696d), - ACE_NTOHL (0x65543a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x54696d65), + ACE_NTOHL (0x42617365), + ACE_NTOHL (0x2f54696d), + ACE_NTOHL (0x65543a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/TimeBase/TimeT:1.0 6, - ACE_NTOHL (0x54696d65), + ACE_NTOHL (0x54696d65), ACE_NTOHL (0x54000000), // name = TimeT CORBA::tk_ulonglong, @@ -85,34 +85,34 @@ static const CORBA::Long _oc_TimeBase_InaccuracyT[] = { TAO_ENCAP_BYTE_ORDER, // byte order 37, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x54696d65), - ACE_NTOHL (0x42617365), - ACE_NTOHL (0x2f496e61), - ACE_NTOHL (0x63637572), - ACE_NTOHL (0x61637954), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x54696d65), + ACE_NTOHL (0x42617365), + ACE_NTOHL (0x2f496e61), + ACE_NTOHL (0x63637572), + ACE_NTOHL (0x61637954), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/TimeBase/InaccuracyT:1.0 12, - ACE_NTOHL (0x496e6163), - ACE_NTOHL (0x63757261), + ACE_NTOHL (0x496e6163), + ACE_NTOHL (0x63757261), ACE_NTOHL (0x63795400), // name = InaccuracyT CORBA::tk_alias, // typecode kind for typedefs 56, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 31, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x54696d65), - ACE_NTOHL (0x42617365), - ACE_NTOHL (0x2f54696d), - ACE_NTOHL (0x65543a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x54696d65), + ACE_NTOHL (0x42617365), + ACE_NTOHL (0x2f54696d), + ACE_NTOHL (0x65543a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/TimeBase/TimeT:1.0 6, - ACE_NTOHL (0x54696d65), + ACE_NTOHL (0x54696d65), ACE_NTOHL (0x54000000), // name = TimeT CORBA::tk_ulonglong, @@ -143,16 +143,16 @@ static const CORBA::Long _oc_TimeBase_TdfT[] = { TAO_ENCAP_BYTE_ORDER, // byte order 30, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x54696d65), - ACE_NTOHL (0x42617365), - ACE_NTOHL (0x2f546466), - ACE_NTOHL (0x543a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x54696d65), + ACE_NTOHL (0x42617365), + ACE_NTOHL (0x2f546466), + ACE_NTOHL (0x543a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/TimeBase/TdfT:1.0 5, - ACE_NTOHL (0x54646654), + ACE_NTOHL (0x54646654), ACE_NTOHL (0x0), // name = TdfT CORBA::tk_short, @@ -182,46 +182,46 @@ static const CORBA::Long _oc_TimeBase_UtcT[] = { TAO_ENCAP_BYTE_ORDER, // byte order 30, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x54696d65), - ACE_NTOHL (0x42617365), - ACE_NTOHL (0x2f557463), - ACE_NTOHL (0x543a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x54696d65), + ACE_NTOHL (0x42617365), + ACE_NTOHL (0x2f557463), + ACE_NTOHL (0x543a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/TimeBase/UtcT:1.0 5, - ACE_NTOHL (0x55746354), + ACE_NTOHL (0x55746354), ACE_NTOHL (0x0), // name = UtcT 4, // member count 5, - ACE_NTOHL (0x74696d65), + ACE_NTOHL (0x74696d65), ACE_NTOHL (0x0), // name = time CORBA::tk_alias, // typecode kind for typedefs 56, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 31, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x54696d65), - ACE_NTOHL (0x42617365), - ACE_NTOHL (0x2f54696d), - ACE_NTOHL (0x65543a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x54696d65), + ACE_NTOHL (0x42617365), + ACE_NTOHL (0x2f54696d), + ACE_NTOHL (0x65543a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/TimeBase/TimeT:1.0 6, - ACE_NTOHL (0x54696d65), + ACE_NTOHL (0x54696d65), ACE_NTOHL (0x54000000), // name = TimeT CORBA::tk_ulonglong, 8, - ACE_NTOHL (0x696e6163), + ACE_NTOHL (0x696e6163), ACE_NTOHL (0x636c6f00), // name = inacclo CORBA::tk_ulong, 8, - ACE_NTOHL (0x696e6163), + ACE_NTOHL (0x696e6163), ACE_NTOHL (0x63686900), // name = inacchi CORBA::tk_ushort, @@ -231,16 +231,16 @@ static const CORBA::Long _oc_TimeBase_UtcT[] = 56, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 30, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x54696d65), - ACE_NTOHL (0x42617365), - ACE_NTOHL (0x2f546466), - ACE_NTOHL (0x543a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x54696d65), + ACE_NTOHL (0x42617365), + ACE_NTOHL (0x2f546466), + ACE_NTOHL (0x543a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/TimeBase/TdfT:1.0 5, - ACE_NTOHL (0x54646654), + ACE_NTOHL (0x54646654), ACE_NTOHL (0x0), // name = TdfT CORBA::tk_short, @@ -264,7 +264,7 @@ TAO_NAMESPACE_DEFINE ( ) TAO_NAMESPACE_END -// TAO_IDL - Generated from +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 void TimeBase::UtcT::_tao_any_destructor (void *_tao_void_pointer) @@ -280,17 +280,18 @@ void TimeBase::UtcT::_tao_any_destructor (void *_tao_void_pointer) template class TAO_Fixed_Var_T< - UtcT + TimeBase::UtcT >; +template class TAO_Var_Base_T<TimeBase::UtcT>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ TAO_Fixed_Var_T< \ - UtcT \ + TimeBase::UtcT \ > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#pragma instantiate TAO_Var_Base_T<TimeBase::UtcT> +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 @@ -299,45 +300,45 @@ static const CORBA::Long _oc_TimeBase_IntervalT[] = { TAO_ENCAP_BYTE_ORDER, // byte order 35, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x54696d65), - ACE_NTOHL (0x42617365), - ACE_NTOHL (0x2f496e74), - ACE_NTOHL (0x65727661), - ACE_NTOHL (0x6c543a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x54696d65), + ACE_NTOHL (0x42617365), + ACE_NTOHL (0x2f496e74), + ACE_NTOHL (0x65727661), + ACE_NTOHL (0x6c543a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/TimeBase/IntervalT:1.0 10, - ACE_NTOHL (0x496e7465), - ACE_NTOHL (0x7276616c), + ACE_NTOHL (0x496e7465), + ACE_NTOHL (0x7276616c), ACE_NTOHL (0x54000000), // name = IntervalT 2, // member count 12, - ACE_NTOHL (0x6c6f7765), - ACE_NTOHL (0x725f626f), + ACE_NTOHL (0x6c6f7765), + ACE_NTOHL (0x725f626f), ACE_NTOHL (0x756e6400), // name = lower_bound CORBA::tk_alias, // typecode kind for typedefs 56, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 31, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x54696d65), - ACE_NTOHL (0x42617365), - ACE_NTOHL (0x2f54696d), - ACE_NTOHL (0x65543a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x54696d65), + ACE_NTOHL (0x42617365), + ACE_NTOHL (0x2f54696d), + ACE_NTOHL (0x65543a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/TimeBase/TimeT:1.0 6, - ACE_NTOHL (0x54696d65), + ACE_NTOHL (0x54696d65), ACE_NTOHL (0x54000000), // name = TimeT CORBA::tk_ulonglong, 12, - ACE_NTOHL (0x75707065), - ACE_NTOHL (0x725f626f), + ACE_NTOHL (0x75707065), + ACE_NTOHL (0x725f626f), ACE_NTOHL (0x756e6400), // name = upper_bound 0xffffffff, // indirection 0xffffffac, // negative offset (-84) @@ -360,7 +361,7 @@ TAO_NAMESPACE_DEFINE ( ) TAO_NAMESPACE_END -// TAO_IDL - Generated from +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66 void TimeBase::IntervalT::_tao_any_destructor (void *_tao_void_pointer) @@ -376,19 +377,21 @@ void TimeBase::IntervalT::_tao_any_destructor (void *_tao_void_pointer) template class TAO_Fixed_Var_T< - IntervalT + TimeBase::IntervalT >; +template class TAO_Var_Base_T<TimeBase::IntervalT>; + #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ TAO_Fixed_Var_T< \ - IntervalT \ + TimeBase::IntervalT \ > +#pragma instantiate TAO_Var_Base_T<TimeBase::IntervalT> +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -// TAO_IDL - Generated from +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -448,12 +451,12 @@ CORBA::Boolean operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO::Any_Dual_Impl_T<TimeBase::UtcT>; +template class TAO::Any_Dual_Impl_T<TimeBase::UtcT>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate TAO::Any_Dual_Impl_T<TimeBase::UtcT> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -517,4 +520,3 @@ CORBA::Boolean operator>>= ( #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate TAO::Any_Dual_Impl_T<TimeBase::IntervalT> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp index 95a187f66b7..8c8c357c8c2 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp @@ -313,9 +313,9 @@ operator>>= ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) - template class TAO_Object_Manager<CORBA::TypeCodeFactory,CORBA::TypeCodeFactory_var>; - template class TAO::Any_Impl_T<CORBA::TypeCodeFactory>; +template class TAO_Object_Manager<CORBA::TypeCodeFactory,CORBA::TypeCodeFactory_var,CORBA::tao_TypeCodeFactory_life>; +template class TAO::Any_Impl_T<CORBA::TypeCodeFactory>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Manager<CORBA::TypeCodeFactory, CORBA::TypeCodeFactory_var> +# pragma instantiate TAO_Object_Manager<CORBA::TypeCodeFactory, CORBA::TypeCodeFactory_var,CORBA::tao_TypeCodeFactory_life> # pragma instantiate TAO::Any_Impl_T<CORBA::TypeCodeFactory> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/ValueBase.cpp b/TAO/tao/ValueBase.cpp index cebdacc77ff..a815476b2ec 100644 --- a/TAO/tao/ValueBase.cpp +++ b/TAO/tao/ValueBase.cpp @@ -38,6 +38,12 @@ CORBA::ValueBase::_downcast (CORBA::ValueBase *vt) return vt; // every vt is a CORBA::ValueBase :-) } +/*static*/ CORBA::ValueBase* +CORBA::ValueBase::_nil (void) +{ + return 0; +} + void CORBA::ValueBase::_tao_any_destructor (void *x) { @@ -361,4 +367,3 @@ operator>> (TAO_InputCDR &strm, # pragma instantiate TAO_Pseudo_Value_Out_T<CORBA::ValueBase, CORBA::ValueBase_var> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - diff --git a/TAO/tao/ValueBase.h b/TAO/tao/ValueBase.h index 0bd0752c73a..22cf8da1567 100644 --- a/TAO/tao/ValueBase.h +++ b/TAO/tao/ValueBase.h @@ -52,6 +52,8 @@ namespace CORBA typedef ValueBase* _ptr_type; typedef ValueBase_var _var_type; + + static ValueBase *_nil (void); // reference counting /// %! virtual CORBA::ValueBase* _copy_value (void) = 0; virtual void _add_ref (void) = 0; diff --git a/TAO/tao/ValueFactory.cpp b/TAO/tao/ValueFactory.cpp index 58e4a5e4b3b..f0a09e7ee00 100644 --- a/TAO/tao/ValueFactory.cpp +++ b/TAO/tao/ValueFactory.cpp @@ -14,6 +14,12 @@ CORBA::ValueFactoryBase::~ValueFactoryBase (void) { } +/*static*/ CORBA::ValueFactoryBase * +CORBA::ValueFactoryBase::_nil (void) +{ + return 0; +} + // No-op. This should never be called, but it can't be pure virtual. CORBA::AbstractBase * CORBA::ValueFactoryBase::create_for_unmarshal_abstract (void) @@ -32,4 +38,3 @@ CORBA::ValueFactoryBase::create_for_unmarshal_abstract (void) # pragma instantiate TAO_Pseudo_Value_Out_T<CORBA::ValueFactoryBase, CORBA::ValueFactoryBase_var> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - diff --git a/TAO/tao/ValueFactory.h b/TAO/tao/ValueFactory.h index 6e8caffddfe..875d3633e11 100644 --- a/TAO/tao/ValueFactory.h +++ b/TAO/tao/ValueFactory.h @@ -34,7 +34,7 @@ namespace CORBA typedef TAO_Pseudo_Value_Var_T<ValueFactoryBase> ValueFactoryBase_var; - typedef TAO_Pseudo_Value_Out_T<ValueFactoryBase, ValueFactoryBase_var> + typedef TAO_Pseudo_Value_Out_T<ValueFactoryBase, ValueFactoryBase_var> ValueFactoryBase_out; typedef ValueFactoryBase_var ValueFactory_var; @@ -45,6 +45,8 @@ namespace CORBA ValueFactoryBase (); virtual ~ValueFactoryBase (); + static ValueFactoryBase * _nil (void); + // non-virtual is non-standard void _add_ref (void); void _remove_ref (void); diff --git a/TAO/tao/VarOut_T.cpp b/TAO/tao/VarOut_T.cpp index 40944b47838..b235c53e0db 100644 --- a/TAO/tao/VarOut_T.cpp +++ b/TAO/tao/VarOut_T.cpp @@ -42,14 +42,14 @@ TAO_Fixed_Var_T<T>::operator= (const TAO_Fixed_Var_T<T> & p) } else { - foo * deep_copy = 0; + T * deep_copy = 0; ACE_NEW_RETURN (deep_copy, T (*p.ptr_), *this); if (deep_copy != 0) { - foo * tmp = deep_copy; + T * tmp = deep_copy; deep_copy = this->ptr_; this->ptr_ = tmp; delete deep_copy; @@ -91,7 +91,7 @@ TAO_Var_Var_T<T>::operator= (const TAO_Var_Var_T<T> & p) } else { - bar *deep_copy = 0; + T *deep_copy = 0; ACE_NEW_RETURN (deep_copy, T (*p.ptr_), *this); |