diff options
70 files changed, 104 insertions, 1104 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 99afcdd2b2a..aaa34a6cc27 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,76 @@ +Mon Oct 3 19:26:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> + + * docs/tutorials/Quoter/Event_Service/Stock_i.cpp + * docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp + * examples/Callback_Quoter/Notifier_i.cpp + * examples/Event_Comm/Event_Comm_i.cpp + * examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp + * examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp + * examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp + * examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp + * examples/Kokyu_dsrt_schedulers/Task_Stats.cpp + * examples/Kokyu_dsrt_schedulers/utils.cpp + * examples/Load_Balancing/Load_Balancer_i.cpp + * examples/Load_Balancing_persistent/Load_Balancer_i.cpp + * examples/Logging/Logger_i.cpp + * examples/OBV/Typed_Events/Client_i.cpp + * examples/OBV/Typed_Events/server.cpp + * examples/POA/On_Demand_Loading/Servant_Manager.cpp + * examples/Persistent_Grid/Grid_Client_i.cpp + * examples/Persistent_Grid/Persistent_Client_i.cpp + * examples/Persistent_Grid/server.cpp + * examples/PluggableUDP/tests/Basic/UDP_i.cpp + * examples/PluggableUDP/tests/Performance/UDP_i.cpp + * examples/RTScheduling/Starter.cpp + * examples/Simple/bank/AccountManager_i.cpp + * examples/Simple/bank/Bank_Client_i.cpp + * examples/Simple/bank/server.cpp + * examples/Simple/chat/Broadcaster_i.cpp + * examples/Simple/echo/Echo_Client_i.cpp + * examples/Simple/echo/server.cpp + * examples/Simple/grid/Grid_Client_i.cpp + * examples/Simple/grid/server.cpp + * examples/Simple/time/Time_Client_i.cpp + * examples/Simple/time/server.cpp + * examples/Simple/time-date/Time_Date.cpp + * examples/Simple/time-date/Time_Date_Client_i.cpp + * examples/Simulator/Event_Supplier/DualEC_Sup.cpp + * examples/Simulator/Event_Supplier/Event_Sup.cpp + * examples/Simulator/Event_Supplier/Logging_Sup.cpp + * orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp + * orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp + * orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp + * orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp + * orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp + * orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp + * orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp + * orbsvcs/examples/CosEC/Simple/Consumer.cpp + * orbsvcs/examples/CosEC/Simple/Service.cpp + * orbsvcs/examples/CosEC/Simple/Supplier.cpp + * orbsvcs/examples/Log/Event/Event_Consumer.cpp + * orbsvcs/examples/Log/Event/Event_Supplier.cpp + * orbsvcs/examples/Log/Notify/Notify_Consumer.cpp + * orbsvcs/examples/Log/Notify/Notify_Supplier.cpp + * orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp + * orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp + * orbsvcs/examples/Notify/Filter/Filter.cpp + * orbsvcs/examples/Notify/Subscribe/Subscribe.cpp + * orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp + * orbsvcs/examples/RtEC/IIOPGateway/EC.cpp + * orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp + * orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp + * orbsvcs/examples/RtEC/Kokyu/Consumer.cpp + * orbsvcs/examples/RtEC/Kokyu/Service.cpp + * orbsvcs/examples/RtEC/Kokyu/Supplier.cpp + * orbsvcs/examples/RtEC/MCast/Consumer.cpp + * orbsvcs/examples/RtEC/MCast/MCast.cpp + * orbsvcs/examples/RtEC/MCast/Supplier.cpp + * orbsvcs/examples/RtEC/Schedule/Service.cpp + * orbsvcs/examples/RtEC/Simple/Consumer.cpp + * orbsvcs/examples/RtEC/Simple/Service.cpp + * orbsvcs/examples/RtEC/Simple/Supplier.cpp + Zapped explicit templates + Mon Oct 3 18:29:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.cpp b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.cpp index b4cb4937eae..37126ff41f2 100644 --- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.cpp +++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.cpp @@ -64,12 +64,3 @@ Quoter_Stock_i::connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin) this->consumer_proxy_->connect_push_supplier (supplier.in ()); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class POA_CosEventComm::PushSupplier_tie<Quoter_Stock_i>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate POA_CosEventComm::PushSupplier_tie<Quoter_Stock_i> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp index ea37a47f82b..a042bbcb1ac 100644 --- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp +++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp @@ -123,12 +123,3 @@ Quoter_Stock_i::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin publications.get_SupplierQOS ()); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class POA_RtecEventComm::PushSupplier_tie<Quoter_Stock_i>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate POA_RtecEventComm::PushSupplier_tie<Quoter_Stock_i> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/examples/Callback_Quoter/Notifier_i.cpp b/TAO/examples/Callback_Quoter/Notifier_i.cpp index 73583bc8a71..995338205c4 100644 --- a/TAO/examples/Callback_Quoter/Notifier_i.cpp +++ b/TAO/examples/Callback_Quoter/Notifier_i.cpp @@ -233,34 +233,3 @@ Notifier_i::Consumer_Data::operator== (const Consumer_Data &rhs) return this->consumer_->_is_equivalent (rhs.consumer_.in ()); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Node<Notifier_i::Consumer_Data>; -template class ACE_Unbounded_Set<Notifier_i::Consumer_Data>; -template class ACE_Unbounded_Set_Iterator<Notifier_i::Consumer_Data>; - -template class ACE_Hash_Map_Entry<ACE_CString,ACE_Unbounded_Set<Notifier_i::Consumer_Data>*>; -template class ACE_Hash_Map_Manager<ACE_CString,ACE_Unbounded_Set<Notifier_i::Consumer_Data>*,ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<ACE_CString, ACE_Unbounded_Set<Notifier_i::Consumer_Data>*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, ACE_Unbounded_Set<Notifier_i::Consumer_Data>*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator<ACE_CString,ACE_Unbounded_Set<Notifier_i::Consumer_Data>*,ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<ACE_CString, ACE_Unbounded_Set<Notifier_i::Consumer_Data>*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator<ACE_CString,ACE_Unbounded_Set<Notifier_i::Consumer_Data>*,ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, ACE_Unbounded_Set<Notifier_i::Consumer_Data>*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Node<Notifier_i::Consumer_Data> -#pragma instantiate ACE_Unbounded_Set<Notifier_i::Consumer_Data> -#pragma instantiate ACE_Unbounded_Set_Iterator<Notifier_i::Consumer_Data> - -#pragma instantiate ACE_Hash_Map_Entry<ACE_CString,ACE_Unbounded_Set<Notifier_i::Consumer_Data>*> -#pragma instantiate ACE_Hash_Map_Manager<ACE_CString,ACE_Unbounded_Set<Notifier_i::Consumer_Data>*,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, ACE_Unbounded_Set<Notifier_i::Consumer_Data>*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, ACE_Unbounded_Set<Notifier_i::Consumer_Data>*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator<ACE_CString,ACE_Unbounded_Set<Notifier_i::Consumer_Data>*,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, ACE_Unbounded_Set<Notifier_i::Consumer_Data>*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_CString,ACE_Unbounded_Set<Notifier_i::Consumer_Data>*,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, ACE_Unbounded_Set<Notifier_i::Consumer_Data>*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/examples/Event_Comm/Event_Comm_i.cpp b/TAO/examples/Event_Comm/Event_Comm_i.cpp index 5868322b8ba..9a2ce82b193 100644 --- a/TAO/examples/Event_Comm/Event_Comm_i.cpp +++ b/TAO/examples/Event_Comm/Event_Comm_i.cpp @@ -450,24 +450,3 @@ Consumer_i::set (ShutdownCallback *_shutdown) shutdown = _shutdown; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Map_Manager<Event_Comm::Consumer *, - Consumer_Entry *, ACE_Null_Mutex>; -template class ACE_Map_Iterator<Event_Comm::Consumer *, Consumer_Entry *, - ACE_Null_Mutex>; -template class ACE_Map_Entry<Event_Comm::Consumer *, Consumer_Entry *>; -template class ACE_Map_Reverse_Iterator<Event_Comm::Consumer *, - Consumer_Entry *, ACE_Null_Mutex>; -template class ACE_Map_Iterator_Base<Event_Comm::Consumer *, - Consumer_Entry *, ACE_Null_Mutex>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Map_Manager<Event_Comm::Consumer *, Consumer_Entry *, ACE_Null_Mutex> -#pragma instantiate ACE_Map_Iterator<Event_Comm::Consumer *, Consumer_Entry *, ACE_Null_Mutex> -#pragma instantiate ACE_Map_Entry<Event_Comm::Consumer *, Consumer_Entry *> -#pragma instantiate ACE_Map_Reverse_Iterator<Event_Comm::Consumer *, Consumer_Entry *, ACE_Null_Mutex> -#pragma instantiate ACE_Map_Iterator_Base<Event_Comm::Consumer *, Consumer_Entry *, ACE_Null_Mutex> - -#endif /* ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA */ diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp index 94855d88c07..eeb9a9846c4 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp @@ -795,66 +795,3 @@ EDF_Scheduler::set_scheduling_parameter (PortableServer::Servant &, ACE_THROW (CORBA::NO_IMPLEMENT ()); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class Kokyu::DSRT_Dispatcher_Factory<EDF_Scheduler_Traits>; -template class Kokyu::DSRT_Dispatcher<EDF_Scheduler_Traits>; -template class Kokyu::DSRT_Dispatcher_Impl<EDF_Scheduler_Traits>; -template class Kokyu::DSRT_Direct_Dispatcher_Impl<EDF_Scheduler_Traits>; -template class Kokyu::DSRT_CV_Dispatcher_Impl<EDF_Scheduler_Traits>; -template class Kokyu::DSRT_Dispatch_Item_var<EDF_Scheduler_Traits>; -template class Kokyu::Comparator_Adapter_Generator<EDF_Scheduler_Traits>; -template class Kokyu::Sched_Ready_Queue<EDF_Scheduler_Traits, Kokyu::Comparator_Adapter_Generator<EDF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex>; - -template class ACE_Hash_Map_Manager_Ex<EDF_Scheduler_Traits::Guid_t, ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<EDF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<EDF_Scheduler_Traits> > *, Kokyu::Sched_Ready_Queue<EDF_Scheduler_Traits, Kokyu::Comparator_Adapter_Generator<EDF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex>::Guid_Hash, ACE_Equal_To<EDF_Scheduler_Traits::Guid_t>, ACE_Null_Mutex>; - -template class ACE_RB_Tree<Kokyu::DSRT_Dispatch_Item_var<EDF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<EDF_Scheduler_Traits>, Kokyu::Comparator_Adapter_Generator<EDF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex>; - -template class ACE_RB_Tree_Iterator<Kokyu::DSRT_Dispatch_Item_var<EDF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<EDF_Scheduler_Traits>, Kokyu::Comparator_Adapter_Generator<EDF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex>; - -template class ACE_Hash_Map_Entry<EDF_Scheduler_Traits::Guid_t, ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<EDF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<EDF_Scheduler_Traits> > *>; - -template class ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<EDF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<EDF_Scheduler_Traits> >; - -template class Kokyu::EDF_Comparator<EDF_Scheduler_Traits::QoSDescriptor_t>; - -template class ACE_Hash_Map_Iterator_Base_Ex<EDF_Scheduler_Traits::Guid_t, ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<EDF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<EDF_Scheduler_Traits> > *, Kokyu::Sched_Ready_Queue<EDF_Scheduler_Traits, Kokyu::Comparator_Adapter_Generator<EDF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex>::Guid_Hash, ACE_Equal_To<EDF_Scheduler_Traits::Guid_t>, ACE_Null_Mutex>; - -template class ACE_RB_Tree_Reverse_Iterator<Kokyu::DSRT_Dispatch_Item_var<EDF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<EDF_Scheduler_Traits>, Kokyu::Comparator_Adapter_Generator<EDF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex>; - -template class ACE_RB_Tree_Iterator_Base<Kokyu::DSRT_Dispatch_Item_var<EDF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<EDF_Scheduler_Traits>, Kokyu::Comparator_Adapter_Generator<EDF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex>; - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate Kokyu::DSRT_Dispatcher_Factory<EDF_Scheduler_Traits> -#pragma instantiate Kokyu::DSRT_Dispatcher<EDF_Scheduler_Traits> -#pragma instantiate Kokyu::DSRT_Dispatcher_Impl<EDF_Scheduler_Traits> -#pragma instantiate Kokyu::DSRT_Direct_Dispatcher_Impl<EDF_Scheduler_Traits> -#pragma instantiate Kokyu::DSRT_CV_Dispatcher_Impl<EDF_Scheduler_Traits> -#pragma instantiate Kokyu::DSRT_Dispatch_Item_var<EDF_Scheduler_Traits> -#pragma instantiate Kokyu::Comparator_Adapter_Generator<EDF_Scheduler_Traits> - -#pragma instantiate Kokyu::Sched_Ready_Queue<EDF_Scheduler_Traits, Kokyu::Comparator_Adapter_Generator<EDF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex> - - -#pragma instantiate ACE_Hash_Map_Manager_Ex<EDF_Scheduler_Traits::Guid_t, ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<EDF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<EDF_Scheduler_Traits> > *, Kokyu::Sched_Ready_Queue<EDF_Scheduler_Traits, Kokyu::Comparator_Adapter_Generator<EDF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex>::Guid_Hash, ACE_Equal_To<EDF_Scheduler_Traits::Guid_t>, ACE_Null_Mutex> - -#pragma instantiate ACE_RB_Tree<Kokyu::DSRT_Dispatch_Item_var<EDF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<EDF_Scheduler_Traits>, Kokyu::Comparator_Adapter_Generator<EDF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex> - -#pragma instantiate ACE_RB_Tree_Iterator<Kokyu::DSRT_Dispatch_Item_var<EDF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<EDF_Scheduler_Traits>, Kokyu::Comparator_Adapter_Generator<EDF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex> - -ACE_Hash_Map_Entry<EDF_Scheduler_Traits::Guid_t, ACE_RB_Tree_Node<Koky\ -u::DSRT_Dispatch_Item_var<EDF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<\ -EDF_Scheduler_Traits> > - -#pragma instantiate ACE_Hash_Map_Entry<EDF_Scheduler_Traits::Guid_t, ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<EDF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<EDF_Scheduler_Traits> > *> - -#pragma instantiate ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<EDF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<EDF_Scheduler_Traits> > - -#pragma instantiate Kokyu::EDF_Comparator<EDF_Scheduler_Traits::QoSDescriptor_t> - -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<EDF_Scheduler_Traits::Guid_t, ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<EDF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<EDF_Scheduler_Traits> > *, Kokyu::Sched_Ready_Queue<EDF_Scheduler_Traits, Kokyu::Comparator_Adapter_Generator<EDF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex>::Guid_Hash, ACE_Equal_To<EDF_Scheduler_Traits::Guid_t>, ACE_Null_Mutex> - -#pragma instantiate ACE_RB_Tree_Reverse_Iterator<Kokyu::DSRT_Dispatch_Item_var<EDF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<EDF_Scheduler_Traits>, Kokyu::Comparator_Adapter_Generator<EDF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex> - -#pragma instantiate ACE_RB_Tree_Iterator_Base<Kokyu::DSRT_Dispatch_Item_var<EDF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<EDF_Scheduler_Traits>, Kokyu::Comparator_Adapter_Generator<EDF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp index 2768bc90151..c4c81385ac1 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp @@ -690,65 +690,3 @@ Fixed_Priority_Scheduler::set_scheduling_parameter (PortableServer::Servant &, ACE_THROW (CORBA::NO_IMPLEMENT ()); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class Kokyu::DSRT_Dispatcher_Factory<FP_Scheduler_Traits>; -template class Kokyu::DSRT_Dispatcher<FP_Scheduler_Traits>; -template class Kokyu::DSRT_Dispatcher_Impl<FP_Scheduler_Traits>; -template class Kokyu::DSRT_Direct_Dispatcher_Impl<FP_Scheduler_Traits>; -template class Kokyu::DSRT_CV_Dispatcher_Impl<FP_Scheduler_Traits>; -template class Kokyu::DSRT_Dispatch_Item_var<FP_Scheduler_Traits>; -template class Kokyu::Comparator_Adapter_Generator<FP_Scheduler_Traits>; -template class Kokyu::Sched_Ready_Queue<FP_Scheduler_Traits, Kokyu::Comparator_Adapter_Generator<FP_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex>; - -template class ACE_Hash_Map_Manager_Ex<FP_Scheduler_Traits::Guid_t, ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<FP_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<FP_Scheduler_Traits> > *, Kokyu::Sched_Ready_Queue<FP_Scheduler_Traits, Kokyu::Comparator_Adapter_Generator<FP_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex>::Guid_Hash, ACE_Equal_To<FP_Scheduler_Traits::Guid_t>, ACE_Null_Mutex>; - -template class ACE_RB_Tree<Kokyu::DSRT_Dispatch_Item_var<FP_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<FP_Scheduler_Traits>, Kokyu::Comparator_Adapter_Generator<FP_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex>; - -template class ACE_RB_Tree_Iterator<Kokyu::DSRT_Dispatch_Item_var<FP_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<FP_Scheduler_Traits>, Kokyu::Comparator_Adapter_Generator<FP_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex>; - -template class ACE_Hash_Map_Entry<FP_Scheduler_Traits::Guid_t, ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<FP_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<FP_Scheduler_Traits> > *>; - -template class ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<FP_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<FP_Scheduler_Traits> >; - -template class Kokyu::Fixed_Priority_Comparator<FP_Scheduler_Traits::QoSDescriptor_t>; - -template class ACE_Hash_Map_Iterator_Base_Ex<FP_Scheduler_Traits::Guid_t, ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<FP_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<FP_Scheduler_Traits> > *, Kokyu::Sched_Ready_Queue<FP_Scheduler_Traits, Kokyu::Comparator_Adapter_Generator<FP_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex>::Guid_Hash, ACE_Equal_To<FP_Scheduler_Traits::Guid_t>, ACE_Null_Mutex>; - -template class ACE_RB_Tree_Reverse_Iterator<Kokyu::DSRT_Dispatch_Item_var<FP_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<FP_Scheduler_Traits>, Kokyu::Comparator_Adapter_Generator<FP_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex>; - -template class ACE_RB_Tree_Iterator_Base<Kokyu::DSRT_Dispatch_Item_var<FP_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<FP_Scheduler_Traits>, Kokyu::Comparator_Adapter_Generator<FP_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex>; - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate Kokyu::DSRT_Dispatcher_Factory<FP_Scheduler_Traits> -#pragma instantiate Kokyu::DSRT_Dispatcher<FP_Scheduler_Traits> -#pragma instantiate Kokyu::DSRT_Dispatcher_Impl<FP_Scheduler_Traits> -#pragma instantiate Kokyu::DSRT_Direct_Dispatcher_Impl<FP_Scheduler_Traits> -#pragma instantiate Kokyu::DSRT_CV_Dispatcher_Impl<FP_Scheduler_Traits> -#pragma instantiate Kokyu::DSRT_Dispatch_Item_var<FP_Scheduler_Traits> -#pragma instantiate Kokyu::Comparator_Adapter_Generator<FP_Scheduler_Traits> - -#pragma instantiate Kokyu::Sched_Ready_Queue<FP_Scheduler_Traits, Kokyu::Comparator_Adapter_Generator<FP_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex> - -#pragma instantiate ACE_Hash_Map_Manager_Ex<FP_Scheduler_Traits::Guid_t, ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<FP_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<FP_Scheduler_Traits> > *, Kokyu::Sched_Ready_Queue<FP_Scheduler_Traits, Kokyu::Comparator_Adapter_Generator<FP_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex>::Guid_Hash, ACE_Equal_To<FP_Scheduler_Traits::Guid_t>, ACE_Null_Mutex> - -#pragma instantiate ACE_RB_Tree<Kokyu::DSRT_Dispatch_Item_var<FP_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<FP_Scheduler_Traits>, Kokyu::Comparator_Adapter_Generator<FP_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex> - -#pragma instantiate ACE_RB_Tree_Iterator<Kokyu::DSRT_Dispatch_Item_var<FP_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<FP_Scheduler_Traits>, Kokyu::Comparator_Adapter_Generator<FP_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex> - -ACE_Hash_Map_Entry<FP_Scheduler_Traits::Guid_t, ACE_RB_Tree_Node<Koky\ -u::DSRT_Dispatch_Item_var<FP_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<\ -FP_Scheduler_Traits> > - -#pragma instantiate ACE_Hash_Map_Entry<FP_Scheduler_Traits::Guid_t, ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<FP_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<FP_Scheduler_Traits> > *> - -#pragma instantiate ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<FP_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<FP_Scheduler_Traits> > - -#pragma instantiate Kokyu::Fixed_Priority_Comparator<FP_Scheduler_Traits::QoSDescriptor_t> - -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<FP_Scheduler_Traits::Guid_t, ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<FP_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<FP_Scheduler_Traits> > *, Kokyu::Sched_Ready_Queue<FP_Scheduler_Traits, Kokyu::Comparator_Adapter_Generator<FP_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex>::Guid_Hash, ACE_Equal_To<FP_Scheduler_Traits::Guid_t>, ACE_Null_Mutex> - -#pragma instantiate ACE_RB_Tree_Reverse_Iterator<Kokyu::DSRT_Dispatch_Item_var<FP_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<FP_Scheduler_Traits>, Kokyu::Comparator_Adapter_Generator<FP_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex> - -#pragma instantiate ACE_RB_Tree_Iterator_Base<Kokyu::DSRT_Dispatch_Item_var<FP_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<FP_Scheduler_Traits>, Kokyu::Comparator_Adapter_Generator<FP_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp index 148cefcbc6f..3bb789fd3da 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp @@ -677,65 +677,3 @@ MIF_Scheduler::set_scheduling_parameter (PortableServer::Servant &, ACE_THROW (CORBA::NO_IMPLEMENT ()); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class Kokyu::DSRT_Dispatcher_Factory<MIF_Scheduler_Traits>; -template class Kokyu::DSRT_Dispatcher<MIF_Scheduler_Traits>; -template class Kokyu::DSRT_Dispatcher_Impl<MIF_Scheduler_Traits>; -template class Kokyu::DSRT_Direct_Dispatcher_Impl<MIF_Scheduler_Traits>; -template class Kokyu::DSRT_CV_Dispatcher_Impl<MIF_Scheduler_Traits>; -template class Kokyu::DSRT_Dispatch_Item_var<MIF_Scheduler_Traits>; -template class Kokyu::Comparator_Adapter_Generator<MIF_Scheduler_Traits>; -template class Kokyu::Sched_Ready_Queue<MIF_Scheduler_Traits, Kokyu::Comparator_Adapter_Generator<MIF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex>; - -template class ACE_Hash_Map_Manager_Ex<MIF_Scheduler_Traits::Guid_t, ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<MIF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<MIF_Scheduler_Traits> > *, Kokyu::Sched_Ready_Queue<MIF_Scheduler_Traits, Kokyu::Comparator_Adapter_Generator<MIF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex>::Guid_Hash, ACE_Equal_To<MIF_Scheduler_Traits::Guid_t>, ACE_Null_Mutex>; - -template class ACE_RB_Tree<Kokyu::DSRT_Dispatch_Item_var<MIF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<MIF_Scheduler_Traits>, Kokyu::Comparator_Adapter_Generator<MIF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex>; - -template class ACE_RB_Tree_Iterator<Kokyu::DSRT_Dispatch_Item_var<MIF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<MIF_Scheduler_Traits>, Kokyu::Comparator_Adapter_Generator<MIF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex>; - -template class ACE_Hash_Map_Entry<MIF_Scheduler_Traits::Guid_t, ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<MIF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<MIF_Scheduler_Traits> > *>; - -template class ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<MIF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<MIF_Scheduler_Traits> >; - -template class Kokyu::MIF_Comparator<MIF_Scheduler_Traits::QoSDescriptor_t>; - -template class ACE_Hash_Map_Iterator_Base_Ex<MIF_Scheduler_Traits::Guid_t, ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<MIF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<MIF_Scheduler_Traits> > *, Kokyu::Sched_Ready_Queue<MIF_Scheduler_Traits, Kokyu::Comparator_Adapter_Generator<MIF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex>::Guid_Hash, ACE_Equal_To<MIF_Scheduler_Traits::Guid_t>, ACE_Null_Mutex>; - -template class ACE_RB_Tree_Reverse_Iterator<Kokyu::DSRT_Dispatch_Item_var<MIF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<MIF_Scheduler_Traits>, Kokyu::Comparator_Adapter_Generator<MIF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex>; - -template class ACE_RB_Tree_Iterator_Base<Kokyu::DSRT_Dispatch_Item_var<MIF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<MIF_Scheduler_Traits>, Kokyu::Comparator_Adapter_Generator<MIF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex>; - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate Kokyu::DSRT_Dispatcher_Factory<MIF_Scheduler_Traits> -#pragma instantiate Kokyu::DSRT_Dispatcher<MIF_Scheduler_Traits> -#pragma instantiate Kokyu::DSRT_Dispatcher_Impl<MIF_Scheduler_Traits> -#pragma instantiate Kokyu::DSRT_Direct_Dispatcher_Impl<MIF_Scheduler_Traits> -#pragma instantiate Kokyu::DSRT_CV_Dispatcher_Impl<MIF_Scheduler_Traits> -#pragma instantiate Kokyu::DSRT_Dispatch_Item_var<MIF_Scheduler_Traits> -#pragma instantiate Kokyu::Comparator_Adapter_Generator<MIF_Scheduler_Traits> - -#pragma instantiate Kokyu::Sched_Ready_Queue<MIF_Scheduler_Traits, Kokyu::Comparator_Adapter_Generator<MIF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex> - -#pragma instantiate ACE_Hash_Map_Manager_Ex<MIF_Scheduler_Traits::Guid_t, ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<MIF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<MIF_Scheduler_Traits> > *, Kokyu::Sched_Ready_Queue<MIF_Scheduler_Traits, Kokyu::Comparator_Adapter_Generator<MIF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex>::Guid_Hash, ACE_Equal_To<MIF_Scheduler_Traits::Guid_t>, ACE_Null_Mutex> - -#pragma instantiate ACE_RB_Tree<Kokyu::DSRT_Dispatch_Item_var<MIF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<MIF_Scheduler_Traits>, Kokyu::Comparator_Adapter_Generator<MIF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex> - -#pragma instantiate ACE_RB_Tree_Iterator<Kokyu::DSRT_Dispatch_Item_var<MIF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<MIF_Scheduler_Traits>, Kokyu::Comparator_Adapter_Generator<MIF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex> - -ACE_Hash_Map_Entry<MIF_Scheduler_Traits::Guid_t, ACE_RB_Tree_Node<Koky\ -u::DSRT_Dispatch_Item_var<MIF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<\ -MIF_Scheduler_Traits> > - -#pragma instantiate ACE_Hash_Map_Entry<MIF_Scheduler_Traits::Guid_t, ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<MIF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<MIF_Scheduler_Traits> > *> - -#pragma instantiate ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<MIF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<MIF_Scheduler_Traits> > - -#pragma instantiate Kokyu::MIF_Comparator<MIF_Scheduler_Traits::QoSDescriptor_t> - -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<MIF_Scheduler_Traits::Guid_t, ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<MIF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<MIF_Scheduler_Traits> > *, Kokyu::Sched_Ready_Queue<MIF_Scheduler_Traits, Kokyu::Comparator_Adapter_Generator<MIF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex>::Guid_Hash, ACE_Equal_To<MIF_Scheduler_Traits::Guid_t>, ACE_Null_Mutex> - -#pragma instantiate ACE_RB_Tree_Reverse_Iterator<Kokyu::DSRT_Dispatch_Item_var<MIF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<MIF_Scheduler_Traits>, Kokyu::Comparator_Adapter_Generator<MIF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex> - -#pragma instantiate ACE_RB_Tree_Iterator_Base<Kokyu::DSRT_Dispatch_Item_var<MIF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<MIF_Scheduler_Traits>, Kokyu::Comparator_Adapter_Generator<MIF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp index 642bb61d6c3..2ee40930b0e 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp @@ -728,66 +728,3 @@ MUF_Scheduler::set_scheduling_parameter (PortableServer::Servant &, ACE_THROW (CORBA::NO_IMPLEMENT ()); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class Kokyu::DSRT_Dispatcher_Factory<MUF_Scheduler_Traits>; -template class Kokyu::DSRT_Dispatcher<MUF_Scheduler_Traits>; -template class Kokyu::DSRT_Dispatcher_Impl<MUF_Scheduler_Traits>; -template class Kokyu::DSRT_Direct_Dispatcher_Impl<MUF_Scheduler_Traits>; -template class Kokyu::DSRT_CV_Dispatcher_Impl<MUF_Scheduler_Traits>; -template class Kokyu::DSRT_Dispatch_Item_var<MUF_Scheduler_Traits>; -template class Kokyu::Comparator_Adapter_Generator<MUF_Scheduler_Traits>; -template class Kokyu::Sched_Ready_Queue<MUF_Scheduler_Traits, Kokyu::Comparator_Adapter_Generator<MUF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex>; - -template class ACE_Hash_Map_Manager_Ex<MUF_Scheduler_Traits::Guid_t, ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<MUF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<MUF_Scheduler_Traits> > *, Kokyu::Sched_Ready_Queue<MUF_Scheduler_Traits, Kokyu::Comparator_Adapter_Generator<MUF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex>::Guid_Hash, ACE_Equal_To<MUF_Scheduler_Traits::Guid_t>, ACE_Null_Mutex>; - -template class ACE_RB_Tree<Kokyu::DSRT_Dispatch_Item_var<MUF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<MUF_Scheduler_Traits>, Kokyu::Comparator_Adapter_Generator<MUF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex>; - -template class ACE_RB_Tree_Iterator<Kokyu::DSRT_Dispatch_Item_var<MUF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<MUF_Scheduler_Traits>, Kokyu::Comparator_Adapter_Generator<MUF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex>; - -template class ACE_Hash_Map_Entry<MUF_Scheduler_Traits::Guid_t, ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<MUF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<MUF_Scheduler_Traits> > *>; - -template class ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<MUF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<MUF_Scheduler_Traits> >; - -template class Kokyu::MUF_Comparator<MUF_Scheduler_Traits::QoSDescriptor_t>; - -template class ACE_Hash_Map_Iterator_Base_Ex<MUF_Scheduler_Traits::Guid_t, ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<MUF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<MUF_Scheduler_Traits> > *, Kokyu::Sched_Ready_Queue<MUF_Scheduler_Traits, Kokyu::Comparator_Adapter_Generator<MUF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex>::Guid_Hash, ACE_Equal_To<MUF_Scheduler_Traits::Guid_t>, ACE_Null_Mutex>; - -template class ACE_RB_Tree_Reverse_Iterator<Kokyu::DSRT_Dispatch_Item_var<MUF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<MUF_Scheduler_Traits>, Kokyu::Comparator_Adapter_Generator<MUF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex>; - -template class ACE_RB_Tree_Iterator_Base<Kokyu::DSRT_Dispatch_Item_var<MUF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<MUF_Scheduler_Traits>, Kokyu::Comparator_Adapter_Generator<MUF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex>; - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate Kokyu::DSRT_Dispatcher_Factory<MUF_Scheduler_Traits> -#pragma instantiate Kokyu::DSRT_Dispatcher<MUF_Scheduler_Traits> -#pragma instantiate Kokyu::DSRT_Dispatcher_Impl<MUF_Scheduler_Traits> -#pragma instantiate Kokyu::DSRT_Direct_Dispatcher_Impl<MUF_Scheduler_Traits> -#pragma instantiate Kokyu::DSRT_CV_Dispatcher_Impl<MUF_Scheduler_Traits> -#pragma instantiate Kokyu::DSRT_Dispatch_Item_var<MUF_Scheduler_Traits> -#pragma instantiate Kokyu::Comparator_Adapter_Generator<MUF_Scheduler_Traits> - -#pragma instantiate Kokyu::Sched_Ready_Queue<MUF_Scheduler_Traits, Kokyu::Comparator_Adapter_Generator<MUF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex> - - -#pragma instantiate ACE_Hash_Map_Manager_Ex<MUF_Scheduler_Traits::Guid_t, ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<MUF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<MUF_Scheduler_Traits> > *, Kokyu::Sched_Ready_Queue<MUF_Scheduler_Traits, Kokyu::Comparator_Adapter_Generator<MUF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex>::Guid_Hash, ACE_Equal_To<MUF_Scheduler_Traits::Guid_t>, ACE_Null_Mutex> - -#pragma instantiate ACE_RB_Tree<Kokyu::DSRT_Dispatch_Item_var<MUF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<MUF_Scheduler_Traits>, Kokyu::Comparator_Adapter_Generator<MUF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex> - -#pragma instantiate ACE_RB_Tree_Iterator<Kokyu::DSRT_Dispatch_Item_var<MUF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<MUF_Scheduler_Traits>, Kokyu::Comparator_Adapter_Generator<MUF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex> - -ACE_Hash_Map_Entry<MUF_Scheduler_Traits::Guid_t, ACE_RB_Tree_Node<Koky\ -u::DSRT_Dispatch_Item_var<MUF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<\ -MUF_Scheduler_Traits> > - -#pragma instantiate ACE_Hash_Map_Entry<MUF_Scheduler_Traits::Guid_t, ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<MUF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<MUF_Scheduler_Traits> > *> - -#pragma instantiate ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<MUF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<MUF_Scheduler_Traits> > - -#pragma instantiate Kokyu::MUF_Comparator<MUF_Scheduler_Traits::QoSDescriptor_t> - -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<MUF_Scheduler_Traits::Guid_t, ACE_RB_Tree_Node<Kokyu::DSRT_Dispatch_Item_var<MUF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<MUF_Scheduler_Traits> > *, Kokyu::Sched_Ready_Queue<MUF_Scheduler_Traits, Kokyu::Comparator_Adapter_Generator<MUF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex>::Guid_Hash, ACE_Equal_To<MUF_Scheduler_Traits::Guid_t>, ACE_Null_Mutex> - -#pragma instantiate ACE_RB_Tree_Reverse_Iterator<Kokyu::DSRT_Dispatch_Item_var<MUF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<MUF_Scheduler_Traits>, Kokyu::Comparator_Adapter_Generator<MUF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex> - -#pragma instantiate ACE_RB_Tree_Iterator_Base<Kokyu::DSRT_Dispatch_Item_var<MUF_Scheduler_Traits>, Kokyu::DSRT_Dispatch_Item_var<MUF_Scheduler_Traits>, Kokyu::Comparator_Adapter_Generator<MUF_Scheduler_Traits>::MoreEligible, ACE_Null_Mutex> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp index d38bb0f652f..d7d06da76fd 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp @@ -81,26 +81,14 @@ Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, for (size_t i = 0; i < this->samples_count_; ++i) { x = this->thr_run_time_[i]; - val_1 = ACE_CU64_TO_CU32 (x); + val_1 = ACE_CU64_TO_CU32 (x); val_2 = this->thr_count_[i]; ACE_OS::fprintf (output_file, "%u \t %d\n",val_1,val_2); } - + ACE_OS::fclose (output_file); ACE_DEBUG ((LM_DEBUG, "Samples are ready to be viewed\n")); } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Singleton<Base_Time, TAO_SYNCH_MUTEX>; -template class ACE_Singleton<Task_Stats, TAO_SYNCH_MUTEX>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Singleton<Base_Time, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Singleton<Task_Stats, TAO_SYNCH_MUTEX> - -#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/examples/Kokyu_dsrt_schedulers/utils.cpp b/TAO/examples/Kokyu_dsrt_schedulers/utils.cpp index 39d2e688d55..d1c32a0c9d6 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/utils.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/utils.cpp @@ -21,10 +21,3 @@ void guid_copy( RTScheduling::Current::IdType& lhs, const Kokyu::GuidType& rhs) rhs.length ()); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Lock_Adapter<ACE_Thread_Mutex>; -template class ACE_Array_Iterator<Kokyu::ConfigInfo>; -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Lock_Adapter<ACE_Thread_Mutex> -#pragma instantiate ACE_Array_Iterator<Kokyu::ConfigInfo> -#endif diff --git a/TAO/examples/Load_Balancing/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing/Load_Balancer_i.cpp index a94b36f36c4..f438dba3874 100644 --- a/TAO/examples/Load_Balancing/Load_Balancer_i.cpp +++ b/TAO/examples/Load_Balancing/Load_Balancer_i.cpp @@ -497,48 +497,3 @@ RR_Object_Group::unbind (const char *id "from <%s> object group\n", id, id_.c_str ())); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, Load_Balancer::Object_Group_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator<ACE_CString, Load_Balancer::Object_Group_var, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<ACE_CString, Load_Balancer::Object_Group_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, Load_Balancer::Object_Group_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, CORBA::Object_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<ACE_CString, Load_Balancer::Object_Group_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager<ACE_CString, Load_Balancer::Object_Group_var, ACE_Null_Mutex>; -template class ACE_Hash_Map_Entry<ACE_CString, Load_Balancer::Object_Group_var>; - -template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, CORBA::Object_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator<ACE_CString, CORBA::Object_var, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<ACE_CString, CORBA::Object_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<ACE_CString, CORBA::Object_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager<ACE_CString, CORBA::Object_var, ACE_Null_Mutex>; -template class ACE_Hash_Map_Entry<ACE_CString, CORBA::Object_var>; - -template class ACE_DLList<ACE_CString>; -template class ACE_DLList_Iterator<ACE_CString>; - -template class ACE_Auto_Basic_Ptr<Object_Group_i>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, Load_Balancer::Object_Group_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator<ACE_CString, Load_Balancer::Object_Group_var, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, Load_Balancer::Object_Group_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString,Load_Balancer::Object_Group_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, CORBA::Object_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, Load_Balancer::Object_Group_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager<ACE_CString, Load_Balancer::Object_Group_var, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Entry<ACE_CString, Load_Balancer::Object_Group_var> - -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, CORBA::Object_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator<ACE_CString, CORBA::Object_var, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, CORBA::Object_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, CORBA::Object_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager<ACE_CString, CORBA::Object_var, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Entry<ACE_CString, CORBA::Object_var> - -#pragma instantiate ACE_DLList<ACE_CString> -#pragma instantiate ACE_DLList_Iterator<ACE_CString> - -#pragma instantiate ACE_Auto_Basic_Ptr<Object_Group_i> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp index 9268e462264..6389a04c776 100755 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp @@ -1011,29 +1011,3 @@ RR_Object_Group::unbind (const char *id this->next_ = next_ % (this->members_->current_size ()); } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Hash_Map_Iterator_Base_Ex<char *, char *, ACE_Hash<char *>, ACE_Equal_To<char *>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<char *, char *, ACE_Hash<char *>, ACE_Equal_To<char *>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Entry<char *, char *>; -template class ACE_Hash_Map_With_Allocator<char *, char *>; -template class ACE_Hash_Map_Manager<char *, char *, ACE_Null_Mutex>; -template class ACE_DLList<char *>; -template class ACE_DLList_Iterator<char*>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<char*,char*,ACE_Hash<char*>,ACE_Equal_To<char*>,ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<char*,char*,ACE_Hash<char*>,ACE_Equal_To<char*>,ACE_Null_Mutex>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<char *, char *, ACE_Hash<char *>, ACE_Equal_To<char *>, ACE_Null_Mutex> -pragma instantiate ACE_Hash_Map_Manager_Ex<char *, char *, ACE_Hash<char *>, ACE_Equal_To<char *>, ACE_Null_Mutex> -pragma instantiate ACE_Hash_Map_Entry<char *, char *> -pragma instantiate ACE_Hash_Map_With_Allocator<char *, char *> -pragma instantiate ACE_Hash_Map_Manager<char *, char *, ACE_Null_Mutex> -pragma instantiate ACE_DLList<char *> -pragma instantiate ACE_DLList_Iterator<char*> -pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<char*,char*,ACE_Hash<char*>,ACE_Equal_To<char*>,ACE_Null_Mutex> -template class ACE_Hash_Map_Iterator_Ex<char*,char*,ACE_Hash<char*>,ACE_Equal_To<char*>,ACE_Null_Mutex> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/examples/Logging/Logger_i.cpp b/TAO/examples/Logging/Logger_i.cpp index 0c9b24e87fe..1e425fbd119 100644 --- a/TAO/examples/Logging/Logger_i.cpp +++ b/TAO/examples/Logging/Logger_i.cpp @@ -193,26 +193,3 @@ Logger_i::verbosity (Logger::Verbosity_Level level this->verbosity_level_ = level; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Hash_Map_Entry<ACE_CString, Logger_i *>; -template class ACE_Hash_Map_Manager<ACE_CString, Logger_i *, ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<ACE_CString, Logger_i *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, Logger_i *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator<ACE_CString, Logger_i *, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<ACE_CString, Logger_i *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator<ACE_CString, Logger_i *, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, Logger_i *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Hash_Map_Entry<ACE_CString, Logger_i *> -#pragma instantiate ACE_Hash_Map_Manager<ACE_CString, Logger_i *, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, Logger_i *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, Logger_i *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator<ACE_CString, Logger_i *, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, Logger_i *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_CString, Logger_i *, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, Logger_i *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/examples/OBV/Typed_Events/Client_i.cpp b/TAO/examples/OBV/Typed_Events/Client_i.cpp index de35eb52028..bbadaefee44 100644 --- a/TAO/examples/OBV/Typed_Events/Client_i.cpp +++ b/TAO/examples/OBV/Typed_Events/Client_i.cpp @@ -119,9 +119,3 @@ CORBA::Float random_number (double min, double max) return static_cast<CORBA::Float> ((min + (range * ACE_OS::rand () / (RAND_MAX + 1.0)))); } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class Client<Checkpoint,Checkpoint_var>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate Client<Checkpoint,Checkpoint_var> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/examples/OBV/Typed_Events/server.cpp b/TAO/examples/OBV/Typed_Events/server.cpp index 935a93de0a9..2a8bb4802ba 100644 --- a/TAO/examples/OBV/Typed_Events/server.cpp +++ b/TAO/examples/OBV/Typed_Events/server.cpp @@ -42,8 +42,3 @@ main (int argc, char *argv[]) return 0; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class Server<Checkpoint_i>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate Server<Checkpoint_i> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp index b62f8507cb8..7f6dfca8f25 100644 --- a/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp +++ b/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp @@ -178,16 +178,3 @@ ServantManager_i::destroy_servant (PortableServer::Servant servant, delete dll; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Hash_Map_Entry<PortableServer::ObjectId, ACE_DLL *>; -template class ACE_Hash_Map_Manager_Ex<PortableServer::ObjectId, ACE_DLL *, TAO_ObjectId_Hash, ACE_Equal_To<PortableServer::ObjectId>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<PortableServer::ObjectId, ACE_DLL *, TAO_ObjectId_Hash, ACE_Equal_To<PortableServer::ObjectId>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<PortableServer::ObjectId, ACE_DLL *, TAO_ObjectId_Hash, ACE_Equal_To<PortableServer::ObjectId>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<PortableServer::ObjectId, ACE_DLL *, TAO_ObjectId_Hash, ACE_Equal_To<PortableServer::ObjectId>, ACE_Null_Mutex>; -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Hash_Map_Entry<PortableServer::ObjectId, ACE_DLL *> -#pragma instantiate ACE_Hash_Map_Manager_Ex<PortableServer::ObjectId, ACE_DLL *, TAO_ObjectId_Hash, ACE_Equal_To<PortableServer::ObjectId>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<PortableServer::ObjectId, ACE_DLL *, TAO_ObjectId_Hash, ACE_Equal_To<PortableServer::ObjectId>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<PortableServer::ObjectId, ACE_DLL *, TAO_ObjectId_Hash, ACE_Equal_To<PortableServer::ObjectId>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<PortableServer::ObjectId, ACE_DLL *, TAO_ObjectId_Hash, ACE_Equal_To<PortableServer::ObjectId>, ACE_Null_Mutex> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/examples/Persistent_Grid/Grid_Client_i.cpp b/TAO/examples/Persistent_Grid/Grid_Client_i.cpp index 2acbc958bdd..ab94a8760c1 100644 --- a/TAO/examples/Persistent_Grid/Grid_Client_i.cpp +++ b/TAO/examples/Persistent_Grid/Grid_Client_i.cpp @@ -126,8 +126,3 @@ Grid_Client_i::run (const char *name, return 0; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class Client<Grid_Factory,Grid_Factory_var>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate Client<Grid_Factory,Grid_Factory_var> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp b/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp index 3eac4a3d7a2..b3b5b0dfd7e 100644 --- a/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp +++ b/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp @@ -114,8 +114,3 @@ Persistent_Client_i::run (const char *name, return 0; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class Client<Grid_Factory,Grid_Factory_var>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate Client<Grid_Factory,Grid_Factory_var> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/examples/Persistent_Grid/server.cpp b/TAO/examples/Persistent_Grid/server.cpp index 4a31cc0403e..99f007eae7f 100644 --- a/TAO/examples/Persistent_Grid/server.cpp +++ b/TAO/examples/Persistent_Grid/server.cpp @@ -43,8 +43,3 @@ main (int argc, char *argv[]) return 0; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class Server<Grid_Factory_i>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate Server<Grid_Factory_i> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/examples/PluggableUDP/tests/Basic/UDP_i.cpp b/TAO/examples/PluggableUDP/tests/Basic/UDP_i.cpp index 2011f010dcc..f1a611b447d 100644 --- a/TAO/examples/PluggableUDP/tests/Basic/UDP_i.cpp +++ b/TAO/examples/PluggableUDP/tests/Basic/UDP_i.cpp @@ -89,20 +89,3 @@ UDP_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) this->orb_->shutdown (); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Hash_Map_Manager_Ex<CORBA::String_var, int, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<CORBA::String_var, int, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<CORBA::String_var, int, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<CORBA::String_var, int, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Entry<CORBA::String_var, int>; - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Hash_Map_Manager_Ex<CORBA::String_var, int, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<CORBA::String_var, int, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<CORBA::String_var, int, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<CORBA::String_var, int, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Entry<CORBA::String_var, int> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp index 025db630473..e7e0180fbd1 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp @@ -165,20 +165,3 @@ UDP_i::getMessagesCount () return tmp; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Hash_Map_Manager_Ex<CORBA::String_var, int, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<CORBA::String_var, int, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<CORBA::String_var, int, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<CORBA::String_var, int, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Entry<CORBA::String_var, int>; - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Hash_Map_Manager_Ex<CORBA::String_var, int, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<CORBA::String_var, int, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<CORBA::String_var, int, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<CORBA::String_var, int, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Entry<CORBA::String_var, int> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/examples/RTScheduling/Starter.cpp b/TAO/examples/RTScheduling/Starter.cpp index 0a6e2511390..3e0b46bca7d 100644 --- a/TAO/examples/RTScheduling/Starter.cpp +++ b/TAO/examples/RTScheduling/Starter.cpp @@ -158,24 +158,3 @@ main (int argc, char** argv) return 0; } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Hash_Map_Entry<ACE_CString, Synch_var>; -template class ACE_Hash_Map_Manager<ACE_CString, Synch_var, ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<ACE_CString, Synch_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, Synch_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<ACE_CString, Synch_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, Synch_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Hash_Map_Entry<ACE_CString, Synch_var> -#pragma instantiate ACE_Hash_Map_Manager<ACE_CString, Synch_var, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, Synch_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, Synch_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, Synch_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, Synch_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> - - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/examples/Simple/bank/AccountManager_i.cpp b/TAO/examples/Simple/bank/AccountManager_i.cpp index 13e605ef568..c6404e5ac28 100644 --- a/TAO/examples/Simple/bank/AccountManager_i.cpp +++ b/TAO/examples/Simple/bank/AccountManager_i.cpp @@ -136,22 +136,3 @@ AccountManager_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) this->orb_->shutdown (); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Hash_Map_Manager<ACE_CString,Account_i *,ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<ACE_CString, Account_i *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator<ACE_CString,Account_i *,ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<ACE_CString, Account_i *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Entry<ACE_CString, Account_i *>; -template class ACE_Hash_Map_Reverse_Iterator<ACE_CString, Account_i *, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, Account_i *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, Account_i *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Hash_Map_Manager<ACE_CString,Account_i *,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, Account_i *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator<ACE_CString,Account_i *,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, Account_i *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Entry<ACE_CString, Account_i *> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_CString, Account_i *, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, Account_i *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, Account_i *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/examples/Simple/bank/Bank_Client_i.cpp b/TAO/examples/Simple/bank/Bank_Client_i.cpp index 4ec01e214d5..a201d196a02 100644 --- a/TAO/examples/Simple/bank/Bank_Client_i.cpp +++ b/TAO/examples/Simple/bank/Bank_Client_i.cpp @@ -150,8 +150,3 @@ Bank_Client_i::test_for_overdraft (ACE_ENV_SINGLE_ARG_DECL) ACE_CHECK; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class Client<Bank::AccountManager,Bank::AccountManager_var>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate Client<Bank,Bank_var> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/examples/Simple/bank/server.cpp b/TAO/examples/Simple/bank/server.cpp index 48c04693ff4..57ded2b1063 100644 --- a/TAO/examples/Simple/bank/server.cpp +++ b/TAO/examples/Simple/bank/server.cpp @@ -41,9 +41,3 @@ main (int argc, char *argv[]) return 0; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class Server<AccountManager_i>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate Server<AccountManager_i> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - diff --git a/TAO/examples/Simple/chat/Broadcaster_i.cpp b/TAO/examples/Simple/chat/Broadcaster_i.cpp index 20c53f09dc2..6aee1874901 100644 --- a/TAO/examples/Simple/chat/Broadcaster_i.cpp +++ b/TAO/examples/Simple/chat/Broadcaster_i.cpp @@ -190,12 +190,3 @@ Broadcaster_i::broadcast (const char *text } } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Unbounded_Set<Broadcaster_i::Receiver_Data>; -template class ACE_Unbounded_Set_Iterator<Broadcaster_i::Receiver_Data>; -template class ACE_Node<Broadcaster_i::Receiver_Data>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Unbounded_Set<Broadcaster_i::Receiver_Data> -#pragma instantiate ACE_Unbounded_Set_Iterator<Broadcaster_i::Receiver_Data> -#pragma instantiate ACE_Node<Broadcaster_i::Receiver_Data> -#endif /* ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA */ diff --git a/TAO/examples/Simple/echo/Echo_Client_i.cpp b/TAO/examples/Simple/echo/Echo_Client_i.cpp index 5ad03333a49..67088738cf4 100644 --- a/TAO/examples/Simple/echo/Echo_Client_i.cpp +++ b/TAO/examples/Simple/echo/Echo_Client_i.cpp @@ -69,9 +69,3 @@ Echo_Client_i::run (const char *name, return 0; } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class Client<Echo,Echo_var>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate Client<Echo,Echo_var> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/examples/Simple/echo/server.cpp b/TAO/examples/Simple/echo/server.cpp index 61fedc66cc8..b74d5bc7af6 100644 --- a/TAO/examples/Simple/echo/server.cpp +++ b/TAO/examples/Simple/echo/server.cpp @@ -43,9 +43,3 @@ main (int argc, char *argv[]) return 0; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class Server<Echo_i>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate Server<Echo_i> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - diff --git a/TAO/examples/Simple/grid/Grid_Client_i.cpp b/TAO/examples/Simple/grid/Grid_Client_i.cpp index 1c00ff70576..d333682c8dd 100644 --- a/TAO/examples/Simple/grid/Grid_Client_i.cpp +++ b/TAO/examples/Simple/grid/Grid_Client_i.cpp @@ -135,8 +135,3 @@ Grid_Client_i::run (const char *name, return 0; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class Client<Grid_Factory,Grid_Factory_var>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate Client<Grid_Factory,Grid_Factory_var> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/examples/Simple/grid/server.cpp b/TAO/examples/Simple/grid/server.cpp index 09ad64e8ef3..6e95c17f2b5 100644 --- a/TAO/examples/Simple/grid/server.cpp +++ b/TAO/examples/Simple/grid/server.cpp @@ -45,9 +45,3 @@ main (int argc, char *argv[]) return 0; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class Server<Grid_Factory_i>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate Server<Grid_Factory_i> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - diff --git a/TAO/examples/Simple/time-date/Time_Date.cpp b/TAO/examples/Simple/time-date/Time_Date.cpp index a701a65f1c6..05e6ceb7159 100644 --- a/TAO/examples/Simple/time-date/Time_Date.cpp +++ b/TAO/examples/Simple/time-date/Time_Date.cpp @@ -227,12 +227,3 @@ Time_Date_Servant::init (int argc, char *argv[]) ACE_SVC_FACTORY_DEFINE (DLL_ORB) ACE_SVC_FACTORY_DEFINE (Time_Date_Servant) -# if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Dynamic_Service<DLL_ORB>; - -# elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Dynamic_Service<DLL_ORB> - -# endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp b/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp index 40bb4c947d8..4d751fcf9fa 100644 --- a/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp +++ b/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp @@ -82,8 +82,3 @@ Time_Date_Client_i::run (const char *name, return 0; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class Client<Time_Date,Time_Date_var>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate Client<Time_Date,Time_Date_var> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/examples/Simple/time/Time_Client_i.cpp b/TAO/examples/Simple/time/Time_Client_i.cpp index 48d0425974b..ace24d63d6e 100644 --- a/TAO/examples/Simple/time/Time_Client_i.cpp +++ b/TAO/examples/Simple/time/Time_Client_i.cpp @@ -72,13 +72,3 @@ Time_Client_i::run (const char *name, return 0; } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class Client<Time,Time_var>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate Client<Time,Time_var> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/examples/Simple/time/server.cpp b/TAO/examples/Simple/time/server.cpp index 5cdd40fbec2..8c3792e16b5 100644 --- a/TAO/examples/Simple/time/server.cpp +++ b/TAO/examples/Simple/time/server.cpp @@ -41,13 +41,3 @@ main (int argc, char *argv[]) return 0; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class Server<Time_i>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate Server<Time_i> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp index a105c63625d..66548bcc92c 100644 --- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp @@ -1144,18 +1144,3 @@ main (int argc, char *argv []) return 0; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Node<Navigation *>; -template class ACE_Unbounded_Queue<Navigation *>; -template class ACE_Unbounded_Queue_Iterator<Navigation *>; -template class ACE_Node<Weapons *>; -template class ACE_Unbounded_Queue<Weapons *>; -template class ACE_Unbounded_Queue_Iterator<Weapons *>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Node<Navigation *> -#pragma instantiate ACE_Unbounded_Queue<Navigation *> -#pragma instantiate ACE_Unbounded_Queue_Iterator<Navigation *> -#pragma instantiate ACE_Node<Weapons *> -#pragma instantiate ACE_Unbounded_Queue<Weapons *> -#pragma instantiate ACE_Unbounded_Queue_Iterator<Weapons *> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp index 834f47ccb98..748cc06b360 100644 --- a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp @@ -484,12 +484,3 @@ main (int argc, char *argv []) return 0; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Node<Schedule_Viewer_Data *>; -template class ACE_Unbounded_Queue<Schedule_Viewer_Data *>; -template class ACE_Unbounded_Queue_Iterator<Schedule_Viewer_Data *>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Node<Schedule_Viewer_Data *> -#pragma instantiate ACE_Unbounded_Queue<Schedule_Viewer_Data *> -#pragma instantiate ACE_Unbounded_Queue_Iterator<Schedule_Viewer_Data *> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp index 02335e137ff..f0d96b78e60 100644 --- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp @@ -530,12 +530,3 @@ main (int argc, char *argv []) return 0; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Node<Schedule_Viewer_Data *>; -template class ACE_Unbounded_Queue<Schedule_Viewer_Data *>; -template class ACE_Unbounded_Queue_Iterator<Schedule_Viewer_Data *>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Node<Schedule_Viewer_Data *> -#pragma instantiate ACE_Unbounded_Queue<Schedule_Viewer_Data *> -#pragma instantiate ACE_Unbounded_Queue_Iterator<Schedule_Viewer_Data *> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp index 60210ad8515..78b17a2bac9 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp @@ -325,15 +325,3 @@ TAO_CosEventChannelFactory_i::find_channel_id return str_return._retn (); } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class auto_ptr <TAO_CEC_EventChannel>; -template class ACE_Auto_Basic_Ptr <TAO_CEC_EventChannel>; - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate auto_ptr <TAO_CEC_EventChannel> -#pragma instantiate ACE_Auto_Basic_Ptr <TAO_CEC_EventChannel> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp index 926686ed6dc..8aa8fcdb042 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp @@ -66,10 +66,3 @@ TAO_CosEC_ConsumerAdmin_i::obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USE return CosEventChannelAdmin::ProxyPullSupplier::_nil (); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class ACE_Auto_Basic_Ptr<TAO_CosEC_ProxyPushSupplier_i>; - template class auto_ptr<TAO_CosEC_ProxyPushSupplier_i>; -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate ACE_Auto_Basic_Ptr<TAO_CosEC_ProxyPushSupplier_i> -# pragma instantiate auto_ptr<TAO_CosEC_ProxyPushSupplier_i> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp index 41da6bcd3b4..543fb669bf8 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp @@ -441,20 +441,3 @@ CosEC_ServantBase::init_ConsumerQOS (RtecBase::handle_t cons_handle, } } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class auto_ptr <POA_RtecEventChannelAdmin::EventChannel>; -template class ACE_Auto_Basic_Ptr <POA_RtecEventChannelAdmin::EventChannel>; - -template class auto_ptr <TAO_CosEC_EventChannel_i>; -template class ACE_Auto_Basic_Ptr <TAO_CosEC_EventChannel_i>; - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate auto_ptr <POA_RtecEventChannelAdmin::EventChannel> -#pragma instantiate ACE_Auto_Basic_Ptr <POA_RtecEventChannelAdmin::EventChannel> - -#pragma instantiate auto_ptr <TAO_CosEC_EventChannel_i> -#pragma instantiate ACE_Auto_Basic_Ptr <TAO_CosEC_EventChannel_i> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp index 3266ded2608..e5dd9fb0348 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp @@ -122,14 +122,3 @@ TAO_CosEC_EventChannel_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class ACE_Auto_Basic_Ptr<TAO_CosEC_ConsumerAdmin_i>; - template class auto_ptr<TAO_CosEC_ConsumerAdmin_i>; - template class ACE_Auto_Basic_Ptr<TAO_CosEC_SupplierAdmin_i>; - template class auto_ptr<TAO_CosEC_SupplierAdmin_i>; -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate ACE_Auto_Basic_Ptr<TAO_CosEC_ConsumerAdmin_i> -# pragma instantiate auto_ptr<TAO_CosEC_ConsumerAdmin_i> -# pragma instantiate ACE_Auto_Basic_Ptr<TAO_CosEC_SupplierAdmin_i> -# pragma instantiate auto_ptr<TAO_CosEC_SupplierAdmin_i> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp index a8a3ae630dc..5870b6c33c7 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp @@ -205,10 +205,3 @@ TAO_CosEC_ProxyPushConsumer_i::connected (void) return this->wrapper_ == 0 ? 0 : 1; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class ACE_Auto_Basic_Ptr<TAO_CosEC_PushSupplierWrapper>; - template class auto_ptr<TAO_CosEC_PushSupplierWrapper>; -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate ACE_Auto_Basic_Ptr<TAO_CosEC_PushSupplierWrapper> -# pragma instantiate auto_ptr<TAO_CosEC_PushSupplierWrapper> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp index 88d88a3d640..866c8a9e1a3 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp @@ -192,10 +192,3 @@ TAO_CosEC_ProxyPushSupplier_i::connected (void) return this->wrapper_ == 0 ? 0 : 1; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class ACE_Auto_Basic_Ptr<TAO_CosEC_PushConsumerWrapper>; - template class auto_ptr<TAO_CosEC_PushConsumerWrapper>; -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate ACE_Auto_Basic_Ptr<TAO_CosEC_PushConsumerWrapper> -# pragma instantiate auto_ptr<TAO_CosEC_PushConsumerWrapper> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp index c0970fa8404..97af59df51a 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp @@ -65,10 +65,3 @@ TAO_CosEC_SupplierAdmin_i::obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USE return CosEventChannelAdmin::ProxyPullConsumer::_nil (); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class ACE_Auto_Basic_Ptr<TAO_CosEC_ProxyPushConsumer_i>; - template class auto_ptr<TAO_CosEC_ProxyPushConsumer_i>; -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate ACE_Auto_Basic_Ptr<TAO_CosEC_ProxyPushConsumer_i> -# pragma instantiate auto_ptr<TAO_CosEC_ProxyPushConsumer_i> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp index 578cebcefd0..bcf4fcfc551 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp @@ -3,8 +3,8 @@ #include "Consumer.h" #include "orbsvcs/CosEventChannelAdminS.h" -ACE_RCSID (CosEC_Examples, - Consumer, +ACE_RCSID (CosEC_Examples, + Consumer, "$Id$") int @@ -128,8 +128,3 @@ Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } -// **************************************************************** - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp index f9fee3e6b0d..07a78aea874 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp @@ -5,8 +5,8 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (CosEC_Simple, - Service, +ACE_RCSID (CosEC_Simple, + Service, "$Id$") const char *ior_output_file = "ec.ior"; @@ -122,8 +122,3 @@ int parse_args (int argc, char *argv[]) return 0; } -// **************************************************************** - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp index 099735ce5f7..3886f6d085a 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp @@ -4,8 +4,8 @@ #include "orbsvcs/CosEventChannelAdminS.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID (CosEC_Examples, - Supplier, +ACE_RCSID (CosEC_Examples, + Supplier, "$Id$") int @@ -127,8 +127,3 @@ Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { } -// **************************************************************** - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp index b8dc8157a18..1b102beac2f 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp +++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp @@ -129,8 +129,3 @@ Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } -// **************************************************************** - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp index 1fee4da0b1a..f65f4a420e9 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp @@ -238,8 +238,3 @@ Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { } -// **************************************************************** - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp index 6c7c5447c96..0d27c8860d3 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp @@ -111,7 +111,7 @@ Consumer::run (int argc, char* argv[]) proxy_supplier_->connect_any_push_consumer (objref.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + orb_->run (); // We don't do any cleanup, it is hard to do it after shutdown, @@ -139,7 +139,7 @@ Consumer::push (const CORBA::Any &event )) { ACE_UNUSED_ARG (event); - + this->event_count_ ++; ACE_DEBUG ((LM_DEBUG, @@ -172,8 +172,3 @@ Consumer::offer_change // No-Op. } -// **************************************************************** - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp index 5a8edb31e03..86fbfd2be3c 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp @@ -360,9 +360,3 @@ Filter_StructuredPushSupplier::disconnect_structured_push_supplier // No-Op. } - -// **************************************************************** - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp index 396b9e8c77e..a9ce5387a62 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp @@ -155,7 +155,7 @@ Consumer::push (const RtecEventComm::EventSet& events ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_UNUSED_ARG (events); - + this->event_count_ ++; ACE_DEBUG ((LM_DEBUG, @@ -173,8 +173,3 @@ Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } -// **************************************************************** - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp index a98457d4f72..1a2de3ca9b9 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp @@ -295,8 +295,3 @@ Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { } -// **************************************************************** - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp index f247121410c..a2aa9dbf434 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp +++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp @@ -505,12 +505,3 @@ Filter_StructuredPushSupplier::disconnect_structured_push_supplier // No-Op. } -/*****************************************************************/ - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - - -#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp index 76466d5880b..a7a0e96183f 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp @@ -469,12 +469,3 @@ Subscribe_StructuredPushSupplier::disconnect_structured_push_supplier // No-Op. } -/*****************************************************************/ - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - - -#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp index 17ae07e376a..05b214aabbc 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp @@ -8,8 +8,8 @@ #include "ace/Arg_Shifter.h" #include "ace/OS_NS_string.h" -ACE_RCSID (EC_Examples, - Consumer, +ACE_RCSID (EC_Examples, + Consumer, "$Id$") const RtecEventComm::EventSourceID MY_SOURCE_ID = ACE_ES_EVENT_SOURCE_ANY + 1; @@ -198,9 +198,3 @@ Consumer::parse_args (int argc, char *argv[]) return 0; } - -// **************************************************************** - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp index 29e85721e86..a25e9f67569 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp @@ -9,8 +9,8 @@ #include "orbsvcs/Event/EC_Gateway.h" #include "ace/Arg_Shifter.h" -ACE_RCSID (EC_Examples, - Supplier, +ACE_RCSID (EC_Examples, + Supplier, "$Id$") static const char* ecname = 0; @@ -157,8 +157,3 @@ EC::parse_args (int argc, char *argv[]) return 0; } -// **************************************************************** - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp index 11a219fd352..c1be767ffd8 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp @@ -9,8 +9,8 @@ #include "ace/Arg_Shifter.h" #include "ace/Dynamic_Service.h" -ACE_RCSID (EC_Examples, - Supplier, +ACE_RCSID (EC_Examples, + Supplier, "$Id$") static const char* supplierec = 0; @@ -183,8 +183,3 @@ Gateway::parse_args (int argc, char *argv[]) return 0; } -// **************************************************************** - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp index 6d8586d16a8..aad09c037e8 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp @@ -9,8 +9,8 @@ #include "ace/OS_NS_string.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID (EC_Examples, - Supplier, +ACE_RCSID (EC_Examples, + Supplier, "$Id$") const RtecEventComm::EventSourceID MY_SOURCE_ID = ACE_ES_EVENT_SOURCE_ANY + 1; @@ -193,8 +193,3 @@ Supplier::parse_args (int argc, char *argv[]) return 0; } -// **************************************************************** - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp index e207d997042..4f23249c145 100644 --- a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp @@ -30,8 +30,3 @@ Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { } -// **************************************************************** - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp index 47d53b16744..3a01a04e9c0 100644 --- a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp @@ -520,124 +520,3 @@ int parse_args (int argc, char *argv[]) return 0; } -// **************************************************************** - -// Instantiate the templates used by the Reconfig scheduler above - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -#if (! defined (__GNUC__)) || (__GNUC__ > 2) || \ -(__GNUC__ == 2 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 8) -template class auto_ptr<RtecScheduler::Config_Info>; -template class auto_ptr<RtecScheduler::RT_Info>; -template class auto_ptr<TAO_Reconfig_Scheduler_Entry>; -template class ACE_Auto_Basic_Ptr<RtecScheduler::Config_Info>; -template class ACE_Auto_Basic_Ptr<RtecScheduler::RT_Info>; -template class ACE_Auto_Basic_Ptr<TAO_Reconfig_Scheduler_Entry>; -template class ACE_Hash_Map_Manager_Ex<int, RtecScheduler::Config_Info *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Manager_Ex<int, RtecScheduler::Dependency_Set *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Manager_Ex<int, RtecScheduler::RT_Info *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Manager_Ex<int, TAO_RT_Info_Ex*, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::Config_Info *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::Dependency_Set *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::RT_Info *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Base_Ex<int, TAO_RT_Info_Ex*, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::Config_Info*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::Dependency_Set*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::RT_Info*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Ex<int,TAO_RT_Info_Ex*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::Config_Info*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::Dependency_Set*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::RT_Info*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<int,TAO_RT_Info_Ex*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Entry<int, RtecScheduler::Config_Info *>; -template class ACE_Hash_Map_Entry<int, RtecScheduler::Dependency_Set *>; -template class ACE_Hash_Map_Entry<int, RtecScheduler::RT_Info *>; -template class ACE_RB_Tree<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, TAO_SYNCH_MUTEX>; -template class ACE_RB_Tree_Node<const char *, RtecScheduler::RT_Info *>; -template class ACE_RB_Tree_Iterator<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, TAO_SYNCH_MUTEX>; -template class ACE_RB_Tree_Iterator_Base<char const *, RtecScheduler::RT_Info *, ACE_Less_Than<char const *>, TAO_SYNCH_MUTEX>; -template class ACE_RB_Tree_Reverse_Iterator<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Entry<int, TAO_RT_Info_Ex*>; -template class ACE_RB_Tree<const char *, TAO_RT_Info_Ex*, ACE_Less_Than<const char *>, TAO_SYNCH_MUTEX>; -template class ACE_RB_Tree_Node<const char *, TAO_RT_Info_Ex*>; -template class ACE_RB_Tree_Iterator<const char *, TAO_RT_Info_Ex*, ACE_Less_Than<const char *>, TAO_SYNCH_MUTEX>; -template class ACE_RB_Tree_Iterator_Base<char const *, TAO_RT_Info_Ex*, ACE_Less_Than<char const *>, TAO_SYNCH_MUTEX>; -template class ACE_RB_Tree_Reverse_Iterator<const char *, TAO_RT_Info_Ex*, ACE_Less_Than<const char *>, TAO_SYNCH_MUTEX>; -template class TAO_Reconfig_Scheduler<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX>; -template class TAO_RSE_Dependency_Visitor<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX>; -template class TAO_RSE_DFS_Visitor<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX>; -template class TAO_RSE_Priority_Visitor<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX>; -template class TAO_RSE_Criticality_Propagation_Visitor<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX>; -template class TAO_RSE_Forward_Propagation_Visitor<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX>; -template class TAO_RSE_Reverse_Propagation_Visitor<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX>; -template class TAO_Tuple_Admission_Visitor<TAO_MUF_FAIR_Reconfig_Sched_Strategy>; -template class TAO_RSE_SCC_Visitor<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX>; -template class TAO_Reconfig_Scheduler<TAO_RMS_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX>; -template class TAO_RSE_Dependency_Visitor<TAO_RMS_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX>; -template class TAO_RSE_DFS_Visitor<TAO_RMS_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX>; -template class TAO_RSE_Priority_Visitor<TAO_RMS_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX>; -template class TAO_RSE_Criticality_Propagation_Visitor<TAO_RMS_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX>; -template class TAO_RSE_Forward_Propagation_Visitor<TAO_RMS_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX>; -template class TAO_RSE_Reverse_Propagation_Visitor<TAO_RMS_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX>; -template class TAO_Tuple_Admission_Visitor<TAO_RMS_FAIR_Reconfig_Sched_Strategy>; -template class TAO_RSE_SCC_Visitor<TAO_RMS_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX>; -# endif /* __GNUC__ */ -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#if (! defined (__GNUC__)) || (__GNUC__ > 2) || \ -(__GNUC__ == 2 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 8) -#pragma instantiate auto_ptr<RtecScheduler::Config_Info> -#pragma instantiate auto_ptr<RtecScheduler::RT_Info> -#pragma instantiate auto_ptr<TAO_Reconfig_Scheduler_Entry> -#pragma instantiate ACE_Auto_Basic_Ptr<RtecScheduler::Config_Info> -#pragma instantiate ACE_Auto_Basic_Ptr<RtecScheduler::RT_Info> -#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Reconfig_Scheduler_Entry> -#pragma instantiate ACE_Hash_Map_Manager_Ex<int, RtecScheduler::Config_Info *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Manager_Ex<int, RtecScheduler::Dependency_Set *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Manager_Ex<int, RtecScheduler::RT_Info *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Manager_Ex<int, TAO_RT_Info_Ex*, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::Config_Info *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::Dependency_Set *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::RT_Info *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<int, TAO_RT_Info_Ex*, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::Config_Info*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::Dependency_Set*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::RT_Info*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<int,TAO_RT_Info_Ex*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::Config_Info*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::Dependency_Set*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::RT_Info*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<int,TAO_RT_Info_Ex*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Entry<int, RtecScheduler::Config_Info *> -#pragma instantiate ACE_Hash_Map_Entry<int, RtecScheduler::Dependency_Set *> -#pragma instantiate ACE_Hash_Map_Entry<int, RtecScheduler::RT_Info *> -#pragma instantiate ACE_Hash_Map_Entry<int, TAO_RT_Info_Ex*> -#pragma instantiate ACE_RB_Tree<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_RB_Tree<const char *, TAO_RT_Info_Ex*, ACE_Less_Than<const char *>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_RB_Tree_Node<const char *, RtecScheduler::RT_Info *> -#pragma instantiate ACE_RB_Tree_Iterator<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_RB_Tree_Iterator_Base<char const *, RtecScheduler::RT_Info *, ACE_Less_Than<char const *>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_RB_Tree_Reverse_Iterator<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_RB_Tree_Node<const char *, TAO_RT_Info_Ex*> -#pragma instantiate ACE_RB_Tree_Iterator<const char *, TAO_RT_Info_Ex*, ACE_Less_Than<const char *>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_RB_Tree_Iterator_Base<char const *, TAO_RT_Info_Ex*, ACE_Less_Than<char const *>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_RB_Tree_Reverse_Iterator<const char *, TAO_RT_Info_Ex*, ACE_Less_Than<const char *>, TAO_SYNCH_MUTEX> -#pragma instantiate TAO_Reconfig_Scheduler<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> -#pragma instantiate TAO_RSE_Dependency_Visitor<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> -#pragma instantiate TAO_RSE_DFS_Visitor<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> -#pragma instantiate TAO_RSE_Priority_Visitor<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> -#pragma instantiate TAO_RSE_Criticality_Propagation_Visitor<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> -#pragma instantiate TAO_RSE_Forward_Propagation_Visitor<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> -#pragma instantiate TAO_RSE_Reverse_Propagation_Visitor<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> -#pragma instantiate TAO_Tuple_Admission_Visitor<TAO_MUF_FAIR_Reconfig_Sched_Strategy> -#pragma instantiate TAO_RSE_SCC_Visitor<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> -#pragma instantiate TAO_Reconfig_Scheduler<TAO_RMS_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> -#pragma instantiate TAO_RSE_Dependency_Visitor<TAO_RMS_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> -#pragma instantiate TAO_RSE_DFS_Visitor<TAO_RMS_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> -#pragma instantiate TAO_RSE_Priority_Visitor<TAO_RMS_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> -#pragma instantiate TAO_RSE_Criticality_Propagation_Visitor<TAO_RMS_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> -#pragma instantiate TAO_RSE_Forward_Propagation_Visitor<TAO_RMS_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> -#pragma instantiate TAO_RSE_Reverse_Propagation_Visitor<TAO_RMS_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> -#pragma instantiate TAO_Tuple_Admission_Visitor<TAO_RMS_FAIR_Reconfig_Sched_Strategy> -#pragma instantiate TAO_RSE_SCC_Visitor<TAO_RMS_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> -# endif /* __GNUC__ */ -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp index 114f54c5ec7..11b8f70666b 100644 --- a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp @@ -30,9 +30,9 @@ Supplier::timeout_occured (ACE_ENV_SINGLE_ARG_DECL) event.length (1); event[0].header.type = ACE_ES_EVENT_UNDEFINED + 1; event[0].header.source = id_; - event[0].header.ttl = 1; + event[0].header.ttl = 1; } - + consumer_proxy_->push (event ACE_ENV_ARG_PARAMETER); } @@ -69,8 +69,3 @@ Timeout_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { } -// **************************************************************** - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp index dba1cb22b01..b85abca57ee 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp @@ -4,8 +4,8 @@ #include "orbsvcs/RtecEventChannelAdminS.h" #include "orbsvcs/Event_Service_Constants.h" -ACE_RCSID (EC_Examples, - Consumer, +ACE_RCSID (EC_Examples, + Consumer, "$Id$") Consumer::Consumer (void) @@ -102,8 +102,3 @@ Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { } -// **************************************************************** - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp index 48125d9dd0c..f61cb958eeb 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp +++ b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp @@ -377,8 +377,3 @@ int parse_args (int argc, char *argv[]) return 0; } -// **************************************************************** - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp index f83b00c5864..f835dcb6daa 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp @@ -4,8 +4,8 @@ #include "orbsvcs/RtecEventChannelAdminS.h" #include "orbsvcs/Event_Service_Constants.h" -ACE_RCSID (EC_Examples, - Supplier, +ACE_RCSID (EC_Examples, + Supplier, "$Id$") Supplier::Supplier (void) @@ -92,8 +92,3 @@ Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { } -// **************************************************************** - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp index 465baff19f6..bb27f0bad68 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp @@ -406,106 +406,3 @@ int parse_args (int argc, char *argv[]) return 0; } -// **************************************************************** - -// Instantiate the templates used by the Reconfig scheduler above - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -#if (! defined (__GNUC__)) || (__GNUC__ > 2) || \ -(__GNUC__ == 2 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 8) -template class auto_ptr<RtecScheduler::Config_Info>; -template class auto_ptr<RtecScheduler::RT_Info>; -template class auto_ptr<TAO_Reconfig_Scheduler_Entry>; -template class ACE_Auto_Basic_Ptr<RtecScheduler::Config_Info>; -template class ACE_Auto_Basic_Ptr<RtecScheduler::RT_Info>; -template class ACE_Auto_Basic_Ptr<TAO_Reconfig_Scheduler_Entry>; -template class ACE_Hash_Map_Manager_Ex<int, RtecScheduler::Config_Info *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Manager_Ex<int, RtecScheduler::Dependency_Set *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Manager_Ex<int, RtecScheduler::RT_Info *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Manager_Ex<int, TAO_RT_Info_Ex*, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::Config_Info *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::Dependency_Set *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::RT_Info *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Base_Ex<int, TAO_RT_Info_Ex*, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::Config_Info*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::Dependency_Set*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::RT_Info*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Ex<int,TAO_RT_Info_Ex*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::Config_Info*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::Dependency_Set*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::RT_Info*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<int,TAO_RT_Info_Ex*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Entry<int, RtecScheduler::Config_Info *>; -template class ACE_Hash_Map_Entry<int, RtecScheduler::Dependency_Set *>; -template class ACE_Hash_Map_Entry<int, RtecScheduler::RT_Info *>; -template class ACE_RB_Tree<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, TAO_SYNCH_MUTEX>; -template class ACE_RB_Tree_Node<const char *, RtecScheduler::RT_Info *>; -template class ACE_RB_Tree_Iterator<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, TAO_SYNCH_MUTEX>; -template class ACE_RB_Tree_Iterator_Base<char const *, RtecScheduler::RT_Info *, ACE_Less_Than<char const *>, TAO_SYNCH_MUTEX>; -template class ACE_RB_Tree_Reverse_Iterator<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Entry<int, TAO_RT_Info_Ex*>; -template class ACE_RB_Tree<const char *, TAO_RT_Info_Ex*, ACE_Less_Than<const char *>, TAO_SYNCH_MUTEX>; -template class ACE_RB_Tree_Node<const char *, TAO_RT_Info_Ex*>; -template class ACE_RB_Tree_Iterator<const char *, TAO_RT_Info_Ex*, ACE_Less_Than<const char *>, TAO_SYNCH_MUTEX>; -template class ACE_RB_Tree_Iterator_Base<char const *, TAO_RT_Info_Ex*, ACE_Less_Than<char const *>, TAO_SYNCH_MUTEX>; -template class ACE_RB_Tree_Reverse_Iterator<const char *, TAO_RT_Info_Ex*, ACE_Less_Than<const char *>, TAO_SYNCH_MUTEX>; -template class TAO_Reconfig_Scheduler<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX>; -template class TAO_RSE_Dependency_Visitor<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX>; -template class TAO_RSE_DFS_Visitor<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX>; -template class TAO_RSE_Priority_Visitor<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX>; -template class TAO_RSE_Criticality_Propagation_Visitor<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX>; -template class TAO_RSE_Forward_Propagation_Visitor<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX>; -template class TAO_RSE_Reverse_Propagation_Visitor<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX>; -template class TAO_Tuple_Admission_Visitor<TAO_MUF_FAIR_Reconfig_Sched_Strategy>; -template class TAO_RSE_SCC_Visitor<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX>; -# endif /* __GNUC__ */ -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#if (! defined (__GNUC__)) || (__GNUC__ > 2) || \ -(__GNUC__ == 2 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 8) -#pragma instantiate auto_ptr<RtecScheduler::Config_Info> -#pragma instantiate auto_ptr<RtecScheduler::RT_Info> -#pragma instantiate auto_ptr<TAO_Reconfig_Scheduler_Entry> -#pragma instantiate ACE_Auto_Basic_Ptr<RtecScheduler::Config_Info> -#pragma instantiate ACE_Auto_Basic_Ptr<RtecScheduler::RT_Info> -#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Reconfig_Scheduler_Entry> -#pragma instantiate ACE_Hash_Map_Manager_Ex<int, RtecScheduler::Config_Info *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Manager_Ex<int, RtecScheduler::Dependency_Set *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Manager_Ex<int, RtecScheduler::RT_Info *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Manager_Ex<int, TAO_RT_Info_Ex*, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::Config_Info *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::Dependency_Set *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<int, RtecScheduler::RT_Info *, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<int, TAO_RT_Info_Ex*, ACE_Hash<int>, ACE_Equal_To<int>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::Config_Info*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::Dependency_Set*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<int,RtecScheduler::RT_Info*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<int,TAO_RT_Info_Ex*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::Config_Info*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::Dependency_Set*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<int,RtecScheduler::RT_Info*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<int,TAO_RT_Info_Ex*,ACE_Hash<int>,ACE_Equal_To<int>,TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Entry<int, RtecScheduler::Config_Info *> -#pragma instantiate ACE_Hash_Map_Entry<int, RtecScheduler::Dependency_Set *> -#pragma instantiate ACE_Hash_Map_Entry<int, RtecScheduler::RT_Info *> -#pragma instantiate ACE_Hash_Map_Entry<int, TAO_RT_Info_Ex*> -#pragma instantiate ACE_RB_Tree<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_RB_Tree<const char *, TAO_RT_Info_Ex*, ACE_Less_Than<const char *>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_RB_Tree_Node<const char *, RtecScheduler::RT_Info *> -#pragma instantiate ACE_RB_Tree_Iterator<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_RB_Tree_Iterator_Base<char const *, RtecScheduler::RT_Info *, ACE_Less_Than<char const *>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_RB_Tree_Reverse_Iterator<const char *, RtecScheduler::RT_Info *, ACE_Less_Than<const char *>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_RB_Tree_Node<const char *, TAO_RT_Info_Ex*> -#pragma instantiate ACE_RB_Tree_Iterator<const char *, TAO_RT_Info_Ex*, ACE_Less_Than<const char *>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_RB_Tree_Iterator_Base<char const *, TAO_RT_Info_Ex*, ACE_Less_Than<char const *>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_RB_Tree_Reverse_Iterator<const char *, TAO_RT_Info_Ex*, ACE_Less_Than<const char *>, TAO_SYNCH_MUTEX> -#pragma instantiate TAO_Reconfig_Scheduler<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> -#pragma instantiate TAO_RSE_Dependency_Visitor<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> -#pragma instantiate TAO_RSE_DFS_Visitor<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> -#pragma instantiate TAO_RSE_Priority_Visitor<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> -#pragma instantiate TAO_RSE_Criticality_Propagation_Visitor<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> -#pragma instantiate TAO_RSE_Forward_Propagation_Visitor<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> -#pragma instantiate TAO_RSE_Reverse_Propagation_Visitor<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> -#pragma instantiate TAO_Tuple_Admission_Visitor<TAO_MUF_FAIR_Reconfig_Sched_Strategy> -#pragma instantiate TAO_RSE_SCC_Visitor<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> -# endif /* __GNUC__ */ -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp index d49a22fa62a..e8af9a77ed8 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp @@ -5,8 +5,8 @@ #include "orbsvcs/Event_Service_Constants.h" #include "orbsvcs/CosNamingC.h" -ACE_RCSID (EC_Examples, - Consumer, +ACE_RCSID (EC_Examples, + Consumer, "$Id$") int @@ -160,8 +160,3 @@ Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } -// **************************************************************** - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp index 4bc618c1232..a3bd5e5740d 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp @@ -6,8 +6,8 @@ #include "orbsvcs/CosNamingC.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (EC_Examples, - Service, +ACE_RCSID (EC_Examples, + Service, "$Id$") const char *ior_output_file = "ec.ior"; @@ -139,8 +139,3 @@ int parse_args (int argc, char *argv[]) return 0; } -// **************************************************************** - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp index 850888b1d77..21ced08639e 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp @@ -6,8 +6,8 @@ #include "orbsvcs/CosNamingC.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID (EC_Examples, - Supplier, +ACE_RCSID (EC_Examples, + Supplier, "$Id$") int @@ -150,8 +150,3 @@ Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { } -// **************************************************************** - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |