diff options
116 files changed, 291 insertions, 4014 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index c527bd418d3..3066d01a9c4 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,122 @@ +Tue Oct 4 10:04:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> + + * examples/POA/DSI/Database_i.cpp + * examples/RTCORBA/Activity/Activity.cpp + * examples/RTCORBA/Activity/Task_Stats.cpp + * examples/RTScheduling/Task_Stats.cpp + * examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp + * examples/RTScheduling/MIF_Scheduler/test.cpp + * orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp + * orbsvcs/FT_ReplicationManager/FT_ReplicationManager_Main.cpp + * orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp + * orbsvcs/Fault_Detector/Fault_Detector_Main.cpp + * orbsvcs/Fault_Notifier/FT_Notifier_i.cpp + * orbsvcs/Fault_Notifier/Fault_Notifier_Main.cpp + * orbsvcs/IFR_Service/be_global.cpp + * orbsvcs/IFR_Service/ifr_adding_visitor.cpp + * orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp + * orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp + * orbsvcs/orbsvcs/AV/AVStreams_i.cpp + * orbsvcs/orbsvcs/AV/AV_Core.cpp + * orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp + * orbsvcs/orbsvcs/AV/Policy.cpp + * orbsvcs/orbsvcs/AV/Protocol_Factory.cpp + * orbsvcs/orbsvcs/AV/RTCP.cpp + * orbsvcs/orbsvcs/AV/TCP.cpp + * orbsvcs/orbsvcs/AV/Transport.cpp + * orbsvcs/orbsvcs/AV/sfp.cpp + * orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp + * orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp + * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp + * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp + * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp + * orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp + * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp + * orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp + * orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp + * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp + * orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp + * orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp + * orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp + * orbsvcs/orbsvcs/Event/ECG_Adapters.cpp + * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp + * orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp + * orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp + * orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp + * orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp + * orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp + * orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp + * orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp + * orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp + * orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp + * orbsvcs/orbsvcs/Event/EC_Factory.cpp + * orbsvcs/orbsvcs/Event/EC_Filter.cpp + * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp + * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp + * orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp + * orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp + * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp + * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp + * orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp + * orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp + * orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp + * orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp + * orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp + * orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp + * orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp + * orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp + * orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp + * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp + * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp + * orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp + * orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp + * orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp + * orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp + * orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp + * orbsvcs/orbsvcs/IFRService/Options.cpp + * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.cpp + * orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.cpp + * orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.cpp + * orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.cpp + * orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.cpp + * orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp + * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp + * orbsvcs/orbsvcs/Log/Hash_LogStore.cpp + * orbsvcs/orbsvcs/Log/LogRecordStore_persist.cpp + * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp + * orbsvcs/orbsvcs/Log/Log_i.cpp + * orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp + * orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.cpp + * orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp + * orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.cpp + * orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp + * orbsvcs/orbsvcs/Naming/Naming_Loader.cpp + * orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp + * orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp + * orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp + * orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp + * orbsvcs/orbsvcs/Notify/Bit_Vector.cpp + * orbsvcs/orbsvcs/Notify/Builder.cpp + * orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp + * orbsvcs/orbsvcs/Notify/Delivery_Request.cpp + * orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp + * orbsvcs/orbsvcs/Notify/EventChannel.cpp + * orbsvcs/orbsvcs/Notify/FilterAdmin.cpp + * orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp + * orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp + * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp + * orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp + * orbsvcs/orbsvcs/Notify/Object.cpp + * orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp + * orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp + * orbsvcs/orbsvcs/Notify/ProxySupplier.cpp + * orbsvcs/orbsvcs/Notify/QoSProperties.cpp + * orbsvcs/orbsvcs/Notify/Random_File.cpp + * orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp: + Zapped explicit templates + Mon Oct 3 23:43:08 2005 J.T. Conklin <jtc@acorntoolworks.com> * orbsvcs/tests/FT_App/Makefile.am: diff --git a/TAO/examples/POA/DSI/Database_i.cpp b/TAO/examples/POA/DSI/Database_i.cpp index 6a9550a6a0a..d4af66acb11 100644 --- a/TAO/examples/POA/DSI/Database_i.cpp +++ b/TAO/examples/POA/DSI/Database_i.cpp @@ -410,14 +410,6 @@ DatabaseImpl::Employee::operator delete (void *pointer) DATABASE::instance ()->free (pointer); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Malloc_Iterator<ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex>; -template class ACE_Malloc_LIFO_Iterator_T<ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex, ACE_Control_Block>; -template class ACE_Singleton<DatabaseImpl::Simpler_Database_Malloc, ACE_Null_Mutex>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Malloc_Iterator<ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex> -#pragma instantiate ACE_Malloc_LIFO_Iterator_T<ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex, ACE_Control_Block> -#pragma instantiate ACE_Singleton<DatabaseImpl::Simpler_Database_Malloc, ACE_Null_Mutex> -#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) +#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) template ACE_Singleton<DatabaseImpl::Simpler_Database_Malloc, ACE_Null_Mutex> *ACE_Singleton<DatabaseImpl::Simpler_Database_Malloc, ACE_Null_Mutex>::singleton_; -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ diff --git a/TAO/examples/RTCORBA/Activity/Activity.cpp b/TAO/examples/RTCORBA/Activity/Activity.cpp index 473488b903e..cec5c7e4c11 100644 --- a/TAO/examples/RTCORBA/Activity/Activity.cpp +++ b/TAO/examples/RTCORBA/Activity/Activity.cpp @@ -456,16 +456,8 @@ main (int argc, char *argv[]) return 0; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Singleton<Activity, ACE_Null_Mutex>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Singleton<Activity, ACE_Null_Mutex> - -#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) +#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) template ACE_Singleton<Activity, ACE_Null_Mutex> *ACE_Singleton<Activity, ACE_Null_Mutex>::singleton_; -#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ diff --git a/TAO/examples/RTCORBA/Activity/Task_Stats.cpp b/TAO/examples/RTCORBA/Activity/Task_Stats.cpp index 603e93b7c9b..142ece1ea34 100644 --- a/TAO/examples/RTCORBA/Activity/Task_Stats.cpp +++ b/TAO/examples/RTCORBA/Activity/Task_Stats.cpp @@ -179,16 +179,8 @@ Task_Stats::dump_latency_stats (ACE_TCHAR *out_msg, ACE_UINT32 sf) l_dev)); */ } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Singleton<Base_Time, TAO_SYNCH_MUTEX>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Singleton<Base_Time, TAO_SYNCH_MUTEX> - -#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) +#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) template ACE_Singleton<Base_Time, ACE_Thread_Mutex> *ACE_Singleton<Base_Time, ACE_Thread_Mutex>::singleton_; -#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp index 0c60f3ddd73..d93e516b963 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp @@ -12,7 +12,7 @@ DT_Test::DT_Test (void) { base_t = ACE_OS::gethrtime (); -} +} void DT_Test::check_supported_priorities (void) @@ -30,7 +30,7 @@ DT_Test::check_supported_priorities (void) sched_policy_ = ACE_SCHED_RR; } - else + else if (thr_sched_policy_ == THR_SCHED_FIFO) { // if (TAO_debug_level > 0) @@ -42,7 +42,7 @@ DT_Test::check_supported_priorities (void) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Sched policy = THR_SCHED_OTHER\n")); - + sched_policy_ = ACE_SCHED_OTHER; } @@ -50,7 +50,7 @@ DT_Test::check_supported_priorities (void) { max_priority_ = ACE_Sched_Params::priority_max (sched_policy_); min_priority_ = ACE_Sched_Params::priority_min (sched_policy_); - + if (max_priority_ == min_priority_) { ACE_DEBUG ((LM_DEBUG, @@ -72,38 +72,38 @@ DT_Test::init (int argc, char *argv [] "" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - + this->check_supported_priorities (); dt_creator_->orb (orb_.in ()); - + TASK_STATS::instance ()->init (dt_creator_->total_load ()); CORBA::Object_ptr manager_obj = orb_->resolve_initial_references ("RTSchedulerManager" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - + TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - - + + ACE_NEW_RETURN (scheduler_, - Fixed_Priority_Scheduler (orb_.in ()), + Fixed_Priority_Scheduler (orb_.in ()), -1); - + manager->rtscheduler (scheduler_); - + CORBA::Object_var object = - orb_->resolve_initial_references ("RTScheduler_Current" + orb_->resolve_initial_references ("RTScheduler_Current" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - + current_ = RTScheduling::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - - + + if (sched_policy_ != ACE_SCHED_OTHER) { @@ -123,12 +123,12 @@ DT_Test::init (int argc, char *argv [] "(%P|%t): sched_params failed\n")); } } - + return 0; } void -DT_Test::run (int argc, char* argv [] +DT_Test::run (int argc, char* argv [] ACE_ENV_ARG_DECL) { init (argc,argv @@ -139,13 +139,13 @@ DT_Test::run (int argc, char* argv [] return; ACE_CHECK; - + //TASK_STATS::instance ()->init (this->dt_creator_->dt_count () * 100); - - + + this->dt_creator_->activate_root_poa (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - + this->dt_creator_->activate_poa_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->dt_creator_->activate_job_list (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -156,18 +156,18 @@ DT_Test::run (int argc, char* argv [] DT_Creator* dt_creator = this->dt_creator_; dt_creator->register_synch_obj (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - + ACE_DEBUG ((LM_DEBUG, "Registered Synch Object\n")); - + /* dt_creator_->create_distributable_threads (current_.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; */ - + this->activate_task (); - + char msg [BUFSIZ]; ACE_OS::sprintf (msg, "ORB RUN\n"); dt_creator_->log_msg (msg); @@ -193,7 +193,7 @@ DT_Test::dt_creator (void) } -Fixed_Priority_Scheduler* +Fixed_Priority_Scheduler* DT_Test::scheduler (void) { return this->scheduler_; @@ -208,10 +208,10 @@ DT_Test::activate_task (void) long flags; flags = THR_NEW_LWP | THR_JOINABLE; - flags |= + flags |= orb_->orb_core ()->orb_params ()->scope_policy () | orb_->orb_core ()->orb_params ()->sched_policy (); - + if (this->activate (flags, 1, 0, @@ -233,12 +233,12 @@ DT_Test::svc (void) { ACE_DEBUG ((LM_DEBUG, "In test::svc\n")); - + dt_creator_->create_distributable_threads (current_.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + } ACE_CATCHANY { @@ -246,7 +246,7 @@ DT_Test::svc (void) "Caught exception:"); return -1; } - ACE_ENDTRY; + ACE_ENDTRY; return 0; } @@ -264,11 +264,11 @@ main (int argc, char* argv []) ACE_TRY_NEW_ENV { ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_FP_DT_Creator); - + DT_TEST::instance ()->run (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + } ACE_CATCHANY { @@ -276,23 +276,15 @@ main (int argc, char* argv []) "Caught exception:"); return 1; } - ACE_ENDTRY; - + ACE_ENDTRY; + return 0; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Singleton<DT_Test, TAO_SYNCH_MUTEX>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Singleton<DT_Test, TAO_SYNCH_MUTEX> - -#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) +#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) template ACE_Singleton<DT_Test, ACE_Thread_Mutex> *ACE_Singleton<DT_Test, ACE_Thread_Mutex>::singleton_; -#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp index a3ea1235e52..392b438c33d 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp +++ b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp @@ -180,16 +180,8 @@ main (int argc, char* argv []) } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Singleton<DT_Test, TAO_SYNCH_MUTEX>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Singleton<DT_Test, TAO_SYNCH_MUTEX> - -#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) +#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) template ACE_Singleton<DT_Test, ACE_Thread_Mutex> *ACE_Singleton<DT_Test, ACE_Thread_Mutex>::singleton_; -#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ diff --git a/TAO/examples/RTScheduling/Task_Stats.cpp b/TAO/examples/RTScheduling/Task_Stats.cpp index 005cf866bc9..647f8d4ae8c 100644 --- a/TAO/examples/RTScheduling/Task_Stats.cpp +++ b/TAO/examples/RTScheduling/Task_Stats.cpp @@ -60,7 +60,7 @@ void Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, ACE_UINT32) { - + FILE* output_file = ACE_OS::fopen (file_name, "w"); if (output_file == 0) @@ -79,19 +79,19 @@ Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, ACE_UINT64 x; x = this->thr_run_time_[0];// scale_factor; - val_1 = ACE_CU64_TO_CU32 (x); - + val_1 = ACE_CU64_TO_CU32 (x); + ACE_OS::fprintf (output_file, "%u \t %d\n",val_1,thr_count_[0]); - + // dump the samples recorded. for (size_t i = 1; 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, @@ -99,18 +99,8 @@ Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, } -#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> - -#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) +#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) template ACE_Singleton<Task_Stats, ACE_Thread_Mutex> *ACE_Singleton<Task_Stats, ACE_Thread_Mutex>::singleton_; -#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp index 8796d31f381..a42fc47a2ba 100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp @@ -1112,17 +1112,3 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::type_failure ( return result; } - -// Template instantiations. -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Unbounded_Set<PortableGroup::Location>; -template class ACE_Unbounded_Set_Iterator<PortableGroup::Location>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Unbounded_Set<PortableGroup::Location> -#pragma instantiate ACE_Unbounded_Set_Iterator<PortableGroup::Location> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager_Main.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager_Main.cpp index e9f7c21a9a4..4b1e493ba02 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager_Main.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager_Main.cpp @@ -22,14 +22,3 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) server_main("ReplicationManager"); return server_main.run(argc, argv); } - -/////////////////////////////////// -// Template instantiation for -// inept compilers. - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class TAO::Utils::Server_Main<TAO::FT_ReplicationManager>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Utils::Server_Main<TAO::FT_ReplicationManager> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp index 979d3806a43..7e8b4f8c457 100644 --- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp +++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp @@ -708,16 +708,3 @@ CORBA::Boolean TAO::FT_FaultDetectorFactory_i::is_alive (ACE_ENV_SINGLE_ARG_DECL 1; } -/////////////////////////////////// -// Template instantiation for -// competence-challenged compilers. - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class ACE_Vector<TAO::Fault_Detector_i *>; - template class ACE_Guard<ACE_SYNCH_MUTEX>; - template class auto_ptr<TAO::Fault_Detector_i>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate ACE_Vector<TAO::Fault_Detector_i *> -# pragma instantiate ACE_Guard<ACE_SYNCH_MUTEX> -# pragma instantiate auto_ptr<TAO::Fault_Detector_i>; -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/Fault_Detector/Fault_Detector_Main.cpp b/TAO/orbsvcs/Fault_Detector/Fault_Detector_Main.cpp index 43bbc02813f..c101b763c69 100644 --- a/TAO/orbsvcs/Fault_Detector/Fault_Detector_Main.cpp +++ b/TAO/orbsvcs/Fault_Detector/Fault_Detector_Main.cpp @@ -23,12 +23,3 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) return server_main.run(argc, argv); } -/////////////////////////////////// -// Template instantiation for -// inept compilers. - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class TAO::Utils::Server_Main<TAO::FT_FaultDetectorFactory_i>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Utils::Server_Main<TAO::FT_FaultDetectorFactory_i> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp index fdf261d9ea8..df80f8f8574 100644 --- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp +++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp @@ -768,8 +768,3 @@ TAO::FT_FaultNotifier_i::ProxyInfo::ProxyInfo (const ProxyInfo & rhs) , proxyVar_ (rhs.proxyVar_) { } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class ACE_Guard<ACE_SYNCH_MUTEX>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate ACE_Guard<ACE_SYNCH_MUTEX> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/Fault_Notifier/Fault_Notifier_Main.cpp b/TAO/orbsvcs/Fault_Notifier/Fault_Notifier_Main.cpp index 6e75bb8bcab..1896c78ea18 100644 --- a/TAO/orbsvcs/Fault_Notifier/Fault_Notifier_Main.cpp +++ b/TAO/orbsvcs/Fault_Notifier/Fault_Notifier_Main.cpp @@ -23,15 +23,3 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) return server_main.run(argc, argv); } -/////////////////////////////////// -// Template instantiation for -// inept compilers. - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class TAO::Utils::Server_Main<TAO::FT_FaultNotifier_i>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO::Utils::Server_Main<TAO::FT_FaultNotifier_i> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - - - diff --git a/TAO/orbsvcs/IFR_Service/be_global.cpp b/TAO/orbsvcs/IFR_Service/be_global.cpp index c9eafd3de5a..f7283b8d3d0 100644 --- a/TAO/orbsvcs/IFR_Service/be_global.cpp +++ b/TAO/orbsvcs/IFR_Service/be_global.cpp @@ -240,18 +240,6 @@ BE_GlobalData::generator_init (void) AST_Generator *gen = 0; ACE_NEW_RETURN (gen, AST_Generator, - 0); + 0); return gen; } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Unbounded_Stack<CORBA::Container_ptr>; -template class ACE_Node<CORBA::Container_ptr>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Unbounded_Stack<CORBA::Container_ptr> -#pragma instantiate ACE_Node<CORBA::Container_ptr> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp index 56b7e4aad92..c418fe74a16 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp @@ -160,7 +160,7 @@ ifr_adding_visitor::visit_module (AST_Module *node) if (CORBA::is_nil (prev_def.in ())) { // New module. - CORBA::Container_ptr container = + CORBA::Container_ptr container = CORBA::Container::_nil (); if (be_global->ifr_scopes ().top (container) == 0) @@ -186,7 +186,7 @@ ifr_adding_visitor::visit_module (AST_Module *node) } else { - CORBA::DefinitionKind kind = + CORBA::DefinitionKind kind = prev_def->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -241,7 +241,7 @@ ifr_adding_visitor::visit_module (AST_Module *node) } this->in_reopened_ = 0; - CORBA::Container_ptr tmp = + CORBA::Container_ptr tmp = CORBA::Container::_nil (); if (be_global->ifr_scopes ().pop (tmp) != 0) @@ -393,7 +393,7 @@ ifr_adding_visitor::visit_interface (AST_Interface *node) return 0; } - bases[i] = + bases[i] = CORBA::InterfaceDef::_narrow (result.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -456,7 +456,7 @@ ifr_adding_visitor::visit_interface (AST_Interface *node) this->ir_current_ = CORBA::IDLType::_duplicate (extant_def.in ()); - CORBA::Container_ptr used_scope = + CORBA::Container_ptr used_scope = CORBA::Container::_nil (); // Pop the new IR object back off the scope stack. @@ -480,7 +480,7 @@ ifr_adding_visitor::visit_interface (AST_Interface *node) // not defined/added - not possible. // defined/not added - takes the other branch. // defined/added - we're ok. - this->ir_current_ = + this->ir_current_ = CORBA::IDLType::_narrow (prev_def.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -528,7 +528,7 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node) CORBA::InterfaceDefSeq bases (0); bases.length (0); - CORBA::Container_ptr current_scope = + CORBA::Container_ptr current_scope = CORBA::Container::_nil (); if (be_global->ifr_scopes ().top (current_scope) == 0) @@ -681,7 +681,7 @@ ifr_adding_visitor::visit_valuetype (AST_ValueType *node) prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - int status = + int status = this->create_value_def (node ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -820,7 +820,7 @@ ifr_adding_visitor::visit_valuetype (AST_ValueType *node) // not defined/added - not possible. // defined/not added - takes the other branch. // defined/added - we're ok. - this->ir_current_ = + this->ir_current_ = CORBA::IDLType::_narrow (prev_def.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -874,8 +874,8 @@ ifr_adding_visitor::visit_valuetype_fwd (AST_ValueTypeFwd *node) CORBA::Container_ptr current_scope = CORBA::Container::_nil (); - - CORBA::Boolean abstract = + + CORBA::Boolean abstract = static_cast<CORBA::Boolean> (v->is_abstract ()); if (be_global->ifr_scopes ().top (current_scope) == 0) @@ -1013,7 +1013,7 @@ ifr_adding_visitor::visit_component (AST_Component *node) prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - int status = + int status = this->create_component_def (node ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -1137,7 +1137,7 @@ ifr_adding_visitor::visit_component (AST_Component *node) // not defined/added - not possible. // defined/not added - takes the other branch. // defined/added - we're ok. - this->ir_current_ = + this->ir_current_ = CORBA::IDLType::_narrow (prev_def.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -1156,7 +1156,7 @@ ifr_adding_visitor::visit_component (AST_Component *node) return 0; } -int +int ifr_adding_visitor::visit_component_fwd (AST_ComponentFwd *node) { if (node->imported () && !be_global->do_included_files ()) @@ -1164,7 +1164,7 @@ ifr_adding_visitor::visit_component_fwd (AST_ComponentFwd *node) return 0; } - AST_Component *c = + AST_Component *c = AST_Component::narrow_from_decl (node->full_definition ()); ACE_DECLARE_NEW_CORBA_ENV; @@ -1289,7 +1289,7 @@ ifr_adding_visitor::visit_component_fwd (AST_ComponentFwd *node) return 0; } -int +int ifr_adding_visitor::visit_eventtype (AST_EventType *node) { if (node->imported () && !be_global->do_included_files ()) @@ -1378,7 +1378,7 @@ ifr_adding_visitor::visit_eventtype (AST_EventType *node) prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - int status = + int status = this->create_event_def (node ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -1517,7 +1517,7 @@ ifr_adding_visitor::visit_eventtype (AST_EventType *node) // not defined/added - not possible. // defined/not added - takes the other branch. // defined/added - we're ok. - this->ir_current_ = + this->ir_current_ = CORBA::IDLType::_narrow (prev_def.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -1536,7 +1536,7 @@ ifr_adding_visitor::visit_eventtype (AST_EventType *node) return 0; } -int +int ifr_adding_visitor::visit_eventtype_fwd (AST_EventTypeFwd *node) { if (node->imported () && !be_global->do_included_files ()) @@ -1580,7 +1580,7 @@ ifr_adding_visitor::visit_eventtype_fwd (AST_EventTypeFwd *node) ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; - + CORBA::Boolean abstract = static_cast<CORBA::Boolean> (v->is_abstract ()); @@ -1717,7 +1717,7 @@ ifr_adding_visitor::visit_home (AST_Home *node) prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - int status = + int status = this->create_home_def (node ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -1737,7 +1737,7 @@ ifr_adding_visitor::visit_home (AST_Home *node) // not defined/added - not possible. // defined/not added - takes the other branch. // defined/added - we're ok. - this->ir_current_ = + this->ir_current_ = CORBA::IDLType::_narrow (prev_def.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -1756,7 +1756,7 @@ ifr_adding_visitor::visit_home (AST_Home *node) return 0; } -int +int ifr_adding_visitor::visit_factory (AST_Factory *) { return 0; @@ -2028,7 +2028,7 @@ ifr_adding_visitor::visit_attribute (AST_Attribute *node) if (be_global->ifr_scopes ().top (current_scope) == 0) { - CORBA::DefinitionKind kind = + CORBA::DefinitionKind kind = current_scope->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -2482,7 +2482,7 @@ ifr_adding_visitor::visit_root (AST_Root *node) -1 ); } - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN (( @@ -2844,15 +2844,15 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node -1 ); } - - bases[i] = + + bases[i] = CORBA::AbstractInterfaceDef::_narrow (this->ir_current_.in () - ACE_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } else { - abs_bases[i] = + abs_bases[i] = CORBA::AbstractInterfaceDef::_narrow (result.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); @@ -2901,9 +2901,9 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node -1 ); } - + bases[i] = CORBA::InterfaceDef::_narrow (this->ir_current_.in () - ACE_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } else @@ -3163,7 +3163,7 @@ ifr_adding_visitor::create_value_def (AST_ValueType *node return 0; } -int +int ifr_adding_visitor::create_component_def (AST_Component *node ACE_ENV_ARG_DECL) { @@ -3289,7 +3289,7 @@ ifr_adding_visitor::create_component_def (AST_Component *node return 0; } -int +int ifr_adding_visitor::create_home_def (AST_Home *node ACE_ENV_ARG_DECL) { @@ -3602,12 +3602,12 @@ ifr_adding_visitor::create_value_member (AST_Field *node) } ACE_TRY_CHECK; - CORBA::ValueDef_var vt = + CORBA::ValueDef_var vt = CORBA::ValueDef::_narrow (current_scope ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::ValueMemberDef_var vm = + CORBA::ValueMemberDef_var vm = vt->create_value_member (node->repoID (), node->local_name ()->get_string (), node->version (), @@ -3671,7 +3671,7 @@ ifr_adding_visitor::get_referenced_type (AST_Type *node } } -void +void ifr_adding_visitor::fill_base_value (CORBA::ValueDef_ptr &result, AST_ValueType *node ACE_ENV_ARG_DECL) @@ -3693,13 +3693,13 @@ ifr_adding_visitor::fill_base_value (CORBA::ValueDef_ptr &result, if (!CORBA::is_nil (holder.in ())) { - result = + result = CORBA::ValueDef::_narrow (holder.in () ACE_ENV_ARG_PARAMETER); } } -void +void ifr_adding_visitor::fill_base_component ( CORBA::ComponentIR::ComponentDef_ptr &result, AST_Component *node @@ -3723,13 +3723,13 @@ ifr_adding_visitor::fill_base_component ( if (!CORBA::is_nil (holder.in ())) { - result = + result = CORBA::ComponentIR::ComponentDef::_narrow (holder.in () ACE_ENV_ARG_PARAMETER); } } -void +void ifr_adding_visitor::fill_base_home (CORBA::ComponentIR::HomeDef_ptr &result, AST_Home *node ACE_ENV_ARG_DECL) @@ -3751,7 +3751,7 @@ ifr_adding_visitor::fill_base_home (CORBA::ComponentIR::HomeDef_ptr &result, if (!CORBA::is_nil (holder.in ())) { - result = + result = CORBA::ComponentIR::HomeDef::_narrow (holder.in () ACE_ENV_ARG_PARAMETER); } @@ -3766,7 +3766,7 @@ ifr_adding_visitor::fill_base_home (CORBA::ComponentIR::HomeDef_ptr &result, } } -void +void ifr_adding_visitor::fill_managed_component ( CORBA::ComponentIR::ComponentDef_ptr &result, AST_Home *node @@ -3788,7 +3788,7 @@ ifr_adding_visitor::fill_managed_component ( if (!CORBA::is_nil (holder.in ())) { - result = + result = CORBA::ComponentIR::ComponentDef::_narrow (holder.in () ACE_ENV_ARG_PARAMETER); } @@ -3803,7 +3803,7 @@ ifr_adding_visitor::fill_managed_component ( } } -void +void ifr_adding_visitor::fill_primary_key (CORBA::ValueDef_ptr &result, AST_Home *node ACE_ENV_ARG_DECL) @@ -3823,7 +3823,7 @@ ifr_adding_visitor::fill_primary_key (CORBA::ValueDef_ptr &result, if (!CORBA::is_nil (holder.in ())) { - result = + result = CORBA::ValueDef::_narrow (holder.in () ACE_ENV_ARG_PARAMETER); } @@ -3838,7 +3838,7 @@ ifr_adding_visitor::fill_primary_key (CORBA::ValueDef_ptr &result, } } -void +void ifr_adding_visitor::fill_abstract_base_values (CORBA::ValueDefSeq &result, AST_ValueType *node ACE_ENV_ARG_DECL) @@ -3874,7 +3874,7 @@ ifr_adding_visitor::fill_abstract_base_values (CORBA::ValueDefSeq &result, } } -void +void ifr_adding_visitor::fill_inherited_interfaces (CORBA::InterfaceDefSeq &result, AST_Interface *node ACE_ENV_ARG_DECL) @@ -3886,7 +3886,7 @@ ifr_adding_visitor::fill_inherited_interfaces (CORBA::InterfaceDefSeq &result, ACE_ENV_ARG_PARAMETER); } -void +void ifr_adding_visitor::fill_supported_interfaces (CORBA::InterfaceDefSeq &result, AST_Interface *node ACE_ENV_ARG_DECL) @@ -3929,7 +3929,7 @@ ifr_adding_visitor::fill_supported_interfaces (CORBA::InterfaceDefSeq &result, ACE_ENV_ARG_PARAMETER); } -void +void ifr_adding_visitor::fill_interfaces (CORBA::InterfaceDefSeq &result, AST_Interface **list, CORBA::Long length @@ -3956,7 +3956,7 @@ ifr_adding_visitor::fill_interfaces (CORBA::InterfaceDefSeq &result, } } -void +void ifr_adding_visitor::fill_initializers (CORBA::ExtInitializerSeq &result, AST_ValueType *node ACE_ENV_ARG_DECL_NOT_USED) @@ -3965,7 +3965,7 @@ ifr_adding_visitor::fill_initializers (CORBA::ExtInitializerSeq &result, AST_Decl *item = 0; ACE_Vector<AST_Factory *> factories; - for (UTL_ScopeActiveIterator v_iter (node, + for (UTL_ScopeActiveIterator v_iter (node, UTL_Scope::IK_decls); !v_iter.is_done (); v_iter.next ()) @@ -4006,10 +4006,10 @@ ifr_adding_visitor::fill_initializers (CORBA::ExtInitializerSeq &result, { arg = AST_Argument::narrow_from_decl (f_iter.item ()); result[i].members[index].name = - CORBA::string_dup (arg->local_name ()->get_string ()); - result[i].members[index].type = + CORBA::string_dup (arg->local_name ()->get_string ()); + result[i].members[index].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void); - + /// This will put the field type in ir_current_, and also add it /// to the repository if it's not already there. if (arg->field_type ()->ast_accept (this) != 0) @@ -4022,11 +4022,11 @@ ifr_adding_visitor::fill_initializers (CORBA::ExtInitializerSeq &result, )); } - result[i].members[index].type_def = + result[i].members[index].type_def = CORBA::IDLType::_duplicate (this->ir_current_.in ()); } - CORBA::ULong n_exceptions = + CORBA::ULong n_exceptions = static_cast<CORBA::ULong> (factories[i]->n_exceptions ()); result[i].exceptions.length (n_exceptions); index = 0; @@ -4036,19 +4036,19 @@ ifr_adding_visitor::fill_initializers (CORBA::ExtInitializerSeq &result, ei.next ()) { excp = AST_Exception::narrow_from_decl (ei.item ()); - result[i].exceptions[index].name = + result[i].exceptions[index].name = CORBA::string_dup (excp->local_name ()->get_string ()); result[i].exceptions[index].id = excp->repoID (); result[i].exceptions[index].defined_in = ScopeAsDecl (excp->defined_in ())->repoID (); result[i].exceptions[index].version = excp->version (); - result[i].exceptions[index++].type = + result[i].exceptions[index++].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void); } } } -void +void ifr_adding_visitor::fill_get_exceptions (CORBA::ExceptionDefSeq &result, AST_Attribute *node ACE_ENV_ARG_DECL) @@ -4058,7 +4058,7 @@ ifr_adding_visitor::fill_get_exceptions (CORBA::ExceptionDefSeq &result, ACE_ENV_ARG_PARAMETER); } -void +void ifr_adding_visitor::fill_set_exceptions (CORBA::ExceptionDefSeq &result, AST_Attribute *node ACE_ENV_ARG_DECL) @@ -4068,7 +4068,7 @@ ifr_adding_visitor::fill_set_exceptions (CORBA::ExceptionDefSeq &result, ACE_ENV_ARG_PARAMETER); } -void +void ifr_adding_visitor::fill_exceptions (CORBA::ExceptionDefSeq &result, AST_Decl *node ACE_ENV_ARG_DECL) @@ -4097,7 +4097,7 @@ ifr_adding_visitor::fill_exceptions (CORBA::ExceptionDefSeq &result, } } -void +void ifr_adding_visitor::fill_exceptions (CORBA::ExceptionDefSeq &result, UTL_ExceptList *list ACE_ENV_ARG_DECL) @@ -4135,7 +4135,7 @@ ifr_adding_visitor::fill_exceptions (CORBA::ExceptionDefSeq &result, } } -void +void ifr_adding_visitor::fill_params (CORBA::ParDescriptionSeq &result, AST_Operation *node ACE_ENV_ARG_DECL) @@ -4152,7 +4152,7 @@ ifr_adding_visitor::fill_params (CORBA::ParDescriptionSeq &result, iter.next (), ++index) { arg = AST_Argument::narrow_from_decl (iter.item ()); - result[index].name = + result[index].name = CORBA::string_dup (arg->local_name ()->get_string ()); result[index].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void); @@ -4167,7 +4167,7 @@ ifr_adding_visitor::fill_params (CORBA::ParDescriptionSeq &result, } } -void +void ifr_adding_visitor::visit_all_provides (AST_Component *node, CORBA::ComponentIR::ComponentDef_ptr c ACE_ENV_ARG_DECL) @@ -4205,7 +4205,7 @@ ifr_adding_visitor::visit_all_provides (AST_Component *node, } } -void +void ifr_adding_visitor::visit_all_uses (AST_Component *node, CORBA::ComponentIR::ComponentDef_ptr c ACE_ENV_ARG_DECL) @@ -4244,7 +4244,7 @@ ifr_adding_visitor::visit_all_uses (AST_Component *node, } } -void +void ifr_adding_visitor::visit_all_emits (AST_Component *node, CORBA::ComponentIR::ComponentDef_ptr c ACE_ENV_ARG_DECL) @@ -4266,7 +4266,7 @@ ifr_adding_visitor::visit_all_emits (AST_Component *node, ACE_ENV_ARG_PARAMETER); ACE_CHECK; - event_type = + event_type = CORBA::ComponentIR::EventDef::_narrow (contained.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -4283,7 +4283,7 @@ ifr_adding_visitor::visit_all_emits (AST_Component *node, } } -void +void ifr_adding_visitor::visit_all_publishes (AST_Component *node, CORBA::ComponentIR::ComponentDef_ptr c ACE_ENV_ARG_DECL) @@ -4305,7 +4305,7 @@ ifr_adding_visitor::visit_all_publishes (AST_Component *node, ACE_ENV_ARG_PARAMETER); ACE_CHECK; - event_type = + event_type = CORBA::ComponentIR::EventDef::_narrow (contained.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -4322,7 +4322,7 @@ ifr_adding_visitor::visit_all_publishes (AST_Component *node, } } -void +void ifr_adding_visitor::visit_all_consumes (AST_Component *node, CORBA::ComponentIR::ComponentDef_ptr c ACE_ENV_ARG_DECL) @@ -4344,7 +4344,7 @@ ifr_adding_visitor::visit_all_consumes (AST_Component *node, ACE_ENV_ARG_PARAMETER); ACE_CHECK; - event_type = + event_type = CORBA::ComponentIR::EventDef::_narrow (contained.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -4361,7 +4361,7 @@ ifr_adding_visitor::visit_all_consumes (AST_Component *node, } } -void +void ifr_adding_visitor::visit_all_factories (AST_Home *node, CORBA::ComponentIR::HomeDef_ptr h ACE_ENV_ARG_DECL) @@ -4397,7 +4397,7 @@ ifr_adding_visitor::visit_all_factories (AST_Home *node, } } -void +void ifr_adding_visitor::visit_all_finders (AST_Home *node, CORBA::ComponentIR::HomeDef_ptr h ACE_ENV_ARG_DECL) @@ -4433,39 +4433,10 @@ ifr_adding_visitor::visit_all_finders (AST_Home *node, } } -void +void ifr_adding_visitor::expand_id (ACE_CString &str, const char *local_name) { ssize_t pos = str.rfind (':'); str = str.substr (0, pos) + '/' + local_name + str.substr (pos); } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Node <AST_Component::port_description>; -template class ACE_Unbounded_Queue <AST_Component::port_description>; -template class ACE_Unbounded_Queue_Iterator <AST_Component::port_description>; - -template class ACE_Node <AST_Operation *>; -template class ACE_Unbounded_Queue <AST_Operation *>; -template class ACE_Unbounded_Queue_Iterator <AST_Operation *>; - -template class ACE_Vector<AST_Factory *>; -template class ACE_Array_Base<AST_Factory *>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Node <AST_Component::port_description> -#pragma instantiate ACE_Unbounded_Queue <AST_Component::port_description> -#pragma instantiate ACE_Unbounded_Queue_Iterator <AST_Component::port_description> - -#pragma instantiate ACE_Node <AST_Operation *> -#pragma instantiate ACE_Unbounded_Queue <AST_Operation *> -#pragma instantiate ACE_Unbounded_Queue_Iterator <AST_Operation *> - -#pragma instantiate ACE_Vector<AST_Factory *> -#pragma instantiate ACE_Array_Base<AST_Factory *> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp index be61ce0f0a9..069b9886882 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp @@ -485,19 +485,3 @@ ifr_adding_visitor_exception::ir_current (void) const { return this->ir_current_.in (); } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Unbounded_Queue<CORBA::Contained_ptr>; -template class ACE_Unbounded_Queue_Iterator<CORBA::Contained_ptr>; -template class ACE_Node<CORBA::Contained_ptr>; -template class ACE_Write_Guard<ACE_Lock>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Unbounded_Queue<CORBA::Contained_ptr> -#pragma instantiate ACE_Unbounded_Queue_Iterator<CORBA::Contained_ptr> -#pragma instantiate ACE_Node<CORBA::Contained_ptr> -#pragma instantiate ACE_Write_Guard<ACE_Lock> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp index 7bf7100a462..02dce835e2e 100644 --- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp +++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp @@ -339,11 +339,3 @@ RTEvent_Logging_Service::parse_args (int argc, char *argv []) return 0; } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Auto_Basic_Ptr<POA_RtecScheduler::Scheduler>; -template class auto_ptr<POA_RtecScheduler::Scheduler>; -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Auto_Basic_Ptr<POA_RtecScheduler::Scheduler> -#pragma instantiate auto_ptr<POA_RtecScheduler::Scheduler> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp index 372be078a81..c975508ca4f 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp @@ -5296,281 +5296,3 @@ TAO_Tokenizer::operator [] (size_t index) const return this->token_array_[index]; } - - - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - -template class ACE_Hash_Map_Entry<ACE_CString, AVStreams::FDev_var>; -template class ACE_Hash_Map_Entry<ACE_CString, AVStreams::FlowConnection_var>; -template class ACE_Hash_Map_Entry<ACE_CString, AVStreams::FlowEndPoint_var>; -template class ACE_Hash_Map_Entry<ACE_CString, TAO_FlowSpec_Entry *>; -template class ACE_Hash_Map_Entry<ACE_CString, TAO_AV_Flow_Handler *>; - -template class ACE_Hash_Map_Manager<ACE_CString, AVStreams::FDev_var, ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager<ACE_CString, TAO_FlowSpec_Entry *, ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager<ACE_CString, AVStreams::FlowConnection_var, ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager<ACE_CString, TAO_AV_Flow_Handler*, ACE_Null_Mutex>; - -template class ACE_Hash_Map_Iterator<ACE_CString, AVStreams::FDev_var, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<ACE_CString, AVStreams::FDev_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, AVStreams::FDev_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator<ACE_CString, AVStreams::FDev_var, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, AVStreams::FDev_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator<ACE_CString, TAO_AV_Flow_Handler*, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<ACE_CString, TAO_AV_Flow_Handler*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_AV_Flow_Handler*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator<ACE_CString, TAO_AV_Flow_Handler*, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, TAO_AV_Flow_Handler*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; - -template class ACE_Hash_Map_Manager_Ex<ACE_CString, AVStreams::FDev_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<ACE_CString, AVStreams::FlowConnection_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_FlowSpec_Entry *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_AV_Flow_Handler *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; - -template class ACE_Hash_Map_Iterator<ACE_CString, AVStreams::FlowConnection_var, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<ACE_CString, AVStreams::FlowConnection_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, AVStreams::FlowConnection_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator<ACE_CString, AVStreams::FlowConnection_var, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, AVStreams::FlowConnection_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; - -template class ACE_Hash_Map_Manager<ACE_CString, AVStreams::FlowEndPoint_var, ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<ACE_CString, AVStreams::FlowEndPoint_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator<ACE_CString, AVStreams::FlowEndPoint_var, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<ACE_CString, AVStreams::FlowEndPoint_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, AVStreams::FlowEndPoint_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator<ACE_CString,AVStreams::FlowEndPoint_var,ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, AVStreams::FlowEndPoint_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; - -template class ACE_Hash_Map_Entry<MMDevice_Map_Hash_Key,TAO_StreamCtrl::MMDevice_Map_Entry>; -template class ACE_Hash_Map_Manager<MMDevice_Map_Hash_Key,TAO_StreamCtrl::MMDevice_Map_Entry,ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<MMDevice_Map_Hash_Key, TAO_StreamCtrl::MMDevice_Map_Entry, ACE_Hash<MMDevice_Map_Hash_Key>, ACE_Equal_To<MMDevice_Map_Hash_Key>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator<MMDevice_Map_Hash_Key,TAO_StreamCtrl::MMDevice_Map_Entry,ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<MMDevice_Map_Hash_Key, TAO_StreamCtrl::MMDevice_Map_Entry, ACE_Hash<MMDevice_Map_Hash_Key>, ACE_Equal_To<MMDevice_Map_Hash_Key>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<MMDevice_Map_Hash_Key, TAO_StreamCtrl::MMDevice_Map_Entry, ACE_Hash<MMDevice_Map_Hash_Key>, ACE_Equal_To<MMDevice_Map_Hash_Key>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator<MMDevice_Map_Hash_Key,TAO_StreamCtrl::MMDevice_Map_Entry,ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<MMDevice_Map_Hash_Key, TAO_StreamCtrl::MMDevice_Map_Entry, ACE_Hash<MMDevice_Map_Hash_Key>, ACE_Equal_To<MMDevice_Map_Hash_Key>, ACE_Null_Mutex>; - -template class ACE_Hash_Map_Entry<ACE_CString,TAO_AV_Acceptor*>; -template class ACE_Hash_Map_Manager<ACE_CString,TAO_AV_Acceptor*,ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_AV_Acceptor*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator<ACE_CString,TAO_AV_Acceptor*,ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<ACE_CString, TAO_AV_Acceptor*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_AV_Acceptor*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator<ACE_CString,TAO_AV_Acceptor*,ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, TAO_AV_Acceptor*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; - -template class ACE_Hash_Map_Entry<ACE_CString,TAO_Forward_FlowSpec_Entry*>; -template class ACE_Hash_Map_Manager<ACE_CString,TAO_Forward_FlowSpec_Entry*,ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_Forward_FlowSpec_Entry*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator<ACE_CString,TAO_Forward_FlowSpec_Entry*,ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<ACE_CString, TAO_Forward_FlowSpec_Entry*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_Forward_FlowSpec_Entry*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator<ACE_CString,TAO_Forward_FlowSpec_Entry*,ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, TAO_Forward_FlowSpec_Entry*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; - -template class ACE_Hash_Map_Entry<ACE_CString,TAO_Reverse_FlowSpec_Entry*>; -template class ACE_Hash_Map_Manager<ACE_CString,TAO_Reverse_FlowSpec_Entry*,ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_Reverse_FlowSpec_Entry*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator<ACE_CString,TAO_Reverse_FlowSpec_Entry*,ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<ACE_CString, TAO_Reverse_FlowSpec_Entry*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_Reverse_FlowSpec_Entry*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator<ACE_CString,TAO_Reverse_FlowSpec_Entry*,ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, TAO_Reverse_FlowSpec_Entry*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; - -template class ACE_Hash_Map_Entry<ACE_CString,TAO_AV_UDP_MCast_Flow_Handler*>; -template class ACE_Hash_Map_Manager<ACE_CString,TAO_AV_UDP_MCast_Flow_Handler*,ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_AV_UDP_MCast_Flow_Handler*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator<ACE_CString,TAO_AV_UDP_MCast_Flow_Handler*,ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<ACE_CString, TAO_AV_UDP_MCast_Flow_Handler*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_AV_UDP_MCast_Flow_Handler*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator<ACE_CString,TAO_AV_UDP_MCast_Flow_Handler*,ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, TAO_AV_UDP_MCast_Flow_Handler*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; - -template class ACE_Hash_Map_Entry<ACE_CString,AVStreams::QoS>; -template class ACE_Hash_Map_Manager<ACE_CString,AVStreams::QoS,ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<ACE_CString, AVStreams::QoS, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator<ACE_CString,AVStreams::QoS,ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<ACE_CString, AVStreams::QoS, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, AVStreams::QoS, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator<ACE_CString,AVStreams::QoS,ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, AVStreams::QoS, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; - -//template class ACE_Hash_Map_Manager<ACE_CString,TAO_FlowSpec_Entry *,ACE_Null_Mutex>; -//template class ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_FlowSpec_Entry *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator<ACE_CString,TAO_FlowSpec_Entry *,ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<ACE_CString, TAO_FlowSpec_Entry *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_FlowSpec_Entry *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator<ACE_CString,TAO_FlowSpec_Entry *,ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, TAO_FlowSpec_Entry *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; - - -template class ACE_Equal_To<MMDevice_Map_Hash_Key>; -template class ACE_Hash<MMDevice_Map_Hash_Key>; -template class ACE_Array<char*>; -template class ACE_DLList<TAO_MCastConfigIf::Peer_Info>; -template class ACE_DLList_Iterator<TAO_MCastConfigIf::Peer_Info>; -template class ACE_DLList <TAO_FlowProducer>; -template class ACE_DLList_Iterator <TAO_FlowProducer>; -template class ACE_DLList <TAO_FlowConsumer>; -template class ACE_DLList_Iterator <TAO_FlowConsumer>; - -template class ACE_Node <TAO_FlowSpec_Entry*>; -template class ACE_Unbounded_Set <TAO_FlowSpec_Entry*>; -template class ACE_Unbounded_Set_Iterator <TAO_FlowSpec_Entry*>; - -template class ACE_Node <TAO_AV_Transport_Item*>; -template class ACE_Unbounded_Set<TAO_AV_Transport_Item*>; -template class ACE_Unbounded_Set_Iterator<TAO_AV_Transport_Item*>; - -template class ACE_Node <TAO_AV_Flow_Protocol_Item*>; -template class ACE_Unbounded_Set<TAO_AV_Flow_Protocol_Item*>; -template class ACE_Unbounded_Set_Iterator<TAO_AV_Flow_Protocol_Item*>; - -template class ACE_Node<AVStreams::FlowProducer *>; -template class ACE_Unbounded_Set<AVStreams::FlowProducer *>; -template class ACE_Unbounded_Set_Iterator<AVStreams::FlowProducer *>; - -template class ACE_Node<AVStreams::FlowConsumer *>; -template class ACE_Unbounded_Set<AVStreams::FlowConsumer *>; -template class ACE_Unbounded_Set_Iterator<AVStreams::FlowConsumer *>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - - -#pragma instantiate ACE_Hash_Map_Entry<ACE_CString,AVStreams::FDev_var> -#pragma instantaite ACE_Hash_Map_Entry<ACE_CString, TAO_FlowSpec_Entry *> -#pragma instantiate ACE_Hash_Map_Manager<ACE_CString,AVStreams::FDev_var,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager<ACE_CString,TAO_FlowSpec_Entry *, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, AVStreams::FDev_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator<ACE_CString,AVStreams::FDev_var,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, AVStreams::FDev_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, AVStreams::FDev_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_CString,AVStreams::FDev_var,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, AVStreams::FDev_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_FlowSpec_Entry *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> - -#pragma instantiate ACE_Hash_Map_Entry<ACE_CString,AVStreams::FlowConnection_var> -#pragma instantiate ACE_Hash_Map_Manager<ACE_CString,AVStreams::FlowConnection_var,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, AVStreams::FlowConnection_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator<ACE_CString,AVStreams::FlowConnection_var,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, AVStreams::FlowConnection_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, AVStreams::FlowConnection_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_CString,AVStreams::FlowConnection_var,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, AVStreams::FlowConnection_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> - -#pragma instantiate ACE_Hash_Map_Entry<ACE_CString,TAO_AV_Flow_Handler*> -#pragma instantiate ACE_Hash_Map_Manager<ACE_CString,TAO_AV_Flow_Handler*,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_AV_Flow_Handler*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator<ACE_CString,TAO_AV_Flow_Handler*,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, TAO_AV_Flow_Handler*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_AV_Flow_Handler*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_CString,TAO_AV_Flow_Handler*,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, TAO_AV_Flow_Handler*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> - - -#pragma instantiate ACE_Hash_Map_Entry<ACE_CString,AVStreams::FlowEndPoint_var> -#pragma instantiate ACE_Hash_Map_Manager<ACE_CString,AVStreams::FlowEndPoint_var,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, AVStreams::FlowEndPoint_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator<ACE_CString,AVStreams::FlowEndPoint_var,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, AVStreams::FlowEndPoint_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, AVStreams::FlowEndPoint_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_CString,AVStreams::FlowEndPoint_var,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, AVStreams::FlowEndPoint_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> - -#pragma instantiate ACE_Hash_Map_Entry<MMDevice_Map_Hash_Key,TAO_StreamCtrl::MMDevice_Map_Entry> -#pragma instantiate ACE_Hash_Map_Manager<MMDevice_Map_Hash_Key,TAO_StreamCtrl::MMDevice_Map_Entry,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<MMDevice_Map_Hash_Key, TAO_StreamCtrl::MMDevice_Map_Entry, ACE_Hash<MMDevice_Map_Hash_Key>, ACE_Equal_To<MMDevice_Map_Hash_Key>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator<MMDevice_Map_Hash_Key,TAO_StreamCtrl::MMDevice_Map_Entry,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<MMDevice_Map_Hash_Key, TAO_StreamCtrl::MMDevice_Map_Entry, ACE_Hash<MMDevice_Map_Hash_Key>, ACE_Equal_To<MMDevice_Map_Hash_Key>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<MMDevice_Map_Hash_Key, TAO_StreamCtrl::MMDevice_Map_Entry, ACE_Hash<MMDevice_Map_Hash_Key>, ACE_Equal_To<MMDevice_Map_Hash_Key>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<MMDevice_Map_Hash_Key,TAO_StreamCtrl::MMDevice_Map_Entry,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<MMDevice_Map_Hash_Key, TAO_StreamCtrl::MMDevice_Map_Entry, ACE_Hash<MMDevice_Map_Hash_Key>, ACE_Equal_To<MMDevice_Map_Hash_Key>, ACE_Null_Mutex> - -#pragma instantiate ACE_Hash_Map_Entry<ACE_CString,TAO_AV_Acceptor*> -#pragma instantiate ACE_Hash_Map_Manager<ACE_CString,TAO_AV_Acceptor*,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_AV_Acceptor*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator<ACE_CString,TAO_AV_Acceptor*,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, TAO_AV_Acceptor*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_AV_Acceptor*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_CString,TAO_AV_Acceptor*,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, TAO_AV_Acceptor*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> - -#pragma instantiate ACE_Hash_Map_Entry<ACE_CString,TAO_Forward_FlowSpec_Entry*> -#pragma instantiate ACE_Hash_Map_Manager<ACE_CString,TAO_Forward_FlowSpec_Entry*,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_Forward_FlowSpec_Entry*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator<ACE_CString,TAO_Forward_FlowSpec_Entry*,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, TAO_Forward_FlowSpec_Entry*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_Forward_FlowSpec_Entry*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_CString,TAO_Forward_FlowSpec_Entry*,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, TAO_Forward_FlowSpec_Entry*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> - -#pragma instantiate ACE_Hash_Map_Entry<ACE_CString,TAO_Reverse_FlowSpec_Entry*> -#pragma instantiate ACE_Hash_Map_Manager<ACE_CString,TAO_Reverse_FlowSpec_Entry*,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_Reverse_FlowSpec_Entry*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator<ACE_CString,TAO_Reverse_FlowSpec_Entry*,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, TAO_Reverse_FlowSpec_Entry*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_Reverse_FlowSpec_Entry*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_CString,TAO_Reverse_FlowSpec_Entry*,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, TAO_Reverse_FlowSpec_Entry*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> - -#pragma instantiate ACE_Hash_Map_Entry<ACE_CString,TAO_AV_UDP_MCast_Flow_Handler*> -#pragma instantiate ACE_Hash_Map_Manager<ACE_CString,TAO_AV_UDP_MCast_Flow_Handler*,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_AV_UDP_MCast_Flow_Handler*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator<ACE_CString,TAO_AV_UDP_MCast_Flow_Handler*,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, TAO_AV_UDP_MCast_Flow_Handler*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_AV_UDP_MCast_Flow_Handler*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_CString,TAO_AV_UDP_MCast_Flow_Handler*,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, TAO_AV_UDP_MCast_Flow_Handler*, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> - -#pragma instantiate ACE_Hash_Map_Entry<ACE_CString,AVStreams::QoS> -#pragma instantiate ACE_Hash_Map_Manager<ACE_CString,AVStreams::QoS,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, AVStreams::QoS, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator<ACE_CString,AVStreams::QoS,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, AVStreams::QoS, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, AVStreams::QoS, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_CString,AVStreams::QoS,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, AVStreams::QoS, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> - -#pragma instantiate ACE_Hash_Map_Entry<ACE_CString,TAO_FlowSpec_Entry *> -#pragma instantiate ACE_Hash_Map_Manager<ACE_CString,TAO_FlowSpec_Entry *,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_FlowSpec_Entry *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator<ACE_CString,TAO_FlowSpec_Entry *,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, TAO_FlowSpec_Entry *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_FlowSpec_Entry *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_CString,TAO_FlowSpec_Entry *,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, TAO_FlowSpec_Entry *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> - -#pragma instantiate ACE_Equal_To<MMDevice_Map_Hash_Key> -#pragma instantiate ACE_Hash<MMDevice_Map_Hash_Key> -#pragma instantiate ACE_Array<char*> -#pragma instantiate ACE_DLList<TAO_MCastConfigIf::Peer_Info> -#pragma instantiate ACE_DLList_Iterator<TAO_MCastConfigIf::Peer_Info> -#pragma instantiate ACE_DLList <TAO_FlowProducer> -#pragma instantiate ACE_DLList_Iterator <TAO_FlowProducer> -#pragma instantiate ACE_DLList <TAO_FlowConsumer> -#pragma instantiate ACE_DLList_Iterator <TAO_FlowConsumer> - -#pragma instantiate ACE_Node <TAO_FlowSpec_Entry*> -#pragma instantiate ACE_Unbounded_Set <TAO_FlowSpec_Entry*> -#pragma instantiate ACE_Unbounded_Set_Iterator <TAO_FlowSpec_Entry*> - -#pragma instantiate ACE_Node <TAO_AV_Transport_Item*> -#pragma instantiate ACE_Unbounded_Set<TAO_AV_Transport_Item*> -#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_AV_Transport_Item*> - -#pragma instantiate ACE_Node <TAO_AV_Flow_Protocol_Item*> -#pragma instantiate ACE_Unbounded_Set<TAO_AV_Flow_Protocol_Item*> -#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_AV_Transport_Item*> - -#pragma instantiate ACE_Node<AVStreams::FlowProducer *> -#pragma instantiate ACE_Unbounded_Set<AVStreams::FlowProducer *> -#pragma instantiate ACE_Unbounded_Set_Iterator<AVStreams::FlowProducer *> - -#pragma instantiate ACE_Node<AVStreams::FlowConsumer *> -#pragma instantiate ACE_Unbounded_Set<AVStreams::FlowConsumer *> -#pragma instantiate ACE_Unbounded_Set_Iterator<AVStreams::FlowConsumer *> - - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp index 05d7f1d7d6c..de9876a3e7b 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp @@ -1178,13 +1178,6 @@ TAO_AV_Core::get_control_flowname(const char *flowname) return flowname; } - - - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Singleton<TAO_AV_Core,ACE_Null_Mutex>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Singleton<TAO_AV_Core,ACE_Null_Mutex> -#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) +#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) template ACE_Singleton<TAO_AV_Core, ACE_Null_Mutex> *ACE_Singleton<TAO_AV_Core, ACE_Null_Mutex>::singleton_; -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp index 463f81c0738..6aa86653c46 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp @@ -69,22 +69,4 @@ Fill_ACE_QoS::map (void) return this->flow_spec_map_; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Hash_Map_Manager<ACE_CString,ACE_Flow_Spec *,ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Entry<ACE_CString, ACE_Flow_Spec *>; -template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator<ACE_CString, ACE_Flow_Spec *, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, ACE_Flow_Spec *, 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,ACE_Flow_Spec *,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Entry<ACE_CString, ACE_Flow_Spec *> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_CString, ACE_Flow_Spec *, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - #endif /* ACE_HAS_RAPI || ACE_HAS_WINSOCK2_GQOS */ diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.cpp b/TAO/orbsvcs/orbsvcs/AV/Policy.cpp index fd923b92bff..6701affedc8 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Policy.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Policy.cpp @@ -146,13 +146,3 @@ TAO_AV_Callback::schedule_timer (void) { return this->handler_->schedule_timer (); } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class TAO_Unbounded_Sequence<TAO_AV_Policy*>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate TAO_Unbounded_Sequence<TAO_AV_Policy*> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp index 56379f64ac2..1f00f0573e4 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp @@ -47,7 +47,7 @@ TAO_AV_Flow_Protocol_Factory::control_flow_factory (void) //---------------------------------------------------------------------- TAO_AV_Protocol_Object::TAO_AV_Protocol_Object (void) :transport_ (0), - callback_ (0) + callback_ (0) { // no-op. } @@ -124,11 +124,3 @@ TAO_AV_Protocol_Object::handle_control_input (ACE_Message_Block *, ACE_DEBUG ((LM_DEBUG,"TAO_AV_Protocol_Object::handle_control_input\n")); return 0; } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Dynamic_Service<TAO_AV_Transport_Factory>; -template class ACE_Dynamic_Service<TAO_AV_Flow_Protocol_Factory>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Dynamic_Service<TAO_AV_Transport_Factory> -#pragma instantiate ACE_Dynamic_Service<TAO_AV_Flow_Protocol_Factory> -#endif diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp index b35f2505e88..0d7124705fe 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp @@ -821,27 +821,3 @@ ACE_STATIC_SVC_DEFINE (TAO_AV_RTCP_Flow_Factory, ACE_Service_Type::DELETE_OBJ, 0) - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Hash_Map_Entry<ACE_UINT32,RTCP_Channel_In *>; -template class ACE_Hash_Map_Manager<ACE_UINT32,RTCP_Channel_In *,ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<ACE_UINT32, RTCP_Channel_In *, ACE_Hash<ACE_UINT32>, ACE_Equal_To<ACE_UINT32>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator<ACE_UINT32,RTCP_Channel_In *,ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<ACE_UINT32, RTCP_Channel_In *, ACE_Hash<ACE_UINT32>, ACE_Equal_To<ACE_UINT32>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<ACE_UINT32, RTCP_Channel_In *, ACE_Hash<ACE_UINT32>, ACE_Equal_To<ACE_UINT32>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator<ACE_UINT32,RTCP_Channel_In *,ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_UINT32, RTCP_Channel_In *, ACE_Hash<ACE_UINT32>, ACE_Equal_To<ACE_UINT32>, ACE_Null_Mutex>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Hash_Map_Entry<ACE_UINT32,RTCP_Channel_In *> -#pragma instantiate ACE_Hash_Map_Manager<ACE_UINT32,RTCP_Channel_In *,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_UINT32, RTCP_Channel_In *, ACE_Hash<ACE_UINT32>, ACE_Equal_To<ACE_UINT32>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator<ACE_UINT32,RTCP_Channel_In *,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_UINT32, RTCP_Channel_In *, ACE_Hash<ACE_UINT32>, ACE_Equal_To<ACE_UINT32>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_UINT32, RTCP_Channel_In *, ACE_Hash<ACE_UINT32>, ACE_Equal_To<ACE_UINT32>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_UINT32,RTCP_Channel_In *,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_UINT32, RTCP_Channel_In *, ACE_Hash<ACE_UINT32>, ACE_Equal_To<ACE_UINT32>, ACE_Null_Mutex> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp index 4ecdbe1e386..85aa7eef6e2 100644 --- a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp @@ -292,11 +292,11 @@ TAO_AV_TCP_Flow_Factory::make_protocol_object (TAO_FlowSpec_Entry *entry, TAO_AV_Transport *transport) { TAO_AV_Callback *callback = 0; - if (endpoint->get_callback (entry->flowname (), callback)) + if (endpoint->get_callback (entry->flowname (), callback)) { ACE_ERROR_RETURN ((LM_ERROR, "(%N,%l) Invalid callback\n"), 0); } - + TAO_AV_TCP_Object *object = 0; ACE_NEW_RETURN (object, TAO_AV_TCP_Object (callback, @@ -308,7 +308,7 @@ TAO_AV_TCP_Flow_Factory::make_protocol_object (TAO_FlowSpec_Entry *entry, object); endpoint->protocol_object_set (); - + return object; } @@ -694,18 +694,6 @@ TAO_AV_TCP_Flow_Handler::handle_timeout (const ACE_Time_Value &tv, return TAO_AV_Flow_Handler::handle_timeout (tv,arg); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Acceptor<TAO_AV_TCP_Flow_Handler, ACE_SOCK_ACCEPTOR>; -template class ACE_Connector_Base<TAO_AV_TCP_Flow_Handler>; -template class ACE_Connector<TAO_AV_TCP_Flow_Handler, ACE_SOCK_CONNECTOR>; -template class ACE_NonBlocking_Connect_Handler<TAO_AV_TCP_Flow_Handler>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Acceptor<TAO_AV_TCP_Flow_Handler, ACE_SOCK_Acceptor, ACE_INET_Addr> -#pragma instantiate ACE_Connector_Base<TAO_AV_TCP_Flow_Handler> -#pragma instantiate ACE_Connector<TAO_AV_TCP_Flow_Handler, ACE_SOCK_Connector, ACE_INET_Addr> -#pragma instantiate ACE_NonBlocking_Connect_Handler<TAO_AV_TCP_Flow_Handler> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - ACE_STATIC_SVC_DEFINE (TAO_AV_TCP_Flow_Factory, ACE_TEXT ("TCP_Flow_Factory"), ACE_SVC_OBJ_T, diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp index 5ee6ccbf10d..4cce7ccdd8c 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp @@ -675,20 +675,3 @@ TAO_AV_Transport_Factory::make_connector (void) { return 0; } - - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Node <TAO_AV_Connector*>; -template class ACE_Node <TAO_AV_Acceptor*>; -template class ACE_Unbounded_Set<TAO_AV_Acceptor*>; -template class ACE_Unbounded_Set<TAO_AV_Connector*>; -template class ACE_Unbounded_Set_Iterator<TAO_AV_Acceptor*>; -template class ACE_Unbounded_Set_Iterator<TAO_AV_Connector*>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Node <TAO_AV_Connector*> -#pragma instantiate ACE_Node <TAO_AV_Acceptor*> -#pragma instantiate ACE_Unbounded_Set<TAO_AV_Connector*> -#pragma instantiate ACE_Unbounded_Set<TAO_AV_Acceptor*> -#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_AV_Connector*> -#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_AV_Acceptor*> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp index f82977a1b20..9c9cccf126a 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp @@ -1319,59 +1319,9 @@ TAO_SFP_Frame_State::reset (void) return 0; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_DNode<TAO_SFP_Fragment_Node>; -template class ACE_Ordered_MultiSet<TAO_SFP_Fragment_Node>; -template class ACE_Ordered_MultiSet_Iterator<TAO_SFP_Fragment_Node>; - -template class ACE_Hash_Map_Manager<CORBA::ULong,TAO_SFP_Fragment_Table_Entry*,ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<CORBA::ULong, TAO_SFP_Fragment_Table_Entry *, ACE_Hash<CORBA::ULong>, ACE_Equal_To<CORBA::ULong>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Entry<CORBA::ULong, TAO_SFP_Fragment_Table_Entry *>; -template class ACE_Hash_Map_Iterator_Base_Ex<CORBA::ULong, TAO_SFP_Fragment_Table_Entry *, ACE_Hash<CORBA::ULong>, ACE_Equal_To<CORBA::ULong>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<CORBA::ULong,TAO_SFP_Fragment_Table_Entry*,ACE_Hash<CORBA::ULong>,ACE_Equal_To<CORBA::ULong>,ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<CORBA::ULong,TAO_SFP_Fragment_Table_Entry*,ACE_Hash<CORBA::ULong>,ACE_Equal_To<CORBA::ULong>,ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator<CORBA::ULong,TAO_SFP_Fragment_Table_Entry *,ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator<CORBA::ULong,TAO_SFP_Fragment_Table_Entry *,ACE_Null_Mutex>; - -template class ACE_Hash_Map_Manager<CORBA::ULong,ACE_Hash_Map_Manager<CORBA::ULong,TAO_SFP_Fragment_Table_Entry*,ACE_Null_Mutex>*,ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<CORBA::ULong, ACE_Hash_Map_Manager<CORBA::ULong,TAO_SFP_Fragment_Table_Entry*,ACE_Null_Mutex> *, ACE_Hash<CORBA::ULong>, ACE_Equal_To<CORBA::ULong>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Entry<CORBA::ULong, ACE_Hash_Map_Manager<CORBA::ULong,TAO_SFP_Fragment_Table_Entry*,ACE_Null_Mutex> *>; -template class ACE_Hash_Map_Iterator_Base_Ex<CORBA::ULong, ACE_Hash_Map_Manager<CORBA::ULong,TAO_SFP_Fragment_Table_Entry*,ACE_Null_Mutex> *, ACE_Hash<CORBA::ULong>, ACE_Equal_To<CORBA::ULong>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<CORBA::ULong,ACE_Hash_Map_Manager<CORBA::ULong,TAO_SFP_Fragment_Table_Entry*,ACE_Null_Mutex>*,ACE_Hash<CORBA::ULong>,ACE_Equal_To<CORBA::ULong>,ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<CORBA::ULong,ACE_Hash_Map_Manager<CORBA::ULong,TAO_SFP_Fragment_Table_Entry*,ACE_Null_Mutex>*,ACE_Hash<CORBA::ULong>,ACE_Equal_To<CORBA::ULong>,ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator<CORBA::ULong,ACE_Hash_Map_Manager<CORBA::ULong,TAO_SFP_Fragment_Table_Entry*,ACE_Null_Mutex> *,ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator<CORBA::ULong,ACE_Hash_Map_Manager<CORBA::ULong,TAO_SFP_Fragment_Table_Entry*,ACE_Null_Mutex> *,ACE_Null_Mutex>; - -template class ACE_Singleton<TAO_SFP_Base, TAO_SYNCH_MUTEX>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_DNode<TAO_SFP_Fragment_Node> -#pragma instantiate ACE_Ordered_MultiSet<TAO_SFP_Fragment_Node> -#pragma instantiate ACE_Ordered_MultiSet_Iterator<TAO_SFP_Fragment_Node> -#pragma instantiate ACE_Hash_Map_Manager<CORBA::ULong,TAO_SFP_Fragment_Table_Entry*,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<CORBA::ULong, TAO_SFP_Fragment_Table_Entry *, ACE_Hash<CORBA::ULong>, ACE_Equal_To<CORBA::ULong>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Entry<CORBA::ULong, TAO_SFP_Fragment_Table_Entry *> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<CORBA::ULong, TAO_SFP_Fragment_Table_Entry *, ACE_Hash<CORBA::ULong>, ACE_Equal_To<CORBA::ULong>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<CORBA::ULong,TAO_SFP_Fragment_Table_Entry*,ACE_Hash<CORBA::ULong>,ACE_Equal_To<CORBA::ULong>,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<CORBA::ULong,TAO_SFP_Fragment_Table_Entry*,ACE_Hash<CORBA::ULong>,ACE_Equal_To<CORBA::ULong>,ACE_Null_Mutex> -#pragma instantiate ACE_Equal_To<CORBA::ULong> -#pragma instantiate ACE_Hash_Map_Iterator<CORBA::ULong,TAO_SFP_Fragment_Table_Entry *,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<CORBA::ULong,TAO_SFP_Fragment_Table_Entry *,ACE_Null_Mutex> - -#pragma instantiate ACE_Hash_Map_Manager<CORBA::ULong,ACE_Hash_Map_Manager<CORBA::ULong,TAO_SFP_Fragment_Table_Entry*,ACE_Null_Mutex>*,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<CORBA::ULong, ACE_Hash_Map_Manager<CORBA::ULong,TAO_SFP_Fragment_Table_Entry*,ACE_Null_Mutex> *, ACE_Hash<CORBA::ULong>, ACE_Equal_To<CORBA::ULong>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Entry<CORBA::ULong, ACE_Hash_Map_Manager<CORBA::ULong,TAO_SFP_Fragment_Table_Entry*,ACE_Null_Mutex> *> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<CORBA::ULong, ACE_Hash_Map_Manager<CORBA::ULong,TAO_SFP_Fragment_Table_Entry*,ACE_Null_Mutex> *, ACE_Hash<CORBA::ULong>, ACE_Equal_To<CORBA::ULong>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<CORBA::ULong,ACE_Hash_Map_Manager<CORBA::ULong,TAO_SFP_Fragment_Table_Entry*,ACE_Null_Mutex>*,ACE_Hash<CORBA::ULong>,ACE_Equal_To<CORBA::ULong>,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<CORBA::ULong,ACE_Hash_Map_Manager<CORBA::ULong,TAO_SFP_Fragment_Table_Entry*,ACE_Null_Mutex>*,ACE_Hash<CORBA::ULong>,ACE_Equal_To<CORBA::ULong>,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator<CORBA::ULong,ACE_Hash_Map_Manager<CORBA::ULong,TAO_SFP_Fragment_Table_Entry*,ACE_Null_Mutex> *,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<CORBA::ULong,ACE_Hash_Map_Manager<CORBA::ULong,TAO_SFP_Fragment_Table_Entry*,ACE_Null_Mutex> *,ACE_Null_Mutex> - -#pragma instantiate ACE_Singleton<TAO_SFP_Base, TAO_SYNCH_MUTEX> -#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) +#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) template ACE_Singleton<TAO_SFP_Base, ACE_Thread_Mutex> *ACE_Singleton<TAO_SFP_Base, ACE_Thread_Mutex>::singleton_; -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ ACE_FACTORY_DEFINE (TAO_AV, TAO_AV_SFP_Factory) ACE_STATIC_SVC_DEFINE (TAO_AV_SFP_Factory, diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp index bb7d244b9ba..bfbfb34f812 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp @@ -15,8 +15,8 @@ #include "CC_LockSet.h" -ACE_RCSID (Concurrency, - CC_LockSet, +ACE_RCSID (Concurrency, + CC_LockSet, "$Id$") // Default constructor. @@ -320,13 +320,3 @@ CORBA::Boolean CC_LockSet::compatible_[NUMBER_OF_LOCK_MODES][NUMBER_OF_LOCK_MODE {1, 1, 0, 0, 0}, {1, 0, 0, 1, 0}, {0, 0, 0, 0, 0}}; - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Node<CC_LockModeEnum>; -template class ACE_Unbounded_Queue<CC_LockModeEnum>; -template class ACE_Unbounded_Queue_Iterator<CC_LockModeEnum>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Node<CC_LockModeEnum> -#pragma instantiate ACE_Unbounded_Queue<CC_LockModeEnum> -#pragma instantiate ACE_Unbounded_Queue_Iterator<CC_LockModeEnum> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp index 65f9a49b534..e52eab77715 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp @@ -84,9 +84,3 @@ TAO_Concurrency_Loader::create_object (CORBA::ORB_ptr orb, } ACE_FACTORY_DEFINE (TAO_Concurrency, TAO_Concurrency_Loader) - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Dynamic_Service<TAO_Concurrency_Loader>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Dynamic_Service<TAO_Concurrency_Loader> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp index faa5d2b9ac0..01b587f9343 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp @@ -12,8 +12,8 @@ #include "CEC_ConsumerAdmin.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID (CosEvent, - CEC_ConsumerAdmin, +ACE_RCSID (CosEvent, + CEC_ConsumerAdmin, "$Id$") TAO_CEC_ConsumerAdmin::TAO_CEC_ConsumerAdmin (TAO_CEC_EventChannel *ec) @@ -135,27 +135,3 @@ TAO_CEC_Propagate_Event_Pull::work (TAO_CEC_ProxyPullSupplier *supplier { supplier->push (this->event_ ACE_ENV_ARG_PARAMETER); } - -// **************************************************************** - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class TAO_ESF_Proxy_Admin<TAO_CEC_EventChannel,TAO_CEC_ProxyPushSupplier,CosEventChannelAdmin::ProxyPushSupplier>; -template class TAO_ESF_Shutdown_Proxy<TAO_CEC_ProxyPushSupplier>; -template class TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier>; - -template class TAO_ESF_Proxy_Admin<TAO_CEC_EventChannel,TAO_CEC_ProxyPullSupplier,CosEventChannelAdmin::ProxyPullSupplier>; -template class TAO_ESF_Shutdown_Proxy<TAO_CEC_ProxyPullSupplier>; -template class TAO_ESF_Worker<TAO_CEC_ProxyPullSupplier>; - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate TAO_ESF_Proxy_Admin<TAO_CEC_EventChannel,TAO_CEC_ProxyPushSupplier,CosEventChannelAdmin::ProxyPushSupplier> -#pragma instantiate TAO_ESF_Shutdown_Proxy<TAO_CEC_ProxyPushSupplier> -#pragma instantiate TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> - -#pragma instantiate TAO_ESF_Proxy_Admin<TAO_CEC_EventChannel,TAO_CEC_ProxyPullSupplier,CosEventChannelAdmin::ProxyPullSupplier> -#pragma instantiate TAO_ESF_Shutdown_Proxy<TAO_CEC_ProxyPullSupplier> -#pragma instantiate TAO_ESF_Worker<TAO_CEC_ProxyPullSupplier> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp index 9994b1bcac3..c069c20808b 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp @@ -55,9 +55,3 @@ void TAO_CEC_ConsumerControl::successful_transmission (PortableServer::ServantBase*) { } - -#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/orbsvcs/CosEvent/CEC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp index 6f6144cc370..c5fa4c4dba0 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp @@ -1325,1257 +1325,3 @@ ACE_STATIC_SVC_DEFINE (TAO_CEC_Default_Factory, ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) ACE_FACTORY_DEFINE (TAO_Event_Serv, TAO_CEC_Default_Factory) - -// **************************************************************** - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -#if !defined(TAO_ORBSVCS_HAS_Event2) -template class ACE_Node<ACE_Command_Base*>; -template class ACE_Unbounded_Queue<ACE_Command_Base*>; -template class ACE_Unbounded_Queue_Iterator<ACE_Command_Base*>; -#endif /* ! TAO_ORBSVCS_HAS_Event2 */ - -template class TAO_ESF_Copy_On_Write_Collection< - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_List_Iterator >; -template class TAO_ESF_Copy_On_Write_Collection< - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_RB_Tree_Iterator >; - -template class TAO_ESF_Proxy_Collection<TAO_CEC_ProxyPushConsumer>; -template class TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>; -template class TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>; -template class ACE_Unbounded_Set<TAO_CEC_ProxyPushConsumer *>; -template class ACE_Node<TAO_CEC_ProxyPushConsumer *>; -template class ACE_Unbounded_Set_Iterator<TAO_CEC_ProxyPushConsumer *>; -template class ACE_RB_Tree<TAO_CEC_ProxyPushConsumer *, int, ACE_Less_Than<TAO_CEC_ProxyPushConsumer *>, ACE_Null_Mutex>; -template class ACE_RB_Tree_Iterator<TAO_CEC_ProxyPushConsumer *, int, ACE_Less_Than<TAO_CEC_ProxyPushConsumer *>, ACE_Null_Mutex>; -template class ACE_RB_Tree_Reverse_Iterator<TAO_CEC_ProxyPushConsumer *, int, ACE_Less_Than<TAO_CEC_ProxyPushConsumer *>, ACE_Null_Mutex>; -template class ACE_RB_Tree_Iterator_Base<TAO_CEC_ProxyPushConsumer *, int, ACE_Less_Than<TAO_CEC_ProxyPushConsumer *>, ACE_Null_Mutex>; -template class ACE_RB_Tree_Node<TAO_CEC_ProxyPushConsumer *, int>; -template class ACE_Less_Than<TAO_CEC_ProxyPushConsumer *>; -template class TAO_ESF_Proxy_RB_Tree_Iterator<TAO_CEC_ProxyPushConsumer>; - -#if defined (TAO_HAS_TYPED_EVENT_CHANNEL) -template class TAO_ESF_Copy_On_Write_Collection< - TAO_ESF_Proxy_List<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_List_Iterator >; -template class TAO_ESF_Copy_On_Write_Collection< - TAO_ESF_Proxy_RB_Tree<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_RB_Tree_Iterator >; - -template class TAO_ESF_Proxy_Collection<TAO_CEC_TypedProxyPushConsumer>; -template class TAO_ESF_Proxy_List<TAO_CEC_TypedProxyPushConsumer>; -template class TAO_ESF_Proxy_RB_Tree<TAO_CEC_TypedProxyPushConsumer>; -template class ACE_Unbounded_Set<TAO_CEC_TypedProxyPushConsumer *>; -template class ACE_Node<TAO_CEC_TypedProxyPushConsumer *>; -template class ACE_Unbounded_Set_Iterator<TAO_CEC_TypedProxyPushConsumer *>; -template class ACE_RB_Tree<TAO_CEC_TypedProxyPushConsumer *, int, ACE_Less_Than<TAO_CEC_TypedProxyPushConsumer *>, ACE_Null_Mutex>; -template class ACE_RB_Tree_Iterator<TAO_CEC_TypedProxyPushConsumer *, int, ACE_Less_Than<TAO_CEC_TypedProxyPushConsumer *>, ACE_Null_Mutex>; -template class ACE_RB_Tree_Reverse_Iterator<TAO_CEC_TypedProxyPushConsumer *, int, ACE_Less_Than<TAO_CEC_TypedProxyPushConsumer *>, ACE_Null_Mutex>; -template class ACE_RB_Tree_Iterator_Base<TAO_CEC_TypedProxyPushConsumer *, int, ACE_Less_Than<TAO_CEC_TypedProxyPushConsumer *>, ACE_Null_Mutex>; -template class ACE_RB_Tree_Node<TAO_CEC_TypedProxyPushConsumer *, int>; -template class ACE_Less_Than<TAO_CEC_TypedProxyPushConsumer *>; -template class TAO_ESF_Proxy_RB_Tree_Iterator<TAO_CEC_TypedProxyPushConsumer>; -#endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ - -template class TAO_ESF_Copy_On_Write_Collection< - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_List_Iterator >; -template class TAO_ESF_Copy_On_Write_Collection< - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_RB_Tree_Iterator >; - -template class TAO_ESF_Proxy_Collection<TAO_CEC_ProxyPushSupplier>; -template class TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>; -template class TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>; -template class ACE_Unbounded_Set<TAO_CEC_ProxyPushSupplier *>; -template class ACE_Node<TAO_CEC_ProxyPushSupplier *>; -template class ACE_Unbounded_Set_Iterator<TAO_CEC_ProxyPushSupplier *>; -template class ACE_RB_Tree<TAO_CEC_ProxyPushSupplier *, int, ACE_Less_Than<TAO_CEC_ProxyPushSupplier *>, ACE_Null_Mutex>; -template class ACE_RB_Tree_Iterator<TAO_CEC_ProxyPushSupplier *, int, ACE_Less_Than<TAO_CEC_ProxyPushSupplier *>, ACE_Null_Mutex>; -template class ACE_RB_Tree_Iterator_Base<TAO_CEC_ProxyPushSupplier *, int, ACE_Less_Than<TAO_CEC_ProxyPushSupplier *>, ACE_Null_Mutex>; -template class ACE_RB_Tree_Reverse_Iterator<TAO_CEC_ProxyPushSupplier *, int, ACE_Less_Than<TAO_CEC_ProxyPushSupplier *>, ACE_Null_Mutex>; -template class ACE_RB_Tree_Node<TAO_CEC_ProxyPushSupplier *, int>; -template class ACE_Less_Than<TAO_CEC_ProxyPushSupplier *>; -template class TAO_ESF_Proxy_RB_Tree_Iterator<TAO_CEC_ProxyPushSupplier>; - -template class TAO_ESF_Copy_On_Write_Collection< - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_List_Iterator >; -template class TAO_ESF_Copy_On_Write_Collection< - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_RB_Tree_Iterator >; - -template class TAO_ESF_Proxy_Collection<TAO_CEC_ProxyPullConsumer>; -template class TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>; -template class TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>; -template class ACE_Unbounded_Set<TAO_CEC_ProxyPullConsumer *>; -template class ACE_Node<TAO_CEC_ProxyPullConsumer *>; -template class ACE_Unbounded_Set_Iterator<TAO_CEC_ProxyPullConsumer *>; -template class ACE_RB_Tree<TAO_CEC_ProxyPullConsumer *, int, ACE_Less_Than<TAO_CEC_ProxyPullConsumer *>, ACE_Null_Mutex>; -template class ACE_RB_Tree_Iterator<TAO_CEC_ProxyPullConsumer *, int, ACE_Less_Than<TAO_CEC_ProxyPullConsumer *>, ACE_Null_Mutex>; -template class ACE_RB_Tree_Reverse_Iterator<TAO_CEC_ProxyPullConsumer *, int, ACE_Less_Than<TAO_CEC_ProxyPullConsumer *>, ACE_Null_Mutex>; -template class ACE_RB_Tree_Iterator_Base<TAO_CEC_ProxyPullConsumer *, int, ACE_Less_Than<TAO_CEC_ProxyPullConsumer *>, ACE_Null_Mutex>; -template class ACE_RB_Tree_Node<TAO_CEC_ProxyPullConsumer *, int>; -template class ACE_Less_Than<TAO_CEC_ProxyPullConsumer *>; -template class TAO_ESF_Proxy_RB_Tree_Iterator<TAO_CEC_ProxyPullConsumer>; - -template class TAO_ESF_Copy_On_Write_Collection< - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_List_Iterator >; -template class TAO_ESF_Copy_On_Write_Collection< - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_RB_Tree_Iterator >; - -template class TAO_ESF_Proxy_Collection<TAO_CEC_ProxyPullSupplier>; -template class TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>; -template class TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>; -template class ACE_Unbounded_Set<TAO_CEC_ProxyPullSupplier *>; -template class ACE_Node<TAO_CEC_ProxyPullSupplier *>; -template class ACE_Unbounded_Set_Iterator<TAO_CEC_ProxyPullSupplier *>; -template class ACE_RB_Tree<TAO_CEC_ProxyPullSupplier *, int, ACE_Less_Than<TAO_CEC_ProxyPullSupplier *>, ACE_Null_Mutex>; -template class ACE_RB_Tree_Iterator<TAO_CEC_ProxyPullSupplier *, int, ACE_Less_Than<TAO_CEC_ProxyPullSupplier *>, ACE_Null_Mutex>; -template class ACE_RB_Tree_Iterator_Base<TAO_CEC_ProxyPullSupplier *, int, ACE_Less_Than<TAO_CEC_ProxyPullSupplier *>, ACE_Null_Mutex>; -template class ACE_RB_Tree_Reverse_Iterator<TAO_CEC_ProxyPullSupplier *, int, ACE_Less_Than<TAO_CEC_ProxyPullSupplier *>, ACE_Null_Mutex>; -template class ACE_RB_Tree_Node<TAO_CEC_ProxyPullSupplier *, int>; -template class ACE_Less_Than<TAO_CEC_ProxyPullSupplier *>; -template class TAO_ESF_Proxy_RB_Tree_Iterator<TAO_CEC_ProxyPullSupplier>; - -#if defined (ACE_HAS_THREADS) -// -// To avoid duplicate instantiations of templates we must put the MT -// versions on this #ifdef, otherwise the ACE_SYNCH* macros expand to -// the ACE_NULL* versions, duplicating the non-MT versions below. -// We *cannot* use explicit ACE_Synch classes because that will not -// compile in platforms without threads. -// -template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_List_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_List_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_List_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_List_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_List_Iterator, - ACE_SYNCH> >; -template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_List_Iterator, - ACE_SYNCH> > >; -template class TAO_ESF_Connected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_List_Iterator, - ACE_SYNCH>,TAO_CEC_ProxyPushConsumer >; -template class TAO_ESF_Reconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_List_Iterator, - ACE_SYNCH>,TAO_CEC_ProxyPushConsumer >; -template class TAO_ESF_Disconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_List_Iterator, - ACE_SYNCH>,TAO_CEC_ProxyPushConsumer >; -template class TAO_ESF_Shutdown_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_List_Iterator, - ACE_SYNCH> >; -template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_RB_Tree_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_RB_Tree_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_RB_Tree_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_RB_Tree_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_RB_Tree_Iterator, - ACE_SYNCH> >; -template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_RB_Tree_Iterator, - ACE_SYNCH> > >; -template class TAO_ESF_Connected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_RB_Tree_Iterator, - ACE_SYNCH>,TAO_CEC_ProxyPushConsumer >; -template class TAO_ESF_Reconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_RB_Tree_Iterator, - ACE_SYNCH>,TAO_CEC_ProxyPushConsumer >; -template class TAO_ESF_Disconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_RB_Tree_Iterator, - ACE_SYNCH>,TAO_CEC_ProxyPushConsumer >; -template class TAO_ESF_Shutdown_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_RB_Tree_Iterator, - ACE_SYNCH> >; - -#if defined (TAO_HAS_TYPED_EVENT_CHANNEL) -template class TAO_ESF_Immediate_Changes<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_List_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Read<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_List_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Write<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_List_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Delayed_Changes<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_List_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_List_Iterator, - ACE_SYNCH> >; -template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_List_Iterator, - ACE_SYNCH> > >; -template class TAO_ESF_Connected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_List_Iterator, - ACE_SYNCH>,TAO_CEC_TypedProxyPushConsumer >; -template class TAO_ESF_Reconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_List_Iterator, - ACE_SYNCH>,TAO_CEC_TypedProxyPushConsumer >; -template class TAO_ESF_Disconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_List_Iterator, - ACE_SYNCH>,TAO_CEC_TypedProxyPushConsumer >; -template class TAO_ESF_Shutdown_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_List_Iterator, - ACE_SYNCH> >; -template class TAO_ESF_Immediate_Changes<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_RB_Tree_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Read<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_RB_Tree_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Write<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_RB_Tree_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Delayed_Changes<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_RB_Tree_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_RB_Tree_Iterator, - ACE_SYNCH> >; -template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_RB_Tree_Iterator, - ACE_SYNCH> > >; -template class TAO_ESF_Connected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_RB_Tree_Iterator, - ACE_SYNCH>,TAO_CEC_TypedProxyPushConsumer >; -template class TAO_ESF_Reconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_RB_Tree_Iterator, - ACE_SYNCH>,TAO_CEC_TypedProxyPushConsumer >; -template class TAO_ESF_Disconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_RB_Tree_Iterator, - ACE_SYNCH>,TAO_CEC_TypedProxyPushConsumer >; -template class TAO_ESF_Shutdown_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_RB_Tree_Iterator, - ACE_SYNCH> >; -#endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ - -template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_List_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_List_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_List_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_List_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_List_Iterator, - ACE_SYNCH> >; -template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_List_Iterator, - ACE_SYNCH> > >; -template class TAO_ESF_Connected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_List_Iterator, - ACE_SYNCH>,TAO_CEC_ProxyPushSupplier >; -template class TAO_ESF_Reconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_List_Iterator, - ACE_SYNCH>,TAO_CEC_ProxyPushSupplier >; -template class TAO_ESF_Disconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_List_Iterator, - ACE_SYNCH>,TAO_CEC_ProxyPushSupplier >; -template class TAO_ESF_Shutdown_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_List_Iterator, - ACE_SYNCH> >; -template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_RB_Tree_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_RB_Tree_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_RB_Tree_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_RB_Tree_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_RB_Tree_Iterator, - ACE_SYNCH> >; -template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_RB_Tree_Iterator, - ACE_SYNCH> > >; -template class TAO_ESF_Connected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_RB_Tree_Iterator, - ACE_SYNCH>,TAO_CEC_ProxyPushSupplier >; -template class TAO_ESF_Reconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_RB_Tree_Iterator, - ACE_SYNCH>,TAO_CEC_ProxyPushSupplier >; -template class TAO_ESF_Disconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_RB_Tree_Iterator, - ACE_SYNCH>,TAO_CEC_ProxyPushSupplier >; -template class TAO_ESF_Shutdown_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_RB_Tree_Iterator, - ACE_SYNCH> >; - -template class TAO_ESF_Copy_On_Write_Read_Guard< - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_List_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Write_Read_Guard< - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_List_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Write_Read_Guard< - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_RB_Tree_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Write_Read_Guard< - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_RB_Tree_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Write_Write_Guard< - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_List_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Copy_On_Write_Write_Guard< - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_List_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Copy_On_Write_Write_Guard< - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_RB_Tree_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Copy_On_Write_Write_Guard< - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_RB_Tree_Iterator, - ACE_SYNCH>; - -#if defined (TAO_HAS_TYPED_EVENT_CHANNEL) -template class TAO_ESF_Copy_On_Write_Read_Guard< - TAO_ESF_Proxy_List<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_List_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Write_Read_Guard< - TAO_ESF_Proxy_RB_Tree<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_RB_Tree_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Write_Write_Guard< - TAO_ESF_Proxy_List<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_List_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Copy_On_Write_Write_Guard< - TAO_ESF_Proxy_RB_Tree<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_RB_Tree_Iterator, - ACE_SYNCH>; -#endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ - -template class TAO_ESF_Copy_On_Write_Read_Guard< - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_List_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Write_Read_Guard< - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_List_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Write_Read_Guard< - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_RB_Tree_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Write_Read_Guard< - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_RB_Tree_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Write_Write_Guard< - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_List_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Copy_On_Write_Write_Guard< - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_List_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Copy_On_Write_Write_Guard< - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_RB_Tree_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Copy_On_Write_Write_Guard< - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_RB_Tree_Iterator, - ACE_SYNCH>; - -#endif /* ACE_HAS_THREADS */ - -template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_List_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_List_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_List_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_List_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_List_Iterator, - ACE_NULL_SYNCH> >; -template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_List_Iterator, - ACE_NULL_SYNCH> > >; -template class TAO_ESF_Connected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_List_Iterator, - ACE_NULL_SYNCH>,TAO_CEC_ProxyPushConsumer >; -template class TAO_ESF_Reconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_List_Iterator, - ACE_NULL_SYNCH>,TAO_CEC_ProxyPushConsumer >; -template class TAO_ESF_Disconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_List_Iterator, - ACE_NULL_SYNCH>,TAO_CEC_ProxyPushConsumer >; -template class TAO_ESF_Shutdown_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_List_Iterator, - ACE_NULL_SYNCH> >; -template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_RB_Tree_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_RB_Tree_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_RB_Tree_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_RB_Tree_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_RB_Tree_Iterator, - ACE_NULL_SYNCH> >; -template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_RB_Tree_Iterator, - ACE_NULL_SYNCH> > >; -template class TAO_ESF_Connected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_RB_Tree_Iterator, - ACE_NULL_SYNCH>,TAO_CEC_ProxyPushConsumer >; -template class TAO_ESF_Reconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_RB_Tree_Iterator, - ACE_NULL_SYNCH>,TAO_CEC_ProxyPushConsumer >; -template class TAO_ESF_Disconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_RB_Tree_Iterator, - ACE_NULL_SYNCH>,TAO_CEC_ProxyPushConsumer >; -template class TAO_ESF_Shutdown_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_RB_Tree_Iterator, - ACE_NULL_SYNCH> >; - -#if defined (TAO_HAS_TYPED_EVENT_CHANNEL) -template class TAO_ESF_Immediate_Changes<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_List_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Read<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_List_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Write<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_List_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Delayed_Changes<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_List_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_List_Iterator, - ACE_NULL_SYNCH> >; -template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_List_Iterator, - ACE_NULL_SYNCH> > >; -template class TAO_ESF_Connected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_List_Iterator, - ACE_NULL_SYNCH>,TAO_CEC_TypedProxyPushConsumer >; -template class TAO_ESF_Reconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_List_Iterator, - ACE_NULL_SYNCH>,TAO_CEC_TypedProxyPushConsumer >; -template class TAO_ESF_Disconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_List_Iterator, - ACE_NULL_SYNCH>,TAO_CEC_TypedProxyPushConsumer >; -template class TAO_ESF_Shutdown_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_List_Iterator, - ACE_NULL_SYNCH> >; -template class TAO_ESF_Immediate_Changes<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_RB_Tree_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Read<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_RB_Tree_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Write<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_RB_Tree_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Delayed_Changes<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_RB_Tree_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_RB_Tree_Iterator, - ACE_NULL_SYNCH> >; -template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_RB_Tree_Iterator, - ACE_NULL_SYNCH> > >; -template class TAO_ESF_Connected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_RB_Tree_Iterator, - ACE_NULL_SYNCH>,TAO_CEC_TypedProxyPushConsumer >; -template class TAO_ESF_Reconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_RB_Tree_Iterator, - ACE_NULL_SYNCH>,TAO_CEC_TypedProxyPushConsumer >; -template class TAO_ESF_Disconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_RB_Tree_Iterator, - ACE_NULL_SYNCH>,TAO_CEC_TypedProxyPushConsumer >; -template class TAO_ESF_Shutdown_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_TypedProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_RB_Tree_Iterator, - ACE_NULL_SYNCH> >; -#endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ - -template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_List_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_List_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_List_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_List_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_List_Iterator, - ACE_NULL_SYNCH> >; -template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_List_Iterator, - ACE_NULL_SYNCH> > >; -template class TAO_ESF_Connected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_List_Iterator, - ACE_NULL_SYNCH>,TAO_CEC_ProxyPushSupplier >; -template class TAO_ESF_Reconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_List_Iterator, - ACE_NULL_SYNCH>,TAO_CEC_ProxyPushSupplier >; -template class TAO_ESF_Disconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_List_Iterator, - ACE_NULL_SYNCH>,TAO_CEC_ProxyPushSupplier >; -template class TAO_ESF_Shutdown_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_List_Iterator, - ACE_NULL_SYNCH> >; -template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_RB_Tree_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_RB_Tree_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_RB_Tree_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_RB_Tree_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_RB_Tree_Iterator, - ACE_NULL_SYNCH> >; -template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_RB_Tree_Iterator, - ACE_NULL_SYNCH> > >; -template class TAO_ESF_Connected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_RB_Tree_Iterator, - ACE_NULL_SYNCH>,TAO_CEC_ProxyPushSupplier >; -template class TAO_ESF_Reconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_RB_Tree_Iterator, - ACE_NULL_SYNCH>,TAO_CEC_ProxyPushSupplier >; -template class TAO_ESF_Disconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_RB_Tree_Iterator, - ACE_NULL_SYNCH>,TAO_CEC_ProxyPushSupplier >; -template class TAO_ESF_Shutdown_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_RB_Tree_Iterator, - ACE_NULL_SYNCH> >; - -#if defined (ACE_HAS_THREADS) -// -// To avoid duplicate instantiations of templates we must put the MT -// versions on this #ifdef, otherwise the ACE_SYNCH* macros expand to -// the ACE_NULL* versions, duplicating the non-MT versions below. -// We *cannot* use explicit ACE_Synch classes because that will not -// compile in platforms without threads. -// -template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_List_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_List_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_List_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_List_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_List_Iterator, - ACE_SYNCH> >; -template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_List_Iterator, - ACE_SYNCH> > >; -template class TAO_ESF_Connected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_List_Iterator, - ACE_SYNCH>,TAO_CEC_ProxyPullConsumer >; -template class TAO_ESF_Reconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_List_Iterator, - ACE_SYNCH>,TAO_CEC_ProxyPullConsumer >; -template class TAO_ESF_Disconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_List_Iterator, - ACE_SYNCH>,TAO_CEC_ProxyPullConsumer >; -template class TAO_ESF_Shutdown_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_List_Iterator, - ACE_SYNCH> >; -template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_RB_Tree_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_RB_Tree_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_RB_Tree_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_RB_Tree_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_RB_Tree_Iterator, - ACE_SYNCH> >; -template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_RB_Tree_Iterator, - ACE_SYNCH> > >; -template class TAO_ESF_Connected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_RB_Tree_Iterator, - ACE_SYNCH>,TAO_CEC_ProxyPullConsumer >; -template class TAO_ESF_Reconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_RB_Tree_Iterator, - ACE_SYNCH>,TAO_CEC_ProxyPullConsumer >; -template class TAO_ESF_Disconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_RB_Tree_Iterator, - ACE_SYNCH>,TAO_CEC_ProxyPullConsumer >; -template class TAO_ESF_Shutdown_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_RB_Tree_Iterator, - ACE_SYNCH> >; - -template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_List_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_List_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_List_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_List_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_List_Iterator, - ACE_SYNCH> >; -template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_List_Iterator, - ACE_SYNCH> > >; -template class TAO_ESF_Connected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_List_Iterator, - ACE_SYNCH>,TAO_CEC_ProxyPullSupplier >; -template class TAO_ESF_Reconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_List_Iterator, - ACE_SYNCH>,TAO_CEC_ProxyPullSupplier >; -template class TAO_ESF_Disconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_List_Iterator, - ACE_SYNCH>,TAO_CEC_ProxyPullSupplier >; -template class TAO_ESF_Shutdown_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_List_Iterator, - ACE_SYNCH> >; -template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_RB_Tree_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_RB_Tree_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_RB_Tree_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_RB_Tree_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_RB_Tree_Iterator, - ACE_SYNCH> >; -template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_RB_Tree_Iterator, - ACE_SYNCH> > >; -template class TAO_ESF_Connected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_RB_Tree_Iterator, - ACE_SYNCH>,TAO_CEC_ProxyPullSupplier >; -template class TAO_ESF_Reconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_RB_Tree_Iterator, - ACE_SYNCH>,TAO_CEC_ProxyPullSupplier >; -template class TAO_ESF_Disconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_RB_Tree_Iterator, - ACE_SYNCH>,TAO_CEC_ProxyPullSupplier >; -template class TAO_ESF_Shutdown_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_RB_Tree_Iterator, - ACE_SYNCH> >; - -#endif /* ACE_HAS_THREADS */ - -template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_List_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_List_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_List_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_List_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_List_Iterator, - ACE_NULL_SYNCH> >; -template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_List_Iterator, - ACE_NULL_SYNCH> > >; -template class TAO_ESF_Connected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_List_Iterator, - ACE_NULL_SYNCH>,TAO_CEC_ProxyPullConsumer >; -template class TAO_ESF_Reconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_List_Iterator, - ACE_NULL_SYNCH>,TAO_CEC_ProxyPullConsumer >; -template class TAO_ESF_Disconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_List_Iterator, - ACE_NULL_SYNCH>,TAO_CEC_ProxyPullConsumer >; -template class TAO_ESF_Shutdown_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_List_Iterator, - ACE_NULL_SYNCH> >; -template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_RB_Tree_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_RB_Tree_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_RB_Tree_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_RB_Tree_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_RB_Tree_Iterator, - ACE_NULL_SYNCH> >; -template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_RB_Tree_Iterator, - ACE_NULL_SYNCH> > >; -template class TAO_ESF_Connected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_RB_Tree_Iterator, - ACE_NULL_SYNCH>,TAO_CEC_ProxyPullConsumer >; -template class TAO_ESF_Reconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_RB_Tree_Iterator, - ACE_NULL_SYNCH>,TAO_CEC_ProxyPullConsumer >; -template class TAO_ESF_Disconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_RB_Tree_Iterator, - ACE_NULL_SYNCH>,TAO_CEC_ProxyPullConsumer >; -template class TAO_ESF_Shutdown_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_RB_Tree_Iterator, - ACE_NULL_SYNCH> >; - -template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_List_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_List_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_List_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_List_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_List_Iterator, - ACE_NULL_SYNCH> >; -template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_List_Iterator, - ACE_NULL_SYNCH> > >; -template class TAO_ESF_Connected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_List_Iterator, - ACE_NULL_SYNCH>,TAO_CEC_ProxyPullSupplier >; -template class TAO_ESF_Reconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_List_Iterator, - ACE_NULL_SYNCH>,TAO_CEC_ProxyPullSupplier >; -template class TAO_ESF_Disconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_List_Iterator, - ACE_NULL_SYNCH>,TAO_CEC_ProxyPullSupplier >; -template class TAO_ESF_Shutdown_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_List_Iterator, - ACE_NULL_SYNCH> >; -template class TAO_ESF_Immediate_Changes<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_RB_Tree_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Read<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_RB_Tree_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Write<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_RB_Tree_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_RB_Tree_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_RB_Tree_Iterator, - ACE_NULL_SYNCH> >; -template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_RB_Tree_Iterator, - ACE_NULL_SYNCH> > >; -template class TAO_ESF_Connected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_RB_Tree_Iterator, - ACE_NULL_SYNCH>,TAO_CEC_ProxyPullSupplier >; -template class TAO_ESF_Reconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_RB_Tree_Iterator, - ACE_NULL_SYNCH>,TAO_CEC_ProxyPullSupplier >; -template class TAO_ESF_Disconnected_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_RB_Tree_Iterator, - ACE_NULL_SYNCH>,TAO_CEC_ProxyPullSupplier >; -template class TAO_ESF_Shutdown_Command< - TAO_ESF_Delayed_Changes<TAO_CEC_ProxyPullSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_RB_Tree_Iterator, - ACE_NULL_SYNCH> >; - -template class TAO_ESF_Copy_On_Write_Read_Guard< - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_List_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Write_Read_Guard< - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_List_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Write_Read_Guard< - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_RB_Tree_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Write_Read_Guard< - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_RB_Tree_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Write_Write_Guard< - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_List_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Copy_On_Write_Write_Guard< - TAO_ESF_Proxy_List<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_List_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Copy_On_Write_Write_Guard< - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushConsumer>, - TAO_CEC_PushConsumer_RB_Tree_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Copy_On_Write_Write_Guard< - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPushSupplier>, - TAO_CEC_PushSupplier_RB_Tree_Iterator, - ACE_NULL_SYNCH>; - -#if defined (TAO_HAS_TYPED_EVENT_CHANNEL) -template class TAO_ESF_Copy_On_Write_Read_Guard< - TAO_ESF_Proxy_List<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_List_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Write_Read_Guard< - TAO_ESF_Proxy_RB_Tree<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_RB_Tree_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Write_Write_Guard< - TAO_ESF_Proxy_List<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_List_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Copy_On_Write_Write_Guard< - TAO_ESF_Proxy_RB_Tree<TAO_CEC_TypedProxyPushConsumer>, - TAO_CEC_TypedPushConsumer_RB_Tree_Iterator, - ACE_NULL_SYNCH>; -#endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ - -template class TAO_ESF_Copy_On_Write_Read_Guard< - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_List_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Write_Read_Guard< - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_List_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Write_Read_Guard< - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_RB_Tree_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Write_Read_Guard< - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_RB_Tree_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Write_Write_Guard< - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_List_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Copy_On_Write_Write_Guard< - TAO_ESF_Proxy_List<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_List_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Copy_On_Write_Write_Guard< - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullConsumer>, - TAO_CEC_PullConsumer_RB_Tree_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Copy_On_Write_Write_Guard< - TAO_ESF_Proxy_RB_Tree<TAO_CEC_ProxyPullSupplier>, - TAO_CEC_PullSupplier_RB_Tree_Iterator, - ACE_NULL_SYNCH>; - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#if !defined(TAO_ORBSVCS_HAS_Event2) -#pragma instantiate ACE_Node<ACE_Command_Base*> -#pragma instantiate ACE_Unbounded_Queue<ACE_Command_Base*> -#pragma instantiate ACE_Unbounded_Queue_Iterator<ACE_Command_Base*> -#endif /* ! TAO_ORBSVCS_HAS_Event2 */ - -#if defined (ACE_HAS_THREADS) -#endif /* ACE_HAS_THREADS */ - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp index ddd191c302a..49849ae3f89 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp @@ -150,13 +150,3 @@ TAO_CEC_Invoke_Command::execute (ACE_ENV_SINGLE_ARG_DECL) return 0; } #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Locked_Data_Block<ACE_Lock_Adapter<TAO_SYNCH_MUTEX> >; - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Locked_Data_Block<ACE_Lock_Adapter<TAO_SYNCH_MUTEX> > - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp index f8a6cd74d47..65bbebb51cf 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp @@ -229,14 +229,3 @@ TAO_CEC_EventChannel::destroy (ACE_ENV_SINGLE_ARG_DECL) { this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Hash_Map_Manager_Ex<PortableServer::ServantBase*, unsigned int, ServantBaseHash, ACE_Equal_To<PortableServer::ServantBase*>, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Entry<PortableServer::ServantBase*, unsigned int>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Hash_Map_Manager_Ex<PortableServer::ServantBase*, unsigned int, ServantBaseHash, ACE_Equal_To<PortableServer::ServantBase*>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Entry<PortableServer::ServantBase*, unsigned int> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp index 58ad965fe0e..42e8edcfc03 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp @@ -507,9 +507,3 @@ TAO_CEC_Event_Loader::fini (void) } ACE_FACTORY_DEFINE (TAO_Event_Serv, TAO_CEC_Event_Loader) - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Dynamic_Service<TAO_CEC_Event_Loader>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Dynamic_Service<TAO_CEC_Event_Loader> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp index 9225b7f38aa..4a746e0b71c 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp @@ -8,13 +8,3 @@ ACE_RCSID(CosEvent, CEC_Factory, "$Id$") TAO_CEC_Factory::~TAO_CEC_Factory (void) { } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Dynamic_Service<TAO_CEC_Factory>; - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Dynamic_Service<TAO_CEC_Factory> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp index b5b75ae5f43..7bbc442b000 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp @@ -355,17 +355,3 @@ TAO_CEC_ProxyPullSupplier::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_decr_refcnt (); } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Unbounded_Queue<CORBA::Any>; -template class ACE_Node<CORBA::Any>; -template class ACE_Unbounded_Queue_Iterator<CORBA::Any>; - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Unbounded_Queue<CORBA::Any> -#pragma instantiate ACE_Node<CORBA::Any> -#pragma instantiate ACE_Unbounded_Queue_Iterator<CORBA::Any> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp index 89602b0a901..1bfa8d36cf5 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp @@ -909,21 +909,3 @@ TAO_CEC_ProxyPushSupplier::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_decr_refcnt (); } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class TAO_ESF_RefCount_Guard<CORBA::ULong>; -template class TAO_ESF_Proxy_RefCount_Guard<TAO_CEC_EventChannel,TAO_CEC_ProxyPushSupplier>; -#if defined (TAO_HAS_TYPED_EVENT_CHANNEL) -template class TAO_ESF_Proxy_RefCount_Guard<TAO_CEC_TypedEventChannel,TAO_CEC_ProxyPushSupplier>; -#endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate TAO_ESF_RefCount_Guard<CORBA::ULong> -#pragma instantiate TAO_ESF_Proxy_RefCount_Guard<TAO_CEC_EventChannel,TAO_CEC_ProxyPushSupplier> -#if defined (TAO_HAS_TYPED_EVENT_CHANNEL) -#pragma instantiate TAO_ESF_Proxy_RefCount_Guard<TAO_CEC_TypedEventChannel,TAO_CEC_ProxyPushSupplier> -#endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp index a2837a9b7eb..e73a071e546 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp @@ -10,8 +10,8 @@ #include "CEC_SupplierAdmin.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID (CosEvent, - CEC_SupplierAdmin, +ACE_RCSID (CosEvent, + CEC_SupplierAdmin, "$Id$") TAO_CEC_SupplierAdmin::TAO_CEC_SupplierAdmin (TAO_CEC_EventChannel *ec) @@ -98,27 +98,3 @@ TAO_CEC_SupplierAdmin::obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL) { return this->pull_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER); } - -// **************************************************************** - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class TAO_ESF_Proxy_Admin<TAO_CEC_EventChannel,TAO_CEC_ProxyPushConsumer,CosEventChannelAdmin::ProxyPushConsumer>; -template class TAO_ESF_Shutdown_Proxy<TAO_CEC_ProxyPushConsumer>; -template class TAO_ESF_Worker<TAO_CEC_ProxyPushConsumer>; - -template class TAO_ESF_Proxy_Admin<TAO_CEC_EventChannel,TAO_CEC_ProxyPullConsumer,CosEventChannelAdmin::ProxyPullConsumer>; -template class TAO_ESF_Shutdown_Proxy<TAO_CEC_ProxyPullConsumer>; -template class TAO_ESF_Worker<TAO_CEC_ProxyPullConsumer>; - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate TAO_ESF_Proxy_Admin<TAO_CEC_EventChannel,TAO_CEC_ProxyPushConsumer,CosEventChannelAdmin::ProxyPushConsumer> -#pragma instantiate TAO_ESF_Shutdown_Proxy<TAO_CEC_ProxyPushConsumer> -#pragma instantiate TAO_ESF_Worker<TAO_CEC_ProxyPushConsumer> - -#pragma instantiate TAO_ESF_Proxy_Admin<TAO_CEC_EventChannel,TAO_CEC_ProxyPullConsumer,CosEventChannelAdmin::ProxyPullConsumer> -#pragma instantiate TAO_ESF_Shutdown_Proxy<TAO_CEC_ProxyPullConsumer> -#pragma instantiate TAO_ESF_Worker<TAO_CEC_ProxyPullConsumer> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp index a3a48f68530..223438df8ed 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp @@ -128,25 +128,3 @@ TAO_CEC_Propagate_Typed_Event::work (TAO_CEC_ProxyPushSupplier *supplier { supplier->invoke (this->typed_event_ ACE_ENV_ARG_PARAMETER); } - -// **************************************************************** - -// Note the following are explicitly instantiated in CEC_ConsumerAdmin -// instantiating them here results in duplicate symbols from Solaris build: -// CC: Forte Developer 7 C++ 5.4 2002/03/09 -// template class TAO_ESF_Shutdown_Proxy<TAO_CEC_ProxyPushSupplier>; -// template class TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier>; -// #pragma instantiate TAO_ESF_Shutdown_Proxy<TAO_CEC_ProxyPushSupplier> -// #pragma instantiate TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class TAO_ESF_Proxy_Admin<TAO_CEC_TypedEventChannel,TAO_CEC_ProxyPushSupplier,CosEventChannelAdmin::ProxyPushSupplier>; -template class TAO_ESF_Proxy_Admin<TAO_CEC_TypedEventChannel,TAO_CEC_ProxyPullSupplier,CosEventChannelAdmin::ProxyPullSupplier>; - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate TAO_ESF_Proxy_Admin<TAO_CEC_TypedEventChannel,TAO_CEC_ProxyPushSupplier,CosEventChannelAdmin::ProxyPushSupplier> -#pragma instantiate TAO_ESF_Proxy_Admin<TAO_CEC_TypedEventChannel,TAO_CEC_ProxyPullSupplier,CosEventChannelAdmin::ProxyPullSupplier> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp index a667b64c44a..00421b15a46 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp @@ -107,20 +107,3 @@ TAO_CEC_TypedSupplierAdmin::obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0); } - -// **************************************************************** - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class TAO_ESF_Proxy_Admin<TAO_CEC_TypedEventChannel,TAO_CEC_TypedProxyPushConsumer,CosTypedEventChannelAdmin::TypedProxyPushConsumer>; -template class TAO_ESF_Shutdown_Proxy<TAO_CEC_TypedProxyPushConsumer>; -template class TAO_ESF_Worker<TAO_CEC_TypedProxyPushConsumer>; - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate TAO_ESF_Proxy_Admin<TAO_CEC_TypedEventChannel,TAO_CEC_TypedProxyPushConsumer,CosTypedEventChannelAdmin::TypedProxyPushConsumer> -#pragma instantiate TAO_ESF_Shutdown_Proxy<TAO_CEC_TypedProxyPushConsumer> -#pragma instantiate TAO_ESF_Worker<TAO_CEC_TypedProxyPushConsumer> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp index a43638d4f23..412bff4ee3d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp @@ -14,11 +14,3 @@ TAO_ECG_Handler_Shutdown::~TAO_ECG_Handler_Shutdown (void) TAO_ECG_Dgram_Handler::~TAO_ECG_Dgram_Handler (void) { } - - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Refcounted_Auto_Ptr<TAO_ECG_Handler_Shutdown, ACE_Null_Mutex>; -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Refcounted_Auto_Ptr<TAO_ECG_Handler_Shutdown, ACE_Null_Mutex> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp index 0ef48309d9d..0116054cb7d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp @@ -603,26 +603,3 @@ TAO_ECG_CDR_Message_Receiver::Mcast_Header::read (char *header, return 0; } - -// **************************************************************** -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Hash_Map_Manager<ACE_INET_Addr,TAO_ECG_CDR_Message_Receiver::Requests*,ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<ACE_INET_Addr, TAO_ECG_CDR_Message_Receiver::Requests*, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Entry<ACE_INET_Addr,TAO_ECG_CDR_Message_Receiver::Requests*>; -template class ACE_Hash_Map_Iterator_Base_Ex<ACE_INET_Addr, TAO_ECG_CDR_Message_Receiver::Requests*, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator<ACE_INET_Addr,TAO_ECG_CDR_Message_Receiver::Requests*,ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<ACE_INET_Addr, TAO_ECG_CDR_Message_Receiver::Requests*, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator<ACE_INET_Addr,TAO_ECG_CDR_Message_Receiver::Requests*,ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_INET_Addr, TAO_ECG_CDR_Message_Receiver::Requests*, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex>; - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Hash_Map_Manager<ACE_INET_Addr,TAO_ECG_CDR_Message_Receiver::Requests*,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_INET_Addr, TAO_ECG_CDR_Message_Receiver::Requests*, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Entry<ACE_INET_Addr,TAO_ECG_CDR_Message_Receiver::Requests*> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_INET_Addr, TAO_ECG_CDR_Message_Receiver::Requests*, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator<ACE_INET_Addr,TAO_ECG_CDR_Message_Receiver::Requests*,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_INET_Addr, TAO_ECG_CDR_Message_Receiver::Requests*, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_INET_Addr,TAO_ECG_CDR_Message_Receiver::Requests*,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_INET_Addr, TAO_ECG_CDR_Message_Receiver::Requests*, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp index de93ffeb41b..446b8a5dc40 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp @@ -164,19 +164,3 @@ TAO_ECG_Complex_Address_Server::dump_content (void) this->default_addr_.get_port_number ())); } } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Hash_Map_Manager_Ex<CORBA::Long, ACE_INET_Addr, ACE_Hash<CORBA::Long>, ACE_Equal_To<CORBA::Long>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Entry<CORBA::Long, ACE_INET_Addr>; -template class ACE_Hash_Map_Iterator_Base_Ex<CORBA::Long, ACE_INET_Addr, ACE_Hash<CORBA::Long>, ACE_Equal_To<CORBA::Long>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator<CORBA::Long,ACE_INET_Addr,ACE_Null_Mutex>; - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Hash_Map_Manager_Ex<CORBA::Long, ACE_INET_Addr, ACE_Hash<CORBA::Long>, ACE_Equal_To<CORBA::Long>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Entry<CORBA::Long, ACE_INET_Addr> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<CORBA::Long, ACE_INET_Addr, ACE_Hash<CORBA::Long>, ACE_Equal_To<CORBA::Long>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator<CORBA::Long,ACE_INET_Addr,ACE_Null_Mutex> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp index 434131ed80f..557ef8d5771 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp @@ -285,44 +285,3 @@ TAO_ECG_Mcast_EH::Observer::shutdown (void) this->eh_ = 0; this->deactivator_.deactivate (); } - - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template void activate<TAO_Objref_Var_T<RtecEventChannelAdmin::Observer> >(TAO_Objref_Var_T<RtecEventChannelAdmin::Observer>&, PortableServer::POA*, TAO_ServantBase*, TAO_EC_Object_Deactivator& ACE_ENV_ARG_DECL); -template class ACE_Hash_Map_Manager<ACE_INET_Addr,ACE_SOCK_Dgram_Mcast*,ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<ACE_INET_Addr, ACE_SOCK_Dgram_Mcast *, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Entry<ACE_INET_Addr, ACE_SOCK_Dgram_Mcast *>; -template class ACE_Hash<ACE_INET_Addr>; -template class ACE_Node<ACE_INET_Addr>; -template class ACE_Equal_To<ACE_INET_Addr>; -template class ACE_Unbounded_Set<ACE_INET_Addr>; -template class ACE_Unbounded_Set_Iterator<ACE_INET_Addr>; -template class ACE_Hash_Map_Iterator_Base_Ex<ACE_INET_Addr, ACE_SOCK_Dgram_Mcast*, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator<ACE_INET_Addr,ACE_SOCK_Dgram_Mcast*,ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<ACE_INET_Addr, ACE_SOCK_Dgram_Mcast*, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator<ACE_INET_Addr,ACE_SOCK_Dgram_Mcast*,ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_INET_Addr, ACE_SOCK_Dgram_Mcast*, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex>; -template class ACE_Array_Base<ACE_SOCK_Dgram_Mcast *>; -template class ACE_Array_Base<TAO_ECG_Mcast_EH::Subscription>; - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate void activate<TAO_Objref_Var_T<RtecEventChannelAdmin::Observer> >(TAO_Objref_Var_T<RtecEventChannelAdmin::Observer>&, PortableServer::POA*, TAO_ServantBase*, TAO_EC_Object_Deactivator& ACE_ENV_ARG_DECL) -#pragma instantiate ACE_Hash_Map_Manager<ACE_INET_Addr,ACE_SOCK_Dgram_Mcast*,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_INET_Addr, ACE_SOCK_Dgram_Mcast *, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Entry<ACE_INET_Addr, ACE_SOCK_Dgram_Mcast *> -#pragma instantiate ACE_Hash<ACE_INET_Addr> -#pragma instantiate ACE_Node<ACE_INET_Addr> -#pragma instantiate ACE_Equal_To<ACE_INET_Addr> -#pragma instantiate ACE_Unbounded_Set<ACE_INET_Addr> -#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_INET_Addr> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_INET_Addr, ACE_SOCK_Dgram_Mcast *, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator<ACE_INET_Addr,ACE_SOCK_Dgram_Mcast*,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_INET_Addr, ACE_SOCK_Dgram_Mcast*, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_INET_Addr,ACE_SOCK_Dgram_Mcast*,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_INET_Addr, ACE_SOCK_Dgram_Mcast*, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, ACE_Null_Mutex> -#pragma instantiate ACE_Array_Base<ACE_SOCK_Dgram_Mcast *> -#pragma instantiate ACE_Array_Base<TAO_ECG_Mcast_EH::Subscription> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp index 2f191294f95..82cf5df8e01 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp @@ -698,18 +698,3 @@ ACE_STATIC_SVC_DEFINE (TAO_ECG_Mcast_Gateway, ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) ACE_FACTORY_DEFINE (TAO_RTEvent_Serv, TAO_ECG_Mcast_Gateway) - -// **************************************************************** - - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Dynamic_Service<TAO_ECG_Mcast_Gateway>; -template void activate<TAO_Objref_Var_T<RtecUDPAdmin::AddrServer> >(TAO_Objref_Var_T<RtecUDPAdmin::AddrServer>&, PortableServer::POA*, TAO_ServantBase*, TAO_EC_Object_Deactivator& ACE_ENV_ARG_DECL); - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Dynamic_Service<TAO_ECG_Mcast_Gateway> -#pragma instantiate void activate<TAO_Objref_Var_T<RtecUDPAdmin::AddrServer> >(TAO_Objref_Var_T<RtecUDPAdmin::AddrServer>&, PortableServer::POA*, TAO_ServantBase*, TAO_EC_Object_Deactivator& ACE_ENV_ARG_DECL) - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp index 22510f5afcc..7b547c02424 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp @@ -313,9 +313,3 @@ TAO_ECG_Reconnect_ConsumerEC_Control_Adapter::handle_timeout ( this->adaptee_->handle_timeout (tv, arg); 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/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp index e6316e790ab..9b3cd513e9d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp @@ -79,15 +79,3 @@ TAO_ECG_UDP_Out_Endpoint::operator= (const TAO_ECG_UDP_Out_Endpoint& rhs) return *this; } - -// **************************************************************** - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Atomic_Op<TAO_SYNCH_MUTEX, CORBA::ULong>; -template class ACE_Atomic_Op_Ex<TAO_SYNCH_MUTEX, CORBA::ULong>; -template class ACE_Refcounted_Auto_Ptr<TAO_ECG_UDP_Out_Endpoint,ACE_Null_Mutex>; -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Atomic_Op<TAO_SYNCH_MUTEX, CORBA::ULong> -#pragma instantiate ACE_Atomic_Op_Ex<TAO_SYNCH_MUTEX, CORBA::ULong> -#pragma instantiate ACE_Refcounted_Auto_Ptr<TAO_ECG_UDP_Out_Endpoint,ACE_Null_Mutex> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp index 73e309bcedf..5a26c45edef 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp @@ -244,14 +244,3 @@ TAO_ECG_UDP_Receiver::handle_input (ACE_SOCK_Dgram& dgram) ACE_ENDTRY; return 0; } - -// **************************************************************** - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template void activate<TAO_Objref_Var_T<RtecEventComm::PushSupplier> >(TAO_Objref_Var_T<RtecEventComm::PushSupplier>&, PortableServer::POA*, TAO_ServantBase*, TAO_EC_Object_Deactivator& ACE_ENV_ARG_DECL); - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate void activate<TAO_Objref_Var_T<RtecEventComm::PushSupplier> >(TAO_Objref_Var_T<RtecEventComm::PushSupplier>&, PortableServer::POA*, TAO_ServantBase*, TAO_EC_Object_Deactivator& ACE_ENV_ARG_DECL) - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp index d111b4d8470..ed7b42c08ce 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp @@ -230,12 +230,3 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events ACE_CHECK; } } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template void activate<TAO_Objref_Var_T<RtecEventComm::PushConsumer> >(TAO_Objref_Var_T<RtecEventComm::PushConsumer>&, PortableServer::POA*, TAO_ServantBase*, TAO_EC_Object_Deactivator& ACE_ENV_ARG_DECL); - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate void activate<TAO_Objref_Var_T<RtecEventComm::PushConsumer> >(TAO_Objref_Var_T<RtecEventComm::PushConsumer>&, PortableServer::POA*, TAO_ServantBase*, TAO_EC_Object_Deactivator& ACE_ENV_ARG_DECL) - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp index 9c8edb3bdec..3ba08f2c8fb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp @@ -35,27 +35,3 @@ TAO_EC_ConsumerAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class TAO_ESF_Peer_Admin<TAO_EC_Event_Channel_Base,TAO_EC_ProxyPushSupplier,RtecEventChannelAdmin::ProxyPushSupplier,TAO_EC_ProxyPushConsumer>; -template class TAO_ESF_Proxy_Admin<TAO_EC_Event_Channel_Base,TAO_EC_ProxyPushSupplier,RtecEventChannelAdmin::ProxyPushSupplier>; -template class TAO_ESF_Worker<TAO_EC_ProxyPushSupplier>; -template class TAO_ESF_Shutdown_Proxy<TAO_EC_ProxyPushSupplier>; -template class TAO_ESF_Peer_Connected<TAO_EC_ProxyPushSupplier,TAO_EC_ProxyPushConsumer>; -template class TAO_ESF_Peer_Reconnected<TAO_EC_ProxyPushSupplier,TAO_EC_ProxyPushConsumer>; -template class TAO_ESF_Peer_Disconnected<TAO_EC_ProxyPushSupplier,TAO_EC_ProxyPushConsumer>; -template class TAO_ESF_RefCountedRef<TAO_EC_ProxyPushSupplier>; - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate TAO_ESF_Peer_Admin<TAO_EC_Event_Channel_Base,TAO_EC_ProxyPushSupplier,RtecEventChannelAdmin::ProxyPushSupplier,TAO_EC_ProxyPushConsumer> -#pragma instantiate TAO_ESF_Proxy_Admin<TAO_EC_Event_Channel_Base,TAO_EC_ProxyPushSupplier,RtecEventChannelAdmin::ProxyPushSupplier> -#pragma instantiate TAO_ESF_Worker<TAO_EC_ProxyPushSupplier> -#pragma instantiate TAO_ESF_Shutdown_Proxy<TAO_EC_ProxyPushSupplier> -#pragma instantiate TAO_ESF_Peer_Connected<TAO_EC_ProxyPushSupplier,TAO_EC_ProxyPushConsumer> -#pragma instantiate TAO_ESF_Peer_Reconnected<TAO_EC_ProxyPushSupplier,TAO_EC_ProxyPushConsumer> -#pragma instantiate TAO_ESF_Peer_Disconnected<TAO_EC_ProxyPushSupplier,TAO_EC_ProxyPushConsumer> -#pragma instantiate TAO_ESF_RefCountedRef<TAO_EC_ProxyPushSupplier> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp index 296ffd4a094..386970cf1d9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp @@ -997,515 +997,3 @@ ACE_STATIC_SVC_DEFINE (TAO_EC_Default_Factory, ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) ACE_FACTORY_DEFINE (TAO_RTEvent_Serv, TAO_EC_Default_Factory) - -// **************************************************************** - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Dynamic_Service<TAO_EC_Queue_Full_Service_Object>; - -template class ACE_Node<ACE_Command_Base*>; -template class ACE_Unbounded_Queue<ACE_Command_Base*>; -template class ACE_Unbounded_Queue_Iterator<ACE_Command_Base*>; -template class ACE_Unbounded_Set<ACE_Static_Svc_Descriptor*>; -template class ACE_Unbounded_Set_Iterator<ACE_Static_Svc_Descriptor*>; -template class ACE_Node<ACE_Static_Svc_Descriptor*>; - -template class TAO_ESF_Proxy_Collection<TAO_EC_ProxyPushConsumer>; -template class TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>; -template class TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>; -template class ACE_Unbounded_Set<TAO_EC_ProxyPushConsumer *>; -template class ACE_Node<TAO_EC_ProxyPushConsumer *>; -template class ACE_Unbounded_Set_Iterator<TAO_EC_ProxyPushConsumer *>; -template class ACE_RB_Tree<TAO_EC_ProxyPushConsumer *, int, ACE_Less_Than<TAO_EC_ProxyPushConsumer *>, ACE_Null_Mutex>; -template class ACE_RB_Tree_Iterator<TAO_EC_ProxyPushConsumer *, int, ACE_Less_Than<TAO_EC_ProxyPushConsumer *>, ACE_Null_Mutex>; -template class ACE_RB_Tree_Reverse_Iterator<TAO_EC_ProxyPushConsumer *, int, ACE_Less_Than<TAO_EC_ProxyPushConsumer *>, ACE_Null_Mutex>; -template class ACE_RB_Tree_Iterator_Base<TAO_EC_ProxyPushConsumer *, int, ACE_Less_Than<TAO_EC_ProxyPushConsumer *>, ACE_Null_Mutex>; -template class ACE_RB_Tree_Node<TAO_EC_ProxyPushConsumer *, int>; -template class ACE_Less_Than<TAO_EC_ProxyPushConsumer *>; -template class TAO_ESF_Proxy_RB_Tree_Iterator<TAO_EC_ProxyPushConsumer>; - -template class TAO_ESF_Copy_On_Write_Collection< - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator >; -template class TAO_ESF_Copy_On_Write_Collection< - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator >; -template class TAO_ESF_Copy_On_Write_Collection< - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator >; -template class TAO_ESF_Copy_On_Write_Collection< - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator >; - -template class TAO_ESF_Proxy_Collection<TAO_EC_ProxyPushSupplier>; -template class TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>; -template class TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>; -template class ACE_Unbounded_Set<TAO_EC_ProxyPushSupplier *>; -template class ACE_Node<TAO_EC_ProxyPushSupplier *>; -template class ACE_Unbounded_Set_Iterator<TAO_EC_ProxyPushSupplier *>; -template class ACE_RB_Tree<TAO_EC_ProxyPushSupplier *, int, ACE_Less_Than<TAO_EC_ProxyPushSupplier *>, ACE_Null_Mutex>; -template class ACE_RB_Tree_Iterator<TAO_EC_ProxyPushSupplier *, int, ACE_Less_Than<TAO_EC_ProxyPushSupplier *>, ACE_Null_Mutex>; -template class ACE_RB_Tree_Iterator_Base<TAO_EC_ProxyPushSupplier *, int, ACE_Less_Than<TAO_EC_ProxyPushSupplier *>, ACE_Null_Mutex>; -template class ACE_RB_Tree_Reverse_Iterator<TAO_EC_ProxyPushSupplier *, int, ACE_Less_Than<TAO_EC_ProxyPushSupplier *>, ACE_Null_Mutex>; -template class ACE_RB_Tree_Node<TAO_EC_ProxyPushSupplier *, int>; -template class ACE_Less_Than<TAO_EC_ProxyPushSupplier *>; -template class TAO_ESF_Proxy_RB_Tree_Iterator<TAO_EC_ProxyPushSupplier>; - -#if defined (ACE_HAS_THREADS) -// -// To avoid duplicate instantiations of templates we must put the MT -// versions on this #ifdef, otherwise the ACE_SYNCH* macros expand to -// the ACE_NULL* versions, duplicating the non-MT versions below. -// We *cannot* use explicit ACE_Synch classes because that will not -// compile in platforms without threads. -// -template class TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_SYNCH> >; -template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_SYNCH> > >; -template class TAO_ESF_Connected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_SYNCH>,TAO_EC_ProxyPushConsumer >; -template class TAO_ESF_Reconnected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_SYNCH>,TAO_EC_ProxyPushConsumer >; -template class TAO_ESF_Disconnected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_SYNCH>,TAO_EC_ProxyPushConsumer >; -template class TAO_ESF_Shutdown_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_SYNCH> >; -template class TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_SYNCH> >; -template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_SYNCH> > >; -template class TAO_ESF_Connected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_SYNCH>,TAO_EC_ProxyPushConsumer >; -template class TAO_ESF_Reconnected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_SYNCH>,TAO_EC_ProxyPushConsumer >; -template class TAO_ESF_Disconnected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_SYNCH>,TAO_EC_ProxyPushConsumer >; -template class TAO_ESF_Shutdown_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_SYNCH> >; - -template class TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_SYNCH> >; -template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_SYNCH> > >; -template class TAO_ESF_Connected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_SYNCH>,TAO_EC_ProxyPushSupplier >; -template class TAO_ESF_Reconnected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_SYNCH>,TAO_EC_ProxyPushSupplier >; -template class TAO_ESF_Disconnected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_SYNCH>,TAO_EC_ProxyPushSupplier >; -template class TAO_ESF_Shutdown_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_SYNCH> >; -template class TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_SYNCH> >; -template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_SYNCH> > >; -template class TAO_ESF_Connected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_SYNCH>,TAO_EC_ProxyPushSupplier >; -template class TAO_ESF_Reconnected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_SYNCH>,TAO_EC_ProxyPushSupplier >; -template class TAO_ESF_Disconnected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_SYNCH>,TAO_EC_ProxyPushSupplier >; -template class TAO_ESF_Shutdown_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_SYNCH> >; - -template class TAO_ESF_Copy_On_Write_Read_Guard< - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Write_Read_Guard< - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Write_Read_Guard< - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Write_Read_Guard< - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Write_Write_Guard< - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Copy_On_Write_Write_Guard< - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Copy_On_Write_Write_Guard< - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Copy_On_Write_Write_Guard< - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_SYNCH>; - -#endif /* ACE_HAS_THREADS */ - -template class TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_NULL_SYNCH> >; -template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_NULL_SYNCH> > >; -template class TAO_ESF_Connected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_NULL_SYNCH>,TAO_EC_ProxyPushConsumer >; -template class TAO_ESF_Reconnected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_NULL_SYNCH>,TAO_EC_ProxyPushConsumer >; -template class TAO_ESF_Disconnected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_NULL_SYNCH>,TAO_EC_ProxyPushConsumer >; -template class TAO_ESF_Shutdown_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_NULL_SYNCH> >; -template class TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_NULL_SYNCH> >; -template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_NULL_SYNCH> > >; -template class TAO_ESF_Connected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_NULL_SYNCH>,TAO_EC_ProxyPushConsumer >; -template class TAO_ESF_Reconnected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_NULL_SYNCH>,TAO_EC_ProxyPushConsumer >; -template class TAO_ESF_Disconnected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_NULL_SYNCH>,TAO_EC_ProxyPushConsumer >; -template class TAO_ESF_Shutdown_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_NULL_SYNCH> >; - -template class TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_NULL_SYNCH> >; -template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_NULL_SYNCH> > >; -template class TAO_ESF_Connected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_NULL_SYNCH>,TAO_EC_ProxyPushSupplier >; -template class TAO_ESF_Reconnected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_NULL_SYNCH>,TAO_EC_ProxyPushSupplier >; -template class TAO_ESF_Disconnected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_NULL_SYNCH>,TAO_EC_ProxyPushSupplier >; -template class TAO_ESF_Shutdown_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_NULL_SYNCH> >; -template class TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_NULL_SYNCH> >; -template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_NULL_SYNCH> > >; -template class TAO_ESF_Connected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_NULL_SYNCH>,TAO_EC_ProxyPushSupplier >; -template class TAO_ESF_Reconnected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_NULL_SYNCH>,TAO_EC_ProxyPushSupplier >; -template class TAO_ESF_Disconnected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_NULL_SYNCH>,TAO_EC_ProxyPushSupplier >; -template class TAO_ESF_Shutdown_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_NULL_SYNCH> >; - -template class TAO_ESF_Copy_On_Write_Read_Guard< - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Write_Read_Guard< - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Write_Read_Guard< - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Write_Read_Guard< - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Write_Write_Guard< - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Copy_On_Write_Write_Guard< - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Copy_On_Write_Write_Guard< - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Copy_On_Write_Write_Guard< - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_NULL_SYNCH>; - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Dynamic_Service<TAO_EC_Queue_Full_Service_Object> -// @@ TODO!!! - -#if defined (ACE_HAS_THREADS) -#endif /* ACE_HAS_THREADS */ - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp index 015d6b83a17..6ce94287fd6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp @@ -8,13 +8,3 @@ ACE_RCSID(Event, EC_Factory, "$Id$") TAO_EC_Factory::~TAO_EC_Factory (void) { } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Dynamic_Service<TAO_EC_Factory>; - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Dynamic_Service<TAO_EC_Factory> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp index 9cb09930bc6..220a8403b96 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp @@ -124,11 +124,3 @@ TAO_EC_Null_Filter::add_dependencies ( { 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/orbsvcs/Event/EC_Gateway_IIOP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp index 91e25f95e96..5ae4f0d558c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp @@ -10,8 +10,8 @@ #include "ace/Dynamic_Service.h" -ACE_RCSID (Event, - EC_Gateway_IIOP, +ACE_RCSID (Event, + EC_Gateway_IIOP, "$Id$") TAO_EC_Gateway_IIOP::TAO_EC_Gateway_IIOP (void) @@ -709,27 +709,3 @@ TAO_EC_Gateway_IIOP::resume_supplier_ec (ACE_ENV_SINGLE_ARG_DECL) supplier_ec_suspended_ = 0; } } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_PushConsumer_Adapter<TAO_EC_Gateway_IIOP>; -template class ACE_PushSupplier_Adapter<TAO_EC_Gateway_IIOP>; -template class ACE_Map_Entry<RtecEventComm::EventSourceID,RtecEventChannelAdmin::ProxyPushConsumer_ptr>; -template class ACE_Map_Manager<RtecEventComm::EventSourceID,RtecEventChannelAdmin::ProxyPushConsumer_ptr,ACE_Null_Mutex>; -template class ACE_Map_Iterator_Base<RtecEventComm::EventSourceID,RtecEventChannelAdmin::ProxyPushConsumer_ptr,ACE_Null_Mutex>; -template class ACE_Map_Iterator<RtecEventComm::EventSourceID,RtecEventChannelAdmin::ProxyPushConsumer_ptr,ACE_Null_Mutex>; -template class ACE_Map_Reverse_Iterator<RtecEventComm::EventSourceID,RtecEventChannelAdmin::ProxyPushConsumer_ptr,ACE_Null_Mutex>; - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_PushConsumer_Adapter<TAO_EC_Gateway_IIOP> -#pragma instantiate ACE_PushSupplier_Adapter<TAO_EC_Gateway_IIOP> - -#pragma instantiate ACE_Map_Entry<RtecEventComm::EventSourceID,RtecEventChannelAdmin::ProxyPushConsumer_ptr> -#pragma instantiate ACE_Map_Manager<RtecEventComm::EventSourceID,RtecEventChannelAdmin::ProxyPushConsumer_ptr,ACE_Null_Mutex> -#pragma instantiate ACE_Map_Iterator_Base<RtecEventComm::EventSourceID,RtecEventChannelAdmin::ProxyPushConsumer_ptr,ACE_Null_Mutex> -#pragma instantiate ACE_Map_Iterator<RtecEventComm::EventSourceID,RtecEventChannelAdmin::ProxyPushConsumer_ptr,ACE_Null_Mutex> -#pragma instantiate ACE_Map_Reverse_Iterator<RtecEventComm::EventSourceID,RtecEventChannelAdmin::ProxyPushConsumer_ptr,ACE_Null_Mutex> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp index 9050514afea..6a576bcb0e0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp @@ -206,14 +206,3 @@ ACE_STATIC_SVC_DEFINE (TAO_EC_Gateway_IIOP_Factory, ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) ACE_FACTORY_DEFINE (TAO_RTEvent_Serv, TAO_EC_Gateway_IIOP_Factory) - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Dynamic_Service<TAO_EC_Gateway_IIOP_Factory>; - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Dynamic_Service<TAO_EC_Gateway_IIOP_Factory> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp index 9d1d284ef0a..aecf424ef41 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp @@ -204,17 +204,3 @@ TAO_EC_Kokyu_Push_Command::execute () return 0; } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -#if (! defined (__GNUC__)) || (__GNUC__ > 2) || \ -(__GNUC__ == 2 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 8) -template class ACE_Array<Kokyu::ConfigInfo>; -template class ACE_Array_Base<Kokyu::ConfigInfo>; -# endif /* __GNUC__ */ -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#if (! defined (__GNUC__)) || (__GNUC__ > 2) || \ -(__GNUC__ == 2 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 8) -#pragma instantiate ACE_Array<Kokyu::ConfigInfo> -#pragma instantiate ACE_Array_Base<Kokyu::ConfigInfo>; -# endif /* __GNUC__ */ -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp index 6c37bf5598a..ca4a07fa8b8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp @@ -266,11 +266,3 @@ ACE_STATIC_SVC_DEFINE (TAO_EC_Kokyu_Factory, ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) ACE_FACTORY_DEFINE (TAO_RTKokyuEvent, TAO_EC_Kokyu_Factory) - -// **************************************************************** - -#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/orbsvcs/Event/EC_ObserverStrategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp index 4c5d9bed338..0263f42c989 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp @@ -510,39 +510,3 @@ TAO_EC_Accumulate_Consumer_Headers::work (TAO_EC_ProxyPushConsumer *consumer this->headers_.insert (event.header, 1); } } - -// **************************************************************** - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Map_Manager<RtecEventChannelAdmin::Observer_Handle,TAO_EC_Basic_ObserverStrategy::Observer_Entry,ACE_Null_Mutex>; -template class ACE_Map_Iterator<RtecEventChannelAdmin::Observer_Handle,TAO_EC_Basic_ObserverStrategy::Observer_Entry,ACE_Null_Mutex>; -template class ACE_Map_Iterator_Base<RtecEventChannelAdmin::Observer_Handle,TAO_EC_Basic_ObserverStrategy::Observer_Entry,ACE_Null_Mutex>; -template class ACE_Map_Reverse_Iterator<RtecEventChannelAdmin::Observer_Handle,TAO_EC_Basic_ObserverStrategy::Observer_Entry,ACE_Null_Mutex>; -template class ACE_Map_Entry<RtecEventChannelAdmin::Observer_Handle,TAO_EC_Basic_ObserverStrategy::Observer_Entry>; - -template class ACE_RB_Tree<RtecEventComm::EventHeader,int,TAO_EC_Basic_ObserverStrategy::Header_Compare,ACE_Null_Mutex>; -template class ACE_RB_Tree_Iterator_Base<RtecEventComm::EventHeader,int,TAO_EC_Basic_ObserverStrategy::Header_Compare,ACE_Null_Mutex>; -template class ACE_RB_Tree_Iterator<RtecEventComm::EventHeader,int,TAO_EC_Basic_ObserverStrategy::Header_Compare,ACE_Null_Mutex>; -template class ACE_RB_Tree_Reverse_Iterator<RtecEventComm::EventHeader,int,TAO_EC_Basic_ObserverStrategy::Header_Compare,ACE_Null_Mutex>; -template class ACE_RB_Tree_Node<RtecEventComm::EventHeader,int>; - -template class ACE_Auto_Basic_Array_Ptr<RtecEventChannelAdmin::Observer_var>; - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Map_Manager<RtecEventChannelAdmin::Observer_Handle,TAO_EC_Basic_ObserverStrategy::Observer_Entry,ACE_Null_Mutex> -#pragma instantiate ACE_Map_Iterator<RtecEventChannelAdmin::Observer_Handle,TAO_EC_Basic_ObserverStrategy::Observer_Entry,ACE_Null_Mutex> -#pragma instantiate ACE_Map_Iterator_Base<RtecEventChannelAdmin::Observer_Handle,TAO_EC_Basic_ObserverStrategy::Observer_Entry,ACE_Null_Mutex> -#pragma instantiate ACE_Map_Reverse_Iterator<RtecEventChannelAdmin::Observer_Handle,TAO_EC_Basic_ObserverStrategy::Observer_Entry,ACE_Null_Mutex> -#pragma instantiate ACE_Map_Entry<RtecEventChannelAdmin::Observer_Handle,TAO_EC_Basic_ObserverStrategy::Observer_Entry> - -#pragma instantiate ACE_RB_Tree<RtecEventComm::EventHeader,int,TAO_EC_Basic_ObserverStrategy::Header_Compare,ACE_Null_Mutex> -#pragma instantiate ACE_RB_Tree_Iterator_Base<RtecEventComm::EventHeader,int,TAO_EC_Basic_ObserverStrategy::Header_Compare,ACE_Null_Mutex> -#pragma instantiate ACE_RB_Tree_Iterator<RtecEventComm::EventHeader,int,TAO_EC_Basic_ObserverStrategy::Header_Compare,ACE_Null_Mutex> -#pragma instantiate ACE_RB_Tree_Reverse_Iterator<RtecEventComm::EventHeader,int,TAO_EC_Basic_ObserverStrategy::Header_Compare,ACE_Null_Mutex> -#pragma instantiate ACE_RB_Tree_Node<RtecEventComm::EventHeader,int> - -#pragma instantiate ACE_Auto_Basic_Array_Ptr<RtecEventChannelAdmin::Observer_var> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp index 9fc4f06efa0..dde5347cec6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp @@ -304,9 +304,3 @@ TAO_EC_ProxyPushConsumer_Guard:: this->proxy_->refcount_zero_hook (); } - -#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/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp index 2b895dbbb6e..1fb8ea7bbfe 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp @@ -529,16 +529,3 @@ TAO_EC_ProxyPushSupplier::add_dependencies ( qos_info ACE_ENV_ARG_PARAMETER); } - - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class TAO_ESF_RefCount_Guard<CORBA::ULong>; -template class TAO_ESF_Proxy_RefCount_Guard<TAO_EC_Event_Channel_Base,TAO_EC_ProxyPushSupplier>; - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate TAO_ESF_RefCount_Guard<CORBA::ULong> -#pragma instantiate TAO_ESF_Proxy_RefCount_Guard<TAO_EC_Event_Channel_Base,TAO_EC_ProxyPushSupplier> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp index 2c8187d103f..8fe8f6cbcff 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp @@ -270,9 +270,3 @@ TAO_EC_Ping_Consumer::work (TAO_EC_ProxyPushSupplier *supplier } ACE_ENDTRY; } - -#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/orbsvcs/Event/EC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp index 4d62eee6241..cdb3dc88a4d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp @@ -260,9 +260,3 @@ TAO_EC_Ping_Supplier::work (TAO_EC_ProxyPushConsumer *consumer } ACE_ENDTRY; } - -#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/orbsvcs/Event/EC_Sched_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp index 16f8510732a..47abbb9b9ed 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp @@ -219,11 +219,3 @@ ACE_STATIC_SVC_DEFINE (TAO_EC_Sched_Factory, ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) ACE_FACTORY_DEFINE (TAO_RTSchedEvent, TAO_EC_Sched_Factory) - -// **************************************************************** - -#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/orbsvcs/Event/EC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp index 73e4e6f86d2..f980f81485e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp @@ -33,27 +33,3 @@ TAO_EC_SupplierAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class TAO_ESF_Peer_Admin<TAO_EC_Event_Channel_Base,TAO_EC_ProxyPushConsumer,RtecEventChannelAdmin::ProxyPushConsumer,TAO_EC_ProxyPushSupplier>; -template class TAO_ESF_Proxy_Admin<TAO_EC_Event_Channel_Base,TAO_EC_ProxyPushConsumer,RtecEventChannelAdmin::ProxyPushConsumer>; -template class TAO_ESF_Worker<TAO_EC_ProxyPushConsumer>; -template class TAO_ESF_Shutdown_Proxy<TAO_EC_ProxyPushConsumer>; -template class TAO_ESF_Peer_Connected<TAO_EC_ProxyPushConsumer,TAO_EC_ProxyPushSupplier>; -template class TAO_ESF_Peer_Reconnected<TAO_EC_ProxyPushConsumer,TAO_EC_ProxyPushSupplier>; -template class TAO_ESF_Peer_Disconnected<TAO_EC_ProxyPushConsumer,TAO_EC_ProxyPushSupplier>; -template class TAO_ESF_RefCountedRef<TAO_EC_ProxyPushConsumer>; - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate TAO_ESF_Peer_Admin<TAO_EC_Event_Channel_Base,TAO_EC_ProxyPushConsumer,RtecEventChannelAdmin::ProxyPushConsumer,TAO_EC_ProxyPushSupplier> -#pragma instantiate TAO_ESF_Proxy_Admin<TAO_EC_Event_Channel_Base,TAO_EC_ProxyPushConsumer,RtecEventChannelAdmin::ProxyPushConsumer> -#pragma instantiate TAO_ESF_Worker<TAO_EC_ProxyPushConsumer> -#pragma instantiate TAO_ESF_Shutdown_Proxy<TAO_EC_ProxyPushConsumer> -#pragma instantiate TAO_ESF_Peer_Connected<TAO_EC_ProxyPushConsumer,TAO_EC_ProxyPushSupplier> -#pragma instantiate TAO_ESF_Peer_Reconnected<TAO_EC_ProxyPushConsumer,TAO_EC_ProxyPushSupplier> -#pragma instantiate TAO_ESF_Peer_Disconnected<TAO_EC_ProxyPushConsumer,TAO_EC_ProxyPushSupplier> -#pragma instantiate TAO_ESF_RefCountedRef<TAO_EC_ProxyPushConsumer> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp index fc635152b66..d90ca8c4678 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp @@ -74,7 +74,7 @@ TAO_EC_TPC_Dispatching::add_consumer (RtecEventComm::PushConsumer_ptr consumer { ACE_DEBUG ((LM_WARNING, "EC (%P|%t): TPC_Dispatching::add_consumer failed to bind consumer (%@)" - " and dispatch task in map (%s): %p\n", + " and dispatch task in map (%s): %p\n", consumer, explanation)); dtask->putq (new TAO_EC_Shutdown_Task_Command); dtask->wait (); @@ -137,7 +137,7 @@ TAO_EC_TPC_Dispatching::shutdown (void) entry->int_id_->putq (new TAO_EC_Shutdown_Task_Command); iter.advance (); } - + this->thread_manager_.wait (); // Wait for the threads to terminate // Now iterate again and call CORBA::release on the ext_id; @@ -152,7 +152,7 @@ TAO_EC_TPC_Dispatching::shutdown (void) CORBA::release (entry->ext_id_); iter.advance (); } - + this->consumer_task_map_.unbind_all (); } @@ -192,13 +192,3 @@ TAO_EC_TPC_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, ACE_CHECK; } } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Hash_Map_Manager_Ex<RtecEventComm::PushConsumer*, TAO_EC_Dispatching_Task*, ACE_Pointer_Hash<RtecEventComm::PushConsumer*>, ACE_Equal_To<RtecEventComm::PushConsumer*>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<RtecEventComm::PushConsumer*, TAO_EC_Dispatching_Task*, ACE_Pointer_Hash<RtecEventComm::PushConsumer*>, ACE_Equal_To<RtecEventComm::PushConsumer*>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<RtecEventComm::PushConsumer*,TAO_EC_Dispatching_Task*, ACE_Pointer_Hash<RtecEventComm::PushConsumer*>,ACE_Equal_To<RtecEventComm::PushConsumer*>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<RtecEventComm::PushConsumer*, TAO_EC_Dispatching_Task*, ACE_Pointer_Hash<RtecEventComm::PushConsumer*>, ACE_Equal_To<RtecEventComm::PushConsumer*>, ACE_Null_Mutex>; -template class ACE_Equal_To<RtecEventComm::PushConsumer*>; -template class ACE_Pointer_Hash<RtecEventComm::PushConsumer*>; -template class ACE_Hash_Map_Entry<RtecEventComm::PushConsumer*, TAO_EC_Dispatching_Task*>; -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp index e39cd60ff99..a1a47f277b6 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp @@ -396,15 +396,4 @@ namespace TAO return t; } - } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_TSS<TAO::FT_TSS>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_TSS<TAO::FT_TSS> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp index d46cdb65417..4dc19d2f66a 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp @@ -75,9 +75,3 @@ ACE_STATIC_SVC_DEFINE (TAO_FT_ClientService_Activate, &ACE_SVC_NAME (TAO_FT_ClientService_Activate), ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Dynamic_Service<TAO_FT_ClientService_Activate>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Dynamic_Service<TAO_FT_ClientService_Activate> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp index dd9f2313ac3..3047cec219d 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp @@ -51,9 +51,3 @@ ACE_STATIC_SVC_DEFINE (TAO_FT_ServerService_Activate, &ACE_SVC_NAME (TAO_FT_ServerService_Activate), ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Dynamic_Service<TAO_FT_ServerService_Activate>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Dynamic_Service<TAO_FT_ServerService_Activate> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp index f64ad373bb9..fea264b08f1 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp @@ -74,9 +74,3 @@ ACE_STATIC_SVC_DEFINE (TAO_FT_Service_Activate, &ACE_SVC_NAME (TAO_FT_Service_Activate), ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Dynamic_Service<TAO_FT_Service_Activate>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Dynamic_Service<TAO_FT_Service_Activate> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp index 243fc0f2aa1..3b08edc08e8 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp @@ -119,14 +119,14 @@ GroupInfoPublisherBase::setup_info(const FTRT::ManagerInfoList & info_list, else { result->successor = info_->successor; } - + if (!CORBA::is_nil(result->successor.in())) { CORBA::PolicyList_var pols; result->successor->_validate_connection (pols.out ()); } */ - + // update backups result->backups.length(successors_length); for (i = 0; i < successors_length; ++i) { @@ -167,12 +167,8 @@ GroupInfoPublisherBase::update_info(GroupInfoPublisherBase::Info_ptr& info) info_ = info; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) +#if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) template ACE_Singleton<GroupInfoPublisherBase, ACE_Thread_Mutex> *ACE_Singleton<GroupInfoPublisherBase, ACE_Thread_Mutex>::singleton_; -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp index 7e244d416ce..ef818176259 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp @@ -881,36 +881,3 @@ TAO::HTIOP::Acceptor::parse_options (const char *str) } return 0; } - - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Auto_Basic_Array_Ptr<ACE::HTBP::Addr>; - -template class TAO::HTIOP::Creation_Strategy<TAO::HTIOP::Completion_Handler>; -template class TAO_Creation_Strategy<TAO::HTIOP::Completion_Handler>; -template class TAO_Concurrency_Strategy<TAO::HTIOP::Connection_Handler>; -template class ACE_Concurrency_Strategy<TAO::HTIOP::Completion_Handler>; -template class TAO::HTIOP::Accept_Strategy<TAO::HTIOP::Completion_Handler, ACE_SOCK_Acceptor>; -template class ACE_Accept_Strategy<TAO::HTIOP::Completion_Handler, ACE_SOCK_Acceptor>; -template class TAO_Accept_Strategy<TAO::HTIOP::Completion_Handler, ACE_SOCK_Acceptor>; -template class ACE_Strategy_Acceptor<TAO::HTIOP::Completion_Handler, ACE_SOCK_Acceptor>; -template class ACE_Acceptor<TAO::HTIOP::Completion_Handler, ACE_SOCK_Acceptor>; -template class ACE_Scheduling_Strategy<TAO::HTIOP::Completion_Handler>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Auto_Basic_Array_Ptr<ACE::HTBP::Addr> - -#pragma instantiate TAO::HTIOP::Creation_Strategy<TAO::HTIOP::Completion_Handler> -#pragma instantiate TAO_Creation_Strategy<TAO::HTIOP::Completion_Handler> -#pragma instantiate TAO_Concurrency_Strategy<TAO::HTIOP::Connection_Handler> -#pragma instantiate ACE_Concurrency_Strategy<TAO::HTIOP::Completion_Handler> -#pragma instantiate TAO::HTIOP::Accept_Strategy<TAO::HTIOP::Completion_Handler, ACE_SOCK_Acceptor> -#pragma instantiate ACE_Accept_Strategy<TAO::HTIOP::Completion_Handler, ACE_SOCK_Acceptor> -#pragma instantiate TAO_Accept_Strategy<TAO::HTIOP::Completion_Handler, ACE_SOCK_Acceptor> -#pragma instantiate ACE_Strategy_Acceptor<TAO::HTIOP::Completion_Handler, ACE_SOCK_Acceptor> -#pragma instantiate ACE_Acceptor<TAO::HTIOP::Completion_Handler, ACE_SOCK_Acceptor> -#pragma instantiate ACE_Scheduling_Strategy<TAO::HTIOP::Completion_Handler> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp index 509364cadc4..485bb25d89d 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp @@ -122,7 +122,7 @@ TAO::HTIOP::Connection_Handler::open (void*) if (!this->transport ()->post_open ((size_t) this->get_handle ())) return -1; - this->state_changed (TAO_LF_Event::LFS_SUCCESS, + this->state_changed (TAO_LF_Event::LFS_SUCCESS, this->orb_core ()->leader_follower ()); return 0; @@ -281,16 +281,3 @@ TAO::HTIOP::Connection_Handler::set_dscp_codepoint (CORBA::Boolean /*enable_netw { return 0; } - - -// **************************************************************** - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Svc_Handler<ACE::HTBP::STREAM, ACE_NULL_SYNCH>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Svc_Handler<ACE::HTBP::STREAM, ACE_NULL_SYNCH> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp index 79dba60c387..efec14803e4 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp @@ -414,39 +414,3 @@ TAO::HTIOP::Connector::remote_endpoint (TAO_Endpoint *endpoint) return htiop_endpoint; } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class TAO_Connect_Concurrency_Strategy<TAO::HTIOP::Connection_Handler>; -template class ACE_Concurrency_Strategy<TAO::HTIOP::Connection_Handler>; -template class TAO_Connect_Creation_Strategy<TAO::HTIOP::Connection_Handler>; - -//template class ACE_Strategy_Connector<TAO::HTIOP::Connection_Handler, ACE_SOCK_CONNECTOR>; -//template class ACE_Connect_Strategy<TAO::HTIOP::Connection_Handler, ACE_SOCK_CONNECTOR>; -//template class ACE_Connector<TAO::HTIOP::Connection_Handler, ACE_SOCK_CONNECTOR>; -template class ACE_Svc_Tuple<TAO::HTIOP::Connection_Handler>; - -template class ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<TAO::HTIOP::Connection_Handler> *, TAO_SYNCH_RW_MUTEX>; -template class ACE_Map_Iterator_Base<ACE_HANDLE, ACE_Svc_Tuple<TAO::HTIOP::Connection_Handler> *, TAO_SYNCH_RW_MUTEX>; -template class ACE_Map_Entry<ACE_HANDLE,ACE_Svc_Tuple<TAO::HTIOP::Connection_Handler>*>; -template class ACE_Map_Iterator<ACE_HANDLE,ACE_Svc_Tuple<TAO::HTIOP::Connection_Handler>*,TAO_SYNCH_RW_MUTEX>; -template class ACE_Map_Reverse_Iterator<ACE_HANDLE,ACE_Svc_Tuple<TAO::HTIOP::Connection_Handler>*,TAO_SYNCH_RW_MUTEX>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate TAO_Connect_Concurrency_Strategy<TAO::HTIOP::Connection_Handler> -#pragma instantiate ACE_Concurrency_Strategy<TAO::HTIOP::Connection_Handler> -#pragma instantiate TAO_Connect_Creation_Strategy<TAO::HTIOP::Connection_Handler> - -//#pragma instantiate ACE_Strategy_Connector<TAO::HTIOP::Connection_Handler, ACE_SOCK_CONNECTOR> -//#pragma instantiate ACE_Connect_Strategy<TAO::HTIOP::Connection_Handler, ACE_SOCK_CONNECTOR> -//#pragma instantiate ACE_Connector<TAO::HTIOP::Connection_Handler, ACE_SOCK_CONNECTOR> -#pragma instantiate ACE_Svc_Tuple<TAO::HTIOP::Connection_Handler> - -#pragma instantiate ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<TAO::HTIOP::Connection_Handler> *, TAO_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Iterator_Base<ACE_HANDLE, ACE_Svc_Tuple<TAO::HTIOP::Connection_Handler> *, TAO_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Entry<ACE_HANDLE,ACE_Svc_Tuple<TAO::HTIOP::Connection_Handler>*> -#pragma instantiate ACE_Map_Iterator<ACE_HANDLE,ACE_Svc_Tuple<TAO::HTIOP::Connection_Handler>*,TAO_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Reverse_Iterator<ACE_HANDLE,ACE_Svc_Tuple<TAO::HTIOP::Connection_Handler>*,TAO_SYNCH_RW_MUTEX> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp index 5b3ae3b4f74..ca98fb93301 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp @@ -452,8 +452,3 @@ TAO::HTIOP::Transport::invalidate_event_handler_i (void) this->connection_handler_ = 0; return eh; } - - -#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT -template class HTIOP_Export ACE_Svc_Handler<ACE_HTBP_STREAM, ACE_NULL_SYNCH>; -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp index ceb6aaf3daf..b6a6810f039 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp @@ -62,20 +62,6 @@ TAO_Port_Utils<CORBA::ComponentIR::UsesDef>::set_is_multiple ( is_multiple); } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class TAO_Port_Desc_Seq_Utils<CORBA::ComponentIR::UsesDescriptionSeq>; -template class TAO_Port_Desc_Seq_Utils<CORBA::ComponentIR::EventPortDescriptionSeq>; -template class TAO_Port_Utils<CORBA::ComponentIR::UsesDef>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate TAO_Port_Desc_Seq_Utils<CORBA::ComponentIR::UsesDescriptionSeq> -#pragma instantiate TAO_Port_Desc_Seq_Utils<CORBA::ComponentIR::EventPortDescriptionSeq> -#pragma instantiate TAO_Port_Utils<CORBA::ComponentIR::UsesDef> - -#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION*/ - // ============================================================== TAO_ComponentDef_i::TAO_ComponentDef_i ( diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp index 03bfd5ddf66..0e861af9cd7 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp @@ -14,8 +14,8 @@ #include "ace/Dynamic_Service.h" #include "ace/Argv_Type_Converter.h" -ACE_RCSID (IFR_Service, - IFR_Service_Loader, +ACE_RCSID (IFR_Service, + IFR_Service_Loader, "$Id$") TAO_IFR_Service_Loader::TAO_IFR_Service_Loader (void) @@ -29,29 +29,29 @@ TAO_IFR_Service_Loader::~TAO_IFR_Service_Loader (void) } int -TAO_IFR_Service_Loader::init (int argc, +TAO_IFR_Service_Loader::init (int argc, ACE_TCHAR *argv[]) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Copy command line parameter. - ACE_Argv_Type_Converter command_line (argc, + ACE_Argv_Type_Converter command_line (argc, argv); // Initialize the ORB CORBA::ORB_var orb = - CORBA::ORB_init (command_line.get_argc (), - command_line.get_ASCII_argv (), - 0 + CORBA::ORB_init (command_line.get_argc (), + command_line.get_ASCII_argv (), + 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // This function call initializes the IFR_Service Service CORBA::Object_var object = - this->create_object (orb.in (), - command_line.get_argc (), - command_line.get_TCHAR_argv () + this->create_object (orb.in (), + command_line.get_argc (), + command_line.get_TCHAR_argv () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -94,9 +94,3 @@ TAO_IFR_Service_Loader::create_object (CORBA::ORB_ptr orb, } ACE_FACTORY_DEFINE (TAO_IFRService, TAO_IFR_Service_Loader) - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Dynamic_Service<TAO_IFR_Service_Loader>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Dynamic_Service<TAO_IFR_Service_Loader> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp index b9eef787c67..66d1efe498f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp @@ -117,22 +117,3 @@ Options::support_multicast_discovery (void) const { return this->support_multicast_; } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Singleton <Options, ACE_Null_Mutex>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Singleton <Options, ACE_Null_Mutex> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - - - - - - - - - - - - - diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.cpp index a1554b35c8a..23586970f71 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.cpp @@ -7,21 +7,3 @@ ACE_RCSID (LoadBalancing, LB_LoadAlertMap, "$Id$") - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Hash_Map_Entry<PortableGroup::Location, TAO_LB_LoadAlertInfo>; -template class ACE_Hash_Map_Manager_Ex<PortableGroup::Location, TAO_LB_LoadAlertInfo, TAO_PG_Location_Hash, TAO_PG_Location_Equal_To, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<PortableGroup::Location, TAO_LB_LoadAlertInfo, TAO_PG_Location_Hash, TAO_PG_Location_Equal_To, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<PortableGroup::Location, TAO_LB_LoadAlertInfo, TAO_PG_Location_Hash, TAO_PG_Location_Equal_To, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<PortableGroup::Location, TAO_LB_LoadAlertInfo, TAO_PG_Location_Hash, TAO_PG_Location_Equal_To, ACE_Null_Mutex>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Hash_Map_Entry<PortableGroup::Location, TAO_LB_LoadAlertInfo> -#pragma instantiate ACE_Hash_Map_Manager_Ex<PortableGroup::Location, TAO_LB_LoadAlertInfo, TAO_PG_Location_Hash, TAO_PG_Location_Equal_To, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<PortableGroup::Location, TAO_LB_LoadAlertInfo, TAO_PG_Location_Hash, TAO_PG_Location_Equal_To, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<PortableGroup::Location, TAO_LB_LoadAlertInfo, TAO_PG_Location_Hash, TAO_PG_Location_Equal_To, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<PortableGroup::Location, TAO_LB_LoadAlertInfo, TAO_PG_Location_Hash, TAO_PG_Location_Equal_To, ACE_Null_Mutex> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.cpp index 75ed8e3a833..5c084408100 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.cpp @@ -5,22 +5,3 @@ ACE_RCSID (LoadBalancing, LB_LoadListMap, "$Id$") - - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Hash_Map_Entry<PortableGroup::Location, CosLoadBalancing::LoadList>; -template class ACE_Hash_Map_Manager_Ex<PortableGroup::Location, CosLoadBalancing::LoadList, TAO_PG_Location_Hash, TAO_PG_Location_Equal_To, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<PortableGroup::Location, CosLoadBalancing::LoadList, TAO_PG_Location_Hash, TAO_PG_Location_Equal_To, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<PortableGroup::Location, CosLoadBalancing::LoadList, TAO_PG_Location_Hash, TAO_PG_Location_Equal_To, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<PortableGroup::Location, CosLoadBalancing::LoadList, TAO_PG_Location_Hash, TAO_PG_Location_Equal_To, ACE_Null_Mutex>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Hash_Map_Entry<PortableGroup::Location, CosLoadBalancing::LoadList> -#pragma instantiate ACE_Hash_Map_Manager_Ex<PortableGroup::Location, CosLoadBalancing::LoadList, TAO_PG_Location_Hash, TAO_PG_Location_Equal_To, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<PortableGroup::Location, CosLoadBalancing::LoadList, TAO_PG_Location_Hash, TAO_PG_Location_Equal_To, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<PortableGroup::Location, CosLoadBalancing::LoadList, TAO_PG_Location_Hash, TAO_PG_Location_Equal_To, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<PortableGroup::Location, CosLoadBalancing::LoadList, TAO_PG_Location_Hash, TAO_PG_Location_Equal_To, ACE_Null_Mutex> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.cpp index 6c49f1327c0..8a40fdb1c95 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.cpp @@ -5,22 +5,3 @@ ACE_RCSID (LoadBalancing, LB_LoadMap, "$Id$") - - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Hash_Map_Entry<PortableGroup::Location, CosLoadBalancing::Load>; -template class ACE_Hash_Map_Manager_Ex<PortableGroup::Location, CosLoadBalancing::Load, TAO_PG_Location_Hash, TAO_PG_Location_Equal_To, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<PortableGroup::Location, CosLoadBalancing::Load, TAO_PG_Location_Hash, TAO_PG_Location_Equal_To, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<PortableGroup::Location, CosLoadBalancing::Load, TAO_PG_Location_Hash, TAO_PG_Location_Equal_To, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<PortableGroup::Location, CosLoadBalancing::Load, TAO_PG_Location_Hash, TAO_PG_Location_Equal_To, ACE_Null_Mutex>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Hash_Map_Entry<PortableGroup::Location, CosLoadBalancing::Load> -#pragma instantiate ACE_Hash_Map_Manager_Ex<PortableGroup::Location, CosLoadBalancing::Load, TAO_PG_Location_Hash, TAO_PG_Location_Equal_To, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<PortableGroup::Location, CosLoadBalancing::Load, TAO_PG_Location_Hash, TAO_PG_Location_Equal_To, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<PortableGroup::Location, CosLoadBalancing::Load, TAO_PG_Location_Hash, TAO_PG_Location_Equal_To, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<PortableGroup::Location, CosLoadBalancing::Load, TAO_PG_Location_Hash, TAO_PG_Location_Equal_To, ACE_Null_Mutex> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.cpp index 58cdf308250..703c0515709 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.cpp @@ -5,22 +5,3 @@ ACE_RCSID (LoadBalancing, LB_Location_Index, "$Id$") - - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Hash_Map_Entry<PortableGroup::ObjectGroupId, CORBA::ULong>; -template class ACE_Hash_Map_Manager_Ex<PortableGroup::ObjectGroupId, CORBA::ULong, ACE_Hash<ACE_UINT64>, ACE_Equal_To<ACE_UINT64>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<PortableGroup::ObjectGroupId, CORBA::ULong, ACE_Hash<ACE_UINT64>, ACE_Equal_To<ACE_UINT64>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<PortableGroup::ObjectGroupId, CORBA::ULong, ACE_Hash<ACE_UINT64>, ACE_Equal_To<ACE_UINT64>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<PortableGroup::ObjectGroupId, CORBA::ULong, ACE_Hash<ACE_UINT64>, ACE_Equal_To<ACE_UINT64>, ACE_Null_Mutex>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Hash_Map_Entry<PortableGroup::ObjectGroupId, CORBA::ULong> -#pragma instantiate ACE_Hash_Map_Manager_Ex<PortableGroup::ObjectGroupId, CORBA::ULong, ACE_Hash<ACE_UINT64>, ACE_Equal_To<ACE_UINT64>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<PortableGroup::ObjectGroupId, CORBA::ULong, ACE_Hash<ACE_UINT64>, ACE_Equal_To<ACE_UINT64>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<PortableGroup::ObjectGroupId, CORBA::ULong, ACE_Hash<ACE_UINT64>, ACE_Equal_To<ACE_UINT64>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<PortableGroup::ObjectGroupId, CORBA::ULong, ACE_Hash<ACE_UINT64>, ACE_Equal_To<ACE_UINT64>, ACE_Null_Mutex> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.cpp index 9089e0021f2..ad8142f3e24 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.cpp @@ -6,22 +6,3 @@ ACE_RCSID (LoadBalancing, LB_MonitorMap, "$Id$") - - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Hash_Map_Entry<PortableGroup::Location, CosLoadBalancing::LoadMonitor_var>; -template class ACE_Hash_Map_Manager_Ex<PortableGroup::Location, CosLoadBalancing::LoadMonitor_var, TAO_PG_Location_Hash, TAO_PG_Location_Equal_To, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<PortableGroup::Location, CosLoadBalancing::LoadMonitor_var, TAO_PG_Location_Hash, TAO_PG_Location_Equal_To, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<PortableGroup::Location, CosLoadBalancing::LoadMonitor_var, TAO_PG_Location_Hash, TAO_PG_Location_Equal_To, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<PortableGroup::Location, CosLoadBalancing::LoadMonitor_var, TAO_PG_Location_Hash, TAO_PG_Location_Equal_To, ACE_Null_Mutex>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Hash_Map_Entry<PortableGroup::Location, CosLoadBalancing::LoadMonitor_var> -#pragma instantiate ACE_Hash_Map_Manager_Ex<PortableGroup::Location, CosLoadBalancing::LoadMonitor_var, TAO_PG_Location_Hash, TAO_PG_Location_Equal_To, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<PortableGroup::Location, CosLoadBalancing::LoadMonitor_var, TAO_PG_Location_Hash, TAO_PG_Location_Equal_To, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<PortableGroup::Location, CosLoadBalancing::LoadMonitor_var, TAO_PG_Location_Hash, TAO_PG_Location_Equal_To, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<PortableGroup::Location, CosLoadBalancing::LoadMonitor_var, TAO_PG_Location_Hash, TAO_PG_Location_Equal_To, ACE_Null_Mutex> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp index dff631c15fb..d525001fc3d 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp @@ -253,25 +253,3 @@ TAO_LB_ObjectReferenceFactory::load_managed_object (const char * repository_id, return 0; } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Hash_Map_Entry<ACE_CString, PortableGroup::ObjectGroup_var>; -template class ACE_Hash_Map_Manager_Ex<ACE_CString, PortableGroup::ObjectGroup_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, PortableGroup::ObjectGroup_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<ACE_CString, PortableGroup::ObjectGroup_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, PortableGroup::ObjectGroup_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>; - -template class ACE_Array_Base<PortableGroup::GenericFactory::FactoryCreationId_var>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Hash_Map_Entry<ACE_CString, PortableGroup::ObjectGroup_var> -#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, PortableGroup::ObjectGroup_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, PortableGroup::ObjectGroup_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, PortableGroup::ObjectGroup_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, PortableGroup::ObjectGroup_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex> - -#pragma instantiate ACE_Array_Base<PortableGroup::GenericFactory::FactoryCreationId_var> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp index 562b0325b2c..fb9b4a0db3f 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp @@ -786,36 +786,3 @@ TAO_Hash_LogRecordStore::set_max_size (CORBA::ULongLong size this->max_size_ = size; } - - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Hash_Map_Entry<DsLogAdmin::RecordId,DsLogAdmin::LogRecord>; -template class ACE_Hash_Map_Manager<DsLogAdmin::RecordId,DsLogAdmin::LogRecord,ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<DsLogAdmin::RecordId, DsLogAdmin::LogRecord, - ACE_Hash<DsLogAdmin::RecordId>, ACE_Equal_To<DsLogAdmin::RecordId>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator<DsLogAdmin::RecordId,DsLogAdmin::LogRecord,ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<DsLogAdmin::RecordId, DsLogAdmin::LogRecord, ACE_Hash<DsLogAdmin::RecordId>, - ACE_Equal_To<DsLogAdmin::RecordId>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<DsLogAdmin::RecordId, DsLogAdmin::LogRecord, ACE_Hash<DsLogAdmin::RecordId>, - ACE_Equal_To<DsLogAdmin::RecordId>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator<DsLogAdmin::RecordId,DsLogAdmin::LogRecord,ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<DsLogAdmin::RecordId, DsLogAdmin::LogRecord, ACE_Hash<DsLogAdmin::RecordId>, - ACE_Equal_To<DsLogAdmin::RecordId>, ACE_Null_Mutex>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Hash_Map_Entry<DsLogAdmin::RecordId,DsLogAdmin::LogRecord> -#pragma instantiate ACE_Hash_Map_Manager<DsLogAdmin::RecordId,DsLogAdmin::LogRecord,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<DsLogAdmin::RecordId, DsLogAdmin::LogRecord, ACE_Hash<DsLogAdmin::RecordId>, -ACE_Equal_To<DsLogAdmin::RecordId>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator<DsLogAdmin::RecordId,DsLogAdmin::LogRecord,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<DsLogAdmin::RecordId, DsLogAdmin::LogRecord, ACE_Hash<DsLogAdmin::RecordId>, -ACE_Equal_To<DsLogAdmin::RecordId>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<DsLogAdmin::RecordId, DsLogAdmin::LogRecord, ACE_Hash<DsLogAdmin::RecordId>, -ACE_Equal_To<DsLogAdmin::RecordId>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<DsLogAdmin::RecordId,DsLogAdmin::LogRecord,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<DsLogAdmin::RecordId, DsLogAdmin::LogRecord, ACE_Hash<DsLogAdmin::RecordId>, -ACE_Equal_To<DsLogAdmin::RecordId>, ACE_Null_Mutex> - -#endif /* ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA */ diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp index 42810373218..2eca24c2127 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp @@ -256,28 +256,3 @@ TAO_Hash_LogStore::get_log_record_store (DsLogAdmin::LogId id return recordstore; } - - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Hash_Map_Entry<DsLogAdmin::LogId,DsLogAdmin::Log_var>; -template class ACE_Hash_Map_Manager<DsLogAdmin::LogId,DsLogAdmin::Log_var,ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<DsLogAdmin::LogId, DsLogAdmin::Log_var, ACE_Hash<DsLogAdmin::LogId>, ACE_Equal_To<DsLogAdmin::LogId>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator<DsLogAdmin::LogId,DsLogAdmin::Log_var,ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<DsLogAdmin::LogId, DsLogAdmin::Log_var, ACE_Hash<DsLogAdmin::LogId>, ACE_Equal_To<DsLogAdmin::LogId>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<DsLogAdmin::LogId, DsLogAdmin::Log_var, ACE_Hash<DsLogAdmin::LogId>, ACE_Equal_To<DsLogAdmin::LogId>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator<DsLogAdmin::LogId,DsLogAdmin::Log_var,ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<DsLogAdmin::LogId, DsLogAdmin::Log_var, ACE_Hash<DsLogAdmin::LogId>, ACE_Equal_To<DsLogAdmin::LogId>, ACE_Null_Mutex>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Hash_Map_Entry<DsLogAdmin::LogId,DsLogAdmin::Log_var> -#pragma instantiate ACE_Hash_Map_Manager<DsLogAdmin::LogId,DsLogAdmin::Log_var,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<DsLogAdmin::LogId, DsLogAdmin::Log_var, ACE_Hash<DsLogAdmin::LogId>, ACE_Equal_To<DsLogAdmin::LogId>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator<DsLogAdmin::LogId,DsLogAdmin::Log_var,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<DsLogAdmin::LogId, DsLogAdmin::Log_var, ACE_Hash<DsLogAdmin::LogId>, ACE_Equal_To<DsLogAdmin::LogId>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<DsLogAdmin::LogId, DsLogAdmin::Log_var, ACE_Hash<DsLogAdmin::LogId>, ACE_Equal_To<DsLogAdmin::LogId>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<DsLogAdmin::LogId,DsLogAdmin::Log_var,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<DsLogAdmin::LogId, DsLogAdmin::Log_var, ACE_Hash<DsLogAdmin::LogId>, ACE_Equal_To<DsLogAdmin::LogId>, ACE_Null_Mutex> - -#endif /* ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA */ diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.cpp b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.cpp index 0f83281fb69..2af2f073dfd 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.cpp @@ -142,7 +142,7 @@ TAO_LogRecordStore::update (DsLogAdmin::LogRecord &rec) --this->num_records_; this->current_size_ -= log_record_size(oldrec); - if (rec_hash_.bind (rec.id, rec) != 0) + if (rec_hash_.bind (rec.id, rec) != 0) { return -1; } @@ -204,35 +204,3 @@ TAO_LogRecordStore::get_storage (void) { return rec_hash_; } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Hash_Map_Entry<DsLogAdmin::RecordId,DsLogAdmin::LogRecord>; -template class ACE_Hash_Map_Manager<DsLogAdmin::RecordId,DsLogAdmin::LogRecord,ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<DsLogAdmin::RecordId, DsLogAdmin::LogRecord, - ACE_Hash<DsLogAdmin::RecordId>, ACE_Equal_To<DsLogAdmin::RecordId>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator<DsLogAdmin::RecordId,DsLogAdmin::LogRecord,ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<DsLogAdmin::RecordId, DsLogAdmin::LogRecord, ACE_Hash<DsLogAdmin::RecordId>, - ACE_Equal_To<DsLogAdmin::RecordId>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<DsLogAdmin::RecordId, DsLogAdmin::LogRecord, ACE_Hash<DsLogAdmin::RecordId>, - ACE_Equal_To<DsLogAdmin::RecordId>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator<DsLogAdmin::RecordId,DsLogAdmin::LogRecord,ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<DsLogAdmin::RecordId, DsLogAdmin::LogRecord, ACE_Hash<DsLogAdmin::RecordId>, - ACE_Equal_To<DsLogAdmin::RecordId>, ACE_Null_Mutex>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Hash_Map_Entry<DsLogAdmin::RecordId,DsLogAdmin::LogRecord> -#pragma instantiate ACE_Hash_Map_Manager<DsLogAdmin::RecordId,DsLogAdmin::LogRecord,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<DsLogAdmin::RecordId, DsLogAdmin::LogRecord, ACE_Hash<DsLogAdmin::RecordId>, -ACE_Equal_To<DsLogAdmin::RecordId>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator<DsLogAdmin::RecordId,DsLogAdmin::LogRecord,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<DsLogAdmin::RecordId, DsLogAdmin::LogRecord, ACE_Hash<DsLogAdmin::RecordId>, -ACE_Equal_To<DsLogAdmin::RecordId>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<DsLogAdmin::RecordId, DsLogAdmin::LogRecord, ACE_Hash<DsLogAdmin::RecordId>, -ACE_Equal_To<DsLogAdmin::RecordId>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<DsLogAdmin::RecordId,DsLogAdmin::LogRecord,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<DsLogAdmin::RecordId, DsLogAdmin::LogRecord, ACE_Hash<DsLogAdmin::RecordId>, -ACE_Equal_To<DsLogAdmin::RecordId>, ACE_Null_Mutex> - -#endif /* ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA */ diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp index 0e1c783cd00..5ce626f3703 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp @@ -1377,33 +1377,3 @@ TAO_Log_Constraint_Visitor::simple_type_match (int expr_type, return 0; } } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Hash_Map_Manager<ACE_CString, CORBA::Any*, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Manager_Ex<ACE_CString, CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Entry <ACE_CString, CORBA::Any*>; -template class ACE_Hash_Map_Iterator<ACE_CString, CORBA::Any*, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Ex<ACE_CString, CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Reverse_Iterator<ACE_CString, CORBA::Any*, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>; -template class ACE_Node<TAO_ETCL_Literal_Constraint>; -template class ACE_Unbounded_Queue<TAO_ETCL_Literal_Constraint>; -template class ACE_Unbounded_Queue_Iterator<TAO_ETCL_Literal_Constraint>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Hash_Map_Manager<ACE_CString, CORBA::Any*, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Entry <ACE_CString, CORBA::Any*> -#pragma instantiate ACE_Hash_Map_Iterator<ACE_CString, CORBA::Any*, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_CString, CORBA::Any*, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Node<TAO_ETCL_Literal_Constraint> -#pragma instantiate ACE_Unbounded_Queue<TAO_ETCL_Literal_Constraint> -#pragma instantiate ACE_Unbounded_Queue_Iterator<TAO_ETCL_Literal_Constraint> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp index cd55a14ddff..5f4dfbce233 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp @@ -1275,7 +1275,7 @@ TAO_Log_i::validate_capacity_alarm_thresholds ( // appears to be an TAO TLS implementation artifact for efficent // threshold checks. We could eliminate this restriction by // normalizing the sequence. - + if (threshs.length () > 1) for (CORBA::ULong i = 0; i < threshs.length () - 1; i++) if (threshs[i] >= threshs[i + 1]) @@ -1283,9 +1283,3 @@ TAO_Log_i::validate_capacity_alarm_thresholds ( return true; } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class TAO_Unbounded_Sequence<DsLogAdmin::TimeInterval>; -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate TAO_Unbounded_Sequence<DsLogAdmin::TimeInterval> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp index 8cad93598aa..fe2ef5b3dfb 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp @@ -236,15 +236,3 @@ TAO_RTEventLogFactory_i::obtain_push_supplier ( { return consumer_admin_->obtain_push_supplier(); } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class auto_ptr <TAO_RTEventLog_i>; -template class ACE_Auto_Basic_Ptr<TAO_RTEventLog_i>; - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate auto_ptr <TAO_RTEventLog_i> -#pragma instantiate ACE_Auto_Basic_Ptr <TAO_RTEventLog_i> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.cpp index e89c29d4dae..73933c27eb1 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.cpp +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.cpp @@ -9,21 +9,4 @@ #include "Metrics_LocalCache.i" #endif /* __ACE_INLINE__ */ -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Hash_Map_Entry<int, TAO_Metrics_LocalCache<ACE_Thread_Mutex, ACE_New_Allocator>::TAO_Metrics_Cache_Data *>; -template class ACE_Hash_Map_Entry<int, TAO_Metrics_LocalCache<ACE_Thread_Mutex, ACE_New_Allocator>::TAO_Metrics_Cache_Data_Base *>; -template class ACE_Hash_Map_Manager_Ex<int, TAO_Metrics_LocalCache<ACE_Thread_Mutex, ACE_New_Allocator>::TAO_Metrics_Cache_Data *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<int, TAO_Metrics_LocalCache<ACE_Thread_Mutex, ACE_New_Allocator>::TAO_Metrics_Cache_Data_Base *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<int, TAO_Metrics_LocalCache<ACE_Thread_Mutex, ACE_New_Allocator>::TAO_Metrics_Cache_Data_Base *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<int, TAO_Metrics_LocalCache<ACE_Thread_Mutex, ACE_New_Allocator>::TAO_Metrics_Cache_Data *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_Null_Mutex>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Hash_Map_Entry<int, TAO_Metrics_LocalCache<ACE_Thread_Mutex, ACE_New_Allocator>::TAO_Metrics_Cache_Data *> -#pragma instantiate ACE_Hash_Map_Entry<int, TAO_Metrics_LocalCache<ACE_Thread_Mutex, ACE_New_Allocator>::TAO_Metrics_Cache_Data_Base *> -#pragma instantiate ACE_Hash_Map_Manager_Ex<int, TAO_Metrics_LocalCache<ACE_Thread_Mutex, ACE_New_Allocator>::TAO_Metrics_Cache_Data *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<int, TAO_Metrics_LocalCache<ACE_Thread_Mutex, ACE_New_Allocator>::TAO_Metrics_Cache_Data_Base *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<int, TAO_Metrics_LocalCache<ACE_Thread_Mutex, ACE_New_Allocator>::TAO_Metrics_Cache_Data_Base *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<int, TAO_Metrics_LocalCache<ACE_Thread_Mutex, ACE_New_Allocator>::TAO_Metrics_Cache_Data *, ACE_Hash<int>, ACE_Equal_To<int>, ACE_Null_Mutex> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - #endif /* METRICS_LOCAL_CACHE_CPP */ - diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp index 2906191c6b3..dd7f2de0b01 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp @@ -864,28 +864,5 @@ TAO_Metrics_Logger::process_timeprobe_data (const Metrics::TimeprobeParameter_Se } } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -// Already instantiated in Transport_Mux_Strategy ... otherwise VxWorks gets dual -// definition link error -//template class ACE_Equal_To<CORBA::ULong>; -// The below template already instantiated in ../ace/Funchtor.h -// template class ACE_Hash<CORBA::ULong>; -template class ACE_Hash_Map_Manager_Ex<CORBA::ULong, CORBA::String_var *, ACE_Hash<CORBA::ULong>, ACE_Equal_To<CORBA::ULong>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<CORBA::ULong, CORBA::String_var *, ACE_Hash<CORBA::ULong>, ACE_Equal_To<CORBA::ULong>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<CORBA::ULong, CORBA::String_var *, ACE_Hash<CORBA::ULong>, ACE_Equal_To<CORBA::ULong>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<CORBA::ULong, CORBA::String_var *, ACE_Hash<CORBA::ULong>, ACE_Equal_To<CORBA::ULong>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Entry<CORBA::ULong, CORBA::String_var *>; -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Equal_To<CORBA::ULong> -//#pragma instantiate ACE_Hash<CORBA::ULong> -#pragma instantiate ACE_Hash_Map_Manager_Ex<CORBA::ULong, CORBA::String_var *, ACE_Hash<CORBA::ULong>, ACE_Equal_To<CORBA::ULong>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<CORBA::ULong, CORBA::String_var *, ACE_Hash<CORBA::ULong>, ACE_Equal_To<CORBA::ULong>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<CORBA::ULong, CORBA::String_var *, ACE_Hash<CORBA::ULong>, ACE_Equal_To<CORBA::ULong>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<CORBA::ULong, CORBA::String_var *, ACE_Hash<CORBA::ULong>, ACE_Equal_To<CORBA::ULong>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Entry<CORBA::ULong, CORBA::String_var *> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - #endif /* ACE_ENABLE_TIMEPROBES & ACE_COMPILE_TIMEPROBES */ #endif /* ACE_METRICS_COLLECTION */ - diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.cpp index bf74bd7eff3..d593c8aa5ca 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.cpp +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.cpp @@ -13,13 +13,6 @@ #include "Metrics_UpcallMonitor.i" #endif /* __ACE_INLINE__ */ -// Added by joeh to fix undefined symbols for VxWorks load -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class TAO_Metrics_LocalCache<ACE_Thread_Mutex, ACE_New_Allocator>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate TAO_Metrics_LocalCache<ACE_Thread_Mutex, ACE_New_Allocator> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - #else #error ACE_COMPILE_TIMEPROBES must be defined in order to collect metrics #endif /* ACE_ENABLE_TIMEPROBES & ACE_COMPILE_TIMEPROBES */ diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp index d07f924e6d8..e4b4dab16bf 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp @@ -527,12 +527,6 @@ WSOA_Metrics_Handles::WSOA_Metrics_Handles () #include "Metrics_Utils.i" #endif /* __ACE_INLINE__ */ -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Singleton<WSOA_Metrics_Handles, ACE_Thread_Mutex>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Singleton<WSOA_Metrics_Handles, ACE_Thread_Mutex> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - #else #error ACE_COMPILE_TIMEPROBES must be defined in order to collect metrics #endif /* ACE_ENABLE_TIMEPROBES & ACE_COMPILE_TIMEPROBES */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp index a5eee0e0f33..2a098d198c8 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp @@ -40,17 +40,17 @@ TAO_Naming_Loader::init (int argc, ACE_TCHAR *argv[]) // Initialize the ORB CORBA::ORB_var orb = - CORBA::ORB_init (command_line.get_argc(), - command_line.get_ASCII_argv(), - 0 + CORBA::ORB_init (command_line.get_argc(), + command_line.get_ASCII_argv(), + 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // This function call initializes the Naming Service CORBA::Object_var object = - this->create_object (orb.in (), - command_line.get_argc(), - command_line.get_TCHAR_argv () + this->create_object (orb.in (), + command_line.get_argc(), + command_line.get_TCHAR_argv () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -91,9 +91,3 @@ TAO_Naming_Loader::create_object (CORBA::ORB_ptr orb, } ACE_FACTORY_DEFINE (TAO_Naming_Serv, TAO_Naming_Loader) - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Dynamic_Service<TAO_Naming_Loader>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Dynamic_Service<TAO_Naming_Loader> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp index b7793665682..c2563037d21 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp @@ -8,39 +8,6 @@ #include "ace/Auto_Ptr.h" #include "ace/OS_NS_unistd.h" -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) -template class ACE_Auto_Basic_Ptr<TAO_Naming_Context>; - -template class ACE_Hash_Map_With_Allocator<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId>; -template class ACE_Hash_Map_Manager<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId, ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId, ACE_Hash<TAO_Persistent_Index_ExtId>, ACE_Equal_To<TAO_Persistent_Index_ExtId>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Entry<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId>; -template class ACE_Hash<TAO_Persistent_Index_ExtId>; -template class ACE_Equal_To<TAO_Persistent_Index_ExtId>; -template class ACE_Hash_Map_Iterator_Base_Ex<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId, ACE_Hash<TAO_Persistent_Index_ExtId>, ACE_Equal_To<TAO_Persistent_Index_ExtId>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId, ACE_Hash<TAO_Persistent_Index_ExtId>, ACE_Equal_To<TAO_Persistent_Index_ExtId>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId, ACE_Hash<TAO_Persistent_Index_ExtId>, ACE_Equal_To<TAO_Persistent_Index_ExtId>, ACE_Null_Mutex>; -template class ACE_Auto_Basic_Ptr<ACE_Hash_Map_With_Allocator<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId>::ITERATOR>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Naming_Context> - -#pragma instantiate ACE_Hash_Map_With_Allocator<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId> -#pragma instantiate ACE_Hash_Map_Manager<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId, ACE_Hash<TAO_Persistent_Index_ExtId>, ACE_Equal_To<TAO_Persistent_Index_ExtId>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Entry<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId> -#pragma instantiate ACE_Hash<TAO_Persistent_Index_ExtId> -#pragma instantiate ACE_Equal_To<TAO_Persistent_Index_ExtId> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId, ACE_Hash<TAO_Persistent_Index_ExtId>, ACE_Equal_To<TAO_Persistent_Index_ExtId>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId, ACE_Hash<TAO_Persistent_Index_ExtId>, ACE_Equal_To<TAO_Persistent_Index_ExtId>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId, ACE_Null_Mutex> -#pragma instantiate ACE_Auto_Basic_Ptr<ACE_Hash_Map_With_Allocator<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId>::ITERATOR> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId, ACE_Hash<TAO_Persistent_Index_ExtId>, ACE_Equal_To<TAO_Persistent_Index_ExtId>, ACE_Null_Mutex> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - int TAO_Persistent_Context_Index::unbind (const char *poa_id) { diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp index 35d065c2858..4a0e122ff90 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp @@ -536,41 +536,3 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many, ACE_CHECK; } } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - -template class ACE_Hash_Map_With_Allocator<TAO_Persistent_ExtId, TAO_Persistent_IntId>; -template class ACE_Hash_Map_Manager<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Hash<TAO_Persistent_ExtId>, ACE_Equal_To<TAO_Persistent_ExtId>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Entry<TAO_Persistent_ExtId, TAO_Persistent_IntId>; -template class ACE_Hash<TAO_Persistent_ExtId>; -template class ACE_Equal_To<TAO_Persistent_ExtId>; -template class ACE_Hash_Map_Iterator_Base_Ex<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Hash<TAO_Persistent_ExtId>, ACE_Equal_To<TAO_Persistent_ExtId>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Hash<TAO_Persistent_ExtId>, ACE_Equal_To<TAO_Persistent_ExtId>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Hash<TAO_Persistent_ExtId>, ACE_Equal_To<TAO_Persistent_ExtId>, ACE_Null_Mutex>; -template class ACE_Auto_Basic_Ptr<TAO_Persistent_Naming_Context>; -template class ACE_Auto_Basic_Ptr<ACE_Hash_Map_Iterator_Ex<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Hash<TAO_Persistent_ExtId>, ACE_Equal_To<TAO_Persistent_ExtId>, ACE_Null_Mutex > >; -template class TAO_Bindings_Iterator<ACE_Hash_Map_Iterator_Ex<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Hash<TAO_Persistent_ExtId>, ACE_Equal_To<TAO_Persistent_ExtId>, ACE_Null_Mutex>, ACE_Hash_Map_Entry<TAO_Persistent_ExtId, TAO_Persistent_IntId> >; -template class ACE_Auto_Basic_Ptr<TAO_Bindings_Iterator<ACE_Hash_Map_Iterator_Ex<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Hash<TAO_Persistent_ExtId>, ACE_Equal_To<TAO_Persistent_ExtId>, ACE_Null_Mutex>, ACE_Hash_Map_Entry<TAO_Persistent_ExtId, TAO_Persistent_IntId> > >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Hash_Map_With_Allocator<TAO_Persistent_ExtId, TAO_Persistent_IntId> -#pragma instantiate ACE_Hash_Map_Manager<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Hash<TAO_Persistent_ExtId>, ACE_Equal_To<TAO_Persistent_ExtId>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Entry<TAO_Persistent_ExtId, TAO_Persistent_IntId> -#pragma instantiate ACE_Hash<TAO_Persistent_ExtId> -#pragma instantiate ACE_Equal_To<TAO_Persistent_ExtId> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Hash<TAO_Persistent_ExtId>, ACE_Equal_To<TAO_Persistent_ExtId>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Hash<TAO_Persistent_ExtId>, ACE_Equal_To<TAO_Persistent_ExtId>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Hash<TAO_Persistent_ExtId>, ACE_Equal_To<TAO_Persistent_ExtId>, ACE_Null_Mutex> -#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Persistent_Naming_Context> -#pragma instantiate ACE_Auto_Basic_Ptr<ACE_Hash_Map_Iterator_Ex<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Hash<TAO_Persistent_ExtId>, ACE_Equal_To<TAO_Persistent_ExtId>, ACE_Null_Mutex> > -#pragma instantiate TAO_Bindings_Iterator<ACE_Hash_Map_Iterator_Ex<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Hash<TAO_Persistent_ExtId>, ACE_Equal_To<TAO_Persistent_ExtId>, ACE_Null_Mutex>, ACE_Hash_Map_Entry<TAO_Persistent_ExtId, TAO_Persistent_IntId> > -#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Bindings_Iterator<ACE_Hash_Map_Iterator_Ex<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Hash<TAO_Persistent_ExtId>, ACE_Equal_To<TAO_Persistent_ExtId>, ACE_Null_Mutex>, ACE_Hash_Map_Entry<TAO_Persistent_ExtId, TAO_Persistent_IntId> > > -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp index a3a900cc207..9b8c8152000 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp @@ -1538,39 +1538,4 @@ CosNaming::NamingContext_ptr TAO_Storable_Naming_Context::recreate_all( if(redundant_) gfl_->close(); return result._retn (); - } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Unbounded_List_Iterator<ACE_CString>; -template class ACE_Unbounded_List<ACE_CString>; -template class ACE_NS_Node<ACE_CString>; -template class ACE_Auto_Basic_Ptr<TAO_Storable_Naming_Context>; -template class ACE_Hash_Map_Manager<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Entry<TAO_Storable_ExtId, TAO_Storable_IntId>; -template class ACE_Hash_Map_Iterator_Base_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex>; -template class ACE_Auto_Basic_Ptr<ACE_Hash_Map_Iterator_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex > >; -template class TAO_Bindings_Iterator<ACE_Hash_Map_Iterator_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex>, ACE_Hash_Map_Entry<TAO_Storable_ExtId, TAO_Storable_IntId> >; -template class ACE_Auto_Basic_Ptr<TAO_Bindings_Iterator<ACE_Hash_Map_Iterator_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex>, ACE_Hash_Map_Entry<TAO_Storable_ExtId, TAO_Storable_IntId> > >; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Hash_Map_Manager<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Entry<TAO_Storable_ExtId, TAO_Storable_IntId> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex> -#pragma instantiate ACE_Auto_Basic_Ptr<ACE_Hash_Map_Iterator_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex> > -#pragma instantiate TAO_Bindings_Iterator<ACE_Hash_Map_Iterator_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex>, ACE_Hash_Map_Entry<TAO_Storable_ExtId, TAO_Storable_IntId> > -#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Bindings_Iterator<ACE_Hash_Map_Iterator_Ex<TAO_Storable_ExtId, TAO_Storable_IntId, ACE_Hash<TAO_Storable_ExtId>, ACE_Equal_To<TAO_Storable_ExtId>, ACE_Null_Mutex>, ACE_Hash_Map_Entry<TAO_Storable_ExtId, TAO_Storable_IntId> > > -#pragma instantiate ACE_Unbounded_List_Iterator<ACE_CString> -#pragma instantiate ACE_Unbounded_List<ACE_CString> -#pragma instantiate ACE_NS_Node<ACE_CString> -#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Storable_Naming_Context> -#endif diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp index a4f7144cdd4..8a81829332d 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp @@ -338,39 +338,3 @@ TAO_Transient_Naming_Context::list (CORBA::ULong how_many, ACE_CHECK; } } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ - defined (ACE_HAS_GNU_REPO) - -template class ACE_Hash_Map_Iterator_Base_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId>, ACE_Equal_To<TAO_ExtId>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator<TAO_ExtId, TAO_IntId, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId>, ACE_Equal_To<TAO_ExtId>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator<TAO_ExtId, TAO_IntId, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId>, ACE_Equal_To<TAO_ExtId>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId>, ACE_Equal_To<TAO_ExtId>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager<TAO_ExtId, TAO_IntId, ACE_Null_Mutex>; -template class ACE_Hash<TAO_ExtId>; -template class ACE_Equal_To<TAO_ExtId>; -template class ACE_Hash_Map_Entry<TAO_ExtId, TAO_IntId>; -template class TAO_Bindings_Iterator<ACE_Hash_Map_Iterator_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId>, ACE_Equal_To<TAO_ExtId>, ACE_Null_Mutex>, ACE_Hash_Map_Entry<TAO_ExtId, TAO_IntId> >; -template class ACE_Auto_Basic_Ptr<TAO_Transient_Naming_Context>; -template class ACE_Auto_Basic_Ptr<TAO_Bindings_Iterator<ACE_Hash_Map_Iterator_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId>, ACE_Equal_To<TAO_ExtId>, ACE_Null_Mutex>, ACE_Hash_Map_Entry<TAO_ExtId, TAO_IntId> > >; -template class ACE_Auto_Basic_Ptr<ACE_Hash_Map_Iterator_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId>, ACE_Equal_To<TAO_ExtId>, ACE_Null_Mutex> >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId>, ACE_Equal_To<TAO_ExtId>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator<TAO_ExtId, TAO_IntId, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId>, ACE_Equal_To<TAO_ExtId>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<TAO_ExtId, TAO_IntId, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId>, ACE_Equal_To<TAO_ExtId>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId>, ACE_Equal_To<TAO_ExtId>, ACE_Null_Mutex> - -#pragma instantiate ACE_Hash_Map_Manager<TAO_ExtId, TAO_IntId, ACE_Null_Mutex> -#pragma instantiate ACE_Hash<TAO_ExtId> -#pragma instantiate ACE_Equal_To<TAO_ExtId> -#pragma instantiate ACE_Hash_Map_Entry<TAO_ExtId, TAO_IntId> -#pragma instantiate TAO_Bindings_Iterator<ACE_Hash_Map_Iterator_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId>, ACE_Equal_To<TAO_ExtId>, ACE_Null_Mutex>, ACE_Hash_Map_Entry<TAO_ExtId, TAO_IntId> > -#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Transient_Naming_Context> -#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Bindings_Iterator<ACE_Hash_Map_Iterator_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId>, ACE_Equal_To<TAO_ExtId>, ACE_Null_Mutex>, ACE_Hash_Map_Entry<TAO_ExtId, TAO_IntId> > > -#pragma instantiate ACE_Auto_Basic_Ptr<ACE_Hash_Map_Iterator_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId>, ACE_Equal_To<TAO_ExtId>, ACE_Null_Mutex> > -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp index 65fc33cde83..b63c36326cc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp @@ -108,11 +108,3 @@ Bit_Vector::find_first_bit_of(const size_t location, bool set) } } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Vector<ACE_UINT32>; -template class ACE_Array_Base<ACE_UINT32>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Vector<ACE_UINT32> -#pragma instantiate ACE_Array_Base<ACE_UINT32> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp index 21c1400db67..d6b4fdb7318 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp @@ -586,13 +586,3 @@ TAO_Notify_Builder::apply_lane_concurrency (TAO_Notify_Object& /*object*/, const // No lane support ACE_THROW (CORBA::NO_IMPLEMENT ()); } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Dynamic_Service<TAO_Notify_FilterFactory>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Dynamic_Service<TAO_Notify_FilterFactory> - -#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp index 3e86a44b2e7..37c29ecba36 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp @@ -480,19 +480,3 @@ TAO_Notify_ConsumerAdmin::find_proxy_supplier ( } return result; } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class TAO_Notify_Find_Worker_T<TAO_Notify_Proxy - , CosNotifyChannelAdmin::ProxySupplier - , CosNotifyChannelAdmin::ProxySupplier_ptr - , CosNotifyChannelAdmin::ProxyNotFound>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate TAO_Notify_Find_Worker_T<TAO_Notify_Proxy - , CosNotifyChannelAdmin::ProxySupplier - , CosNotifyChannelAdmin::ProxySupplier_ptr - , CosNotifyChannelAdmin::ProxyNotFound> - -#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp index a14b7d827f6..c5c2fcffa31 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp @@ -98,21 +98,3 @@ Delivery_Request::routing_slip () const } // namespace -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -//template class ACE_Auto_Basic_Ptr<TAO_Notify::Routing_Slip>; -//template class ACE_Strong_Bound_Ptr<TAO_Notify::Routing_Slip, TAO_SYNCH_MUTEX>; -//template class ACE_Auto_Basic_Ptr<TAO_Notify::Delivery_Request>; -//template class ACE_Strong_Bound_Ptr<TAO_Notify::Delivery_Request,TAO_SYNCH_MUTEX>; -// Duplicated in Routing_Slip.cpp -//template class ACE_Vector <TAO_Notify::Delivery_Request_Ptr>; -//template class ACE_Array_Base<ACE_Strong_Bound_Ptr<TAO_Notify::Delivery_Request,TAO_SYNCH_MUTEX> >; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -//#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Notify::Routing_Slip> -//#pragma instantiate ACE_Strong_Bound_Ptr<TAO_Notify::Routing_Slip,TAO_SYNCH_MUTEX> -//#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Notify::Delivery_Request> -//#pragma instantiate ACE_Strong_Bound_Ptr<TAO_Notify::Delivery_Request,TAO_SYNCH_MUTEX> -// Duplicated in Routing_Slip.cpp -//#pragma instantiate ACE_Vector <TAO_Notify::Delivery_Request_Ptr> -//#pragma instantiate ACE_Array_Base<ACE_Strong_Bound_Ptr<TAO_Notify::Delivery_Request,TAO_SYNCH_MUTEX> > -#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp index 3aab442e6ff..664af405c97 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp @@ -440,46 +440,3 @@ TAO_Notify_ETCL_Filter::get_callbacks (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0); } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Hash_Map_Entry<CosNotifyFilter::ConstraintID,TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr *>; -template class ACE_Hash_Map_Manager<CosNotifyFilter::ConstraintID,TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*,ACE_SYNCH_NULL_MUTEX>; -template class ACE_Hash_Map_Manager_Ex<CosNotifyFilter::ConstraintID,TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,ACE_SYNCH_NULL_MUTEX>; -template class ACE_Hash_Map_Iterator<CosNotifyFilter::ConstraintID,TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*,ACE_SYNCH_NULL_MUTEX>; -template class ACE_Hash_Map_Iterator_Ex<CosNotifyFilter::ConstraintID,TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,ACE_SYNCH_NULL_MUTEX>; -template class ACE_Hash_Map_Iterator_Base_Ex<CosNotifyFilter::ConstraintID,TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,ACE_SYNCH_NULL_MUTEX>; -template class ACE_Hash_Map_Reverse_Iterator<CosNotifyFilter::ConstraintID,TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*,ACE_SYNCH_NULL_MUTEX>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<CosNotifyFilter::ConstraintID,TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,ACE_SYNCH_NULL_MUTEX>; - -#if !defined (ACE_HAS_STD_TEMPLATE_SPECIALIZATION) -template class ACE_Equal_To<CosNotifyFilter::ConstraintID>; -#endif /* ACE_HAS_STD_TEMPLATE_SPECIALIZATION */ - -template class ACE_Array<TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*>; -template class ACE_Array_Base<TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*>; - -template class auto_ptr<CosNotifyFilter::ConstraintInfoSeq>; -template class ACE_Auto_Basic_Ptr<CosNotifyFilter::ConstraintInfoSeq>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Hash_Map_Entry<CosNotifyFilter::ConstraintID,TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*> -#pragma instantiate ACE_Hash_Map_Manager<CosNotifyFilter::ConstraintID,TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*,ACE_SYNCH_NULL_MUTEX> -#pragma instantiate ACE_Hash_Map_Manager_Ex<CosNotifyFilter::ConstraintID,TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,ACE_SYNCH_NULL_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator<CosNotifyFilter::ConstraintID,TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*,ACE_SYNCH_NULL_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<CosNotifyFilter::ConstraintID,TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,ACE_SYNCH_NULL_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<CosNotifyFilter::ConstraintID,TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,ACE_SYNCH_NULL_MUTEX> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<CosNotifyFilter::ConstraintID,TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*,ACE_SYNCH_NULL_MUTEX> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<CosNotifyFilter::ConstraintID,TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*,ACE_Hash<CosNotifyFilter::ConstraintID>, ACE_Equal_To<CosNotifyFilter::ConstraintID>,ACE_SYNCH_NULL_MUTEX> - -#if !defined (ACE_HAS_STD_TEMPLATE_SPECIALIZATION) -#pragma instantiate ACE_Equal_To<CosNotifyFilter::ConstraintID> -#endif /* ACE_HAS_STD_TEMPLATE_SPECIALIZATION */ - -#pragma instantiate ACE_Array<TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*> -#pragma instantiate ACE_Array_Base<TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*> - -#pragma instantiate auto_ptr<CosNotifyFilter::ConstraintInfoSeq> -#pragma instantiate ACE_Auto_Basic_Ptr<CosNotifyFilter::ConstraintInfoSeq> - -#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp index d1a83f19473..74d4783a14a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp @@ -519,17 +519,6 @@ namespace { attrs.push_back(TAO_Notify::NVP (prop)); } } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template void add_attr<TAO_Notify_Property_Boolean>(TAO_Notify::NVPList&, - const TAO_Notify_Property_Boolean&); -template void add_attr<TAO_Notify_Property_T<int> >(TAO_Notify::NVPList&, - const TAO_Notify_Property_T<int>&); -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate void add_attr<TAO_Notify_Property_Boolean>(\ - TAO_Notify::NVPList&, const TAO_Notify_Property_Boolean&) -#pragma instantiate void add_attr<TAO_Notify_Property_T<int> >(\ - TAO_Notify::NVPList&, const TAO_Notify_Property_T<int>&) -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ } void diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp index 7f961da6692..0ff7ce87611 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp @@ -198,26 +198,3 @@ TAO_Notify_FilterAdmin::release (void) { delete this; } - - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Hash_Map_Entry<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var>; -template class ACE_Hash_Map_Manager<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Null_Mutex>; -template class ACE_Hash_Map_Manager_Ex<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Hash<CosNotifyFilter::FilterID>, ACE_Equal_To<CosNotifyFilter::FilterID>,ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Hash<CosNotifyFilter::FilterID>, ACE_Equal_To<CosNotifyFilter::FilterID>,ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Hash<CosNotifyFilter::FilterID>, ACE_Equal_To<CosNotifyFilter::FilterID>,ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Hash<CosNotifyFilter::FilterID>, ACE_Equal_To<CosNotifyFilter::FilterID>,ACE_Null_Mutex>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Hash_Map_Entry<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var> -#pragma instantiate ACE_Hash_Map_Manager<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Manager_Ex<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Hash<CosNotifyFilter::FilterID>, ACE_Equal_To<CosNotifyFilter::FilterID>,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Hash<CosNotifyFilter::FilterID>, ACE_Equal_To<CosNotifyFilter::FilterID>,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Hash<CosNotifyFilter::FilterID>, ACE_Equal_To<CosNotifyFilter::FilterID>,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Hash<CosNotifyFilter::FilterID>, ACE_Equal_To<CosNotifyFilter::FilterID>,ACE_Null_Mutex> - -#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp index 4e89758faf0..27c0c16d782 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp @@ -52,33 +52,3 @@ TAO_Notify_Method_Request_Updates_No_Copy::execute (ACE_ENV_SINGLE_ARG_DECL) { return this->execute_i (ACE_ENV_SINGLE_ARG_PARAMETER); } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class TAO_Notify_Method_Request_Updates_T<const TAO_Notify_EventTypeSeq -, TAO_Notify_Proxy::Ptr -, const TAO_Notify_EventTypeSeq& -, TAO_Notify_Proxy* ->; - -template class TAO_Notify_Method_Request_Updates_T<const TAO_Notify_EventTypeSeq& -, TAO_Notify_Proxy* -, const TAO_Notify_EventTypeSeq& -, TAO_Notify_Proxy* ->; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate TAO_Notify_Method_Request_Updates_T<const TAO_Notify_EventTypeSeq -, TAO_Notify_Proxy::Ptr -, const TAO_Notify_EventTypeSeq& -, TAO_Notify_Proxy* -> - -#pragma instantiate TAO_Notify_Method_Request_Updates_T<const TAO_Notify_EventTypeSeq& -, TAO_Notify_Proxy* -, const TAO_Notify_EventTypeSeq& -, TAO_Notify_Proxy* -> - -#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp b/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp index 1032bac7d51..3a17fe83265 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp @@ -210,13 +210,3 @@ namespace TAO_Notify } } // namespace TAO_Notify - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Array_Base<TAO_Notify::NVP>; -template class ACE_Array<TAO_Notify::NVP>; -template class ACE_Vector<TAO_Notify::NVP>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Array_Base<TAO_Notify::NVP> -#pragma instantiate ACE_Array<TAO_Notify::NVP> -#pragma instantiate ACE_Vector<TAO_Notify::NVP> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp index 6f5f604bc4e..a76c30518d8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp @@ -1462,51 +1462,3 @@ TAO_Notify_Constraint_Visitor::simple_type_match (int expr_type, } return 1; } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Hash_Map_Manager<ACE_CString, CORBA::Any*, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Manager_Ex<ACE_CString, CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Entry <ACE_CString, CORBA::Any*>; -template class ACE_Hash_Map_Iterator<ACE_CString, CORBA::Any*, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Ex<ACE_CString, CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Reverse_Iterator<ACE_CString, CORBA::Any*, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>; -template class ACE_Node<TAO_ETCL_Literal_Constraint>; -template class ACE_Unbounded_Queue<TAO_ETCL_Literal_Constraint>; -template class ACE_Unbounded_Queue_Iterator<TAO_ETCL_Literal_Constraint>; - - -template class ACE_Hash_Map_Manager<ACE_CString, TAO_Notify_Constraint_Visitor::structured_event_field, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_Notify_Constraint_Visitor::structured_event_field, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Entry <ACE_CString, TAO_Notify_Constraint_Visitor::structured_event_field>; -template class ACE_Hash_Map_Iterator<ACE_CString, TAO_Notify_Constraint_Visitor::structured_event_field, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Ex<ACE_CString, TAO_Notify_Constraint_Visitor::structured_event_field, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_Notify_Constraint_Visitor::structured_event_field, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Reverse_Iterator<ACE_CString, TAO_Notify_Constraint_Visitor::structured_event_field, TAO_SYNCH_MUTEX>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, TAO_Notify_Constraint_Visitor::structured_event_field, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Hash_Map_Manager<ACE_CString, CORBA::Any*, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Entry <ACE_CString, CORBA::Any*> -#pragma instantiate ACE_Hash_Map_Iterator<ACE_CString, CORBA::Any*, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_CString, CORBA::Any*, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Node<TAO_ETCL_Literal_Constraint> -#pragma instantiate ACE_Unbounded_Queue<TAO_ETCL_Literal_Constraint> -#pragma instantiate ACE_Unbounded_Queue_Iterator<TAO_ETCL_Literal_Constraint> - -#pragma instantiate ACE_Hash_Map_Manager<ACE_CString, TAO_Notify_Constraint_Visitor::structured_event_field, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_Notify_Constraint_Visitor::structured_event_field, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Entry <ACE_CString, TAO_Notify_Constraint_Visitor::structured_event_field> -#pragma instantiate ACE_Hash_Map_Iterator<ACE_CString, TAO_Notify_Constraint_Visitor::structured_event_field, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, TAO_Notify_Constraint_Visitor::structured_event_field, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_Notify_Constraint_Visitor::structured_event_field, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_CString, TAO_Notify_Constraint_Visitor::structured_event_field, TAO_SYNCH_MUTEX> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, TAO_Notify_Constraint_Visitor::structured_event_field, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp index 83420ad3fff..fb3587a0e78 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp @@ -35,13 +35,3 @@ TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA AC return notify_factory._retn (); } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Dynamic_Service<TAO_Notify_Service>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Dynamic_Service<TAO_Notify_Service> - -#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp index 293128a9700..ceb2606ccfa 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp @@ -331,27 +331,6 @@ namespace { attrs.push_back(TAO_Notify::NVP (prop)); } } -// Note : These instantiations have to be here because each namespace {} -// is unique. -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template void add_qos_attr<TAO_Notify_Property_Boolean>( - TAO_Notify::NVPList&, const TAO_Notify_Property_Boolean&); -template void add_qos_attr<TAO_Notify_Property_T<int> >( - TAO_Notify::NVPList&, const TAO_Notify_Property_T<int>&); -template void add_qos_attr<TAO_Notify_Property_T<unsigned long long> >( - TAO_Notify::NVPList&, const TAO_Notify_Property_T<unsigned long long>&); -template void add_qos_attr<TAO_Notify_Property_T<short> >( - TAO_Notify::NVPList&, const TAO_Notify_Property_T<short>&); -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate void add_qos_attr<TAO_Notify_Property_Boolean>(\ - TAO_Notify::NVPList&, const TAO_Notify_Property_Boolean&) -#pragma instantiate void add_qos_attr<TAO_Notify_Property_T<int> >(\ - TAO_Notify::NVPList&, const TAO_Notify_Property_T<int>&) -#pragma instantiate void add_qos_attr<TAO_Notify_Property_T<unsigned long long> >(\ - TAO_Notify::NVPList&, const TAO_Notify_Property_T<unsigned long long>&) -#pragma instantiate void add_qos_attr<TAO_Notify_Property_T<short> >(\ - TAO_Notify::NVPList&, const TAO_Notify_Property_T<short>&) -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ } // namespace void diff --git a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp index 8edd870b9c5..8e27e57dad0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp @@ -394,17 +394,3 @@ Persistent_File_Allocator::run() } } /* namespace TAO_Notify */ - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Node<size_t>; -template class ACE_Unbounded_Stack<size_t>; -template class ACE_Node<TAO_Notify::Persistent_Storage_Block*>; -template class ACE_Unbounded_Queue<TAO_Notify::Persistent_Storage_Block*>; -template class ACE_Unbounded_Queue_Iterator<TAO_Notify::Persistent_Storage_Block*>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Node<size_t> -#pragma instantiate ACE_Unbounded_Stack<size_t> -#pragma instantiate ACE_Node<TAO_Notify::Persistent_Storage_Block*> -#pragma instantiate ACE_Unbounded_Queue<TAO_Notify::Persistent_Storage_Block*> -#pragma instantiate ACE_Unbounded_Queue_Iterator<TAO_Notify::Persistent_Storage_Block*> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp index 5ca226ccd8c..5d309383a26 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp @@ -193,13 +193,3 @@ TAO_Notify_ProxyConsumer::destroy (ACE_ENV_SINGLE_ARG_DECL) this->supplier_admin_->remove (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class TAO_Notify_Refcountable_Guard_T<TAO_Notify_ProxyConsumer>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate TAO_Notify_Refcountable_Guard_T<TAO_Notify_ProxyConsumer> - -#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp index cd08b686721..0f1733335f3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp @@ -154,14 +154,3 @@ TAO_Notify_ProxySupplier::qos_changed (const TAO_Notify_QoSProperties& qos_prope { TAO_Notify_Proxy::qos_changed (qos_properties); } - - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class TAO_Notify_Refcountable_Guard_T<TAO_Notify_ProxySupplier>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate TAO_Notify_Refcountable_Guard_T<TAO_Notify_ProxySupplier> - -#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp index 28767124b86..a25544ae6a5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp @@ -212,31 +212,3 @@ TAO_Notify_QoSProperties::transfer (TAO_Notify_QoSProperties& qos_properties) return 0; } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class TAO_Notify_PropertyBase_T<CORBA::Long>; -template class TAO_Notify_PropertyBase_T<CORBA::Short>; -template class TAO_Notify_PropertyBase_T<TimeBase::TimeT>; - -template class TAO_Notify_Property_T<CORBA::Long>; -template class TAO_Notify_Property_T<CORBA::Short>; -template class TAO_Notify_Property_T<TimeBase::TimeT>; - -template class TAO_Notify_StructProperty_T<NotifyExt::ThreadPoolParams>; -template class TAO_Notify_StructProperty_T<NotifyExt::ThreadPoolLanesParams>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate TAO_Notify_PropertyBase_T<CORBA::Long> -#pragma instantiate TAO_Notify_PropertyBase_T<CORBA::Short> -#pragma instantiate TAO_Notify_PropertyBase_T<TimeBase::TimeT> - -#pragma instantiate TAO_Notify_Property_T<CORBA::Long> -#pragma instantiate TAO_Notify_Property_T<CORBA::Short> -#pragma instantiate TAO_Notify_Property_T<TimeBase::TimeT> - -#pragma instantiate TAO_Notify_StructProperty_T<NotifyExt::ThreadPoolParams> -#pragma instantiate TAO_Notify_StructProperty_T<NotifyExt::ThreadPoolLanesParams> - -#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp b/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp index acf3ce1d1d2..ca9b3cf010e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp @@ -154,7 +154,3 @@ Random_File::sync() } } /* namespace TAO_Notify */ - -#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/orbsvcs/Notify/Reconnection_Registry.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp index c09a843aa74..85681eafd55 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp @@ -244,20 +244,3 @@ namespace TAO_Notify } // namespace TAO_Notify - - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Hash_Map_Entry<NotifyExt::ReconnectionRegistry::ReconnectionID, ACE_CString>; -template class ACE_Hash_Map_Manager_Ex<NotifyExt::ReconnectionRegistry::ReconnectionID, ACE_CString, ACE_Hash<NotifyExt::ReconnectionRegistry::ReconnectionID>, ACE_Equal_To<NotifyExt::ReconnectionRegistry::ReconnectionID>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex<NotifyExt::ReconnectionRegistry::ReconnectionID, ACE_CString,ACE_Hash<NotifyExt::ReconnectionRegistry::ReconnectionID>, ACE_Equal_To<NotifyExt::ReconnectionRegistry::ReconnectionID>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex<NotifyExt::ReconnectionRegistry::ReconnectionID, ACE_CString,ACE_Hash<NotifyExt::ReconnectionRegistry::ReconnectionID>, ACE_Equal_To<NotifyExt::ReconnectionRegistry::ReconnectionID>, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex<NotifyExt::ReconnectionRegistry::ReconnectionID, ACE_CString,ACE_Hash<NotifyExt::ReconnectionRegistry::ReconnectionID>, ACE_Equal_To<NotifyExt::ReconnectionRegistry::ReconnectionID>, ACE_Null_Mutex>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Hash_Map_Entry<NotifyExt::ReconnectionRegistry::ReconnectionID, ACE_CString > -#pragma instantiate ACE_Hash_Map_Manager_Ex<NotifyExt::ReconnectionRegistry::ReconnectionID, ACE_CString ,ACE_Hash<NotifyExt::ReconnectionRegistry::ReconnectionID>, ACE_Equal_To<NotifyExt::ReconnectionRegistry::ReconnectionID>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<NotifyExt::ReconnectionRegistry::ReconnectionID, ACE_CString ,ACE_Hash<NotifyExt::ReconnectionRegistry::ReconnectionID>, ACE_Equal_To<NotifyExt::ReconnectionRegistry::ReconnectionID>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex<NotifyExt::ReconnectionRegistry::ReconnectionID, ACE_CString ,ACE_Hash<NotifyExt::ReconnectionRegistry::ReconnectionID>, ACE_Equal_To<NotifyExt::ReconnectionRegistry::ReconnectionID>, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<NotifyExt::ReconnectionRegistry::ReconnectionID, ACE_CString ,ACE_Hash<NotifyExt::ReconnectionRegistry::ReconnectionID>, ACE_Equal_To<NotifyExt::ReconnectionRegistry::ReconnectionID>, ACE_Null_Mutex> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |