From 0a0ac45745ce93b042a0cffebebb5fc761bb9013 Mon Sep 17 00:00:00 2001 From: venkita Date: Fri, 29 Aug 2003 13:30:16 +0000 Subject: ChangeLogTag: Fri Aug 29 08:27:58 2003 Venkita Subramonian --- ChangeLog | 9 ++++++ Kokyu/Dispatcher_Task.cpp | 7 ++--- Kokyu/Kokyu_defs.cpp | 10 ++----- Kokyu/tests/DSRT_MIF/MIF.cpp | 68 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 83 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 01ff9c02593..3a31b469598 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Fri Aug 29 08:27:58 2003 Venkita Subramonian + + * Kokyu/Dispatcher_Task.cpp: + * Kokyu/Kokyu_defs.cpp: + * Kokyu/tests/DSRT_MIF/MIF.cpp: Added explicit template + instantiations to fix compile errors in + Solaris_9_Forte7_ACE_(MPC) build. Thanks to Don Hinton for + pointing this out. + Thu Aug 28 22:29:03 2003 Ossama Othman From Don Hinton diff --git a/Kokyu/Dispatcher_Task.cpp b/Kokyu/Dispatcher_Task.cpp index 3897c2e7941..19ae12a3fa8 100644 --- a/Kokyu/Dispatcher_Task.cpp +++ b/Kokyu/Dispatcher_Task.cpp @@ -74,7 +74,7 @@ Dispatcher_Task::svc (void) } ACE_DEBUG ((LM_DEBUG, "(%t) Dispatcher Thread started prio=%d\n", prio)); - + while (!done) { ACE_Message_Block *mb; @@ -169,9 +169,8 @@ void Dispatch_Queue_Item::init_i (const QoSDescriptor& qos_info) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Locked_Data_Block >; - +template class ACE_Lock_Adapter; #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - #pragma instantiate ACE_Locked_Data_Block > - +#pragma instantiate ACE_Lock_Adapter #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/Kokyu/Kokyu_defs.cpp b/Kokyu/Kokyu_defs.cpp index febd8da38bf..f9afca619b8 100644 --- a/Kokyu/Kokyu_defs.cpp +++ b/Kokyu/Kokyu_defs.cpp @@ -21,15 +21,11 @@ namespace Kokyu } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -#if (! defined (__GNUC__)) || (__GNUC__ > 2) || \ -(__GNUC__ == 2 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 8) template class ACE_Array; template class ACE_Array_Base; -# endif /* __GNUC__ */ +template class ACE_Array_Iterator; #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#if (! defined (__GNUC__)) || (__GNUC__ > 2) || \ -(__GNUC__ == 2 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 8) #pragma instantiate ACE_Array -#pragma instantiate ACE_Array_Base; -# endif /* __GNUC__ */ +#pragma instantiate ACE_Array_Base +#pragma instantiate ACE_Array_Iterator #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/Kokyu/tests/DSRT_MIF/MIF.cpp b/Kokyu/tests/DSRT_MIF/MIF.cpp index 586cf505cbd..4e1b14b9665 100644 --- a/Kokyu/tests/DSRT_MIF/MIF.cpp +++ b/Kokyu/tests/DSRT_MIF/MIF.cpp @@ -156,3 +156,71 @@ int main (int,char**) return 0; } + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) +template class Kokyu::DSRT_Dispatcher_Factory; +template class Kokyu::DSRT_Dispatcher; +template class Kokyu::DSRT_Dispatcher_Impl; +template class Kokyu::DSRT_Direct_Dispatcher_Impl; +template class ACE_Lock_Adapter; +template class Kokyu::DSRT_Dispatch_Item_var; +template class Kokyu::Comparator_Adapter_Generator; +template class Kokyu::Sched_Ready_Queue::MoreEligible, ACE_Null_Mutex>; + +template class ACE_Hash_Map_Manager_Ex, Kokyu::DSRT_Dispatch_Item_var > *, Kokyu::Sched_Ready_Queue::MoreEligible, ACE_Null_Mutex>::Guid_Hash, ACE_Equal_To, ACE_Null_Mutex>; + +template class ACE_RB_Tree, Kokyu::DSRT_Dispatch_Item_var, Kokyu::Comparator_Adapter_Generator::MoreEligible, ACE_Null_Mutex>; + +template class ACE_RB_Tree_Iterator, Kokyu::DSRT_Dispatch_Item_var, Kokyu::Comparator_Adapter_Generator::MoreEligible, ACE_Null_Mutex>; + +template class ACE_Hash_Map_Entry, Kokyu::DSRT_Dispatch_Item_var > *>; + +template class ACE_RB_Tree_Node, Kokyu::DSRT_Dispatch_Item_var >; + +template class Kokyu::MIF_Comparator; + +template class ACE_Hash_Map_Iterator_Base_Ex, Kokyu::DSRT_Dispatch_Item_var > *, Kokyu::Sched_Ready_Queue::MoreEligible, ACE_Null_Mutex>::Guid_Hash, ACE_Equal_To, ACE_Null_Mutex>; + +template class ACE_RB_Tree_Reverse_Iterator, Kokyu::DSRT_Dispatch_Item_var, Kokyu::Comparator_Adapter_Generator::MoreEligible, ACE_Null_Mutex>; + +template class ACE_RB_Tree_Iterator_Base, Kokyu::DSRT_Dispatch_Item_var, Kokyu::Comparator_Adapter_Generator::MoreEligible, ACE_Null_Mutex>; + +template class ACE_Array_Iterator; + +#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +#pragma instantiate Kokyu::DSRT_Dispatcher_Factory +#pragma instantiate Kokyu::DSRT_Dispatcher +#pragma instantiate Kokyu::DSRT_Dispatcher_Impl +#pragma instantiate Kokyu::DSRT_Direct_Dispatcher_Impl +#pragma instantiate Kokyu::DSRT_Dispatch_Item_var +#pragma instantiate Kokyu::Comparator_Adapter_Generator + +#pragma instantiate Kokyu::Sched_Ready_Queue::MoreEligible, ACE_Null_Mutex> + +#pragma instantiate ACE_Lock_Adapter + +#pragma instantiate ACE_Hash_Map_Manager_Ex, Kokyu::DSRT_Dispatch_Item_var > *, Kokyu::Sched_Ready_Queue::MoreEligible, ACE_Null_Mutex>::Guid_Hash, ACE_Equal_To, ACE_Null_Mutex> + +#pragma instantiate ACE_RB_Tree, Kokyu::DSRT_Dispatch_Item_var, Kokyu::Comparator_Adapter_Generator::MoreEligible, ACE_Null_Mutex> + +#pragma instantiate ACE_RB_Tree_Iterator, Kokyu::DSRT_Dispatch_Item_var, Kokyu::Comparator_Adapter_Generator::MoreEligible, ACE_Null_Mutex> + +ACE_Hash_Map_Entry, Kokyu::DSRT_Dispatch_Item_var<\ +mif_scheduler_traits> > + +#pragma instantiate ACE_Hash_Map_Entry, Kokyu::DSRT_Dispatch_Item_var > *> + +#pragma instantiate ACE_RB_Tree_Node, Kokyu::DSRT_Dispatch_Item_var > + +#pragma instantiate Kokyu::MIF_Comparator + +#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex, Kokyu::DSRT_Dispatch_Item_var > *, Kokyu::Sched_Ready_Queue::MoreEligible, ACE_Null_Mutex>::Guid_Hash, ACE_Equal_To, ACE_Null_Mutex> + +#pragma instantiate ACE_RB_Tree_Reverse_Iterator, Kokyu::DSRT_Dispatch_Item_var, Kokyu::Comparator_Adapter_Generator::MoreEligible, ACE_Null_Mutex> + +#pragma instantiate ACE_RB_Tree_Iterator_Base, Kokyu::DSRT_Dispatch_Item_var, Kokyu::Comparator_Adapter_Generator::MoreEligible, ACE_Null_Mutex> + +#pragma instantiate ACE_Array_Iterator + +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -- cgit v1.2.1