diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-12-10 04:16:54 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-12-10 04:16:54 +0000 |
| commit | 03191427ed28a617bdcc27c25a1a8920faa61113 (patch) | |
| tree | 52340ff6afe7503bb76c0a54b096a29d94c67214 | |
| parent | 41bef51ae88ce354a194ef4ec78fd4586ed52f6f (diff) | |
| download | ATCD-03191427ed28a617bdcc27c25a1a8920faa61113.tar.gz | |
ChangeLogTag: Tue Dec 9 22:15:55 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/tao/IFR_Client/IFR_ExtendedC.cpp | 134 |
2 files changed, 6 insertions, 134 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 257c366522a..530cdf20968 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Tue Dec 9 22:15:55 2003 Jeff Parsons <j.parsons@vanderbilt.edu> + + * tao/IFR_Client/IFR_ExtendedC.cpp: + + Removed more duplicate explicit template instantiations. + Tue Dec 9 18:25:27 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * orbsvcs/orbsvcs/FaultTolerance.mpc: diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp index ee84e5923ee..db9efdca4af 100644 --- a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp +++ b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp @@ -7696,24 +7696,6 @@ CORBA::Boolean operator>> ( #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -#if !defined (_CORBA_VALUEDEF__ARG_TRAITS_TMPLINST_CS_) -#define _CORBA_VALUEDEF__ARG_TRAITS_TMPLINST_CS_ - - template class - TAO::Arg_Traits< - CORBA::ValueDef - >; - - template class - TAO::Object_Arg_Traits_T< - CORBA::ValueDef_ptr, - CORBA::ValueDef_var, - CORBA::ValueDef_out, - TAO::Objref_Traits<CORBA::ValueDef> - >; - -#endif /* end #if !defined */ - template class TAO::Ret_Var_Size_Argument_T< CORBA::InitializerSeq, @@ -7721,32 +7703,11 @@ CORBA::Boolean operator>> ( >; template class - TAO::In_Var_Size_Argument_T< - CORBA::InitializerSeq - >; - - template class - TAO::Ret_Object_Argument_T< - CORBA::ValueDef_ptr, - CORBA::ValueDef_var - >; - - template class - TAO::In_Object_Argument_T< - CORBA::ValueDef_ptr - >; - - template class TAO::Ret_Var_Size_Argument_T< CORBA::ValueDefSeq, CORBA::ValueDefSeq_var >; - template class - TAO::In_Var_Size_Argument_T< - CORBA::ValueDefSeq - >; - #if !defined (_CORBA_VALUEDEF_FULLVALUEDESCRIPTION__ARG_TRAITS_TMPLINST_CS_) #define _CORBA_VALUEDEF_FULLVALUEDESCRIPTION__ARG_TRAITS_TMPLINST_CS_ @@ -7795,20 +7756,6 @@ CORBA::Boolean operator>> ( CORBA::ValueMemberSeq >; -#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_) -#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_ - - template class TAO::Arg_Traits<CORBA::InitializerSeq>; - - template class - TAO::Var_Size_Arg_Traits_T< - CORBA::InitializerSeq, - CORBA::InitializerSeq_var, - CORBA::InitializerSeq_out - >; - -#endif /* end #if !defined */ - template class TAO_Var_Var_T< CORBA::ValueDef::FullValueDescription @@ -7843,12 +7790,6 @@ CORBA::Boolean operator>> ( >; template class - TAO::Ret_Object_Argument_T< - CORBA::OperationDef_ptr, - CORBA::OperationDef_var - >; - - template class TAO::Objref_Traits< CORBA::ValueDef >; @@ -7873,20 +7814,6 @@ CORBA::Boolean operator>> ( CORBA::ValueDef >; -#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_) -#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_ - - template class TAO::Arg_Traits<CORBA::ValueDefSeq>; - - template class - TAO::Var_Size_Arg_Traits_T< - CORBA::ValueDefSeq, - CORBA::ValueDefSeq_var, - CORBA::ValueDefSeq_out - >; - -#endif /* end #if !defined */ - template class TAO::Objref_Traits< CORBA::ValueBoxDef @@ -8096,39 +8023,6 @@ CORBA::Boolean operator>> ( #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#if !defined (_CORBA_VALUEDEF__ARG_TRAITS_TMPLINST_CS_) -#define _CORBA_VALUEDEF__ARG_TRAITS_TMPLINST_CS_ - -# pragma instantiate \ - TAO::Arg_Traits< \ - CORBA::ValueDef \ - > - -# pragma instantiate \ - TAO::Object_Arg_Traits_T< \ - CORBA::ValueDef_ptr, \ - CORBA::ValueDef_var, \ - CORBA::ValueDef_out, \ - TAO::Objref_Traits<CORBA::ValueDef> \ - > - -#endif /* end #if !defined */ - -# pragma instantiate \ - TAO::In_Var_Size_Argument_T< \ - CORBA::InitializerSeq \ - > - -# pragma instantiate \ - TAO::In_Object_Argument_T< \ - CORBA::ValueDef_ptr \ - > - -# pragma instantiate \ - TAO::In_Var_Size_Argument_T< \ - CORBA::ValueDefSeq \ - > - #if !defined (_CORBA_VALUEDEF_FULLVALUEDESCRIPTION__ARG_TRAITS_TMPLINST_CS_) #define _CORBA_VALUEDEF_FULLVALUEDESCRIPTION__ARG_TRAITS_TMPLINST_CS_ @@ -8177,20 +8071,6 @@ CORBA::Boolean operator>> ( CORBA::ValueMemberSeq \ > -#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_) -#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_ - -# pragma instantiate TAO::Arg_Traits<CORBA::InitializerSeq> - -# pragma instantiate \ - TAO::Var_Size_Arg_Traits_T< \ - CORBA::InitializerSeq, \ - CORBA::InitializerSeq_var, \ - CORBA::InitializerSeq_out \ - > - -#endif /* end #if !defined */ - # pragma instantiate \ TAO_Var_Var_T< \ CORBA::ValueDef::FullValueDescription \ @@ -8237,20 +8117,6 @@ CORBA::Boolean operator>> ( CORBA::ValueDef \ > -#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_) -#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_ - -# pragma instantiate TAO::Arg_Traits<CORBA::ValueDefSeq> - -# pragma instantiate \ - TAO::Var_Size_Arg_Traits_T< \ - CORBA::ValueDefSeq, \ - CORBA::ValueDefSeq_var, \ - CORBA::ValueDefSeq_out \ - > - -#endif /* end #if !defined */ - # pragma instantiate \ TAO::Objref_Traits< \ CORBA::ValueBoxDef \ |