ChangeLogTag: Tue Oct 4 11:37:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

6 files changed, 0 insertions, 158 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
index 5b61ba71352..d253fa396c8 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
@@ -668,9 +668,3 @@ void ACE_Config_Scheduler::get_config_info_set (RtecScheduler::Config_Info_Set_o
 {
   ACE_THROW (CORBA::NO_IMPLEMENT ());
 }
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_DNode<TAO_RT_Info_Tuple *>;
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_DNode<TAO_RT_Info_Tuple *>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
index 45f36427bff..0a657a7ffba 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
@@ -2417,68 +2417,3 @@ ACE_DynScheduler::output_timeline (const char *filename, const char *heading)
   return status;
 }
   // this prints the entire set of timeline outputs to the specified file
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Map_Entry<ACE_CString, RtecScheduler::RT_Info *>;
-template class ACE_Map_Manager<ACE_CString, RtecScheduler::RT_Info *, TAO_SYNCH_MUTEX>;
-template class ACE_Map_Iterator_Base<ACE_CString, RtecScheduler::RT_Info *, TAO_SYNCH_MUTEX>;
-template class ACE_Map_Iterator<ACE_CString, RtecScheduler::RT_Info *, TAO_SYNCH_MUTEX>;
-template class ACE_Map_Reverse_Iterator<ACE_CString, RtecScheduler::RT_Info *, TAO_SYNCH_MUTEX>;
-template class ACE_DNode<Dispatch_Entry_Link>;
-template class ACE_DNode<Dispatch_Proxy_Iterator *>;
-template class ACE_DNode<TimeLine_Entry_Link>;
-template class ACE_Node<RtecScheduler::RT_Info *>;
-template class ACE_Node<Task_Entry_Link *>;
-template class ACE_Ordered_MultiSet<Dispatch_Entry_Link>;
-template class ACE_Ordered_MultiSet<Dispatch_Proxy_Iterator *>;
-template class ACE_Ordered_MultiSet<TimeLine_Entry_Link>;
-template class ACE_Ordered_MultiSet_Iterator<Dispatch_Entry_Link>;
-template class ACE_Ordered_MultiSet_Iterator<Dispatch_Proxy_Iterator *>;
-template class ACE_Ordered_MultiSet_Iterator<TimeLine_Entry_Link>;
-template class ACE_Unbounded_Queue<Dispatch_Entry *>;
-template class ACE_Unbounded_Queue_Iterator<Dispatch_Entry *>;
-template class ACE_Unbounded_Set<RtecScheduler::RT_Info *>;
-template class ACE_Unbounded_Set<Task_Entry_Link *>;
-template class ACE_Unbounded_Set_Iterator<RtecScheduler::RT_Info *>;
-template class ACE_Unbounded_Set_Iterator<Task_Entry_Link *>;
-template class ACE_Node<RtecScheduler::Config_Info *>;
-template class ACE_Unbounded_Set<RtecScheduler::Config_Info *>;
-template class ACE_Unbounded_Set_Iterator<RtecScheduler::Config_Info *>;
-template class ACE_Node<RtecScheduler::Scheduling_Anomaly *>;
-template class ACE_Unbounded_Set<RtecScheduler::Scheduling_Anomaly *>;
-template class ACE_Unbounded_Set_Iterator<RtecScheduler::Scheduling_Anomaly *>;
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Map_Entry<ACE_CString, RtecScheduler::RT_Info *>
-#pragma instantiate ACE_Map_Manager<ACE_CString, RtecScheduler::RT_Info *, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Map_Iterator_Base<ACE_CString, RtecScheduler::RT_Info *, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Map_Iterator<ACE_CString, RtecScheduler::RT_Info *, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Map_Reverse_Iterator<ACE_CString, RtecScheduler::RT_Info *, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_DNode<Dispatch_Entry_Link>
-#pragma instantiate ACE_DNode<Dispatch_Proxy_Iterator *>
-#pragma instantiate ACE_DNode<TimeLine_Entry_Link>
-#pragma instantiate ACE_Node<RtecScheduler::RT_Info *>
-#pragma instantiate ACE_Node<Task_Entry_Link *>
-#pragma instantiate ACE_Ordered_MultiSet<Dispatch_Entry_Link>
-#pragma instantiate ACE_Ordered_MultiSet<Dispatch_Proxy_Iterator *>
-#pragma instantiate ACE_Ordered_MultiSet<TimeLine_Entry_Link>
-#pragma instantiate ACE_Ordered_MultiSet_Iterator<Dispatch_Entry_Link>
-#pragma instantiate ACE_Ordered_MultiSet_Iterator<Dispatch_Proxy_Iterator *>
-#pragma instantiate ACE_Ordered_MultiSet_Iterator<TimeLine_Entry_Link>
-#pragma instantiate ACE_Unbounded_Queue<Dispatch_Entry *>
-#pragma instantiate ACE_Unbounded_Queue_Iterator<Dispatch_Entry *>
-#pragma instantiate ACE_Unbounded_Set<RtecScheduler::RT_Info *>
-#pragma instantiate ACE_Unbounded_Set<Task_Entry_Link *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<RtecScheduler::RT_Info *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<Task_Entry_Link *>
-#pragma instantiate ACE_Node<RtecScheduler::Config_Info *>
-#pragma instantiate ACE_Unbounded_Set<RtecScheduler::Config_Info *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<RtecScheduler::Config_Info *>
-#pragma instantiate ACE_Node<RtecScheduler::Scheduling_Anomaly *>
-#pragma instantiate ACE_Unbounded_Set<RtecScheduler::Scheduling_Anomaly *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<RtecScheduler::Scheduling_Anomaly *>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
-
-
-// EOF
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.cpp
index 4b1aacc3b1f..9422209f27c 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.cpp
@@ -24,22 +24,4 @@
 
 ACE_RCSID(Sched, Reconfig_Scheduler, "$Id$")
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template void maintain_scheduling_array <> (TAO_Reconfig_Scheduler_Entry **&,
-                                            long&, RtecScheduler::handle_t ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-template void maintain_scheduling_array <> (TAO_RT_Info_Tuple **&, long&,
-                                   RtecScheduler::handle_t ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException));
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-template void maintain_scheduling_array <> (TAO_Reconfig_Scheduler_Entry **&,
-                                            long&, RtecScheduler::handle_t ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-template void maintain_scheduling_array <> (TAO_RT_Info_Tuple **&, long&,
-                                   RtecScheduler::handle_t ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException));
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #endif /* TAO_RECONFIG_SCHEDULER_C */
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
index 20007440ad8..5c6eb041289 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
@@ -269,32 +269,3 @@ ACE_Scheduler::dispatch_configuration (const Preemption_Priority & p_priority,
   return 0;
 }
   // provide the thread priority and queue type for the given priority level
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Map_Entry<ACE_CString, ACE_Scheduler::RT_Info **>;
-
-template class ACE_Lock_Adapter<TAO_SYNCH_RW_MUTEX>;
-template class ACE_Map_Manager<ACE_CString,
-                               ACE_Scheduler::RT_Info **,
-                               TAO_SYNCH_MUTEX>;
-template class ACE_Map_Iterator_Base<ACE_CString, ACE_Scheduler::RT_Info **,
-                                     TAO_SYNCH_MUTEX>;
-template class ACE_Map_Iterator<ACE_CString, ACE_Scheduler::RT_Info **,
-                                TAO_SYNCH_MUTEX>;
-template class ACE_Map_Reverse_Iterator<ACE_CString, ACE_Scheduler::RT_Info **,
-                                        TAO_SYNCH_MUTEX>;
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Map_Entry<ACE_CString, ACE_Scheduler::RT_Info **>
-
-#pragma instantiate ACE_Lock_Adapter<TAO_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Manager<ACE_CString, ACE_Scheduler::RT_Info **, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Map_Iterator_Base<ACE_CString, ACE_Scheduler::RT_Info **, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Map_Iterator<ACE_CString, ACE_Scheduler::RT_Info **, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Map_Reverse_Iterator<ACE_CString, ACE_Scheduler::RT_Info **, TAO_SYNCH_MUTEX>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// EOF
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
index 5be44333377..4d5cfdd4623 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
@@ -268,16 +268,3 @@ void
 Scheduler_Generic::print_schedule ()
 {
 }
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Node<RtecScheduler::RT_Info **>;
-template class ACE_Unbounded_Set<RtecScheduler::RT_Info **>;
-template class ACE_Unbounded_Set_Iterator<RtecScheduler::RT_Info **>;
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Node<RtecScheduler::RT_Info **>
-#pragma instantiate ACE_Unbounded_Set<RtecScheduler::RT_Info **>
-#pragma instantiate ACE_Unbounded_Set_Iterator<RtecScheduler::RT_Info **>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
-// EOF
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
index 5d2b4605685..f2e7c3c467f 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
@@ -1388,7 +1388,6 @@ ACE_Criticality_Scheduler_Strategy::minimum_critical_priority ()
   return minimum_critical_priority_;
 }
 
-
 // = Provides the dispatching queue type for the given dispatch entry.
 
 ACE_DynScheduler::Dispatching_Type
@@ -1397,29 +1396,3 @@ ACE_Criticality_Scheduler_Strategy::dispatch_type (const Dispatch_Entry &entry)
   ACE_UNUSED_ARG (entry);
   return RtecScheduler::STATIC_DISPATCHING;
 }
-
-
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Node<Dispatch_Entry *>;
-template class ACE_Unbounded_Set<Dispatch_Entry *>;
-template class ACE_Unbounded_Set_Iterator<Dispatch_Entry *>;
-template class ACE_Strategy_Scheduler_Factory<ACE_MUF_Scheduler_Strategy>;
-template class ACE_Strategy_Scheduler_Factory<ACE_RMS_Scheduler_Strategy>;
-template class ACE_Strategy_Scheduler_Factory<ACE_MLF_Scheduler_Strategy>;
-template class ACE_Strategy_Scheduler_Factory<ACE_EDF_Scheduler_Strategy>;
-template class ACE_Strategy_Scheduler_Factory<ACE_Criticality_Scheduler_Strategy>;
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Node<Dispatch_Entry *>
-#pragma instantiate ACE_Unbounded_Set<Dispatch_Entry *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<Dispatch_Entry *>
-#pragma instantiate ACE_Strategy_Scheduler_Factory<ACE_MUF_Scheduler_Strategy>
-#pragma instantiate ACE_Strategy_Scheduler_Factory<ACE_RMS_Scheduler_Strategy>
-#pragma instantiate ACE_Strategy_Scheduler_Factory<ACE_MLF_Scheduler_Strategy>
-#pragma instantiate ACE_Strategy_Scheduler_Factory<ACE_EDF_Scheduler_Strategy>
-#pragma instantiate ACE_Strategy_Scheduler_Factory<ACE_Criticality_Scheduler_Strategy>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
-// EOF