diff options
Diffstat (limited to 'TAO/tao/PollableC.cpp')
| -rw-r--r-- | TAO/tao/PollableC.cpp | 141 |
1 files changed, 16 insertions, 125 deletions
diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp index 8c2302debab..abde9255d7c 100644 --- a/TAO/tao/PollableC.cpp +++ b/TAO/tao/PollableC.cpp @@ -643,40 +643,7 @@ CORBA::PollableSet::marshal (TAO_OutputCDR &) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -#if !defined (_CORBA_POLLABLESET__ARG_TRAITS_TMPLINST_CS_) -#define _CORBA_POLLABLESET__ARG_TRAITS_TMPLINST_CS_ - - template class TAO::Arg_Traits<CORBA::PollableSet>; - - template class - TAO::Object_Arg_Traits_T< - CORBA::PollableSet_ptr, - CORBA::PollableSet_var, - CORBA::PollableSet_out, - TAO::Objref_Traits<CORBA::PollableSet> - >; - -#endif /* end #if !defined */ - -#if 0 - template class - TAO::Ret_Object_Argument_T< - CORBA::DIIPollable_ptr, - CORBA::DIIPollable_var - >; - - template class - TAO::Ret_Object_Argument_T< - CORBA::Pollable_ptr, - CORBA::Pollable_var - >; -#endif /*if 0*/ - - template class - TAO::In_Object_Argument_T< - CORBA::Pollable_ptr - >; - + template class TAO::Objref_Traits<CORBA::PollableSet>; template class TAO_Objref_Var_T< @@ -688,28 +655,7 @@ CORBA::PollableSet::marshal (TAO_OutputCDR &) CORBA::PollableSet >; -#if !defined (_CORBA_POLLABLE__ARG_TRAITS_TMPLINST_CS_) -#define _CORBA_POLLABLE__ARG_TRAITS_TMPLINST_CS_ - - template class TAO::Arg_Traits<CORBA::Pollable>; - - template class - TAO::Object_Arg_Traits_T< - CORBA::Pollable_ptr, - CORBA::Pollable_var, - CORBA::Pollable_out, - TAO::Objref_Traits<CORBA::Pollable> - >; - -#endif /* end #if !defined */ - -#if 0 - template class - TAO::Ret_Object_Argument_T< - CORBA::PollableSet_ptr, - CORBA::PollableSet_var - >; -#endif /*if 0*/ + template class TAO::Objref_Traits<CORBA::Pollable>; template class TAO_Objref_Var_T< @@ -721,20 +667,7 @@ CORBA::PollableSet::marshal (TAO_OutputCDR &) CORBA::Pollable >; -#if !defined (_CORBA_DIIPOLLABLE__ARG_TRAITS_TMPLINST_CS_) -#define _CORBA_DIIPOLLABLE__ARG_TRAITS_TMPLINST_CS_ - - template class TAO::Arg_Traits<CORBA::DIIPollable>; - - template class - TAO::Object_Arg_Traits_T< - CORBA::DIIPollable_ptr, - CORBA::DIIPollable_var, - CORBA::DIIPollable_out, - TAO::Objref_Traits<CORBA::DIIPollable> - >; - -#endif /* end #if !defined */ + template class TAO::Objref_Traits<CORBA::DIIPollable>; template class TAO_Objref_Var_T< @@ -748,87 +681,45 @@ CORBA::PollableSet::marshal (TAO_OutputCDR &) #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#if !defined (_CORBA_POLLABLESET__ARG_TRAITS_TMPLINST_CS_) -#define _CORBA_POLLABLESET__ARG_TRAITS_TMPLINST_CS_ - -# pragma instantiate TAO::Arg_Traits<CORBA::PollableSet> - -# pragma instantiate \ - TAO::Object_Arg_Traits_T< \ - CORBA::PollableSet_ptr, \ - CORBA::PollableSet_var, \ - CORBA::PollableSet_out \ - > - -#endif /* end #if !defined */ - -# pragma instantiate \ - TAO::In_Object_Argument_T< \ - CORBA::Pollable_ptr \ - > +# pragma instantiate TAO::Objref_Traits<CORBA::PollableSet> # pragma instantiate \ TAO_Objref_Var_T< \ - CORBA::PollableSet, \ - TAO::Objref_Traits<CORBA::PollableSet> \ + CORBA::PollableSet > # pragma instantiate \ TAO_Objref_Out_T< \ - CORBA::PollableSet, \ - TAO::Objref_Traits<CORBA::PollableSet> \ - > - -#if !defined (_CORBA_POLLABLE__ARG_TRAITS_TMPLINST_CS_) -#define _CORBA_POLLABLE__ARG_TRAITS_TMPLINST_CS_ - -# pragma instantiate TAO::Arg_Traits<CORBA::Pollable> - -# pragma instantiate \ - TAO::Object_Arg_Traits_T< \ - CORBA::Pollable_ptr, \ - CORBA::Pollable_var, \ - CORBA::Pollable_out \ + CORBA::PollableSet > -#endif /* end #if !defined */ +# pragma instantiate TAO::Objref_Traits<CORBA::Pollable> # pragma instantiate \ TAO_Objref_Var_T< \ - CORBA::Pollable, \ - TAO::Objref_Traits<CORBA::Pollable> \ + CORBA::Pollable > # pragma instantiate \ TAO_Objref_Out_T< \ - CORBA::Pollable, \ - TAO::Objref_Traits<CORBA::Pollable> \ + CORBA::Pollable > -#if !defined (_CORBA_DIIPOLLABLE__ARG_TRAITS_TMPLINST_CS_) -#define _CORBA_DIIPOLLABLE__ARG_TRAITS_TMPLINST_CS_ - -# pragma instantiate TAO::Arg_Traits<CORBA::DIIPollable> +# pragma instantiate TAO::Objref_Traits<CORBA::DIIPollable> # pragma instantiate \ - TAO::Object_Arg_Traits_T< \ - CORBA::DIIPollable_ptr, \ - CORBA::DIIPollable_var, \ - CORBA::DIIPollable_out \ + TAO_Objref_Var_T< \ + CORBA::DIIPollable > -#endif /* end #if !defined */ - # pragma instantiate \ - TAO_Objref_Var_T< \ - CORBA::DIIPollable, \ - TAO::Objref_Traits<CORBA::DIIPollable> \ + TAO_Objref_Out_T< \ + CORBA::DIIPollable > # pragma instantiate \ - TAO_Objref_Out_T< \ - CORBA::DIIPollable, \ - TAO::Objref_Traits<CORBA::DIIPollable> \ + TAO::Any_Impl_T< \ + CORBA::DIIPollable \ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |