diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2003-10-24 23:31:31 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2003-10-24 23:31:31 +0000 |
| commit | 2b2673e9b680edde1b54b22b742fd7ed556a1f94 (patch) | |
| tree | a6053c5a2a1f679ede64431f363b99d6a6b5c9d6 | |
| parent | 5f423e0ba844b4fc823a0be15312212477e0688a (diff) | |
| download | ATCD-2b2673e9b680edde1b54b22b742fd7ed556a1f94.tar.gz | |
ChangeLogTag:Fri Oct 24 18:28:51 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
23 files changed, 1225 insertions, 1856 deletions
diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref index d9d549900d6..686a502447d 100644 --- a/TAO/ChangeLog_ref +++ b/TAO/ChangeLog_ref @@ -1,3 +1,38 @@ +Fri Oct 24 18:28:51 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * tao/DynamicInterface/Context.h: + * tao/DynamicInterface/Context.inl: + * tao/DynamicInterface/Request.cpp: + + Added is_nil () and release () for CORBA::Context. Further, + fixed some compilation errors with explicit template + instantiations. + + * tao/Messaging/Messaging.pidl: + * tao/Messaging/Messaging_No_Impl.pidl: + * tao/Messaging/Messaging_RT_Policy.pidl: + * tao/Messaging/TAO_Ext.pidl: + * tao/Messaging/Messaging_SyncScope_Policy.pidl: + * tao/ObjRefTemplate/ObjectReferenceTemplate.pidl: + + Added command line options for compiling these files. + + * tao/IORInterceptor/IORInterceptorC.cpp: + * tao/IORInterceptor/IORInterceptorC.h: + * tao/IORInterceptor/IORInterceptorC.i: + * tao/Messaging/MessagingC.cpp: + * tao/Messaging/MessagingC.h: + * tao/Messaging/MessagingC.i: + * tao/Messaging/Messaging_No_ImplC.cpp: + * tao/Messaging/Messaging_RT_PolicyC.cpp: + * tao/Messaging/Messaging_SyncScope_PolicyC.cpp: + * tao/Messaging/TAO_ExtC.cpp: + * tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp: + * tao/ObjRefTemplate/ObjectReferenceTemplateC.h: + * tao/ObjRefTemplate/ObjectReferenceTemplateC.i: + + Regenerated code + Fri Oct 24 18:27:31 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * TAO_IDL/be/be_visitor_tmplinst/tmplinst_cs.cpp: diff --git a/TAO/tao/DynamicInterface/Context.h b/TAO/tao/DynamicInterface/Context.h index ebe398e1f6e..c906c86b2cf 100644 --- a/TAO/tao/DynamicInterface/Context.h +++ b/TAO/tao/DynamicInterface/Context.h @@ -55,8 +55,11 @@ namespace CORBA class Environment; + TAO_NAMESPACE_INLINE_FUNCTION void release (Context_ptr); + TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (Context_ptr ); + TAO_NAMESPACE_INLINE_FUNCTION void release (ContextList_ptr); - TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (ContextList_ptr); + TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (ContextList_ptr ); typedef TAO_Pseudo_Var_T<Context> Context_var; typedef TAO_Pseudo_Out_T<Context, Context_var> Context_out; diff --git a/TAO/tao/DynamicInterface/Context.inl b/TAO/tao/DynamicInterface/Context.inl index af53a6b4cfe..1542333d043 100644 --- a/TAO/tao/DynamicInterface/Context.inl +++ b/TAO/tao/DynamicInterface/Context.inl @@ -4,7 +4,24 @@ ACE_INLINE void -CORBA::release (CORBA::ContextList_ptr x) +CORBA::release (CORBA::Context_ptr x) +{ + if (x != 0) + { + x->_decr_refcnt (); + } +} + +ACE_INLINE +CORBA::Boolean +CORBA::is_nil (CORBA::Context_ptr x) +{ + return (CORBA::Boolean) (x == 0); +} + +ACE_INLINE +void +CORBA::release (CORBA::ContextList *x) { if (x != 0) { @@ -21,7 +38,7 @@ CORBA::is_nil (CORBA::ContextList_ptr x) // =================================================================== -ACE_INLINE +ACE_INLINE CORBA::Context_ptr CORBA::Context::_duplicate (CORBA::Context_ptr x) { @@ -33,7 +50,7 @@ CORBA::Context::_duplicate (CORBA::Context_ptr x) return x; } -ACE_INLINE +ACE_INLINE CORBA::Context_ptr CORBA::Context::_nil (void) { @@ -49,21 +66,21 @@ CORBA::ContextList::ContextList (void) { } -ACE_INLINE +ACE_INLINE CORBA::ULong CORBA::ContextList::count (void) { return (CORBA::ULong) this->ctx_list_.size (); } -ACE_INLINE +ACE_INLINE CORBA::ContextList_ptr CORBA::ContextList::_nil (void) { return (CORBA::ContextList_ptr)0; } -ACE_INLINE +ACE_INLINE CORBA::ContextList_ptr CORBA::ContextList::_duplicate (CORBA::ContextList_ptr x) { @@ -74,4 +91,3 @@ CORBA::ContextList::_duplicate (CORBA::ContextList_ptr x) return x; } - diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp index ec3f6fdd3b0..7acb2a70cdf 100644 --- a/TAO/tao/DynamicInterface/Request.cpp +++ b/TAO/tao/DynamicInterface/Request.cpp @@ -352,23 +352,20 @@ CORBA::Request::handle_response (TAO_InputCDR &incoming, template class TAO_Pseudo_Out_T<CORBA::Request, CORBA::Request_var>; template class TAO_Unbounded_Pseudo_Sequence< - CORBA::Request, - CORBA::Request_var + CORBA::Request >; template class TAO_MngSeq_Var_T< CORBA::ORB::RequestSeq, TAO_Pseudo_Object_Manager< - CORBA::Request, - CORBA::Request_var + CORBA::Request > >; template class TAO_Seq_Var_Base_T< CORBA::ORB::RequestSeq, TAO_Pseudo_Object_Manager< - CORBA::Request, - CORBA::Request_var + CORBA::Request > >; template class @@ -376,8 +373,7 @@ CORBA::Request::handle_response (TAO_InputCDR &incoming, CORBA::ORB::RequestSeq, CORBA::ORB::RequestSeq_var, TAO_Pseudo_Object_Manager< - CORBA::Request, - CORBA::Request_var + CORBA::Request > >; @@ -387,23 +383,20 @@ CORBA::Request::handle_response (TAO_InputCDR &incoming, # pragma instantiate TAO_Pseudo_Out_T<CORBA::Request, CORBA::Request_var> # pragma instantiate \ TAO_Unbounded_Pseudo_Sequence< \ - CORBA::Request, \ - CORBA::Request_var \ + CORBA::Request \ > # pragma instantiate \ TAO_VarSeq_Var_T< \ CORBA::ORB::RequestSeq, \ TAO_Pseudo_Object_Manager< \ - CORBA::Request, \ - CORBA::Request_var \ + CORBA::Request \ > \ > # pragma instantiate \ TAO_Seq_Var_Base_T< \ CORBA::ORB::RequestSeq, \ TAO_Pseudo_Object_Manager< \ - CORBA::Request, \ - CORBA::Request_var \ + CORBA::Request \ > \ > # pragma instantiate \ @@ -411,8 +404,7 @@ CORBA::Request::handle_response (TAO_InputCDR &incoming, CORBA::ORB::RequestSeq, \ CORBA::ORB::RequestSeq_var, \ TAO_Pseudo_Object_Manager< \ - CORBA::Request, \ - CORBA::Request_var \ + CORBA::Request \ > \ > diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.cpp b/TAO/tao/IORInterceptor/IORInterceptorC.cpp index 26995e278e0..2b0c8c08b0c 100644 --- a/TAO/tao/IORInterceptor/IORInterceptorC.cpp +++ b/TAO/tao/IORInterceptor/IORInterceptorC.cpp @@ -26,18 +26,10 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be/be_codegen.cpp:301 +// be/be_codegen.cpp:302 #include "IORInterceptorC.h" -#include "tao/Stub.h" -#include "tao/Invocation_Adapter.h" -#include "tao/Object_T.h" -#include "tao/Basic_Arguments.h" -#include "tao/Object_Argument_T.h" -#include "tao/Special_Basic_Arguments.h" -#include "tao/UB_String_Arguments.h" -#include "tao/Var_Size_Argument_T.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig @@ -48,134 +40,11 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be/be_visitor_arg_traits.cpp:59 +// be/be_visitor_arg_traits.cpp:60 // Arg traits specializations. namespace TAO { - -#if !defined (_CORBA_POLICY__ARG_TRAITS_CS_) -#define _CORBA_POLICY__ARG_TRAITS_CS_ - - ACE_TEMPLATE_SPECIALIZATION - class TAO_IORInterceptor_Export Arg_Traits<CORBA::Policy> - : public - Object_Arg_Traits_T< - CORBA::Policy_ptr, - CORBA::Policy_var, - CORBA::Policy_out, - TAO::Objref_Traits<CORBA::Policy> - > - { - }; - -#endif /* end #if !defined */ - -#if !defined (_CORBA_POLICY__ARG_TRAITS_CS_) -#define _CORBA_POLICY__ARG_TRAITS_CS_ - - ACE_TEMPLATE_SPECIALIZATION - class TAO_IORInterceptor_Export Arg_Traits<CORBA::Policy> - : public - Object_Arg_Traits_T< - CORBA::Policy_ptr, - CORBA::Policy_var, - CORBA::Policy_out, - TAO::Objref_Traits<CORBA::Policy> - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:428 - -#if !defined (_IOP_TAGGEDCOMPONENT__ARG_TRAITS_CS_) -#define _IOP_TAGGEDCOMPONENT__ARG_TRAITS_CS_ - - ACE_TEMPLATE_SPECIALIZATION - class TAO_IORInterceptor_Export Arg_Traits<IOP::TaggedComponent> - : public - Var_Size_Arg_Traits_T< - IOP::TaggedComponent, - IOP::TaggedComponent_var, - IOP::TaggedComponent_out - > - { - }; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_CS_) -#define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_CS_ - - ACE_TEMPLATE_SPECIALIZATION - class TAO_IORInterceptor_Export Arg_Traits<PortableInterceptor::ObjectReferenceFactory> - : public - Object_Arg_Traits_T< - PortableInterceptor::ObjectReferenceFactory *, - PortableInterceptor::ObjectReferenceFactory_var, - PortableInterceptor::ObjectReferenceFactory_out, - TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory> - > - { - }; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__ARG_TRAITS_CS_) -#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__ARG_TRAITS_CS_ - - ACE_TEMPLATE_SPECIALIZATION - class TAO_IORInterceptor_Export Arg_Traits<PortableInterceptor::ObjectReferenceTemplate> - : public - Object_Arg_Traits_T< - PortableInterceptor::ObjectReferenceTemplate *, - PortableInterceptor::ObjectReferenceTemplate_var, - PortableInterceptor::ObjectReferenceTemplate_out, - TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate> - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:262 - -#if !defined (__TAO_SEQ_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE___ARG_TRAITS_CS_) -#define __TAO_SEQ_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE___ARG_TRAITS_CS_ - - ACE_TEMPLATE_SPECIALIZATION - class TAO_IORInterceptor_Export Arg_Traits<PortableInterceptor::ObjectReferenceTemplateSeq> - : public - Var_Size_Arg_Traits_T< - PortableInterceptor::ObjectReferenceTemplateSeq, - PortableInterceptor::ObjectReferenceTemplateSeq_var, - PortableInterceptor::ObjectReferenceTemplateSeq_out - > - { - }; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_IORINFO__ARG_TRAITS_CS_) -#define _PORTABLEINTERCEPTOR_IORINFO__ARG_TRAITS_CS_ - - ACE_TEMPLATE_SPECIALIZATION - class TAO_IORInterceptor_Export Arg_Traits<PortableInterceptor::IORInfo> - : public - Object_Arg_Traits_T< - PortableInterceptor::IORInfo_ptr, - PortableInterceptor::IORInfo_var, - PortableInterceptor::IORInfo_out, - TAO::Objref_Traits<PortableInterceptor::IORInfo> - > - { - }; - -#endif /* end #if !defined */ }; // TAO_IDL - Generated from @@ -232,10 +101,15 @@ PortableInterceptor::IORInfo::_narrow ( ACE_ENV_ARG_DECL_NOT_USED ) { + if (CORBA::is_nil (_tao_objref)) + { + return IORInfo::_nil (); + } + IORInfo_ptr proxy = dynamic_cast<IORInfo_ptr> (_tao_objref); - proxy->_add_ref (); - return proxy; + + return IORInfo::_duplicate (proxy); } PortableInterceptor::IORInfo_ptr @@ -343,10 +217,15 @@ PortableInterceptor::IORInterceptor::_narrow ( ACE_ENV_ARG_DECL_NOT_USED ) { + if (CORBA::is_nil (_tao_objref)) + { + return IORInterceptor::_nil (); + } + IORInterceptor_ptr proxy = dynamic_cast<IORInterceptor_ptr> (_tao_objref); - proxy->_add_ref (); - return proxy; + + return IORInterceptor::_duplicate (proxy); } PortableInterceptor::IORInterceptor_ptr @@ -405,262 +284,58 @@ PortableInterceptor::IORInterceptor::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// be/be_visitor_root/root.cpp:1703 +// be/be_visitor_root/root.cpp:1702 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -#if !defined (_CORBA_POLICY__ARG_TRAITS_TMPLINST_CS_) -#define _CORBA_POLICY__ARG_TRAITS_TMPLINST_CS_ - - template class TAO::Arg_Traits<CORBA::Policy>; - - template class - TAO::Object_Arg_Traits_T< - CORBA::Policy_ptr, - CORBA::Policy_var, - CORBA::Policy_out - >; - -#endif /* end #if !defined */ - -#if !defined (_IOP_TAGGEDCOMPONENT__ARG_TRAITS_TMPLINST_CS_) -#define _IOP_TAGGEDCOMPONENT__ARG_TRAITS_TMPLINST_CS_ - - template class TAO::Arg_Traits<IOP::TaggedComponent>; - - template class - TAO::Var_Size_Arg_Traits< - IOP::TaggedComponent, - IOP::TaggedComponent_var, - IOP::TaggedComponent_out - >; - -#endif /* end #if !defined */ - - template class - TAO::In_Object_Argument_T< - PortableInterceptor::IORInfo_ptr - >; - - template class - TAO::In_Var_Size_Argument_T< - PortableInterceptor::sequence - >; + template class TAO::Objref_Traits<PortableInterceptor::IORInterceptor>; template class TAO_Objref_Var_T< - PortableInterceptor::IORInterceptor, - TAO::Objref_Traits<PortableInterceptor::IORInterceptor> + PortableInterceptor::IORInterceptor >; template class TAO_Objref_Out_T< - PortableInterceptor::IORInterceptor, - TAO::Objref_Traits<PortableInterceptor::IORInterceptor> + PortableInterceptor::IORInterceptor >; -#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_TMPLINST_CS_) -#define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_TMPLINST_CS_ - - template class TAO::Arg_Traits<PortableInterceptor::ObjectReferenceFactory>; - - template class - TAO::Object_Arg_Traits_T< - PortableInterceptor::ObjectReferenceFactory *, - PortableInterceptor::ObjectReferenceFactory_var, - PortableInterceptor::ObjectReferenceFactory_out - >; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__ARG_TRAITS_TMPLINST_CS_) -#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__ARG_TRAITS_TMPLINST_CS_ - - template class TAO::Arg_Traits<PortableInterceptor::ObjectReferenceTemplate>; - - template class - TAO::Object_Arg_Traits_T< - PortableInterceptor::ObjectReferenceTemplate *, - PortableInterceptor::ObjectReferenceTemplate_var, - PortableInterceptor::ObjectReferenceTemplate_out - >; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_SEQUENCE__ARG_TRAITS_TMPLINST_CS_) -#define _PORTABLEINTERCEPTOR_SEQUENCE__ARG_TRAITS_TMPLINST_CS_ - - template class TAO::Arg_Traits<PortableInterceptor::ObjectReferenceTemplateSeq>; - - template class - TAO::Var_Size_Arg_Traits< - PortableInterceptor::ObjectReferenceTemplateSeq, - PortableInterceptor::ObjectReferenceTemplateSeq_var, - PortableInterceptor::ObjectReferenceTemplateSeq_out - >; - -#endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_IORINFO__ARG_TRAITS_TMPLINST_CS_) -#define _PORTABLEINTERCEPTOR_IORINFO__ARG_TRAITS_TMPLINST_CS_ - - template class TAO::Arg_Traits<PortableInterceptor::IORInfo>; - - template class - TAO::Object_Arg_Traits_T< - PortableInterceptor::IORInfo_ptr, - PortableInterceptor::IORInfo_var, - PortableInterceptor::IORInfo_out - >; - -#endif /* end #if !defined */ - - template class - TAO::Ret_Object_Argument_T< - CORBA::Policy_ptr, - CORBA::Policy_var - >; - - template class - TAO::In_Var_Size_Argument_T< - IOP::TaggedComponent - >; + template class TAO::Objref_Traits<PortableInterceptor::IORInfo>; template class TAO_Objref_Var_T< - PortableInterceptor::IORInfo, - TAO::Objref_Traits<PortableInterceptor::IORInfo> + PortableInterceptor::IORInfo >; template class TAO_Objref_Out_T< - PortableInterceptor::IORInfo, - TAO::Objref_Traits<PortableInterceptor::IORInfo> + PortableInterceptor::IORInfo >; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#if !defined (_CORBA_POLICY__ARG_TRAITS_TMPLINST_CS_) -#define _CORBA_POLICY__ARG_TRAITS_TMPLINST_CS_ - -# pragma instantiate TAO::Arg_Traits<CORBA::Policy> - -# pragma instantiate \ - TAO::Object_Arg_Traits_T< \ - CORBA::Policy_ptr, \ - CORBA::Policy_var, \ - CORBA::Policy_out \ - > - -#endif /* end #if !defined */ - -#if !defined (_IOP_TAGGEDCOMPONENT__ARG_TRAITS_TMPLINST_CS_) -#define _IOP_TAGGEDCOMPONENT__ARG_TRAITS_TMPLINST_CS_ - -# pragma instantiate TAO::Arg_Traits<IOP::TaggedComponent> - -# pragma instantiate \ - TAO::Var_Size_Arg_Traits< \ - IOP::TaggedComponent, \ - IOP::TaggedComponent_var, \ - IOP::TaggedComponent_out \ - > - -#endif /* end #if !defined */ - -# pragma instantiate \ - TAO::In_Object_Argument_T< \ - PortableInterceptor::IORInfo_ptr \ - > - -# pragma instantiate \ - TAO::In_Var_Size_Argument_T< \ - PortableInterceptor::sequence \ - > +# pragma instantiate TAO::Objref_Traits<PortableInterceptor::IORInterceptor> # pragma instantiate \ TAO_Objref_Var_T< \ - PortableInterceptor::IORInterceptor, \ - TAO::Objref_Traits<PortableInterceptor::IORInterceptor> \ + PortableInterceptor::IORInterceptor > # pragma instantiate \ TAO_Objref_Out_T< \ - PortableInterceptor::IORInterceptor, \ - TAO::Objref_Traits<PortableInterceptor::IORInterceptor> \ - > - -#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_TMPLINST_CS_) -#define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_TMPLINST_CS_ - -# pragma instantiate TAO::Arg_Traits<PortableInterceptor::ObjectReferenceFactory> - -# pragma instantiate \ - TAO::Object_Arg_Traits_T< \ - PortableInterceptor::ObjectReferenceFactory *, \ - PortableInterceptor::ObjectReferenceFactory_var, \ - PortableInterceptor::ObjectReferenceFactory_out \ - > - -#endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__ARG_TRAITS_TMPLINST_CS_) -#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__ARG_TRAITS_TMPLINST_CS_ - -# pragma instantiate TAO::Arg_Traits<PortableInterceptor::ObjectReferenceTemplate> - -# pragma instantiate \ - TAO::Object_Arg_Traits_T< \ - PortableInterceptor::ObjectReferenceTemplate *, \ - PortableInterceptor::ObjectReferenceTemplate_var, \ - PortableInterceptor::ObjectReferenceTemplate_out \ + PortableInterceptor::IORInterceptor > -#endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_SEQUENCE__ARG_TRAITS_TMPLINST_CS_) -#define _PORTABLEINTERCEPTOR_SEQUENCE__ARG_TRAITS_TMPLINST_CS_ - -# pragma instantiate TAO::Arg_Traits<PortableInterceptor::ObjectReferenceTemplateSeq> - -# pragma instantiate \ - TAO::Var_Size_Arg_Traits< \ - PortableInterceptor::ObjectReferenceTemplateSeq, \ - PortableInterceptor::ObjectReferenceTemplateSeq_var, \ - PortableInterceptor::ObjectReferenceTemplateSeq_out \ - > - -#endif /* end #if !defined */ - -#if !defined (_PORTABLEINTERCEPTOR_IORINFO__ARG_TRAITS_TMPLINST_CS_) -#define _PORTABLEINTERCEPTOR_IORINFO__ARG_TRAITS_TMPLINST_CS_ - -# pragma instantiate TAO::Arg_Traits<PortableInterceptor::IORInfo> - -# pragma instantiate \ - TAO::Object_Arg_Traits_T< \ - PortableInterceptor::IORInfo_ptr, \ - PortableInterceptor::IORInfo_var, \ - PortableInterceptor::IORInfo_out \ - > - -#endif /* end #if !defined */ - -# pragma instantiate \ - TAO::In_Var_Size_Argument_T< \ - IOP::TaggedComponent \ - > +# pragma instantiate TAO::Objref_Traits<PortableInterceptor::IORInfo> # pragma instantiate \ TAO_Objref_Var_T< \ - PortableInterceptor::IORInfo, \ - TAO::Objref_Traits<PortableInterceptor::IORInfo> \ + PortableInterceptor::IORInfo > # pragma instantiate \ TAO_Objref_Out_T< \ - PortableInterceptor::IORInfo, \ - TAO::Objref_Traits<PortableInterceptor::IORInfo> \ + PortableInterceptor::IORInfo > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.h b/TAO/tao/IORInterceptor/IORInterceptorC.h index f8ed170a6cc..bbe00ad1d5b 100644 --- a/TAO/tao/IORInterceptor/IORInterceptorC.h +++ b/TAO/tao/IORInterceptor/IORInterceptorC.h @@ -26,30 +26,24 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be/be_codegen.cpp:151 +// be/be_codegen.cpp:150 #ifndef _TAO_IDL_ORIG_IORINTERCEPTORC_H_ #define _TAO_IDL_ORIG_IORINTERCEPTORC_H_ #include /**/ "ace/pre.h" -#include "iorinterceptor_export.h" +#include "tao/ORB.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Valuetype/AbstractBase.h" -#include "tao/Valuetype/ValueBase.h" -#include "tao/Valuetype/Valuetype_Adapter_Impl.h" -#include "tao/Valuetype/ValueFactory.h" -#include "tao/Valuetype/Sequence_T.h" -#include "tao/Sequence_T.h" +#include "iorinterceptor_export.h" +#include "tao/CDR.h" +#include "tao/Environment.h" +#include "tao/Object.h" #include "tao/Objref_VarOut_T.h" -#include "tao/Valuetype/Value_VarOut_T.h" -#include "tao/Seq_Var_T.h" -#include "tao/Seq_Out_T.h" -#include "tao/VarOut_T.h" #include "tao/PortableInterceptorC.h" #include "tao/ObjRefTemplate/ObjectReferenceTemplateC.h" @@ -83,6 +77,8 @@ namespace TAO { class Collocation_Proxy_Broker; + + template<typename T> class Narrow_Utils; } // TAO_IDL - Generated from @@ -92,7 +88,7 @@ namespace PortableInterceptor { // TAO_IDL - Generated from - // be/be_interface.cpp:601 + // be/be_interface.cpp:605 #if !defined (_PORTABLEINTERCEPTOR_IORINFO__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_IORINFO__VAR_OUT_CH_ @@ -115,7 +111,7 @@ namespace PortableInterceptor #endif /* end #if !defined */ // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:53 + // be/be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLEINTERCEPTOR_IORINFO_CH_) #define _PORTABLEINTERCEPTOR_IORINFO_CH_ @@ -136,9 +132,9 @@ namespace PortableInterceptor ); static IORInfo_ptr _nil (void) - { - return (IORInfo_ptr)0; - } + { + return (IORInfo_ptr)0; + } @@ -228,7 +224,7 @@ namespace PortableInterceptor )) = 0; // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:185 + // be/be_visitor_interface/interface_ch.cpp:187 virtual CORBA::Boolean _is_a ( const char *type_id @@ -239,18 +235,22 @@ namespace PortableInterceptor virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); protected: + // Abstract or local interface only. IORInfo (void); + virtual ~IORInfo (void); private: + // Private and unimplemented for concrete interfaces. IORInfo (const IORInfo &); + void operator= (const IORInfo &); }; #endif /* end #if !defined */ // TAO_IDL - Generated from - // be/be_interface.cpp:601 + // be/be_interface.cpp:605 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_ @@ -273,7 +273,7 @@ namespace PortableInterceptor #endif /* end #if !defined */ // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:53 + // be/be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR_CH_) #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR_CH_ @@ -294,9 +294,9 @@ namespace PortableInterceptor ); static IORInterceptor_ptr _nil (void) - { - return (IORInterceptor_ptr)0; - } + { + return (IORInterceptor_ptr)0; + } @@ -347,7 +347,7 @@ namespace PortableInterceptor )) = 0; // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:185 + // be/be_visitor_interface/interface_ch.cpp:187 virtual CORBA::Boolean _is_a ( const char *type_id @@ -358,11 +358,15 @@ namespace PortableInterceptor virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); protected: + // Abstract or local interface only. IORInterceptor (void); + virtual ~IORInterceptor (void); private: + // Private and unimplemented for concrete interfaces. IORInterceptor (const IORInterceptor &); + void operator= (const IORInterceptor &); }; @@ -379,6 +383,7 @@ namespace PortableInterceptor // Traits specializations. namespace TAO { + #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_) #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_ @@ -433,7 +438,7 @@ namespace TAO #endif /* __ACE_INLINE__ */ // TAO_IDL - Generated from -// be/be_codegen.cpp:969 +// be/be_codegen.cpp:911 #if defined (__ACE_INLINE__) #include "IORInterceptorC.i" @@ -448,5 +453,6 @@ namespace TAO #endif /* __BORLANDC__ */ #include /**/ "ace/post.h" + #endif /* ifndef */ diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.i b/TAO/tao/IORInterceptor/IORInterceptorC.i index 3e4a23c06ce..38aa32569ba 100644 --- a/TAO/tao/IORInterceptor/IORInterceptorC.i +++ b/TAO/tao/IORInterceptor/IORInterceptorC.i @@ -26,19 +26,3 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ci.cpp:63 - -#if !defined (_PORTABLEINTERCEPTOR_IORINFO___CI_) -#define _PORTABLEINTERCEPTOR_IORINFO___CI_ - -#endif /* end #if !defined */ - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ci.cpp:63 - -#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR___CI_) -#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR___CI_ - -#endif /* end #if !defined */ - diff --git a/TAO/tao/Messaging/Messaging.pidl b/TAO/tao/Messaging/Messaging.pidl index a897ecb9275..939598a9fc3 100644 --- a/TAO/tao/Messaging/Messaging.pidl +++ b/TAO/tao/Messaging/Messaging.pidl @@ -11,11 +11,11 @@ * The command used to generate code from this file is: * * tao_idl - * -o orig -Gp -Gd -Ge 1 + * -o orig -Gp -Gd -GT -Ge 1 * -Wb,export_macro=TAO_Messaging_Export * -Wb,export_include=messaging_export.h * -Wb,pre_include="ace/pre.h" - * -Wb,post_include="ace/post.h" + * -Wb,post_include="ace/post.h" -I$(TAO_ROOT) * Messaging.pidl * * after the file is generated a patch must be applied: @@ -36,11 +36,11 @@ #ifndef TAO_MESSAGING_PIDL #define TAO_MESSAGING_PIDL -#include <Pollable.pidl> -#include <Messaging_SyncScope_Policy.pidl> -#include <Messaging_RT_Policy.pidl> -#include <Messaging_No_Impl.pidl> -#include <OctetSeq.pidl> +#include "tao/Pollable.pidl" +#include "tao/Messaging/Messaging_SyncScope_Policy.pidl" +#include "tao/Messaging/Messaging_RT_Policy.pidl" +#include "tao/Messaging/Messaging_No_Impl.pidl" +#include "tao/OctetSeq.pidl" #pragma prefix "omg.org" diff --git a/TAO/tao/Messaging/MessagingC.cpp b/TAO/tao/Messaging/MessagingC.cpp index b6adeda4fdf..17f84239f8b 100644 --- a/TAO/tao/Messaging/MessagingC.cpp +++ b/TAO/tao/Messaging/MessagingC.cpp @@ -26,19 +26,13 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be/be_codegen.cpp:301 +// be/be_codegen.cpp:302 #include "Messaging.h" -#include "tao/Stub.h" -#include "tao/Invocation_Adapter.h" #include "tao/Object_T.h" -#include "tao/Any_Impl_T.h" -#include "tao/Any_Dual_Impl_T.h" -#include "tao/Any_Basic_Impl_T.h" -#include "tao/Basic_Arguments.h" -#include "tao/Fixed_Size_Argument_T.h" #include "tao/Typecode.h" +#include "tao/Any_Impl_T.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig @@ -49,7 +43,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be/be_visitor_arg_traits.cpp:59 +// be/be_visitor_arg_traits.cpp:60 // Arg traits specializations. namespace TAO @@ -150,7 +144,7 @@ namespace Messaging } // TAO_IDL - Generated from -// be/be_visitor_valuetype/valuetype_cs.cpp:94 +// be/be_visitor_valuetype/valuetype_cs.cpp:66 void TAO::Value_Traits<Messaging::ExceptionHolder>::tao_add_ref ( @@ -176,7 +170,7 @@ Messaging::ExceptionHolder::_downcast (CORBA::ValueBase *v) return 0; } - return (ExceptionHolder *) v->_tao_obv_narrow ((ptrdiff_t) &_downcast); + return dynamic_cast<Messaging::ExceptionHolder *> (v); } const char * @@ -184,32 +178,6 @@ Messaging::ExceptionHolder::_tao_obv_repository_id (void) const { return this->_tao_obv_static_repository_id (); } - -void * -#if defined (_MSC_VER) -Messaging::ExceptionHolder::Messaging_ExceptionHolder_tao_obv_narrow (ptrdiff_t type_id) -#else -Messaging::ExceptionHolder::_tao_obv_narrow (ptrdiff_t type_id) -#endif /* _MSC_VER */ -{ - if (type_id == (ptrdiff_t) &_downcast) - { - return this; - } - - void *rval = 0; - - return rval; -} - -#if defined (_MSC_VER) -void * -Messaging::ExceptionHolder::_tao_obv_narrow (ptrdiff_t type_id) -{ - return this->Messaging_ExceptionHolder_tao_obv_narrow (type_id); -} -#endif /* _MSC_VER */ - void Messaging::ExceptionHolder::_tao_any_destructor (void *_tao_void_pointer) { @@ -275,7 +243,7 @@ CORBA::Boolean Messaging::ExceptionHolder::_tao_unmarshal ( } // TAO_IDL - Generated from -// be/be_visitor_valuetype/valuetype_init_cs.cpp:84 +// be/be_visitor_valuetype/valuetype_init_cs.cpp:85 Messaging::ExceptionHolder_init::ExceptionHolder_init (void) { @@ -559,7 +527,19 @@ OBV_Messaging::ExceptionHolder::marshaled_exception (void) // TAO_IDL - Generated from // be/be_visitor_valuetype/any_op_cs.cpp:57 -// Copying insertion. + + +template<> +ACE_INLINE +CORBA::Boolean +TAO::Any_Impl_T<Messaging::ExceptionHolder>::to_value ( + CORBA::ValueBase *&_tao_elem + ) const +{ + CORBA::add_ref (this->value_); + _tao_elem = this->value_; + return 1; +}// Copying insertion. void operator<<= ( CORBA::Any &_tao_any, @@ -600,22 +580,21 @@ operator>>= ( ); } + + +// TAO_IDL - Generated from +// be/be_visitor_interface/any_op_cs.cpp:50 + ACE_TEMPLATE_SPECIALIZATION CORBA::Boolean -TAO::Any_Impl_T<Messaging::ExceptionHolder>::to_value ( - CORBA::ValueBase *&_tao_elem +TAO::Any_Impl_T<Messaging::ReplyHandler>::to_object ( + CORBA::Object_ptr &_tao_elem ) const { - CORBA::add_ref (this->value_); - _tao_elem = this->value_; + _tao_elem = CORBA::Object::_duplicate (this->value_); return 1; } - - -// TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:50 - // Copying insertion. void operator<<= ( @@ -658,18 +637,8 @@ operator>>= ( ); } -ACE_TEMPLATE_SPECIALIZATION -CORBA::Boolean -TAO::Any_Impl_T<Messaging::ReplyHandler>::to_object ( - CORBA::Object_ptr &_tao_elem - ) const -{ - _tao_elem = CORBA::Object::_duplicate (this->value_); - return 1; -} - // TAO_IDL - Generated from -// be/be_valuetype.cpp:263 +// be/be_valuetype.cpp:490 void CORBA::add_ref (Messaging::ExceptionHolder * vt) @@ -792,43 +761,20 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be/be_visitor_root/root.cpp:1703 +// be/be_visitor_root/root.cpp:1702 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class - TAO::Any_Dual_Impl_T< - CORBA::PollableSet::NoPossiblePollable - >; - - template class - TAO::Any_Dual_Impl_T< - CORBA::PollableSet::UnknownPollable - >; - - template class - TAO::Any_Basic_Impl_T< - CORBA::SetOverrideType - >; - - template class - TAO::Any_Dual_Impl_T< - CORBA::PolicyError - >; - - template class - TAO::Any_Dual_Impl_T< - CORBA::InvalidPolicies - >; template class TAO_Value_Var_T< - Messaging::ExceptionHolder, - TAO::Value_Traits<Messaging::ExceptionHolder> + Messaging::ExceptionHolder + >; template class TAO_Value_Out_T< - Messaging::ExceptionHolder, - TAO::Value_Traits<Messaging::ExceptionHolder> + Messaging::ExceptionHolder + >; template class @@ -836,19 +782,24 @@ CORBA::Boolean operator>> ( Messaging::ExceptionHolder >; + template class TAO::Objref_Traits<Messaging::ReplyHandler>; + template class TAO_Objref_Var_T< - Messaging::ReplyHandler, - TAO::Objref_Traits<Messaging::ReplyHandler> + Messaging::ReplyHandler + >; template class TAO_Objref_Out_T< - Messaging::ReplyHandler, - TAO::Objref_Traits<Messaging::ReplyHandler> + Messaging::ReplyHandler + >; template class + TAO::Narrow_Utils<Messaging::ReplyHandler>; + + template class TAO::Any_Impl_T< Messaging::ReplyHandler >; @@ -856,38 +807,15 @@ CORBA::Boolean operator>> ( #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - CORBA::PollableSet::NoPossiblePollable \ - > - -# pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - CORBA::PollableSet::UnknownPollable \ - > - -# pragma instantiate \ - TAO::Any_Basic_Impl_T< \ - CORBA::SetOverrideType \ - > - -# pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - CORBA::PolicyError \ - > - -# pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - CORBA::InvalidPolicies \ - ># pragma instantiate \ TAO_Value_Var_T< \ - Messaging::ExceptionHolder, \ - TAO::Value_Traits<Messaging::ExceptionHolder> \ + Messaging::ExceptionHolder \ + > # pragma instantiate \ TAO_Value_Out_T< \ - Messaging::ExceptionHolder, \ - TAO::Value_Traits<Messaging::ExceptionHolder> \ + Messaging::ExceptionHolder \ + > # pragma instantiate \ @@ -895,19 +823,24 @@ CORBA::Boolean operator>> ( Messaging::ExceptionHolder \ > +# pragma instantiate TAO::Objref_Traits<Messaging::ReplyHandler> + # pragma instantiate \ TAO_Objref_Var_T< \ - Messaging::ReplyHandler, \ - TAO::Objref_Traits<Messaging::ReplyHandler> \ + Messaging::ReplyHandler + > # pragma instantiate \ TAO_Objref_Out_T< \ - Messaging::ReplyHandler, \ - TAO::Objref_Traits<Messaging::ReplyHandler> \ + Messaging::ReplyHandler + > # pragma instantiate \ + TAO::Narrow_Utils<Messaging::ReplyHandler> + +# pragma instantiate \ TAO::Any_Impl_T< \ Messaging::ReplyHandler \ > diff --git a/TAO/tao/Messaging/MessagingC.h b/TAO/tao/Messaging/MessagingC.h index cd01767b501..5fdf5d628b6 100644 --- a/TAO/tao/Messaging/MessagingC.h +++ b/TAO/tao/Messaging/MessagingC.h @@ -26,14 +26,14 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be/be_codegen.cpp:151 +// be/be_codegen.cpp:150 #ifndef _TAO_IDL_ORIG_MESSAGINGC_H_ #define _TAO_IDL_ORIG_MESSAGINGC_H_ #include /**/ "ace/pre.h" -#include "messaging_export.h" +#include "tao/ORB.h" #ifndef TAO_MESSAGING_SAFE_INCLUDE #error "You should not include MessagingC.h directly, use Messaging.h" @@ -43,19 +43,21 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Messaging/messaging_export.h" +#include "tao/CDR.h" +#include "tao/Environment.h" +#include "tao/Object.h" #include "tao/Valuetype/ValueBase.h" #include "tao/Valuetype/Valuetype_Adapter_Impl.h" #include "tao/Valuetype/ValueFactory.h" -#include "tao/Sequence_T.h" #include "tao/Objref_VarOut_T.h" #include "tao/Valuetype/Value_VarOut_T.h" -#include "tao/Seq_Var_T.h" -#include "tao/Seq_Out_T.h" -#include "tao/VarOut_T.h" -#include "Messaging_SyncScope_PolicyC.h" -#include "Messaging_RT_PolicyC.h" -#include "Messaging_No_ImplC.h" +#include "tao/PollableC.h" +#include "tao/Messaging/Messaging_SyncScope_PolicyC.h" +#include "tao/Messaging/Messaging_RT_PolicyC.h" +#include "tao/Messaging/Messaging_No_ImplC.h" +#include "tao/OctetSeqC.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -86,6 +88,8 @@ namespace TAO { class Collocation_Proxy_Broker; + + template<typename T> class Narrow_Utils; } // TAO_IDL - Generated from @@ -95,7 +99,7 @@ namespace Messaging { // TAO_IDL - Generated from - // be/be_valuetype.cpp:300 + // be/be_valuetype.cpp:527 @@ -128,15 +132,17 @@ namespace Messaging { public: typedef ExceptionHolder_var _var_type; - static ExceptionHolder* _downcast (CORBA::ValueBase* ); - // The address of static _downcast is implicit used as type id + + static ExceptionHolder* _downcast (CORBA::ValueBase *); // (TAO extensions or internals) static CORBA::Boolean _tao_unmarshal ( TAO_InputCDR &, ExceptionHolder *& ); + virtual const char* _tao_obv_repository_id (void) const; + static const char* _tao_obv_static_repository_id (void); static void _tao_any_destructor (void *); @@ -161,16 +167,13 @@ namespace Messaging virtual CORBA::OctetSeq &marshaled_exception (void) = 0; // TAO_IDL - Generated from - // be/be_visitor_valuetype/valuetype_ch.cpp:275 + // be/be_visitor_valuetype/valuetype_ch.cpp:250 protected: ExceptionHolder (void); + virtual ~ExceptionHolder (void); - virtual void *_tao_obv_narrow (ptrdiff_t); -#if defined (_MSC_VER) - virtual void *Messaging_ExceptionHolder_tao_obv_narrow (ptrdiff_t); -#endif /* _MSC_VER */ virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &); virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &); @@ -179,8 +182,11 @@ namespace Messaging void operator= (const ExceptionHolder &); protected: - virtual CORBA::Boolean _tao_marshal__Messaging_ExceptionHolder (TAO_OutputCDR &) = 0; - virtual CORBA::Boolean _tao_unmarshal__Messaging_ExceptionHolder (TAO_InputCDR &) = 0; + virtual CORBA::Boolean + _tao_marshal__Messaging_ExceptionHolder (TAO_OutputCDR &) = 0; + + virtual CORBA::Boolean + _tao_unmarshal__Messaging_ExceptionHolder (TAO_InputCDR &) = 0; }; #endif /* end #if !defined */ @@ -189,7 +195,7 @@ namespace Messaging #define _MESSAGING_EXCEPTIONHOLDER___INIT_CH_ // TAO_IDL - Generated from - // be/be_visitor_valuetype/valuetype_init_ch.cpp:71 + // be/be_visitor_valuetype/valuetype_init_ch.cpp:72 class TAO_Messaging_Export ExceptionHolder_init : public virtual CORBA::ValueFactoryBase { @@ -216,7 +222,7 @@ namespace Messaging TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExceptionHolder; // TAO_IDL - Generated from - // be/be_interface.cpp:601 + // be/be_interface.cpp:605 #if !defined (_MESSAGING_REPLYHANDLER__VAR_OUT_CH_) #define _MESSAGING_REPLYHANDLER__VAR_OUT_CH_ @@ -239,7 +245,7 @@ namespace Messaging #endif /* end #if !defined */ // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:53 + // be/be_visitor_interface/interface_ch.cpp:54 #if !defined (_MESSAGING_REPLYHANDLER_CH_) #define _MESSAGING_REPLYHANDLER_CH_ @@ -261,14 +267,14 @@ namespace Messaging ); static ReplyHandler_ptr _nil (void) - { - return (ReplyHandler_ptr)0; - } + { + return (ReplyHandler_ptr)0; + } static void _tao_any_destructor (void *); // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:185 + // be/be_visitor_interface/interface_ch.cpp:187 virtual CORBA::Boolean _is_a ( const char *type_id @@ -281,25 +287,33 @@ namespace Messaging TAO::Collocation_Proxy_Broker *the_TAO_ReplyHandler_Proxy_Broker_; protected: + // Concrete interface only. ReplyHandler (int collocated = 0); // These methods travese the inheritance tree and set the // parents piece of the given class in the right mode. virtual void Messaging_ReplyHandler_setup_collocation (int collocated); - ReplyHandler (IOP::IOR *ior, - TAO_ORB_Core *orb_core = 0); + // Concrete non-local interface only. + ReplyHandler ( + IOP::IOR *ior, + TAO_ORB_Core *orb_core = 0 + ); + // Non-local interface only. ReplyHandler ( TAO_Stub *objref, CORBA::Boolean _tao_collocated = 0, TAO_Abstract_ServantBase *servant = 0, TAO_ORB_Core *orb_core = 0 ); + virtual ~ReplyHandler (void); private: + // Private and unimplemented for concrete interfaces. ReplyHandler (const ReplyHandler &); + void operator= (const ReplyHandler &); }; @@ -318,7 +332,7 @@ namespace Messaging // Proxy Broker Factory function pointer declarations. // TAO_IDL - Generated from -// be/be_visitor_root/root.cpp:121 +// be/be_visitor_root/root.cpp:120 extern TAO_Messaging_Export TAO::Collocation_Proxy_Broker * @@ -367,8 +381,12 @@ namespace OBV_Messaging virtual CORBA::OctetSeq &marshaled_exception (void); protected: - virtual CORBA::Boolean _tao_marshal__Messaging_ExceptionHolder (TAO_OutputCDR &); - virtual CORBA::Boolean _tao_unmarshal__Messaging_ExceptionHolder (TAO_InputCDR &); + virtual CORBA::Boolean + _tao_marshal__Messaging_ExceptionHolder (TAO_OutputCDR &); + + virtual CORBA::Boolean + _tao_unmarshal__Messaging_ExceptionHolder (TAO_InputCDR &); + CORBA::Boolean _tao_marshal_state (TAO_OutputCDR &); CORBA::Boolean _tao_unmarshal_state (TAO_InputCDR &); @@ -387,6 +405,39 @@ namespace OBV_Messaging // Traits specializations. namespace TAO { + +#if !defined (_MESSAGING_EXCEPTIONHOLDER__TRAITS_CH_) +#define _MESSAGING_EXCEPTIONHOLDER__TRAITS_CH_ + + ACE_TEMPLATE_SPECIALIZATION + struct TAO_Messaging_Export Value_Traits<Messaging::ExceptionHolder> + { + static void tao_add_ref (Messaging::ExceptionHolder *); + static void tao_remove_ref (Messaging::ExceptionHolder *); + }; + +#endif /* end #if !defined */ + +#if !defined (_MESSAGING_REPLYHANDLER__TRAITS_CH_) +#define _MESSAGING_REPLYHANDLER__TRAITS_CH_ + + ACE_TEMPLATE_SPECIALIZATION + struct TAO_Messaging_Export Objref_Traits<Messaging::ReplyHandler> + { + static Messaging::ReplyHandler_ptr tao_duplicate ( + Messaging::ReplyHandler_ptr + ); + static void tao_release ( + Messaging::ReplyHandler_ptr + ); + static Messaging::ReplyHandler_ptr tao_nil (void); + static CORBA::Boolean tao_marshal ( + Messaging::ReplyHandler_ptr p, + TAO_OutputCDR & cdr + ); + }; + +#endif /* end #if !defined */ }; // TAO_IDL - Generated from @@ -409,7 +460,7 @@ TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging:: #ifndef __ACE_INLINE__ // TAO_IDL - Generated from -// be/be_valuetype.cpp:207 +// be/be_valuetype.cpp:434 namespace CORBA { @@ -435,7 +486,7 @@ TAO_Messaging_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::Reply #endif /* __ACE_INLINE__ */ // TAO_IDL - Generated from -// be/be_codegen.cpp:969 +// be/be_codegen.cpp:911 #if defined (__ACE_INLINE__) #include "MessagingC.i" @@ -450,4 +501,5 @@ TAO_Messaging_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::Reply #endif /* __BORLANDC__ */ #include /**/ "ace/post.h" + #endif /* ifndef */ diff --git a/TAO/tao/Messaging/MessagingC.i b/TAO/tao/Messaging/MessagingC.i index 00c27ebad1f..9e5481e2098 100644 --- a/TAO/tao/Messaging/MessagingC.i +++ b/TAO/tao/Messaging/MessagingC.i @@ -44,7 +44,7 @@ Messaging::ExceptionHolder::_tao_obv_static_repository_id () } // TAO_IDL - Generated from -// be/be_visitor_interface/interface_ci.cpp:63 +// be/be_visitor_interface/interface_ci.cpp:70 #if !defined (_MESSAGING_REPLYHANDLER___CI_) #define _MESSAGING_REPLYHANDLER___CI_ @@ -56,9 +56,13 @@ Messaging::ReplyHandler::ReplyHandler ( TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc ) - : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant, oc), + : ACE_NESTED_CLASS (CORBA, Object) ( + objref, + _tao_collocated, + servant, + oc + ), the_TAO_ReplyHandler_Proxy_Broker_ (0) - { this->Messaging_ReplyHandler_setup_collocation (_tao_collocated); } @@ -70,14 +74,13 @@ Messaging::ReplyHandler::ReplyHandler ( ) : ACE_NESTED_CLASS (CORBA, Object) (ior, oc), the_TAO_ReplyHandler_Proxy_Broker_ (0) - { } #endif /* end #if !defined */ // TAO_IDL - Generated from -// be/be_valuetype.cpp:236 +// be/be_valuetype.cpp:463 #if defined (__ACE_INLINE__) diff --git a/TAO/tao/Messaging/Messaging_No_Impl.pidl b/TAO/tao/Messaging/Messaging_No_Impl.pidl index 39abffcf345..4c377e2e81a 100644 --- a/TAO/tao/Messaging/Messaging_No_Impl.pidl +++ b/TAO/tao/Messaging/Messaging_No_Impl.pidl @@ -13,11 +13,11 @@ * The command used to generate code from this file is: * * tao_idl - * -o orig -Gp -Gd -Ge 1 + * -o orig -Gp -Gd -Ge 1 -GT * -Wb,export_macro=TAO_Messaging_Export * -Wb,export_include=messaging_export.h * -Wb,pre_include="ace/pre.h" - * -Wb,post_include="ace/post.h" + * -Wb,post_include="ace/post.h" -I$(TAO_ROOT) * Messaging_No_Impl.pidl * * after the file is generated a patch must be applied: @@ -38,9 +38,9 @@ #ifndef TAO_MESSAGING_NO_IMPL_PIDL #define TAO_MESSAGING_NO_IMPL_PIDL -#include <TimeBase.pidl> -#include <Policy.pidl> -#include <Pollable.pidl> +#include "tao/TimeBase.pidl" +#include "tao/Policy.pidl" +#include "tao/Pollable.pidl" #pragma prefix "omg.org" diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.cpp b/TAO/tao/Messaging/Messaging_No_ImplC.cpp index 31e78fb0feb..969cbd762a1 100644 --- a/TAO/tao/Messaging/Messaging_No_ImplC.cpp +++ b/TAO/tao/Messaging/Messaging_No_ImplC.cpp @@ -26,19 +26,13 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be/be_codegen.cpp:301 +// be/be_codegen.cpp:302 #include "Messaging_No_ImplC.h" -#include "tao/Stub.h" -#include "tao/Invocation_Adapter.h" -#include "tao/Object_T.h" +#include "tao/Typecode.h" #include "tao/Any_Impl_T.h" #include "tao/Any_Dual_Impl_T.h" -#include "tao/Any_Basic_Impl_T.h" -#include "tao/Basic_Arguments.h" -#include "tao/Fixed_Size_Argument_T.h" -#include "tao/Typecode.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig @@ -49,62 +43,11 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be/be_visitor_arg_traits.cpp:59 +// be/be_visitor_arg_traits.cpp:60 // Arg traits specializations. namespace TAO { - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:428 - -#if !defined (_TIMEBASE_UTCT__ARG_TRAITS_CS_) -#define _TIMEBASE_UTCT__ARG_TRAITS_CS_ - - ACE_TEMPLATE_SPECIALIZATION - class TAO_Messaging_Export Arg_Traits<TimeBase::UtcT> - : public - Fixed_Size_Arg_Traits_T< - TimeBase::UtcT - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:428 - -#if !defined (_MESSAGING_PRIORITYRANGE__ARG_TRAITS_CS_) -#define _MESSAGING_PRIORITYRANGE__ARG_TRAITS_CS_ - - ACE_TEMPLATE_SPECIALIZATION - class TAO_Messaging_Export Arg_Traits<Messaging::PriorityRange> - : public - Fixed_Size_Arg_Traits_T< - Messaging::PriorityRange - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:428 - -#if !defined (_MESSAGING_ROUTINGTYPERANGE__ARG_TRAITS_CS_) -#define _MESSAGING_ROUTINGTYPERANGE__ARG_TRAITS_CS_ - - ACE_TEMPLATE_SPECIALIZATION - class TAO_Messaging_Export Arg_Traits<Messaging::RoutingTypeRange> - : public - Fixed_Size_Arg_Traits_T< - Messaging::RoutingTypeRange - > - { - }; - -#endif /* end #if !defined */ }; // TAO_IDL - Generated from @@ -114,18 +57,18 @@ static const CORBA::Long _oc_Messaging_Priority[] = { TAO_ENCAP_BYTE_ORDER, // byte order 35, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d657373), - ACE_NTOHL (0x6167696e), - ACE_NTOHL (0x672f5072), - ACE_NTOHL (0x696f7269), - ACE_NTOHL (0x74793a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d657373), + ACE_NTOHL (0x6167696e), + ACE_NTOHL (0x672f5072), + ACE_NTOHL (0x696f7269), + ACE_NTOHL (0x74793a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/Messaging/Priority:1.0 9, - ACE_NTOHL (0x5072696f), - ACE_NTOHL (0x72697479), + ACE_NTOHL (0x5072696f), + ACE_NTOHL (0x72697479), ACE_NTOHL (0x0), // name = Priority CORBA::tk_short, @@ -152,19 +95,19 @@ static const CORBA::Long _oc_Messaging_RebindMode[] = { TAO_ENCAP_BYTE_ORDER, // byte order 37, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d657373), - ACE_NTOHL (0x6167696e), - ACE_NTOHL (0x672f5265), - ACE_NTOHL (0x62696e64), - ACE_NTOHL (0x4d6f6465), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d657373), + ACE_NTOHL (0x6167696e), + ACE_NTOHL (0x672f5265), + ACE_NTOHL (0x62696e64), + ACE_NTOHL (0x4d6f6465), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/Messaging/RebindMode:1.0 11, - ACE_NTOHL (0x52656269), - ACE_NTOHL (0x6e644d6f), + ACE_NTOHL (0x52656269), + ACE_NTOHL (0x6e644d6f), ACE_NTOHL (0x64650000), // name = RebindMode CORBA::tk_short, @@ -191,19 +134,19 @@ static const CORBA::Long _oc_Messaging_RoutingType[] = { TAO_ENCAP_BYTE_ORDER, // byte order 38, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d657373), - ACE_NTOHL (0x6167696e), - ACE_NTOHL (0x672f526f), - ACE_NTOHL (0x7574696e), - ACE_NTOHL (0x67547970), - ACE_NTOHL (0x653a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d657373), + ACE_NTOHL (0x6167696e), + ACE_NTOHL (0x672f526f), + ACE_NTOHL (0x7574696e), + ACE_NTOHL (0x67547970), + ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/Messaging/RoutingType:1.0 12, - ACE_NTOHL (0x526f7574), - ACE_NTOHL (0x696e6754), + ACE_NTOHL (0x526f7574), + ACE_NTOHL (0x696e6754), ACE_NTOHL (0x79706500), // name = RoutingType CORBA::tk_short, @@ -230,18 +173,18 @@ static const CORBA::Long _oc_Messaging_Ordering[] = { TAO_ENCAP_BYTE_ORDER, // byte order 35, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d657373), - ACE_NTOHL (0x6167696e), - ACE_NTOHL (0x672f4f72), - ACE_NTOHL (0x64657269), - ACE_NTOHL (0x6e673a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d657373), + ACE_NTOHL (0x6167696e), + ACE_NTOHL (0x672f4f72), + ACE_NTOHL (0x64657269), + ACE_NTOHL (0x6e673a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/Messaging/Ordering:1.0 9, - ACE_NTOHL (0x4f726465), - ACE_NTOHL (0x72696e67), + ACE_NTOHL (0x4f726465), + ACE_NTOHL (0x72696e67), ACE_NTOHL (0x0), // name = Ordering CORBA::tk_ushort, @@ -298,7 +241,7 @@ TAO::Objref_Traits<Messaging::RebindPolicy>::tao_marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*Messaging__TAO_RebindPolicy_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -309,7 +252,7 @@ Messaging::RebindPolicy::RebindPolicy (void) Messaging::RebindPolicy::~RebindPolicy (void) {} -void +void Messaging::RebindPolicy::_tao_any_destructor (void *_tao_void_pointer) { RebindPolicy *_tao_tmp_pointer = @@ -323,10 +266,15 @@ Messaging::RebindPolicy::_narrow ( ACE_ENV_ARG_DECL_NOT_USED ) { + if (CORBA::is_nil (_tao_objref)) + { + return RebindPolicy::_nil (); + } + RebindPolicy_ptr proxy = dynamic_cast<RebindPolicy_ptr> (_tao_objref); - proxy->_add_ref (); - return proxy; + + return RebindPolicy::_duplicate (proxy); } Messaging::RebindPolicy_ptr @@ -336,7 +284,7 @@ Messaging::RebindPolicy::_duplicate (RebindPolicy_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -391,20 +339,20 @@ static const CORBA::Long _oc_Messaging_RebindPolicy[] = { TAO_ENCAP_BYTE_ORDER, // byte order 39, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d657373), - ACE_NTOHL (0x6167696e), - ACE_NTOHL (0x672f5265), - ACE_NTOHL (0x62696e64), - ACE_NTOHL (0x506f6c69), - ACE_NTOHL (0x63793a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d657373), + ACE_NTOHL (0x6167696e), + ACE_NTOHL (0x672f5265), + ACE_NTOHL (0x62696e64), + ACE_NTOHL (0x506f6c69), + ACE_NTOHL (0x63793a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/Messaging/RebindPolicy:1.0 13, - ACE_NTOHL (0x52656269), - ACE_NTOHL (0x6e64506f), - ACE_NTOHL (0x6c696379), + ACE_NTOHL (0x52656269), + ACE_NTOHL (0x6e64506f), + ACE_NTOHL (0x6c696379), ACE_NTOHL (0x0), // name = RebindPolicy }; @@ -429,20 +377,20 @@ static const CORBA::Long _oc_Messaging_PriorityRange[] = { TAO_ENCAP_BYTE_ORDER, // byte order 40, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d657373), - ACE_NTOHL (0x6167696e), - ACE_NTOHL (0x672f5072), - ACE_NTOHL (0x696f7269), - ACE_NTOHL (0x74795261), - ACE_NTOHL (0x6e67653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d657373), + ACE_NTOHL (0x6167696e), + ACE_NTOHL (0x672f5072), + ACE_NTOHL (0x696f7269), + ACE_NTOHL (0x74795261), + ACE_NTOHL (0x6e67653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/Messaging/PriorityRange:1.0 14, - ACE_NTOHL (0x5072696f), - ACE_NTOHL (0x72697479), - ACE_NTOHL (0x52616e67), + ACE_NTOHL (0x5072696f), + ACE_NTOHL (0x72697479), + ACE_NTOHL (0x52616e67), ACE_NTOHL (0x65000000), // name = PriorityRange 2, // member count 4, @@ -451,18 +399,18 @@ static const CORBA::Long _oc_Messaging_PriorityRange[] = 64, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 35, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d657373), - ACE_NTOHL (0x6167696e), - ACE_NTOHL (0x672f5072), - ACE_NTOHL (0x696f7269), - ACE_NTOHL (0x74793a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d657373), + ACE_NTOHL (0x6167696e), + ACE_NTOHL (0x672f5072), + ACE_NTOHL (0x696f7269), + ACE_NTOHL (0x74793a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/Messaging/Priority:1.0 9, - ACE_NTOHL (0x5072696f), - ACE_NTOHL (0x72697479), + ACE_NTOHL (0x5072696f), + ACE_NTOHL (0x72697479), ACE_NTOHL (0x0), // name = Priority CORBA::tk_short, @@ -473,18 +421,18 @@ static const CORBA::Long _oc_Messaging_PriorityRange[] = 64, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 35, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d657373), - ACE_NTOHL (0x6167696e), - ACE_NTOHL (0x672f5072), - ACE_NTOHL (0x696f7269), - ACE_NTOHL (0x74793a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d657373), + ACE_NTOHL (0x6167696e), + ACE_NTOHL (0x672f5072), + ACE_NTOHL (0x696f7269), + ACE_NTOHL (0x74793a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/Messaging/Priority:1.0 9, - ACE_NTOHL (0x5072696f), - ACE_NTOHL (0x72697479), + ACE_NTOHL (0x5072696f), + ACE_NTOHL (0x72697479), ACE_NTOHL (0x0), // name = Priority CORBA::tk_short, @@ -505,10 +453,10 @@ namespace Messaging &_tc_TAO_tc_Messaging_PriorityRange; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_visitor_structure/structure_cs.cpp:66 -void +void Messaging::PriorityRange::_tao_any_destructor ( void *_tao_void_pointer ) @@ -555,7 +503,7 @@ TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::tao_marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*Messaging__TAO_RequestPriorityPolicy_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -566,7 +514,7 @@ Messaging::RequestPriorityPolicy::RequestPriorityPolicy (void) Messaging::RequestPriorityPolicy::~RequestPriorityPolicy (void) {} -void +void Messaging::RequestPriorityPolicy::_tao_any_destructor (void *_tao_void_pointer) { RequestPriorityPolicy *_tao_tmp_pointer = @@ -580,10 +528,15 @@ Messaging::RequestPriorityPolicy::_narrow ( ACE_ENV_ARG_DECL_NOT_USED ) { + if (CORBA::is_nil (_tao_objref)) + { + return RequestPriorityPolicy::_nil (); + } + RequestPriorityPolicy_ptr proxy = dynamic_cast<RequestPriorityPolicy_ptr> (_tao_objref); - proxy->_add_ref (); - return proxy; + + return RequestPriorityPolicy::_duplicate (proxy); } Messaging::RequestPriorityPolicy_ptr @@ -593,7 +546,7 @@ Messaging::RequestPriorityPolicy::_duplicate (RequestPriorityPolicy_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -648,24 +601,24 @@ static const CORBA::Long _oc_Messaging_RequestPriorityPolicy[] = { TAO_ENCAP_BYTE_ORDER, // byte order 48, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d657373), - ACE_NTOHL (0x6167696e), - ACE_NTOHL (0x672f5265), - ACE_NTOHL (0x71756573), - ACE_NTOHL (0x74507269), - ACE_NTOHL (0x6f726974), - ACE_NTOHL (0x79506f6c), - ACE_NTOHL (0x6963793a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d657373), + ACE_NTOHL (0x6167696e), + ACE_NTOHL (0x672f5265), + ACE_NTOHL (0x71756573), + ACE_NTOHL (0x74507269), + ACE_NTOHL (0x6f726974), + ACE_NTOHL (0x79506f6c), + ACE_NTOHL (0x6963793a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/Messaging/RequestPriorityPolicy:1.0 22, - ACE_NTOHL (0x52657175), - ACE_NTOHL (0x65737450), - ACE_NTOHL (0x72696f72), - ACE_NTOHL (0x69747950), - ACE_NTOHL (0x6f6c6963), + ACE_NTOHL (0x52657175), + ACE_NTOHL (0x65737450), + ACE_NTOHL (0x72696f72), + ACE_NTOHL (0x69747950), + ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x79000000), // name = RequestPriorityPolicy }; @@ -720,7 +673,7 @@ TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::tao_marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*Messaging__TAO_ReplyPriorityPolicy_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -731,7 +684,7 @@ Messaging::ReplyPriorityPolicy::ReplyPriorityPolicy (void) Messaging::ReplyPriorityPolicy::~ReplyPriorityPolicy (void) {} -void +void Messaging::ReplyPriorityPolicy::_tao_any_destructor (void *_tao_void_pointer) { ReplyPriorityPolicy *_tao_tmp_pointer = @@ -745,10 +698,15 @@ Messaging::ReplyPriorityPolicy::_narrow ( ACE_ENV_ARG_DECL_NOT_USED ) { + if (CORBA::is_nil (_tao_objref)) + { + return ReplyPriorityPolicy::_nil (); + } + ReplyPriorityPolicy_ptr proxy = dynamic_cast<ReplyPriorityPolicy_ptr> (_tao_objref); - proxy->_add_ref (); - return proxy; + + return ReplyPriorityPolicy::_duplicate (proxy); } Messaging::ReplyPriorityPolicy_ptr @@ -758,7 +716,7 @@ Messaging::ReplyPriorityPolicy::_duplicate (ReplyPriorityPolicy_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -813,23 +771,23 @@ static const CORBA::Long _oc_Messaging_ReplyPriorityPolicy[] = { TAO_ENCAP_BYTE_ORDER, // byte order 46, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d657373), - ACE_NTOHL (0x6167696e), - ACE_NTOHL (0x672f5265), - ACE_NTOHL (0x706c7950), - ACE_NTOHL (0x72696f72), - ACE_NTOHL (0x69747950), - ACE_NTOHL (0x6f6c6963), - ACE_NTOHL (0x793a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d657373), + ACE_NTOHL (0x6167696e), + ACE_NTOHL (0x672f5265), + ACE_NTOHL (0x706c7950), + ACE_NTOHL (0x72696f72), + ACE_NTOHL (0x69747950), + ACE_NTOHL (0x6f6c6963), + ACE_NTOHL (0x793a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/Messaging/ReplyPriorityPolicy:1.0 20, - ACE_NTOHL (0x5265706c), - ACE_NTOHL (0x79507269), - ACE_NTOHL (0x6f726974), - ACE_NTOHL (0x79506f6c), + ACE_NTOHL (0x5265706c), + ACE_NTOHL (0x79507269), + ACE_NTOHL (0x6f726974), + ACE_NTOHL (0x79506f6c), ACE_NTOHL (0x69637900), // name = ReplyPriorityPolicy }; @@ -884,7 +842,7 @@ TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::tao_marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*Messaging__TAO_RequestStartTimePolicy_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -895,7 +853,7 @@ Messaging::RequestStartTimePolicy::RequestStartTimePolicy (void) Messaging::RequestStartTimePolicy::~RequestStartTimePolicy (void) {} -void +void Messaging::RequestStartTimePolicy::_tao_any_destructor (void *_tao_void_pointer) { RequestStartTimePolicy *_tao_tmp_pointer = @@ -909,10 +867,15 @@ Messaging::RequestStartTimePolicy::_narrow ( ACE_ENV_ARG_DECL_NOT_USED ) { + if (CORBA::is_nil (_tao_objref)) + { + return RequestStartTimePolicy::_nil (); + } + RequestStartTimePolicy_ptr proxy = dynamic_cast<RequestStartTimePolicy_ptr> (_tao_objref); - proxy->_add_ref (); - return proxy; + + return RequestStartTimePolicy::_duplicate (proxy); } Messaging::RequestStartTimePolicy_ptr @@ -922,7 +885,7 @@ Messaging::RequestStartTimePolicy::_duplicate (RequestStartTimePolicy_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -977,25 +940,25 @@ static const CORBA::Long _oc_Messaging_RequestStartTimePolicy[] = { TAO_ENCAP_BYTE_ORDER, // byte order 49, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d657373), - ACE_NTOHL (0x6167696e), - ACE_NTOHL (0x672f5265), - ACE_NTOHL (0x71756573), - ACE_NTOHL (0x74537461), - ACE_NTOHL (0x72745469), - ACE_NTOHL (0x6d65506f), - ACE_NTOHL (0x6c696379), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d657373), + ACE_NTOHL (0x6167696e), + ACE_NTOHL (0x672f5265), + ACE_NTOHL (0x71756573), + ACE_NTOHL (0x74537461), + ACE_NTOHL (0x72745469), + ACE_NTOHL (0x6d65506f), + ACE_NTOHL (0x6c696379), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/Messaging/RequestStartTimePolicy:1.0 23, - ACE_NTOHL (0x52657175), - ACE_NTOHL (0x65737453), - ACE_NTOHL (0x74617274), - ACE_NTOHL (0x54696d65), - ACE_NTOHL (0x506f6c69), + ACE_NTOHL (0x52657175), + ACE_NTOHL (0x65737453), + ACE_NTOHL (0x74617274), + ACE_NTOHL (0x54696d65), + ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63790000), // name = RequestStartTimePolicy }; @@ -1050,7 +1013,7 @@ TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::tao_marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*Messaging__TAO_RequestEndTimePolicy_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -1061,7 +1024,7 @@ Messaging::RequestEndTimePolicy::RequestEndTimePolicy (void) Messaging::RequestEndTimePolicy::~RequestEndTimePolicy (void) {} -void +void Messaging::RequestEndTimePolicy::_tao_any_destructor (void *_tao_void_pointer) { RequestEndTimePolicy *_tao_tmp_pointer = @@ -1075,10 +1038,15 @@ Messaging::RequestEndTimePolicy::_narrow ( ACE_ENV_ARG_DECL_NOT_USED ) { + if (CORBA::is_nil (_tao_objref)) + { + return RequestEndTimePolicy::_nil (); + } + RequestEndTimePolicy_ptr proxy = dynamic_cast<RequestEndTimePolicy_ptr> (_tao_objref); - proxy->_add_ref (); - return proxy; + + return RequestEndTimePolicy::_duplicate (proxy); } Messaging::RequestEndTimePolicy_ptr @@ -1088,7 +1056,7 @@ Messaging::RequestEndTimePolicy::_duplicate (RequestEndTimePolicy_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -1143,24 +1111,24 @@ static const CORBA::Long _oc_Messaging_RequestEndTimePolicy[] = { TAO_ENCAP_BYTE_ORDER, // byte order 47, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d657373), - ACE_NTOHL (0x6167696e), - ACE_NTOHL (0x672f5265), - ACE_NTOHL (0x71756573), - ACE_NTOHL (0x74456e64), - ACE_NTOHL (0x54696d65), - ACE_NTOHL (0x506f6c69), - ACE_NTOHL (0x63793a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d657373), + ACE_NTOHL (0x6167696e), + ACE_NTOHL (0x672f5265), + ACE_NTOHL (0x71756573), + ACE_NTOHL (0x74456e64), + ACE_NTOHL (0x54696d65), + ACE_NTOHL (0x506f6c69), + ACE_NTOHL (0x63793a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/Messaging/RequestEndTimePolicy:1.0 21, - ACE_NTOHL (0x52657175), - ACE_NTOHL (0x65737445), - ACE_NTOHL (0x6e645469), - ACE_NTOHL (0x6d65506f), - ACE_NTOHL (0x6c696379), + ACE_NTOHL (0x52657175), + ACE_NTOHL (0x65737445), + ACE_NTOHL (0x6e645469), + ACE_NTOHL (0x6d65506f), + ACE_NTOHL (0x6c696379), ACE_NTOHL (0x0), // name = RequestEndTimePolicy }; @@ -1215,7 +1183,7 @@ TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::tao_marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*Messaging__TAO_ReplyStartTimePolicy_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -1226,7 +1194,7 @@ Messaging::ReplyStartTimePolicy::ReplyStartTimePolicy (void) Messaging::ReplyStartTimePolicy::~ReplyStartTimePolicy (void) {} -void +void Messaging::ReplyStartTimePolicy::_tao_any_destructor (void *_tao_void_pointer) { ReplyStartTimePolicy *_tao_tmp_pointer = @@ -1240,10 +1208,15 @@ Messaging::ReplyStartTimePolicy::_narrow ( ACE_ENV_ARG_DECL_NOT_USED ) { + if (CORBA::is_nil (_tao_objref)) + { + return ReplyStartTimePolicy::_nil (); + } + ReplyStartTimePolicy_ptr proxy = dynamic_cast<ReplyStartTimePolicy_ptr> (_tao_objref); - proxy->_add_ref (); - return proxy; + + return ReplyStartTimePolicy::_duplicate (proxy); } Messaging::ReplyStartTimePolicy_ptr @@ -1253,7 +1226,7 @@ Messaging::ReplyStartTimePolicy::_duplicate (ReplyStartTimePolicy_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -1308,24 +1281,24 @@ static const CORBA::Long _oc_Messaging_ReplyStartTimePolicy[] = { TAO_ENCAP_BYTE_ORDER, // byte order 47, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d657373), - ACE_NTOHL (0x6167696e), - ACE_NTOHL (0x672f5265), - ACE_NTOHL (0x706c7953), - ACE_NTOHL (0x74617274), - ACE_NTOHL (0x54696d65), - ACE_NTOHL (0x506f6c69), - ACE_NTOHL (0x63793a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d657373), + ACE_NTOHL (0x6167696e), + ACE_NTOHL (0x672f5265), + ACE_NTOHL (0x706c7953), + ACE_NTOHL (0x74617274), + ACE_NTOHL (0x54696d65), + ACE_NTOHL (0x506f6c69), + ACE_NTOHL (0x63793a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/Messaging/ReplyStartTimePolicy:1.0 21, - ACE_NTOHL (0x5265706c), - ACE_NTOHL (0x79537461), - ACE_NTOHL (0x72745469), - ACE_NTOHL (0x6d65506f), - ACE_NTOHL (0x6c696379), + ACE_NTOHL (0x5265706c), + ACE_NTOHL (0x79537461), + ACE_NTOHL (0x72745469), + ACE_NTOHL (0x6d65506f), + ACE_NTOHL (0x6c696379), ACE_NTOHL (0x0), // name = ReplyStartTimePolicy }; @@ -1380,7 +1353,7 @@ TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::tao_marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*Messaging__TAO_ReplyEndTimePolicy_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -1391,7 +1364,7 @@ Messaging::ReplyEndTimePolicy::ReplyEndTimePolicy (void) Messaging::ReplyEndTimePolicy::~ReplyEndTimePolicy (void) {} -void +void Messaging::ReplyEndTimePolicy::_tao_any_destructor (void *_tao_void_pointer) { ReplyEndTimePolicy *_tao_tmp_pointer = @@ -1405,10 +1378,15 @@ Messaging::ReplyEndTimePolicy::_narrow ( ACE_ENV_ARG_DECL_NOT_USED ) { + if (CORBA::is_nil (_tao_objref)) + { + return ReplyEndTimePolicy::_nil (); + } + ReplyEndTimePolicy_ptr proxy = dynamic_cast<ReplyEndTimePolicy_ptr> (_tao_objref); - proxy->_add_ref (); - return proxy; + + return ReplyEndTimePolicy::_duplicate (proxy); } Messaging::ReplyEndTimePolicy_ptr @@ -1418,7 +1396,7 @@ Messaging::ReplyEndTimePolicy::_duplicate (ReplyEndTimePolicy_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -1473,23 +1451,23 @@ static const CORBA::Long _oc_Messaging_ReplyEndTimePolicy[] = { TAO_ENCAP_BYTE_ORDER, // byte order 45, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d657373), - ACE_NTOHL (0x6167696e), - ACE_NTOHL (0x672f5265), - ACE_NTOHL (0x706c7945), - ACE_NTOHL (0x6e645469), - ACE_NTOHL (0x6d65506f), - ACE_NTOHL (0x6c696379), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d657373), + ACE_NTOHL (0x6167696e), + ACE_NTOHL (0x672f5265), + ACE_NTOHL (0x706c7945), + ACE_NTOHL (0x6e645469), + ACE_NTOHL (0x6d65506f), + ACE_NTOHL (0x6c696379), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/Messaging/ReplyEndTimePolicy:1.0 19, - ACE_NTOHL (0x5265706c), - ACE_NTOHL (0x79456e64), - ACE_NTOHL (0x54696d65), - ACE_NTOHL (0x506f6c69), + ACE_NTOHL (0x5265706c), + ACE_NTOHL (0x79456e64), + ACE_NTOHL (0x54696d65), + ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63790000), // name = ReplyEndTimePolicy }; @@ -1544,7 +1522,7 @@ TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::tao_marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*Messaging__TAO_RelativeRequestTimeoutPolicy_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -1555,7 +1533,7 @@ Messaging::RelativeRequestTimeoutPolicy::RelativeRequestTimeoutPolicy (void) Messaging::RelativeRequestTimeoutPolicy::~RelativeRequestTimeoutPolicy (void) {} -void +void Messaging::RelativeRequestTimeoutPolicy::_tao_any_destructor (void *_tao_void_pointer) { RelativeRequestTimeoutPolicy *_tao_tmp_pointer = @@ -1569,10 +1547,15 @@ Messaging::RelativeRequestTimeoutPolicy::_narrow ( ACE_ENV_ARG_DECL_NOT_USED ) { + if (CORBA::is_nil (_tao_objref)) + { + return RelativeRequestTimeoutPolicy::_nil (); + } + RelativeRequestTimeoutPolicy_ptr proxy = dynamic_cast<RelativeRequestTimeoutPolicy_ptr> (_tao_objref); - proxy->_add_ref (); - return proxy; + + return RelativeRequestTimeoutPolicy::_duplicate (proxy); } Messaging::RelativeRequestTimeoutPolicy_ptr @@ -1582,7 +1565,7 @@ Messaging::RelativeRequestTimeoutPolicy::_duplicate (RelativeRequestTimeoutPolic { obj->_add_ref (); } - + return obj; } @@ -1637,28 +1620,28 @@ static const CORBA::Long _oc_Messaging_RelativeRequestTimeoutPolicy[] = { TAO_ENCAP_BYTE_ORDER, // byte order 55, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d657373), - ACE_NTOHL (0x6167696e), - ACE_NTOHL (0x672f5265), - ACE_NTOHL (0x6c617469), - ACE_NTOHL (0x76655265), - ACE_NTOHL (0x71756573), - ACE_NTOHL (0x7454696d), - ACE_NTOHL (0x656f7574), - ACE_NTOHL (0x506f6c69), - ACE_NTOHL (0x63793a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d657373), + ACE_NTOHL (0x6167696e), + ACE_NTOHL (0x672f5265), + ACE_NTOHL (0x6c617469), + ACE_NTOHL (0x76655265), + ACE_NTOHL (0x71756573), + ACE_NTOHL (0x7454696d), + ACE_NTOHL (0x656f7574), + ACE_NTOHL (0x506f6c69), + ACE_NTOHL (0x63793a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/Messaging/RelativeRequestTimeoutPolicy:1.0 29, - ACE_NTOHL (0x52656c61), - ACE_NTOHL (0x74697665), - ACE_NTOHL (0x52657175), - ACE_NTOHL (0x65737454), - ACE_NTOHL (0x696d656f), - ACE_NTOHL (0x7574506f), - ACE_NTOHL (0x6c696379), + ACE_NTOHL (0x52656c61), + ACE_NTOHL (0x74697665), + ACE_NTOHL (0x52657175), + ACE_NTOHL (0x65737454), + ACE_NTOHL (0x696d656f), + ACE_NTOHL (0x7574506f), + ACE_NTOHL (0x6c696379), ACE_NTOHL (0x0), // name = RelativeRequestTimeoutPolicy }; @@ -1683,22 +1666,22 @@ static const CORBA::Long _oc_Messaging_RoutingTypeRange[] = { TAO_ENCAP_BYTE_ORDER, // byte order 43, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d657373), - ACE_NTOHL (0x6167696e), - ACE_NTOHL (0x672f526f), - ACE_NTOHL (0x7574696e), - ACE_NTOHL (0x67547970), - ACE_NTOHL (0x6552616e), - ACE_NTOHL (0x67653a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d657373), + ACE_NTOHL (0x6167696e), + ACE_NTOHL (0x672f526f), + ACE_NTOHL (0x7574696e), + ACE_NTOHL (0x67547970), + ACE_NTOHL (0x6552616e), + ACE_NTOHL (0x67653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/Messaging/RoutingTypeRange:1.0 17, - ACE_NTOHL (0x526f7574), - ACE_NTOHL (0x696e6754), - ACE_NTOHL (0x79706552), - ACE_NTOHL (0x616e6765), + ACE_NTOHL (0x526f7574), + ACE_NTOHL (0x696e6754), + ACE_NTOHL (0x79706552), + ACE_NTOHL (0x616e6765), ACE_NTOHL (0x0), // name = RoutingTypeRange 2, // member count 4, @@ -1707,19 +1690,19 @@ static const CORBA::Long _oc_Messaging_RoutingTypeRange[] = 68, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 38, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d657373), - ACE_NTOHL (0x6167696e), - ACE_NTOHL (0x672f526f), - ACE_NTOHL (0x7574696e), - ACE_NTOHL (0x67547970), - ACE_NTOHL (0x653a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d657373), + ACE_NTOHL (0x6167696e), + ACE_NTOHL (0x672f526f), + ACE_NTOHL (0x7574696e), + ACE_NTOHL (0x67547970), + ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/Messaging/RoutingType:1.0 12, - ACE_NTOHL (0x526f7574), - ACE_NTOHL (0x696e6754), + ACE_NTOHL (0x526f7574), + ACE_NTOHL (0x696e6754), ACE_NTOHL (0x79706500), // name = RoutingType CORBA::tk_short, @@ -1730,19 +1713,19 @@ static const CORBA::Long _oc_Messaging_RoutingTypeRange[] = 68, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 38, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d657373), - ACE_NTOHL (0x6167696e), - ACE_NTOHL (0x672f526f), - ACE_NTOHL (0x7574696e), - ACE_NTOHL (0x67547970), - ACE_NTOHL (0x653a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d657373), + ACE_NTOHL (0x6167696e), + ACE_NTOHL (0x672f526f), + ACE_NTOHL (0x7574696e), + ACE_NTOHL (0x67547970), + ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/Messaging/RoutingType:1.0 12, - ACE_NTOHL (0x526f7574), - ACE_NTOHL (0x696e6754), + ACE_NTOHL (0x526f7574), + ACE_NTOHL (0x696e6754), ACE_NTOHL (0x79706500), // name = RoutingType CORBA::tk_short, @@ -1763,10 +1746,10 @@ namespace Messaging &_tc_TAO_tc_Messaging_RoutingTypeRange; } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_visitor_structure/structure_cs.cpp:66 -void +void Messaging::RoutingTypeRange::_tao_any_destructor ( void *_tao_void_pointer ) @@ -1813,7 +1796,7 @@ TAO::Objref_Traits<Messaging::RoutingPolicy>::tao_marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*Messaging__TAO_RoutingPolicy_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -1824,7 +1807,7 @@ Messaging::RoutingPolicy::RoutingPolicy (void) Messaging::RoutingPolicy::~RoutingPolicy (void) {} -void +void Messaging::RoutingPolicy::_tao_any_destructor (void *_tao_void_pointer) { RoutingPolicy *_tao_tmp_pointer = @@ -1838,10 +1821,15 @@ Messaging::RoutingPolicy::_narrow ( ACE_ENV_ARG_DECL_NOT_USED ) { + if (CORBA::is_nil (_tao_objref)) + { + return RoutingPolicy::_nil (); + } + RoutingPolicy_ptr proxy = dynamic_cast<RoutingPolicy_ptr> (_tao_objref); - proxy->_add_ref (); - return proxy; + + return RoutingPolicy::_duplicate (proxy); } Messaging::RoutingPolicy_ptr @@ -1851,7 +1839,7 @@ Messaging::RoutingPolicy::_duplicate (RoutingPolicy_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -1906,20 +1894,20 @@ static const CORBA::Long _oc_Messaging_RoutingPolicy[] = { TAO_ENCAP_BYTE_ORDER, // byte order 40, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d657373), - ACE_NTOHL (0x6167696e), - ACE_NTOHL (0x672f526f), - ACE_NTOHL (0x7574696e), - ACE_NTOHL (0x67506f6c), - ACE_NTOHL (0x6963793a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d657373), + ACE_NTOHL (0x6167696e), + ACE_NTOHL (0x672f526f), + ACE_NTOHL (0x7574696e), + ACE_NTOHL (0x67506f6c), + ACE_NTOHL (0x6963793a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/Messaging/RoutingPolicy:1.0 14, - ACE_NTOHL (0x526f7574), - ACE_NTOHL (0x696e6750), - ACE_NTOHL (0x6f6c6963), + ACE_NTOHL (0x526f7574), + ACE_NTOHL (0x696e6750), + ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x79000000), // name = RoutingPolicy }; @@ -1974,7 +1962,7 @@ TAO::Objref_Traits<Messaging::MaxHopsPolicy>::tao_marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*Messaging__TAO_MaxHopsPolicy_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -1985,7 +1973,7 @@ Messaging::MaxHopsPolicy::MaxHopsPolicy (void) Messaging::MaxHopsPolicy::~MaxHopsPolicy (void) {} -void +void Messaging::MaxHopsPolicy::_tao_any_destructor (void *_tao_void_pointer) { MaxHopsPolicy *_tao_tmp_pointer = @@ -1999,10 +1987,15 @@ Messaging::MaxHopsPolicy::_narrow ( ACE_ENV_ARG_DECL_NOT_USED ) { + if (CORBA::is_nil (_tao_objref)) + { + return MaxHopsPolicy::_nil (); + } + MaxHopsPolicy_ptr proxy = dynamic_cast<MaxHopsPolicy_ptr> (_tao_objref); - proxy->_add_ref (); - return proxy; + + return MaxHopsPolicy::_duplicate (proxy); } Messaging::MaxHopsPolicy_ptr @@ -2012,7 +2005,7 @@ Messaging::MaxHopsPolicy::_duplicate (MaxHopsPolicy_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -2067,20 +2060,20 @@ static const CORBA::Long _oc_Messaging_MaxHopsPolicy[] = { TAO_ENCAP_BYTE_ORDER, // byte order 40, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d657373), - ACE_NTOHL (0x6167696e), - ACE_NTOHL (0x672f4d61), - ACE_NTOHL (0x78486f70), - ACE_NTOHL (0x73506f6c), - ACE_NTOHL (0x6963793a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d657373), + ACE_NTOHL (0x6167696e), + ACE_NTOHL (0x672f4d61), + ACE_NTOHL (0x78486f70), + ACE_NTOHL (0x73506f6c), + ACE_NTOHL (0x6963793a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/Messaging/MaxHopsPolicy:1.0 14, - ACE_NTOHL (0x4d617848), - ACE_NTOHL (0x6f707350), - ACE_NTOHL (0x6f6c6963), + ACE_NTOHL (0x4d617848), + ACE_NTOHL (0x6f707350), + ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x79000000), // name = MaxHopsPolicy }; @@ -2135,7 +2128,7 @@ TAO::Objref_Traits<Messaging::QueueOrderPolicy>::tao_marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*Messaging__TAO_QueueOrderPolicy_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -2146,7 +2139,7 @@ Messaging::QueueOrderPolicy::QueueOrderPolicy (void) Messaging::QueueOrderPolicy::~QueueOrderPolicy (void) {} -void +void Messaging::QueueOrderPolicy::_tao_any_destructor (void *_tao_void_pointer) { QueueOrderPolicy *_tao_tmp_pointer = @@ -2160,10 +2153,15 @@ Messaging::QueueOrderPolicy::_narrow ( ACE_ENV_ARG_DECL_NOT_USED ) { + if (CORBA::is_nil (_tao_objref)) + { + return QueueOrderPolicy::_nil (); + } + QueueOrderPolicy_ptr proxy = dynamic_cast<QueueOrderPolicy_ptr> (_tao_objref); - proxy->_add_ref (); - return proxy; + + return QueueOrderPolicy::_duplicate (proxy); } Messaging::QueueOrderPolicy_ptr @@ -2173,7 +2171,7 @@ Messaging::QueueOrderPolicy::_duplicate (QueueOrderPolicy_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -2228,22 +2226,22 @@ static const CORBA::Long _oc_Messaging_QueueOrderPolicy[] = { TAO_ENCAP_BYTE_ORDER, // byte order 43, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d657373), - ACE_NTOHL (0x6167696e), - ACE_NTOHL (0x672f5175), - ACE_NTOHL (0x6575654f), - ACE_NTOHL (0x72646572), - ACE_NTOHL (0x506f6c69), - ACE_NTOHL (0x63793a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d657373), + ACE_NTOHL (0x6167696e), + ACE_NTOHL (0x672f5175), + ACE_NTOHL (0x6575654f), + ACE_NTOHL (0x72646572), + ACE_NTOHL (0x506f6c69), + ACE_NTOHL (0x63793a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/Messaging/QueueOrderPolicy:1.0 17, - ACE_NTOHL (0x51756575), - ACE_NTOHL (0x654f7264), - ACE_NTOHL (0x6572506f), - ACE_NTOHL (0x6c696379), + ACE_NTOHL (0x51756575), + ACE_NTOHL (0x654f7264), + ACE_NTOHL (0x6572506f), + ACE_NTOHL (0x6c696379), ACE_NTOHL (0x0), // name = QueueOrderPolicy }; @@ -2263,6 +2261,7 @@ namespace Messaging // TAO_IDL - Generated from // be/be_visitor_interface/any_op_cs.cpp:50 + ACE_TEMPLATE_SPECIALIZATION CORBA::Boolean TAO::Any_Impl_T<Messaging::RebindPolicy>::to_object ( @@ -2329,7 +2328,7 @@ operator>>= ( ); } -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -2389,6 +2388,7 @@ CORBA::Boolean operator>>= ( // TAO_IDL - Generated from // be/be_visitor_interface/any_op_cs.cpp:50 + ACE_TEMPLATE_SPECIALIZATION CORBA::Boolean TAO::Any_Impl_T<Messaging::RequestPriorityPolicy>::to_object ( @@ -2457,6 +2457,7 @@ operator>>= ( // TAO_IDL - Generated from // be/be_visitor_interface/any_op_cs.cpp:50 + ACE_TEMPLATE_SPECIALIZATION CORBA::Boolean TAO::Any_Impl_T<Messaging::ReplyPriorityPolicy>::to_object ( @@ -2481,7 +2482,6 @@ TAO::Any_Impl_T<Messaging::ReplyPriorityPolicy>::demarshal_value (TAO_InputCDR & return 0; } - // Copying insertion. void operator<<= ( @@ -2526,6 +2526,7 @@ operator>>= ( // TAO_IDL - Generated from // be/be_visitor_interface/any_op_cs.cpp:50 + ACE_TEMPLATE_SPECIALIZATION CORBA::Boolean TAO::Any_Impl_T<Messaging::RequestStartTimePolicy>::to_object ( @@ -2594,6 +2595,7 @@ operator>>= ( // TAO_IDL - Generated from // be/be_visitor_interface/any_op_cs.cpp:50 + ACE_TEMPLATE_SPECIALIZATION CORBA::Boolean TAO::Any_Impl_T<Messaging::RequestEndTimePolicy>::to_object ( @@ -2618,7 +2620,6 @@ TAO::Any_Impl_T<Messaging::RequestEndTimePolicy>::demarshal_value (TAO_InputCDR return 0; } - // Copying insertion. void operator<<= ( @@ -2663,6 +2664,7 @@ operator>>= ( // TAO_IDL - Generated from // be/be_visitor_interface/any_op_cs.cpp:50 + ACE_TEMPLATE_SPECIALIZATION CORBA::Boolean TAO::Any_Impl_T<Messaging::ReplyStartTimePolicy>::to_object ( @@ -2731,6 +2733,7 @@ operator>>= ( // TAO_IDL - Generated from // be/be_visitor_interface/any_op_cs.cpp:50 + ACE_TEMPLATE_SPECIALIZATION CORBA::Boolean TAO::Any_Impl_T<Messaging::ReplyEndTimePolicy>::to_object ( @@ -2799,6 +2802,7 @@ operator>>= ( // TAO_IDL - Generated from // be/be_visitor_interface/any_op_cs.cpp:50 + ACE_TEMPLATE_SPECIALIZATION CORBA::Boolean TAO::Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>::to_object ( @@ -2823,7 +2827,6 @@ TAO::Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>::demarshal_value (TAO_I return 0; } - // Copying insertion. void operator<<= ( @@ -2866,8 +2869,7 @@ operator>>= ( ); } - -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be/be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. @@ -2927,6 +2929,7 @@ CORBA::Boolean operator>>= ( // TAO_IDL - Generated from // be/be_visitor_interface/any_op_cs.cpp:50 + ACE_TEMPLATE_SPECIALIZATION CORBA::Boolean TAO::Any_Impl_T<Messaging::RoutingPolicy>::to_object ( @@ -2995,6 +2998,7 @@ operator>>= ( // TAO_IDL - Generated from // be/be_visitor_interface/any_op_cs.cpp:50 + ACE_TEMPLATE_SPECIALIZATION CORBA::Boolean TAO::Any_Impl_T<Messaging::MaxHopsPolicy>::to_object ( @@ -3019,7 +3023,6 @@ TAO::Any_Impl_T<Messaging::MaxHopsPolicy>::demarshal_value (TAO_InputCDR &) return 0; } - // Copying insertion. void operator<<= ( @@ -3064,6 +3067,7 @@ operator>>= ( // TAO_IDL - Generated from // be/be_visitor_interface/any_op_cs.cpp:50 + ACE_TEMPLATE_SPECIALIZATION CORBA::Boolean TAO::Any_Impl_T<Messaging::QueueOrderPolicy>::to_object ( @@ -3131,57 +3135,22 @@ operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_root/root.cpp:1703 +// be/be_visitor_root/root.cpp:1702 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -#if !defined (_TIMEBASE_UTCT__ARG_TRAITS_TMPLINST_CS_) -#define _TIMEBASE_UTCT__ARG_TRAITS_TMPLINST_CS_ - - template class TAO::Arg_Traits<TimeBase::UtcT>; - - template class - TAO::Fixed_Size_Arg_Traits< - TimeBase::UtcT - >; - -#endif /* end #if !defined */ - - template class - TAO::Any_Basic_Impl_T< - CORBA::SetOverrideType - >; - - template class - TAO::Any_Dual_Impl_T< - CORBA::PolicyError - >; - - template class - TAO::Any_Dual_Impl_T< - CORBA::InvalidPolicies - >; - - template class - TAO::Any_Dual_Impl_T< - CORBA::PollableSet::NoPossiblePollable - >; - - template class - TAO::Any_Dual_Impl_T< - CORBA::PollableSet::UnknownPollable - >; + template class TAO::Objref_Traits<Messaging::RebindPolicy>; template class TAO_Objref_Var_T< - Messaging::RebindPolicy, - TAO::Objref_Traits<Messaging::RebindPolicy> + Messaging::RebindPolicy + >; - + template class TAO_Objref_Out_T< - Messaging::RebindPolicy, - TAO::Objref_Traits<Messaging::RebindPolicy> + Messaging::RebindPolicy + >; template class @@ -3189,18 +3158,6 @@ operator>>= ( Messaging::RebindPolicy >; -#if !defined (_MESSAGING_PRIORITYRANGE__ARG_TRAITS_TMPLINST_CS_) -#define _MESSAGING_PRIORITYRANGE__ARG_TRAITS_TMPLINST_CS_ - - template class TAO::Arg_Traits<Messaging::PriorityRange>; - - template class - TAO::Fixed_Size_Arg_Traits< - Messaging::PriorityRange - >; - -#endif /* end #if !defined */ - template class TAO_Fixed_Var_T< Messaging::PriorityRange @@ -3216,16 +3173,18 @@ operator>>= ( Messaging::PriorityRange >; + template class TAO::Objref_Traits<Messaging::RequestPriorityPolicy>; + template class TAO_Objref_Var_T< - Messaging::RequestPriorityPolicy, - TAO::Objref_Traits<Messaging::RequestPriorityPolicy> + Messaging::RequestPriorityPolicy + >; - + template class TAO_Objref_Out_T< - Messaging::RequestPriorityPolicy, - TAO::Objref_Traits<Messaging::RequestPriorityPolicy> + Messaging::RequestPriorityPolicy + >; template class @@ -3233,16 +3192,18 @@ operator>>= ( Messaging::RequestPriorityPolicy >; + template class TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>; + template class TAO_Objref_Var_T< - Messaging::ReplyPriorityPolicy, - TAO::Objref_Traits<Messaging::ReplyPriorityPolicy> + Messaging::ReplyPriorityPolicy + >; - + template class TAO_Objref_Out_T< - Messaging::ReplyPriorityPolicy, - TAO::Objref_Traits<Messaging::ReplyPriorityPolicy> + Messaging::ReplyPriorityPolicy + >; template class @@ -3250,16 +3211,18 @@ operator>>= ( Messaging::ReplyPriorityPolicy >; + template class TAO::Objref_Traits<Messaging::RequestStartTimePolicy>; + template class TAO_Objref_Var_T< - Messaging::RequestStartTimePolicy, - TAO::Objref_Traits<Messaging::RequestStartTimePolicy> + Messaging::RequestStartTimePolicy + >; - + template class TAO_Objref_Out_T< - Messaging::RequestStartTimePolicy, - TAO::Objref_Traits<Messaging::RequestStartTimePolicy> + Messaging::RequestStartTimePolicy + >; template class @@ -3267,16 +3230,18 @@ operator>>= ( Messaging::RequestStartTimePolicy >; + template class TAO::Objref_Traits<Messaging::RequestEndTimePolicy>; + template class TAO_Objref_Var_T< - Messaging::RequestEndTimePolicy, - TAO::Objref_Traits<Messaging::RequestEndTimePolicy> + Messaging::RequestEndTimePolicy + >; - + template class TAO_Objref_Out_T< - Messaging::RequestEndTimePolicy, - TAO::Objref_Traits<Messaging::RequestEndTimePolicy> + Messaging::RequestEndTimePolicy + >; template class @@ -3284,16 +3249,18 @@ operator>>= ( Messaging::RequestEndTimePolicy >; + template class TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>; + template class TAO_Objref_Var_T< - Messaging::ReplyStartTimePolicy, - TAO::Objref_Traits<Messaging::ReplyStartTimePolicy> + Messaging::ReplyStartTimePolicy + >; - + template class TAO_Objref_Out_T< - Messaging::ReplyStartTimePolicy, - TAO::Objref_Traits<Messaging::ReplyStartTimePolicy> + Messaging::ReplyStartTimePolicy + >; template class @@ -3301,16 +3268,18 @@ operator>>= ( Messaging::ReplyStartTimePolicy >; + template class TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>; + template class TAO_Objref_Var_T< - Messaging::ReplyEndTimePolicy, - TAO::Objref_Traits<Messaging::ReplyEndTimePolicy> + Messaging::ReplyEndTimePolicy + >; - + template class TAO_Objref_Out_T< - Messaging::ReplyEndTimePolicy, - TAO::Objref_Traits<Messaging::ReplyEndTimePolicy> + Messaging::ReplyEndTimePolicy + >; template class @@ -3318,16 +3287,18 @@ operator>>= ( Messaging::ReplyEndTimePolicy >; + template class TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>; + template class TAO_Objref_Var_T< - Messaging::RelativeRequestTimeoutPolicy, - TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy> + Messaging::RelativeRequestTimeoutPolicy + >; - + template class TAO_Objref_Out_T< - Messaging::RelativeRequestTimeoutPolicy, - TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy> + Messaging::RelativeRequestTimeoutPolicy + >; template class @@ -3335,18 +3306,6 @@ operator>>= ( Messaging::RelativeRequestTimeoutPolicy >; -#if !defined (_MESSAGING_ROUTINGTYPERANGE__ARG_TRAITS_TMPLINST_CS_) -#define _MESSAGING_ROUTINGTYPERANGE__ARG_TRAITS_TMPLINST_CS_ - - template class TAO::Arg_Traits<Messaging::RoutingTypeRange>; - - template class - TAO::Fixed_Size_Arg_Traits< - Messaging::RoutingTypeRange - >; - -#endif /* end #if !defined */ - template class TAO_Fixed_Var_T< Messaging::RoutingTypeRange @@ -3362,16 +3321,18 @@ operator>>= ( Messaging::RoutingTypeRange >; + template class TAO::Objref_Traits<Messaging::RoutingPolicy>; + template class TAO_Objref_Var_T< - Messaging::RoutingPolicy, - TAO::Objref_Traits<Messaging::RoutingPolicy> + Messaging::RoutingPolicy + >; - + template class TAO_Objref_Out_T< - Messaging::RoutingPolicy, - TAO::Objref_Traits<Messaging::RoutingPolicy> + Messaging::RoutingPolicy + >; template class @@ -3379,16 +3340,18 @@ operator>>= ( Messaging::RoutingPolicy >; + template class TAO::Objref_Traits<Messaging::MaxHopsPolicy>; + template class TAO_Objref_Var_T< - Messaging::MaxHopsPolicy, - TAO::Objref_Traits<Messaging::MaxHopsPolicy> + Messaging::MaxHopsPolicy + >; - + template class TAO_Objref_Out_T< - Messaging::MaxHopsPolicy, - TAO::Objref_Traits<Messaging::MaxHopsPolicy> + Messaging::MaxHopsPolicy + >; template class @@ -3396,16 +3359,18 @@ operator>>= ( Messaging::MaxHopsPolicy >; + template class TAO::Objref_Traits<Messaging::QueueOrderPolicy>; + template class TAO_Objref_Var_T< - Messaging::QueueOrderPolicy, - TAO::Objref_Traits<Messaging::QueueOrderPolicy> + Messaging::QueueOrderPolicy + >; - + template class TAO_Objref_Out_T< - Messaging::QueueOrderPolicy, - TAO::Objref_Traits<Messaging::QueueOrderPolicy> + Messaging::QueueOrderPolicy + >; template class @@ -3415,53 +3380,18 @@ operator>>= ( #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#if !defined (_TIMEBASE_UTCT__ARG_TRAITS_TMPLINST_CS_) -#define _TIMEBASE_UTCT__ARG_TRAITS_TMPLINST_CS_ - -# pragma instantiate TAO::Arg_Traits<TimeBase::UtcT> - -# pragma instantiate \ - TAO::Fixed_Size_Arg_Traits< \ - TimeBase::UtcT \ - > - -#endif /* end #if !defined */ - -# pragma instantiate \ - TAO::Any_Basic_Impl_T< \ - CORBA::SetOverrideType \ - > - -# pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - CORBA::PolicyError \ - > - -# pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - CORBA::InvalidPolicies \ - > - -# pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - CORBA::PollableSet::NoPossiblePollable \ - > - -# pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - CORBA::PollableSet::UnknownPollable \ - > +# pragma instantiate TAO::Objref_Traits<Messaging::RebindPolicy> # pragma instantiate \ TAO_Objref_Var_T< \ - Messaging::RebindPolicy, \ - TAO::Objref_Traits<Messaging::RebindPolicy> \ + Messaging::RebindPolicy + > - + # pragma instantiate \ TAO_Objref_Out_T< \ - Messaging::RebindPolicy, \ - TAO::Objref_Traits<Messaging::RebindPolicy> \ + Messaging::RebindPolicy + > # pragma instantiate \ @@ -3469,18 +3399,6 @@ operator>>= ( Messaging::RebindPolicy \ > -#if !defined (_MESSAGING_PRIORITYRANGE__ARG_TRAITS_TMPLINST_CS_) -#define _MESSAGING_PRIORITYRANGE__ARG_TRAITS_TMPLINST_CS_ - -# pragma instantiate TAO::Arg_Traits<Messaging::PriorityRange> - -# pragma instantiate \ - TAO::Fixed_Size_Arg_Traits< \ - Messaging::PriorityRange \ - > - -#endif /* end #if !defined */ - # pragma instantiate \ TAO_Fixed_Var_T< \ Messaging::PriorityRange \ @@ -3496,16 +3414,18 @@ operator>>= ( Messaging::PriorityRange \ > +# pragma instantiate TAO::Objref_Traits<Messaging::RequestPriorityPolicy> + # pragma instantiate \ TAO_Objref_Var_T< \ - Messaging::RequestPriorityPolicy, \ - TAO::Objref_Traits<Messaging::RequestPriorityPolicy> \ + Messaging::RequestPriorityPolicy + > - + # pragma instantiate \ TAO_Objref_Out_T< \ - Messaging::RequestPriorityPolicy, \ - TAO::Objref_Traits<Messaging::RequestPriorityPolicy> \ + Messaging::RequestPriorityPolicy + > # pragma instantiate \ @@ -3513,16 +3433,18 @@ operator>>= ( Messaging::RequestPriorityPolicy \ > +# pragma instantiate TAO::Objref_Traits<Messaging::ReplyPriorityPolicy> + # pragma instantiate \ TAO_Objref_Var_T< \ - Messaging::ReplyPriorityPolicy, \ - TAO::Objref_Traits<Messaging::ReplyPriorityPolicy> \ + Messaging::ReplyPriorityPolicy + > - + # pragma instantiate \ TAO_Objref_Out_T< \ - Messaging::ReplyPriorityPolicy, \ - TAO::Objref_Traits<Messaging::ReplyPriorityPolicy> \ + Messaging::ReplyPriorityPolicy + > # pragma instantiate \ @@ -3530,16 +3452,18 @@ operator>>= ( Messaging::ReplyPriorityPolicy \ > +# pragma instantiate TAO::Objref_Traits<Messaging::RequestStartTimePolicy> + # pragma instantiate \ TAO_Objref_Var_T< \ - Messaging::RequestStartTimePolicy, \ - TAO::Objref_Traits<Messaging::RequestStartTimePolicy> \ + Messaging::RequestStartTimePolicy + > - + # pragma instantiate \ TAO_Objref_Out_T< \ - Messaging::RequestStartTimePolicy, \ - TAO::Objref_Traits<Messaging::RequestStartTimePolicy> \ + Messaging::RequestStartTimePolicy + > # pragma instantiate \ @@ -3547,16 +3471,18 @@ operator>>= ( Messaging::RequestStartTimePolicy \ > +# pragma instantiate TAO::Objref_Traits<Messaging::RequestEndTimePolicy> + # pragma instantiate \ TAO_Objref_Var_T< \ - Messaging::RequestEndTimePolicy, \ - TAO::Objref_Traits<Messaging::RequestEndTimePolicy> \ + Messaging::RequestEndTimePolicy + > - + # pragma instantiate \ TAO_Objref_Out_T< \ - Messaging::RequestEndTimePolicy, \ - TAO::Objref_Traits<Messaging::RequestEndTimePolicy> \ + Messaging::RequestEndTimePolicy + > # pragma instantiate \ @@ -3564,16 +3490,18 @@ operator>>= ( Messaging::RequestEndTimePolicy \ > +# pragma instantiate TAO::Objref_Traits<Messaging::ReplyStartTimePolicy> + # pragma instantiate \ TAO_Objref_Var_T< \ - Messaging::ReplyStartTimePolicy, \ - TAO::Objref_Traits<Messaging::ReplyStartTimePolicy> \ + Messaging::ReplyStartTimePolicy + > - + # pragma instantiate \ TAO_Objref_Out_T< \ - Messaging::ReplyStartTimePolicy, \ - TAO::Objref_Traits<Messaging::ReplyStartTimePolicy> \ + Messaging::ReplyStartTimePolicy + > # pragma instantiate \ @@ -3581,16 +3509,18 @@ operator>>= ( Messaging::ReplyStartTimePolicy \ > +# pragma instantiate TAO::Objref_Traits<Messaging::ReplyEndTimePolicy> + # pragma instantiate \ TAO_Objref_Var_T< \ - Messaging::ReplyEndTimePolicy, \ - TAO::Objref_Traits<Messaging::ReplyEndTimePolicy> \ + Messaging::ReplyEndTimePolicy + > - + # pragma instantiate \ TAO_Objref_Out_T< \ - Messaging::ReplyEndTimePolicy, \ - TAO::Objref_Traits<Messaging::ReplyEndTimePolicy> \ + Messaging::ReplyEndTimePolicy + > # pragma instantiate \ @@ -3598,16 +3528,18 @@ operator>>= ( Messaging::ReplyEndTimePolicy \ > +# pragma instantiate TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy> + # pragma instantiate \ TAO_Objref_Var_T< \ - Messaging::RelativeRequestTimeoutPolicy, \ - TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy> \ + Messaging::RelativeRequestTimeoutPolicy + > - + # pragma instantiate \ TAO_Objref_Out_T< \ - Messaging::RelativeRequestTimeoutPolicy, \ - TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy> \ + Messaging::RelativeRequestTimeoutPolicy + > # pragma instantiate \ @@ -3615,18 +3547,6 @@ operator>>= ( Messaging::RelativeRequestTimeoutPolicy \ > -#if !defined (_MESSAGING_ROUTINGTYPERANGE__ARG_TRAITS_TMPLINST_CS_) -#define _MESSAGING_ROUTINGTYPERANGE__ARG_TRAITS_TMPLINST_CS_ - -# pragma instantiate TAO::Arg_Traits<Messaging::RoutingTypeRange> - -# pragma instantiate \ - TAO::Fixed_Size_Arg_Traits< \ - Messaging::RoutingTypeRange \ - > - -#endif /* end #if !defined */ - # pragma instantiate \ TAO_Fixed_Var_T< \ Messaging::RoutingTypeRange \ @@ -3642,16 +3562,18 @@ operator>>= ( Messaging::RoutingTypeRange \ > +# pragma instantiate TAO::Objref_Traits<Messaging::RoutingPolicy> + # pragma instantiate \ TAO_Objref_Var_T< \ - Messaging::RoutingPolicy, \ - TAO::Objref_Traits<Messaging::RoutingPolicy> \ + Messaging::RoutingPolicy + > - + # pragma instantiate \ TAO_Objref_Out_T< \ - Messaging::RoutingPolicy, \ - TAO::Objref_Traits<Messaging::RoutingPolicy> \ + Messaging::RoutingPolicy + > # pragma instantiate \ @@ -3659,16 +3581,18 @@ operator>>= ( Messaging::RoutingPolicy \ > +# pragma instantiate TAO::Objref_Traits<Messaging::MaxHopsPolicy> + # pragma instantiate \ TAO_Objref_Var_T< \ - Messaging::MaxHopsPolicy, \ - TAO::Objref_Traits<Messaging::MaxHopsPolicy> \ + Messaging::MaxHopsPolicy + > - + # pragma instantiate \ TAO_Objref_Out_T< \ - Messaging::MaxHopsPolicy, \ - TAO::Objref_Traits<Messaging::MaxHopsPolicy> \ + Messaging::MaxHopsPolicy + > # pragma instantiate \ @@ -3676,16 +3600,18 @@ operator>>= ( Messaging::MaxHopsPolicy \ > +# pragma instantiate TAO::Objref_Traits<Messaging::QueueOrderPolicy> + # pragma instantiate \ TAO_Objref_Var_T< \ - Messaging::QueueOrderPolicy, \ - TAO::Objref_Traits<Messaging::QueueOrderPolicy> \ + Messaging::QueueOrderPolicy + > - + # pragma instantiate \ TAO_Objref_Out_T< \ - Messaging::QueueOrderPolicy, \ - TAO::Objref_Traits<Messaging::QueueOrderPolicy> \ + Messaging::QueueOrderPolicy + > # pragma instantiate \ @@ -3693,4 +3619,5 @@ operator>>= ( Messaging::QueueOrderPolicy \ > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/Messaging/Messaging_RT_Policy.pidl b/TAO/tao/Messaging/Messaging_RT_Policy.pidl index 6350ddc4a80..5d6599e6e3f 100644 --- a/TAO/tao/Messaging/Messaging_RT_Policy.pidl +++ b/TAO/tao/Messaging/Messaging_RT_Policy.pidl @@ -37,8 +37,8 @@ #ifndef TAO_MESSAGING_RT_POLICY_PIDL #define TAO_MESSAGING_RT_POLICY_PIDL -#include <TimeBase.pidl> -#include <Policy.pidl> +#include "tao/TimeBase.pidl" +#include "tao/Policy.pidl" #pragma prefix "omg.org" diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp index 0ebcb8817eb..30c71292fb5 100644 --- a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp +++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp @@ -26,18 +26,12 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be/be_codegen.cpp:301 +// be/be_codegen.cpp:302 #include "Messaging_RT_PolicyC.h" -#include "tao/Stub.h" -#include "tao/Invocation_Adapter.h" -#include "tao/Object_T.h" -#include "tao/Any_Impl_T.h" -#include "tao/Any_Dual_Impl_T.h" -#include "tao/Any_Basic_Impl_T.h" -#include "tao/Basic_Arguments.h" #include "tao/Typecode.h" +#include "tao/Any_Impl_T.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig @@ -48,7 +42,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be/be_visitor_arg_traits.cpp:59 +// be/be_visitor_arg_traits.cpp:60 // Arg traits specializations. namespace TAO @@ -62,32 +56,32 @@ static const CORBA::Long _oc_Messaging_Timeout[] = { TAO_ENCAP_BYTE_ORDER, // byte order 34, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d657373), - ACE_NTOHL (0x6167696e), - ACE_NTOHL (0x672f5469), - ACE_NTOHL (0x6d656f75), - ACE_NTOHL (0x743a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d657373), + ACE_NTOHL (0x6167696e), + ACE_NTOHL (0x672f5469), + ACE_NTOHL (0x6d656f75), + ACE_NTOHL (0x743a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/Messaging/Timeout:1.0 8, - ACE_NTOHL (0x54696d65), + ACE_NTOHL (0x54696d65), ACE_NTOHL (0x6f757400), // name = Timeout CORBA::tk_alias, // typecode kind for typedefs 56, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 31, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x54696d65), - ACE_NTOHL (0x42617365), - ACE_NTOHL (0x2f54696d), - ACE_NTOHL (0x65543a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x54696d65), + ACE_NTOHL (0x42617365), + ACE_NTOHL (0x2f54696d), + ACE_NTOHL (0x65543a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/TimeBase/TimeT:1.0 6, - ACE_NTOHL (0x54696d65), + ACE_NTOHL (0x54696d65), ACE_NTOHL (0x54000000), // name = TimeT CORBA::tk_ulonglong, @@ -145,7 +139,7 @@ TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::tao_marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*Messaging__TAO_RelativeRoundtripTimeoutPolicy_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -156,7 +150,7 @@ Messaging::RelativeRoundtripTimeoutPolicy::RelativeRoundtripTimeoutPolicy (void) Messaging::RelativeRoundtripTimeoutPolicy::~RelativeRoundtripTimeoutPolicy (void) {} -void +void Messaging::RelativeRoundtripTimeoutPolicy::_tao_any_destructor (void *_tao_void_pointer) { RelativeRoundtripTimeoutPolicy *_tao_tmp_pointer = @@ -170,10 +164,15 @@ Messaging::RelativeRoundtripTimeoutPolicy::_narrow ( ACE_ENV_ARG_DECL_NOT_USED ) { + if (CORBA::is_nil (_tao_objref)) + { + return RelativeRoundtripTimeoutPolicy::_nil (); + } + RelativeRoundtripTimeoutPolicy_ptr proxy = dynamic_cast<RelativeRoundtripTimeoutPolicy_ptr> (_tao_objref); - proxy->_add_ref (); - return proxy; + + return RelativeRoundtripTimeoutPolicy::_duplicate (proxy); } Messaging::RelativeRoundtripTimeoutPolicy_ptr @@ -183,7 +182,7 @@ Messaging::RelativeRoundtripTimeoutPolicy::_duplicate (RelativeRoundtripTimeoutP { obj->_add_ref (); } - + return obj; } @@ -238,29 +237,29 @@ static const CORBA::Long _oc_Messaging_RelativeRoundtripTimeoutPolicy[] = { TAO_ENCAP_BYTE_ORDER, // byte order 57, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d657373), - ACE_NTOHL (0x6167696e), - ACE_NTOHL (0x672f5265), - ACE_NTOHL (0x6c617469), - ACE_NTOHL (0x7665526f), - ACE_NTOHL (0x756e6474), - ACE_NTOHL (0x72697054), - ACE_NTOHL (0x696d656f), - ACE_NTOHL (0x7574506f), - ACE_NTOHL (0x6c696379), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d657373), + ACE_NTOHL (0x6167696e), + ACE_NTOHL (0x672f5265), + ACE_NTOHL (0x6c617469), + ACE_NTOHL (0x7665526f), + ACE_NTOHL (0x756e6474), + ACE_NTOHL (0x72697054), + ACE_NTOHL (0x696d656f), + ACE_NTOHL (0x7574506f), + ACE_NTOHL (0x6c696379), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/Messaging/RelativeRoundtripTimeoutPolicy:1.0 31, - ACE_NTOHL (0x52656c61), - ACE_NTOHL (0x74697665), - ACE_NTOHL (0x526f756e), - ACE_NTOHL (0x64747269), - ACE_NTOHL (0x7054696d), - ACE_NTOHL (0x656f7574), - ACE_NTOHL (0x506f6c69), + ACE_NTOHL (0x52656c61), + ACE_NTOHL (0x74697665), + ACE_NTOHL (0x526f756e), + ACE_NTOHL (0x64747269), + ACE_NTOHL (0x7054696d), + ACE_NTOHL (0x656f7574), + ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63790000), // name = RelativeRoundtripTimeoutPolicy }; @@ -280,6 +279,7 @@ namespace Messaging // TAO_IDL - Generated from // be/be_visitor_interface/any_op_cs.cpp:50 + ACE_TEMPLATE_SPECIALIZATION CORBA::Boolean TAO::Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>::to_object ( @@ -347,35 +347,22 @@ operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_root/root.cpp:1703 +// be/be_visitor_root/root.cpp:1702 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class - TAO::Any_Basic_Impl_T< - CORBA::SetOverrideType - >; - - template class - TAO::Any_Dual_Impl_T< - CORBA::PolicyError - >; - - template class - TAO::Any_Dual_Impl_T< - CORBA::InvalidPolicies - >; + template class TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>; template class TAO_Objref_Var_T< - Messaging::RelativeRoundtripTimeoutPolicy, - TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy> + Messaging::RelativeRoundtripTimeoutPolicy + >; - + template class TAO_Objref_Out_T< - Messaging::RelativeRoundtripTimeoutPolicy, - TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy> + Messaging::RelativeRoundtripTimeoutPolicy + >; template class @@ -385,31 +372,18 @@ operator>>= ( #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate \ - TAO::Any_Basic_Impl_T< \ - CORBA::SetOverrideType \ - > - -# pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - CORBA::PolicyError \ - > - -# pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - CORBA::InvalidPolicies \ - > +# pragma instantiate TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy> # pragma instantiate \ TAO_Objref_Var_T< \ - Messaging::RelativeRoundtripTimeoutPolicy, \ - TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy> \ + Messaging::RelativeRoundtripTimeoutPolicy + > - + # pragma instantiate \ TAO_Objref_Out_T< \ - Messaging::RelativeRoundtripTimeoutPolicy, \ - TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy> \ + Messaging::RelativeRoundtripTimeoutPolicy + > # pragma instantiate \ @@ -417,4 +391,5 @@ operator>>= ( Messaging::RelativeRoundtripTimeoutPolicy \ > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/Messaging/Messaging_SyncScope_Policy.pidl b/TAO/tao/Messaging/Messaging_SyncScope_Policy.pidl index 27269cd862a..914c161d650 100644 --- a/TAO/tao/Messaging/Messaging_SyncScope_Policy.pidl +++ b/TAO/tao/Messaging/Messaging_SyncScope_Policy.pidl @@ -12,11 +12,11 @@ * The command used to generate code from this file is: * * tao_idl - * -o orig -Gp -Gd -Ge 1 + * -o orig -Gp -Gd -Ge 1 -GT * -Wb,export_macro=TAO_Messaging_Export * -Wb,export_include=messaging_export.h * -Wb,pre_include="ace/pre.h" - * -Wb,post_include="ace/post.h" + * -Wb,post_include="ace/post.h" -I$(TAO_ROOT) * Messaging_SyncScope_Policy.pidl * * after the file is generated a patch must be applied: @@ -37,8 +37,8 @@ #ifndef TAO_MESSAGING_SYNCSCOPE_POLICY_PIDL #define TAO_MESSAGING_SYNCSCOPE_POLICY_PIDL -#include <Policy.pidl> -#include <Messaging_SyncScope.pidl> +#include "tao/Policy.pidl" +#include "tao/Messaging_SyncScope.pidl" #pragma prefix "omg.org" diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp index 1a45d708212..cb7db40d6e5 100644 --- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp +++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp @@ -26,18 +26,12 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be/be_codegen.cpp:301 +// be/be_codegen.cpp:302 #include "Messaging_SyncScope_PolicyC.h" -#include "tao/Stub.h" -#include "tao/Invocation_Adapter.h" -#include "tao/Object_T.h" -#include "tao/Any_Impl_T.h" -#include "tao/Any_Dual_Impl_T.h" -#include "tao/Any_Basic_Impl_T.h" -#include "tao/Basic_Arguments.h" #include "tao/Typecode.h" +#include "tao/Any_Impl_T.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig @@ -48,7 +42,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be/be_visitor_arg_traits.cpp:59 +// be/be_visitor_arg_traits.cpp:60 // Arg traits specializations. namespace TAO @@ -92,7 +86,7 @@ TAO::Objref_Traits<Messaging::SyncScopePolicy>::tao_marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*Messaging__TAO_SyncScopePolicy_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -103,7 +97,7 @@ Messaging::SyncScopePolicy::SyncScopePolicy (void) Messaging::SyncScopePolicy::~SyncScopePolicy (void) {} -void +void Messaging::SyncScopePolicy::_tao_any_destructor (void *_tao_void_pointer) { SyncScopePolicy *_tao_tmp_pointer = @@ -117,10 +111,15 @@ Messaging::SyncScopePolicy::_narrow ( ACE_ENV_ARG_DECL_NOT_USED ) { + if (CORBA::is_nil (_tao_objref)) + { + return SyncScopePolicy::_nil (); + } + SyncScopePolicy_ptr proxy = dynamic_cast<SyncScopePolicy_ptr> (_tao_objref); - proxy->_add_ref (); - return proxy; + + return SyncScopePolicy::_duplicate (proxy); } Messaging::SyncScopePolicy_ptr @@ -130,7 +129,7 @@ Messaging::SyncScopePolicy::_duplicate (SyncScopePolicy_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -185,21 +184,21 @@ static const CORBA::Long _oc_Messaging_SyncScopePolicy[] = { TAO_ENCAP_BYTE_ORDER, // byte order 42, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x4d657373), - ACE_NTOHL (0x6167696e), - ACE_NTOHL (0x672f5379), - ACE_NTOHL (0x6e635363), - ACE_NTOHL (0x6f706550), - ACE_NTOHL (0x6f6c6963), - ACE_NTOHL (0x793a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x4d657373), + ACE_NTOHL (0x6167696e), + ACE_NTOHL (0x672f5379), + ACE_NTOHL (0x6e635363), + ACE_NTOHL (0x6f706550), + ACE_NTOHL (0x6f6c6963), + ACE_NTOHL (0x793a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/Messaging/SyncScopePolicy:1.0 16, - ACE_NTOHL (0x53796e63), - ACE_NTOHL (0x53636f70), - ACE_NTOHL (0x65506f6c), + ACE_NTOHL (0x53796e63), + ACE_NTOHL (0x53636f70), + ACE_NTOHL (0x65506f6c), ACE_NTOHL (0x69637900), // name = SyncScopePolicy }; @@ -219,6 +218,7 @@ namespace Messaging // TAO_IDL - Generated from // be/be_visitor_interface/any_op_cs.cpp:50 + ACE_TEMPLATE_SPECIALIZATION CORBA::Boolean TAO::Any_Impl_T<Messaging::SyncScopePolicy>::to_object ( @@ -243,7 +243,6 @@ TAO::Any_Impl_T<Messaging::SyncScopePolicy>::demarshal_value (TAO_InputCDR &) return 0; } - // Copying insertion. void operator<<= ( @@ -287,35 +286,22 @@ operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_root/root.cpp:1703 +// be/be_visitor_root/root.cpp:1702 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class - TAO::Any_Basic_Impl_T< - CORBA::SetOverrideType - >; - - template class - TAO::Any_Dual_Impl_T< - CORBA::PolicyError - >; - - template class - TAO::Any_Dual_Impl_T< - CORBA::InvalidPolicies - >; + template class TAO::Objref_Traits<Messaging::SyncScopePolicy>; template class TAO_Objref_Var_T< - Messaging::SyncScopePolicy, - TAO::Objref_Traits<Messaging::SyncScopePolicy> + Messaging::SyncScopePolicy + >; - + template class TAO_Objref_Out_T< - Messaging::SyncScopePolicy, - TAO::Objref_Traits<Messaging::SyncScopePolicy> + Messaging::SyncScopePolicy + >; template class @@ -325,31 +311,18 @@ operator>>= ( #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate \ - TAO::Any_Basic_Impl_T< \ - CORBA::SetOverrideType \ - > - -# pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - CORBA::PolicyError \ - > - -# pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - CORBA::InvalidPolicies \ - > +# pragma instantiate TAO::Objref_Traits<Messaging::SyncScopePolicy> # pragma instantiate \ TAO_Objref_Var_T< \ - Messaging::SyncScopePolicy, \ - TAO::Objref_Traits<Messaging::SyncScopePolicy> \ + Messaging::SyncScopePolicy + > - + # pragma instantiate \ TAO_Objref_Out_T< \ - Messaging::SyncScopePolicy, \ - TAO::Objref_Traits<Messaging::SyncScopePolicy> \ + Messaging::SyncScopePolicy + > # pragma instantiate \ @@ -357,4 +330,5 @@ operator>>= ( Messaging::SyncScopePolicy \ > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/Messaging/TAO_Ext.pidl b/TAO/tao/Messaging/TAO_Ext.pidl index 4a4e2dbfa5a..65a6b27ef55 100644 --- a/TAO/tao/Messaging/TAO_Ext.pidl +++ b/TAO/tao/Messaging/TAO_Ext.pidl @@ -15,11 +15,12 @@ * this is: * * tao_idl - * -o orig -Gp -Gd -Ge 1 + * -o orig -Gp -Gd -Ge 1 -GT * -Wb,export_macro=TAO_Messaging_Export + * -Wb,export_include=messaging_export.h * -Wb,pre_include="ace/pre.h" * -Wb,post_include="ace/post.h" - * -Wb,export_include="tao/corbafwd.h" TAO_Ext.pidl + * -Wb,export_include="tao/corbafwd.h" -I$(TAO_ROOT) TAO_Ext.pidl * * 2. Then patch the generated code. The patch fixes the interface * repository IDs, disables the code under certain configurations, @@ -42,8 +43,8 @@ #ifndef TAO_TAO_EXT_IDL #define TAO_TAO_EXT_IDL -#include "Policy.pidl" -#include "TimeBase.pidl" +#include "tao/Policy.pidl" +#include "tao/TimeBase.pidl" #pragma prefix "tao" diff --git a/TAO/tao/Messaging/TAO_ExtC.cpp b/TAO/tao/Messaging/TAO_ExtC.cpp index b37e99a360d..8e989da14a7 100644 --- a/TAO/tao/Messaging/TAO_ExtC.cpp +++ b/TAO/tao/Messaging/TAO_ExtC.cpp @@ -26,18 +26,12 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be/be_codegen.cpp:301 +// be/be_codegen.cpp:302 #include "TAO_ExtC.h" -#include "tao/Stub.h" -#include "tao/Invocation_Adapter.h" -#include "tao/Object_T.h" -#include "tao/Any_Impl_T.h" -#include "tao/Any_Dual_Impl_T.h" -#include "tao/Any_Basic_Impl_T.h" -#include "tao/Basic_Arguments.h" #include "tao/Typecode.h" +#include "tao/Any_Impl_T.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig @@ -48,7 +42,7 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be/be_visitor_arg_traits.cpp:59 +// be/be_visitor_arg_traits.cpp:60 // Arg traits specializations. namespace TAO @@ -92,7 +86,7 @@ TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::tao_marshal ( } // Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * +TAO::Collocation_Proxy_Broker * (*TAO__TAO_ConnectionTimeoutPolicy_Proxy_Broker_Factory_function_pointer) ( CORBA::Object_ptr obj ) = 0; @@ -103,7 +97,7 @@ TAO::ConnectionTimeoutPolicy::ConnectionTimeoutPolicy (void) TAO::ConnectionTimeoutPolicy::~ConnectionTimeoutPolicy (void) {} -void +void TAO::ConnectionTimeoutPolicy::_tao_any_destructor (void *_tao_void_pointer) { ConnectionTimeoutPolicy *_tao_tmp_pointer = @@ -117,10 +111,15 @@ TAO::ConnectionTimeoutPolicy::_narrow ( ACE_ENV_ARG_DECL_NOT_USED ) { + if (CORBA::is_nil (_tao_objref)) + { + return ConnectionTimeoutPolicy::_nil (); + } + ConnectionTimeoutPolicy_ptr proxy = dynamic_cast<ConnectionTimeoutPolicy_ptr> (_tao_objref); - proxy->_add_ref (); - return proxy; + + return ConnectionTimeoutPolicy::_duplicate (proxy); } TAO::ConnectionTimeoutPolicy_ptr @@ -130,7 +129,7 @@ TAO::ConnectionTimeoutPolicy::_duplicate (ConnectionTimeoutPolicy_ptr obj) { obj->_add_ref (); } - + return obj; } @@ -185,22 +184,22 @@ static const CORBA::Long _oc_TAO_ConnectionTimeoutPolicy[] = { TAO_ENCAP_BYTE_ORDER, // byte order 40, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x74616f2f), - ACE_NTOHL (0x54414f2f), - ACE_NTOHL (0x436f6e6e), - ACE_NTOHL (0x65637469), - ACE_NTOHL (0x6f6e5469), - ACE_NTOHL (0x6d656f75), - ACE_NTOHL (0x74506f6c), - ACE_NTOHL (0x6963793a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x74616f2f), + ACE_NTOHL (0x54414f2f), + ACE_NTOHL (0x436f6e6e), + ACE_NTOHL (0x65637469), + ACE_NTOHL (0x6f6e5469), + ACE_NTOHL (0x6d656f75), + ACE_NTOHL (0x74506f6c), + ACE_NTOHL (0x6963793a), ACE_NTOHL (0x312e3000), // repository ID = IDL:tao/TAO/ConnectionTimeoutPolicy:1.0 24, - ACE_NTOHL (0x436f6e6e), - ACE_NTOHL (0x65637469), - ACE_NTOHL (0x6f6e5469), - ACE_NTOHL (0x6d656f75), - ACE_NTOHL (0x74506f6c), + ACE_NTOHL (0x436f6e6e), + ACE_NTOHL (0x65637469), + ACE_NTOHL (0x6f6e5469), + ACE_NTOHL (0x6d656f75), + ACE_NTOHL (0x74506f6c), ACE_NTOHL (0x69637900), // name = ConnectionTimeoutPolicy }; @@ -220,6 +219,7 @@ namespace TAO // TAO_IDL - Generated from // be/be_visitor_interface/any_op_cs.cpp:50 + ACE_TEMPLATE_SPECIALIZATION CORBA::Boolean TAO::Any_Impl_T<TAO::ConnectionTimeoutPolicy>::to_object ( @@ -287,35 +287,22 @@ operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_root/root.cpp:1703 +// be/be_visitor_root/root.cpp:1702 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class - TAO::Any_Basic_Impl_T< - CORBA::SetOverrideType - >; - - template class - TAO::Any_Dual_Impl_T< - CORBA::PolicyError - >; - - template class - TAO::Any_Dual_Impl_T< - CORBA::InvalidPolicies - >; + template class TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>; template class TAO_Objref_Var_T< - TAO::ConnectionTimeoutPolicy, - TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy> + TAO::ConnectionTimeoutPolicy + >; - + template class TAO_Objref_Out_T< - TAO::ConnectionTimeoutPolicy, - TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy> + TAO::ConnectionTimeoutPolicy + >; template class @@ -325,31 +312,18 @@ operator>>= ( #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate \ - TAO::Any_Basic_Impl_T< \ - CORBA::SetOverrideType \ - > - -# pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - CORBA::PolicyError \ - > - -# pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - CORBA::InvalidPolicies \ - > +# pragma instantiate TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy> # pragma instantiate \ TAO_Objref_Var_T< \ - TAO::ConnectionTimeoutPolicy, \ - TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy> \ + TAO::ConnectionTimeoutPolicy + > - + # pragma instantiate \ TAO_Objref_Out_T< \ - TAO::ConnectionTimeoutPolicy, \ - TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy> \ + TAO::ConnectionTimeoutPolicy + > # pragma instantiate \ @@ -357,4 +331,5 @@ operator>>= ( TAO::ConnectionTimeoutPolicy \ > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl index 867272a683b..24eddb191ed 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl @@ -12,6 +12,7 @@ * * tao_idl.exe * -o orig -Gp -Gd -Ge 1 -GT + * -I$(TAO_ROOT) * -Wb,export_macro=TAO_ORT_Export * -Wb,export_include=ort_export.h * -Wb,pre_include="ace/pre.h" @@ -33,7 +34,7 @@ #define _OBJECT_REFERENCE_TEMPLATE_IDL_ #include <orb.idl> -#include <PI_Forward.pidl> +#include "tao/PI_Forward.pidl" module PortableInterceptor { diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp index d424e9efc9d..7e4c500a073 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp @@ -26,21 +26,19 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be/be_codegen.cpp:301 +// be/be_codegen.cpp:302 #include "ObjectReferenceTemplateC.h" -#include "tao/Stub.h" +#include "tao/Exception_Data.h" #include "tao/Invocation_Adapter.h" -#include "tao/Object_T.h" +#include "tao/Valuetype/ValueFactory.h" +#include "tao/Typecode.h" #include "tao/Any_Impl_T.h" #include "tao/Any_Dual_Impl_T.h" -#include "tao/Any_Basic_Impl_T.h" #include "tao/Basic_Arguments.h" -#include "tao/Object_Argument_T.h" #include "tao/UB_String_Arguments.h" #include "tao/Var_Size_Argument_T.h" -#include "tao/Typecode.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig @@ -51,36 +49,17 @@ #endif /* !defined INLINE */ // TAO_IDL - Generated from -// be/be_visitor_arg_traits.cpp:59 +// be/be_visitor_arg_traits.cpp:60 // Arg traits specializations. namespace TAO { // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:262 - -#if !defined (__TAO_SEQ_CORBA_OCTET___ARG_TRAITS_CS_) -#define __TAO_SEQ_CORBA_OCTET___ARG_TRAITS_CS_ - - ACE_TEMPLATE_SPECIALIZATION - class TAO_ORT_Export Arg_Traits<CORBA::OctetSeq> - : public - Var_Size_Arg_Traits_T< - CORBA::OctetSeq, - CORBA::OctetSeq_var, - CORBA::OctetSeq_out - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:262 + // be/be_visitor_arg_traits.cpp:263 -#if !defined (__TAO_SEQ_CORBA_STRING___ARG_TRAITS_CS_) -#define __TAO_SEQ_CORBA_STRING___ARG_TRAITS_CS_ +#if !defined (_CORBA_STRINGSEQ__ARG_TRAITS_CS_) +#define _CORBA_STRINGSEQ__ARG_TRAITS_CS_ ACE_TEMPLATE_SPECIALIZATION class TAO_ORT_Export Arg_Traits<CORBA::StringSeq> @@ -94,44 +73,6 @@ namespace TAO }; #endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:262 - -#if !defined (__TAO_SEQ_CORBA_STRING___ARG_TRAITS_CS_) -#define __TAO_SEQ_CORBA_STRING___ARG_TRAITS_CS_ - - ACE_TEMPLATE_SPECIALIZATION - class TAO_ORT_Export Arg_Traits<PortableInterceptor::AdapterName> - : public - Var_Size_Arg_Traits_T< - PortableInterceptor::AdapterName, - PortableInterceptor::AdapterName_var, - PortableInterceptor::AdapterName_out - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:262 - -#if !defined (__TAO_SEQ_CORBA_OCTET___ARG_TRAITS_CS_) -#define __TAO_SEQ_CORBA_OCTET___ARG_TRAITS_CS_ - - ACE_TEMPLATE_SPECIALIZATION - class TAO_ORT_Export Arg_Traits<PortableInterceptor::ObjectId> - : public - Var_Size_Arg_Traits_T< - PortableInterceptor::ObjectId, - PortableInterceptor::ObjectId_var, - PortableInterceptor::ObjectId_out - > - { - }; - -#endif /* end #if !defined */ }; // TAO_IDL - Generated from @@ -184,7 +125,7 @@ namespace PortableInterceptor } // TAO_IDL - Generated from -// be/be_visitor_valuetype/valuetype_cs.cpp:94 +// be/be_visitor_valuetype/valuetype_cs.cpp:66 void TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::tao_add_ref ( @@ -210,7 +151,7 @@ PortableInterceptor::ObjectReferenceFactory::_downcast (CORBA::ValueBase *v) return 0; } - return (ObjectReferenceFactory *) v->_tao_obv_narrow ((ptrdiff_t) &_downcast); + return dynamic_cast<PortableInterceptor::ObjectReferenceFactory *> (v); } const char * @@ -218,32 +159,6 @@ PortableInterceptor::ObjectReferenceFactory::_tao_obv_repository_id (void) const { return this->_tao_obv_static_repository_id (); } - -void * -#if defined (_MSC_VER) -PortableInterceptor::ObjectReferenceFactory::PortableInterceptor_ObjectReferenceFactory_tao_obv_narrow (ptrdiff_t type_id) -#else -PortableInterceptor::ObjectReferenceFactory::_tao_obv_narrow (ptrdiff_t type_id) -#endif /* _MSC_VER */ -{ - if (type_id == (ptrdiff_t) &_downcast) - { - return this; - } - - void *rval = 0; - - return rval; -} - -#if defined (_MSC_VER) -void * -PortableInterceptor::ObjectReferenceFactory::_tao_obv_narrow (ptrdiff_t type_id) -{ - return this->PortableInterceptor_ObjectReferenceFactory_tao_obv_narrow (type_id); -} -#endif /* _MSC_VER */ - void PortableInterceptor::ObjectReferenceFactory::_tao_any_destructor (void *_tao_void_pointer) { @@ -348,7 +263,7 @@ namespace PortableInterceptor } // TAO_IDL - Generated from -// be/be_visitor_valuetype/valuetype_cs.cpp:94 +// be/be_visitor_valuetype/valuetype_cs.cpp:66 void TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::tao_add_ref ( @@ -374,7 +289,7 @@ PortableInterceptor::ObjectReferenceTemplate::_downcast (CORBA::ValueBase *v) return 0; } - return (ObjectReferenceTemplate *) v->_tao_obv_narrow ((ptrdiff_t) &_downcast); + return dynamic_cast<PortableInterceptor::ObjectReferenceTemplate *> (v); } const char * @@ -382,41 +297,6 @@ PortableInterceptor::ObjectReferenceTemplate::_tao_obv_repository_id (void) cons { return this->_tao_obv_static_repository_id (); } - -void * -#if defined (_MSC_VER) -PortableInterceptor::ObjectReferenceTemplate::PortableInterceptor_ObjectReferenceTemplate_tao_obv_narrow (ptrdiff_t type_id) -#else -PortableInterceptor::ObjectReferenceTemplate::_tao_obv_narrow (ptrdiff_t type_id) -#endif /* _MSC_VER */ -{ - if (type_id == (ptrdiff_t) &_downcast) - { - return this; - } - - void *rval = 0; - - if (rval == 0) - { -#if defined (_MSC_VER) - rval = this->PortableInterceptor_ObjectReferenceFactory_tao_obv_narrow (type_id); -#else - rval = this->PortableInterceptor::ObjectReferenceFactory::_tao_obv_narrow (type_id); -#endif /* _MSC_VER */ - } - - return rval; -} - -#if defined (_MSC_VER) -void * -PortableInterceptor::ObjectReferenceTemplate::_tao_obv_narrow (ptrdiff_t type_id) -{ - return this->PortableInterceptor_ObjectReferenceTemplate_tao_obv_narrow (type_id); -} -#endif /* _MSC_VER */ - void PortableInterceptor::ObjectReferenceTemplate::_tao_any_destructor (void *_tao_void_pointer) { @@ -701,7 +581,19 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be/be_visitor_valuetype/any_op_cs.cpp:57 -// Copying insertion. + + +template<> +ACE_INLINE +CORBA::Boolean +TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceFactory>::to_value ( + CORBA::ValueBase *&_tao_elem + ) const +{ + CORBA::add_ref (this->value_); + _tao_elem = this->value_; + return 1; +}// Copying insertion. void operator<<= ( CORBA::Any &_tao_any, @@ -742,23 +634,24 @@ operator>>= ( ); } -ACE_TEMPLATE_SPECIALIZATION + + +// TAO_IDL - Generated from +// be/be_visitor_valuetype/any_op_cs.cpp:57 + + + +template<> +ACE_INLINE CORBA::Boolean -TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceFactory>::to_value ( +TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceTemplate>::to_value ( CORBA::ValueBase *&_tao_elem ) const { CORBA::add_ref (this->value_); _tao_elem = this->value_; return 1; -} - - - -// TAO_IDL - Generated from -// be/be_visitor_valuetype/any_op_cs.cpp:57 - -// Copying insertion. +}// Copying insertion. void operator<<= ( CORBA::Any &_tao_any, @@ -799,17 +692,6 @@ operator>>= ( ); } -ACE_TEMPLATE_SPECIALIZATION -CORBA::Boolean -TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceTemplate>::to_value ( - CORBA::ValueBase *&_tao_elem - ) const -{ - CORBA::add_ref (this->value_); - _tao_elem = this->value_; - return 1; -} - // TAO_IDL - Generated from @@ -871,7 +753,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_valuetype.cpp:263 +// be/be_valuetype.cpp:490 void CORBA::add_ref (PortableInterceptor::ObjectReferenceFactory * vt) @@ -923,7 +805,7 @@ operator>> ( // TAO_IDL - Generated from -// be/be_valuetype.cpp:263 +// be/be_valuetype.cpp:490 void CORBA::add_ref (PortableInterceptor::ObjectReferenceTemplate * vt) @@ -1047,61 +929,17 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_CPP_ */ // TAO_IDL - Generated from -// be/be_visitor_root/root.cpp:1703 +// be/be_visitor_root/root.cpp:1702 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class - TAO::Any_Basic_Impl_T< - CORBA::SetOverrideType - >; - - template class - TAO::Any_Dual_Impl_T< - CORBA::PolicyError - >; - - template class - TAO::Any_Dual_Impl_T< - CORBA::InvalidPolicies - >; - -#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_) -#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_ - - template class TAO::Arg_Traits<CORBA::OctetSeq>; - - template class - TAO::Var_Size_Arg_Traits< - CORBA::OctetSeq, - CORBA::OctetSeq_var, - CORBA::OctetSeq_out - >; - -#endif /* end #if !defined */ - - template class - TAO::Any_Basic_Impl_T< - CORBA::TCKind - >; - - template class - TAO::Any_Basic_Impl_T< - CORBA::exception_type - >; - - template class - TAO::Any_Basic_Impl_T< - CORBA::ParameterMode - >; - #if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_) #define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_ template class TAO::Arg_Traits<CORBA::StringSeq>; template class - TAO::Var_Size_Arg_Traits< + TAO::Var_Size_Arg_Traits_T< CORBA::StringSeq, CORBA::StringSeq_var, CORBA::StringSeq_out @@ -1109,34 +947,37 @@ CORBA::Boolean operator>> ( #endif /* end #if !defined */ + template class TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>; + template class - TAO::In_Var_Size_Argument_T< - CORBA::sequence - >; template class TAO_Value_Var_T< - PortableInterceptor::ObjectReferenceFactory, - TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory> + PortableInterceptor::ObjectReferenceFactory + >; template class TAO_Value_Out_T< - PortableInterceptor::ObjectReferenceFactory, - TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory> + PortableInterceptor::ObjectReferenceFactory + >; template class TAO::Any_Impl_T< PortableInterceptor::ObjectReferenceFactory - >; template class + >; + + template class TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>; + + template class TAO_Value_Var_T< - PortableInterceptor::ObjectReferenceTemplate, - TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate> + PortableInterceptor::ObjectReferenceTemplate + >; template class TAO_Value_Out_T< - PortableInterceptor::ObjectReferenceTemplate, - TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate> + PortableInterceptor::ObjectReferenceTemplate + >; template class @@ -1145,9 +986,9 @@ CORBA::Boolean operator>> ( >; template class - TAO_Valuetypet_Manager< + TAO_Valuetype_Manager< PortableInterceptor::ObjectReferenceTemplate, - PortableInterceptor::ObjectReferenceTemplate_va, + PortableInterceptor::ObjectReferenceTemplate_var >; template class @@ -1155,7 +996,7 @@ CORBA::Boolean operator>> ( PortableInterceptor::ObjectReferenceTemplateSeq, TAO_Valuetype_Manager< PortableInterceptor::ObjectReferenceTemplate, - PortableInterceptor::ObjectReferenceTemplate_var, + PortableInterceptor::ObjectReferenceTemplate_var > >; @@ -1164,7 +1005,7 @@ CORBA::Boolean operator>> ( PortableInterceptor::ObjectReferenceTemplateSeq, TAO_Valuetype_Manager< PortableInterceptor::ObjectReferenceTemplate, - PortableInterceptor::ObjectReferenceTemplate_var, + PortableInterceptor::ObjectReferenceTemplate_var > >; @@ -1174,12 +1015,12 @@ CORBA::Boolean operator>> ( PortableInterceptor::ObjectReferenceTemplateSeq_var, TAO_Valuetype_Manager< PortableInterceptor::ObjectReferenceTemplate, - PortableInterceptor::ObjectReferenceTemplate_var, + PortableInterceptor::ObjectReferenceTemplate_var > >; -#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CS_) -#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CS_ +#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ__EXPLICIT_CS_) +#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ__EXPLICIT_CS_ template class TAO_Unbounded_Valuetype_Sequence< @@ -1196,57 +1037,13 @@ CORBA::Boolean operator>> ( #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate \ - TAO::Any_Basic_Impl_T< \ - CORBA::SetOverrideType \ - > - -# pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - CORBA::PolicyError \ - > - -# pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - CORBA::InvalidPolicies \ - > - -#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_) -#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_ - -# pragma instantiate TAO::Arg_Traits<CORBA::OctetSeq> - -# pragma instantiate \ - TAO::Var_Size_Arg_Traits< \ - CORBA::OctetSeq, \ - CORBA::OctetSeq_var, \ - CORBA::OctetSeq_out \ - > - -#endif /* end #if !defined */ - -# pragma instantiate \ - TAO::Any_Basic_Impl_T< \ - CORBA::TCKind \ - > - -# pragma instantiate \ - TAO::Any_Basic_Impl_T< \ - CORBA::exception_type \ - > - -# pragma instantiate \ - TAO::Any_Basic_Impl_T< \ - CORBA::ParameterMode \ - > - #if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_) #define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_ # pragma instantiate TAO::Arg_Traits<CORBA::StringSeq> # pragma instantiate \ - TAO::Var_Size_Arg_Traits< \ + TAO::Var_Size_Arg_Traits_T< \ CORBA::StringSeq, \ CORBA::StringSeq_var, \ CORBA::StringSeq_out \ @@ -1254,34 +1051,37 @@ CORBA::Boolean operator>> ( #endif /* end #if !defined */ +# pragma instantiate TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory> + # pragma instantiate \ - TAO::In_Var_Size_Argument_T< \ - CORBA::sequence \ - ># pragma instantiate \ TAO_Value_Var_T< \ - PortableInterceptor::ObjectReferenceFactory, \ - TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory> \ + PortableInterceptor::ObjectReferenceFactory \ + > # pragma instantiate \ TAO_Value_Out_T< \ - PortableInterceptor::ObjectReferenceFactory, \ - TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory> \ + PortableInterceptor::ObjectReferenceFactory \ + > # pragma instantiate \ TAO::Any_Impl_T< \ PortableInterceptor::ObjectReferenceFactory \ - ># pragma instantiate \ + > + +# pragma instantiate TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate> + +# pragma instantiate \ TAO_Value_Var_T< \ - PortableInterceptor::ObjectReferenceTemplate, \ - TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate> \ + PortableInterceptor::ObjectReferenceTemplate \ + > # pragma instantiate \ TAO_Value_Out_T< \ - PortableInterceptor::ObjectReferenceTemplate, \ - TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate> \ + PortableInterceptor::ObjectReferenceTemplate \ + > # pragma instantiate \ @@ -1294,7 +1094,7 @@ CORBA::Boolean operator>> ( PortableInterceptor::ObjectReferenceTemplateSeq, \ TAO_Valuetype_Manager< \ PortableInterceptor::ObjectReferenceTemplate, \ - PortableInterceptor::ObjectReferenceTemplate_var, \ + PortableInterceptor::ObjectReferenceTemplate_var \ > \ > @@ -1303,7 +1103,7 @@ CORBA::Boolean operator>> ( PortableInterceptor::ObjectReferenceTemplateSeq, \ TAO_Valuetype_Manager< \ PortableInterceptor::ObjectReferenceTemplate, \ - PortableInterceptor::ObjectReferenceTemplate_var, \ + PortableInterceptor::ObjectReferenceTemplate_var \ > \ > @@ -1313,12 +1113,12 @@ CORBA::Boolean operator>> ( PortableInterceptor::ObjectReferenceTemplateSeq_var, \ TAO_Valuetype_Manager< \ PortableInterceptor::ObjectReferenceTemplate, \ - PortableInterceptor::ObjectReferenceTemplate_var, \ + PortableInterceptor::ObjectReferenceTemplate_var \ > \ > -#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CS_) -#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CS_ +#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ__EXPLICIT_CS_) +#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ__EXPLICIT_CS_ # pragma instantiate \ TAO_Unbounded_Valuetype_Sequence< \ diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h index 56e3f6392c1..7372ae1191b 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h @@ -26,31 +26,32 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be/be_codegen.cpp:151 +// be/be_codegen.cpp:150 #ifndef _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATEC_H_ #define _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATEC_H_ #include /**/ "ace/pre.h" -#include "ort_export.h" +#include "tao/ORB.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Valuetype/AbstractBase.h" +#include "ort_export.h" +#include "tao/CDR.h" +#include "tao/Environment.h" +#include "tao/Object.h" #include "tao/Valuetype/ValueBase.h" #include "tao/Valuetype/Valuetype_Adapter_Impl.h" -#include "tao/Valuetype/ValueFactory.h" #include "tao/Valuetype/Sequence_T.h" #include "tao/Sequence_T.h" -#include "tao/Objref_VarOut_T.h" #include "tao/Valuetype/Value_VarOut_T.h" #include "tao/Seq_Var_T.h" #include "tao/Seq_Out_T.h" -#include "tao/VarOut_T.h" -#include "tao/PortableInterceptorC.h" + +#include "tao/PI_ForwardC.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -76,34 +77,26 @@ #endif /* __BORLANDC__ */ // TAO_IDL - Generated from -// be/be_visitor_root/root_ch.cpp:63 - -namespace TAO -{ - class Collocation_Proxy_Broker; -} - -// TAO_IDL - Generated from // be/be_visitor_module/module_ch.cpp:48 namespace PortableInterceptor { - + // TAO_IDL - Generated from - // be/be_valuetype.cpp:300 - - + // be/be_valuetype.cpp:527 + + #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__VAR_OUT_CH_ - + class ObjectReferenceFactory; typedef TAO_Value_Var_T< ObjectReferenceFactory > ObjectReferenceFactory_var; - + typedef TAO_Value_Out_T< ObjectReferenceFactory @@ -111,79 +104,78 @@ namespace PortableInterceptor ObjectReferenceFactory_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be/be_visitor_valuetype/valuetype_ch.cpp:56 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY_CH_ - + class TAO_ORT_Export ObjectReferenceFactory : public virtual CORBA::ValueBase { public: typedef ObjectReferenceFactory_var _var_type; - static ObjectReferenceFactory* _downcast (CORBA::ValueBase* ); - // The address of static _downcast is implicit used as type id - + + static ObjectReferenceFactory* _downcast (CORBA::ValueBase *); + // (TAO extensions or internals) static CORBA::Boolean _tao_unmarshal ( TAO_InputCDR &, ObjectReferenceFactory *& ); + virtual const char* _tao_obv_repository_id (void) const; + static const char* _tao_obv_static_repository_id (void); - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from - // be/be_visitor_valuetype/valuetype_ch.cpp:430 - + // be/be_visitor_valuetype/valuetype_ch.cpp:401 + public: virtual CORBA::Object_ptr make_object ( const char *, const PortableInterceptor::ObjectId & ACE_ENV_ARG_DECL_WITH_DEFAULTS ) = 0; - + // TAO_IDL - Generated from - // be/be_visitor_valuetype/valuetype_ch.cpp:275 - + // be/be_visitor_valuetype/valuetype_ch.cpp:250 + protected: ObjectReferenceFactory (void); + virtual ~ObjectReferenceFactory (void); - - virtual void *_tao_obv_narrow (ptrdiff_t); -#if defined (_MSC_VER) - virtual void *PortableInterceptor_ObjectReferenceFactory_tao_obv_narrow (ptrdiff_t); -#endif /* _MSC_VER */ - + + private: ObjectReferenceFactory (const ObjectReferenceFactory &); void operator= (const ObjectReferenceFactory &); - + }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be/be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceFactory; - + // TAO_IDL - Generated from - // be/be_valuetype.cpp:300 - - + // be/be_valuetype.cpp:527 + + #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__VAR_OUT_CH_ - + class ObjectReferenceTemplate; typedef TAO_Value_Var_T< ObjectReferenceTemplate > ObjectReferenceTemplate_var; - + typedef TAO_Value_Out_T< ObjectReferenceTemplate @@ -191,88 +183,87 @@ namespace PortableInterceptor ObjectReferenceTemplate_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be/be_visitor_valuetype/valuetype_ch.cpp:56 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE_CH_ - + class TAO_ORT_Export ObjectReferenceTemplate : public virtual ObjectReferenceFactory { public: typedef ObjectReferenceTemplate_var _var_type; - static ObjectReferenceTemplate* _downcast (CORBA::ValueBase* ); - // The address of static _downcast is implicit used as type id - + + static ObjectReferenceTemplate* _downcast (CORBA::ValueBase *); + // (TAO extensions or internals) static CORBA::Boolean _tao_unmarshal ( TAO_InputCDR &, ObjectReferenceTemplate *& ); + virtual const char* _tao_obv_repository_id (void) const; + static const char* _tao_obv_static_repository_id (void); - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from - // be/be_visitor_valuetype/valuetype_ch.cpp:430 - + // be/be_visitor_valuetype/valuetype_ch.cpp:401 + public: virtual char * server_id ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) = 0; - + // TAO_IDL - Generated from - // be/be_visitor_valuetype/valuetype_ch.cpp:430 - + // be/be_visitor_valuetype/valuetype_ch.cpp:401 + public: virtual char * orb_id ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) = 0; - + // TAO_IDL - Generated from - // be/be_visitor_valuetype/valuetype_ch.cpp:430 - + // be/be_visitor_valuetype/valuetype_ch.cpp:401 + public: virtual ::PortableInterceptor::AdapterName * adapter_name ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) = 0; - + // TAO_IDL - Generated from - // be/be_visitor_valuetype/valuetype_ch.cpp:275 - + // be/be_visitor_valuetype/valuetype_ch.cpp:250 + protected: ObjectReferenceTemplate (void); + virtual ~ObjectReferenceTemplate (void); - - virtual void *_tao_obv_narrow (ptrdiff_t); -#if defined (_MSC_VER) - virtual void *PortableInterceptor_ObjectReferenceTemplate_tao_obv_narrow (ptrdiff_t); -#endif /* _MSC_VER */ - + + private: ObjectReferenceTemplate (const ObjectReferenceTemplate &); void operator= (const ObjectReferenceTemplate &); - + }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be/be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplate; - + // TAO_IDL - Generated from // be/be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_) #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_ - + class ObjectReferenceTemplateSeq; - + typedef TAO_MngSeq_Var_T< ObjectReferenceTemplateSeq, @@ -282,7 +273,7 @@ namespace PortableInterceptor > > ObjectReferenceTemplateSeq_var; - + typedef TAO_MngSeq_Out_T< ObjectReferenceTemplateSeq, @@ -293,7 +284,7 @@ namespace PortableInterceptor > > ObjectReferenceTemplateSeq_out; - + class TAO_ORT_Export ObjectReferenceTemplateSeq : public TAO_Unbounded_Valuetype_Sequence< @@ -307,69 +298,69 @@ namespace PortableInterceptor ObjectReferenceTemplateSeq ( CORBA::ULong max, CORBA::ULong length, - ObjectReferenceTemplate ** buffer, + ObjectReferenceTemplate ** buffer, CORBA::Boolean release = 0 ); ObjectReferenceTemplateSeq (const ObjectReferenceTemplateSeq &); ~ObjectReferenceTemplateSeq (void); - + static void _tao_any_destructor (void *); - + typedef ObjectReferenceTemplateSeq_var _var_type; }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be/be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplateSeq; - + // TAO_IDL - Generated from - // be/be_visitor_typedef/typedef_ch.cpp:333 - + // be/be_visitor_typedef/typedef_ch.cpp:342 + typedef CORBA::Long AdapterManagerId; typedef CORBA::Long_out AdapterManagerId_out; - + // TAO_IDL - Generated from // be/be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterManagerId; - + // TAO_IDL - Generated from - // be/be_visitor_typedef/typedef_ch.cpp:333 - + // be/be_visitor_typedef/typedef_ch.cpp:342 + typedef CORBA::Short AdapterState; typedef CORBA::Short_out AdapterState_out; - + // TAO_IDL - Generated from // be/be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterState; - + // TAO_IDL - Generated from // be/be_visitor_constant/constant_ch.cpp:52 - + const PortableInterceptor::AdapterState HOLDING = 0; - + // TAO_IDL - Generated from // be/be_visitor_constant/constant_ch.cpp:52 - + const PortableInterceptor::AdapterState ACTIVE = 1; - + // TAO_IDL - Generated from // be/be_visitor_constant/constant_ch.cpp:52 - + const PortableInterceptor::AdapterState DISCARDING = 2; - + // TAO_IDL - Generated from // be/be_visitor_constant/constant_ch.cpp:52 - + const PortableInterceptor::AdapterState INACTIVE = 3; - + // TAO_IDL - Generated from // be/be_visitor_constant/constant_ch.cpp:52 - + const PortableInterceptor::AdapterState NON_EXISTENT = 4; // TAO_IDL - Generated from @@ -390,6 +381,30 @@ namespace OBV_PortableInterceptor // Traits specializations. namespace TAO { + +#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__TRAITS_CH_) +#define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__TRAITS_CH_ + + ACE_TEMPLATE_SPECIALIZATION + struct TAO_ORT_Export Value_Traits<PortableInterceptor::ObjectReferenceFactory> + { + static void tao_add_ref (PortableInterceptor::ObjectReferenceFactory *); + static void tao_remove_ref (PortableInterceptor::ObjectReferenceFactory *); + }; + +#endif /* end #if !defined */ + +#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__TRAITS_CH_) +#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__TRAITS_CH_ + + ACE_TEMPLATE_SPECIALIZATION + struct TAO_ORT_Export Value_Traits<PortableInterceptor::ObjectReferenceTemplate> + { + static void tao_add_ref (PortableInterceptor::ObjectReferenceTemplate *); + static void tao_remove_ref (PortableInterceptor::ObjectReferenceTemplate *); + }; + +#endif /* end #if !defined */ }; // TAO_IDL - Generated from @@ -420,7 +435,7 @@ TAO_ORT_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInt #ifndef __ACE_INLINE__ // TAO_IDL - Generated from -// be/be_valuetype.cpp:207 +// be/be_valuetype.cpp:434 namespace CORBA { @@ -435,7 +450,7 @@ TAO_ORT_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterce TAO_ORT_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ObjectReferenceFactory *&); // TAO_IDL - Generated from -// be/be_valuetype.cpp:207 +// be/be_valuetype.cpp:434 namespace CORBA { @@ -472,7 +487,7 @@ TAO_ORT_Export CORBA::Boolean operator>> ( #endif /* __ACE_INLINE__ */ // TAO_IDL - Generated from -// be/be_codegen.cpp:969 +// be/be_codegen.cpp:911 #if defined (__ACE_INLINE__) #include "ObjectReferenceTemplateC.i" @@ -487,4 +502,6 @@ TAO_ORT_Export CORBA::Boolean operator>> ( #endif /* __BORLANDC__ */ #include /**/ "ace/post.h" + #endif /* ifndef */ + diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.i b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.i index 7bbd1ce5a2d..ce046f2c9fd 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.i +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.i @@ -61,7 +61,7 @@ PortableInterceptor::ObjectReferenceTemplate::_tao_obv_static_repository_id () } // TAO_IDL - Generated from -// be/be_valuetype.cpp:236 +// be/be_valuetype.cpp:463 #if defined (__ACE_INLINE__) @@ -80,7 +80,7 @@ TAO_ORT_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterce TAO_ORT_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ObjectReferenceFactory *&); // TAO_IDL - Generated from -// be/be_valuetype.cpp:236 +// be/be_valuetype.cpp:463 #if defined (__ACE_INLINE__) |