diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp | 44 |
1 files changed, 10 insertions, 34 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp index d3dc77f9b62..b18ce49fd22 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp @@ -9,21 +9,10 @@ ACE_RCSID(RT_Notify, TAO_NS_Event_Manager, "$Id$") -#include "ace/Refcounted_Auto_Ptr.h" -#include "orbsvcs/ESF/ESF_Proxy_Collection.h" - -#include "EventTypeSeq.h" -#include "Event.h" -#include "Peer.h" -#include "Consumer.h" #include "ProxyConsumer.h" #include "ProxySupplier.h" -#include "Proxy.h" -#include "Admin.h" -#include "EventChannel.h" -#include "EventChannelFactory.h" -#include "Notify_Service.h" -#include "Event_Map_T.h" +#include "Consumer_Map.h" +#include "Supplier_Map.h" TAO_NS_Event_Manager::TAO_NS_Event_Manager (void) :consumer_map_ (0), supplier_map_ (0) @@ -219,10 +208,6 @@ template class ACE_Hash_Map_Manager<TAO_NS_EventType, TAO_NS_Event_Map_Entry_T<T template class ACE_Hash_Map_Manager<TAO_NS_EventType, TAO_NS_Event_Map_Entry_T<TAO_NS_ProxyConsumer> *, ACE_Null_Mutex>; template class ACE_Hash_Map_Manager<ACE_CString, CORBA::Any, ACE_Null_Mutex>; -template class TAO_NS_Object_Find_Worker_T<TAO_NS_Proxy>; -template class TAO_NS_Object_Find_Worker_T<TAO_NS_Admin>; -template class TAO_NS_Object_Find_Worker_T<TAO_NS_EventChannel>; - template class ACE_Unbounded_Set<TAO_NS_EventType>; template class ACE_Unbounded_Set_Const_Iterator<TAO_NS_EventType>; template class ACE_Unbounded_Queue<ACE_Refcounted_Auto_Ptr<TAO_NS_Event, TAO_SYNCH_MUTEX> >; @@ -233,7 +218,8 @@ template class TAO_ESF_Worker<TAO_NS_ProxyConsumer>; template class TAO_ESF_Worker<TAO_NS_Proxy>; template class TAO_ESF_Worker<TAO_NS_Consumer>; template class TAO_ESF_Worker<TAO_NS_Peer>; -template class TAO_ESF_Worker<TAO_NS_Admin>; +template class TAO_ESF_Worker<TAO_NS_SupplierAdmin>; +template class TAO_ESF_Worker<TAO_NS_ConsumerAdmin>; template class TAO_ESF_Worker<TAO_NS_EventChannel>; template class ACE_Refcounted_Auto_Ptr<TAO_NS_Event, TAO_SYNCH_MUTEX>; @@ -241,7 +227,8 @@ template class ACE_Unbounded_Queue_Iterator<ACE_Refcounted_Auto_Ptr<TAO_NS_Event template class ACE_Node<ACE_Refcounted_Auto_Ptr<TAO_NS_Event, TAO_SYNCH_MUTEX > >; template class ACE_Node<TAO_NS_Supplier *>; -template class ACE_Node<TAO_NS_Admin *>; +template class ACE_Node<TAO_NS_SupplierAdmin *>; +template class ACE_Node<TAO_NS_ConsumerAdmin *>; template class ACE_Node<TAO_NS_EventChannel *>; template class ACE_Node<TAO_NS_ProxyConsumer *>; template class ACE_Node<TAO_NS_EventType>; @@ -269,10 +256,6 @@ template class ACE_Hash_Map_Iterator_Ex<ACE_CString, CORBA::Any, ACE_Hash<ACE_CS template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, CORBA::Any, ACE_Hash<ACE_CString >, ACE_Equal_To<ACE_CString >, ACE_Null_Mutex>; template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, CORBA::Any, ACE_Hash<ACE_CString >, ACE_Equal_To<ACE_CString >, ACE_Null_Mutex>; -template class TAO_ESF_Shutdown_Proxy<TAO_NS_EventChannel>; -template class TAO_ESF_Shutdown_Proxy<TAO_NS_Admin>; -template class TAO_ESF_Shutdown_Proxy<TAO_NS_Proxy>; - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate TAO_NS_Event_Map_T<TAO_NS_ProxySupplier, TAO_SYNCH_RW_MUTEX> @@ -290,10 +273,6 @@ template class TAO_ESF_Shutdown_Proxy<TAO_NS_Proxy>; #pragma instantiate ACE_Hash_Map_Manager<TAO_NS_EventType, TAO_NS_Event_Map_Entry_T<TAO_NS_ProxyConsumer> *, ACE_Null_Mutex> #pragma instantiate ACE_Hash_Map_Manager<ACE_CString, CORBA::Any, ACE_Null_Mutex> -#pragma instantiate TAO_NS_Object_Find_Worker_T<TAO_NS_Proxy> -#pragma instantiate TAO_NS_Object_Find_Worker_T<TAO_NS_Admin> -#pragma instantiate TAO_NS_Object_Find_Worker_T<TAO_NS_EventChannel> - #pragma instantiate ACE_Unbounded_Set<TAO_NS_EventType> #pragma instantiate ACE_Unbounded_Set_Const_Iterator<TAO_NS_EventType> #pragma instantiate ACE_Unbounded_Queue<ACE_Refcounted_Auto_Ptr<TAO_NS_Event, TAO_SYNCH_MUTEX> > @@ -304,7 +283,8 @@ template class TAO_ESF_Shutdown_Proxy<TAO_NS_Proxy>; #pragma instantiate TAO_ESF_Worker<TAO_NS_Proxy> #pragma instantiate TAO_ESF_Worker<TAO_NS_Consumer> #pragma instantiate TAO_ESF_Worker<TAO_NS_Peer> -#pragma instantiate TAO_ESF_Worker<TAO_NS_Admin> +#pragma instantiate TAO_ESF_Worker<TAO_NS_ConsumerAdmin> +#pragma instantiate TAO_ESF_Worker<TAO_NS_SupplierAdmin> #pragma instantiate TAO_ESF_Worker<TAO_NS_EventChannel> #pragma instantiate ACE_Refcounted_Auto_Ptr<TAO_NS_Event, TAO_SYNCH_MUTEX> @@ -312,7 +292,8 @@ template class TAO_ESF_Shutdown_Proxy<TAO_NS_Proxy>; #pragma instantiate ACE_Node<ACE_Refcounted_Auto_Ptr<TAO_NS_Event, TAO_SYNCH_MUTEX > > #pragma instantiate ACE_Node<TAO_NS_Supplier *> -#pragma instantiate ACE_Node<TAO_NS_Admin *> +#pragma instantiate ACE_Node<TAO_NS_SupplierAdmin *> +#pragma instantiate ACE_Node<TAO_NS_ConsumerAdmin *> #pragma instantiate ACE_Node<TAO_NS_EventChannel *> #pragma instantiate ACE_Node<TAO_NS_ProxyConsumer *> #pragma instantiate ACE_Node<TAO_NS_EventType> @@ -339,9 +320,4 @@ template class TAO_ESF_Shutdown_Proxy<TAO_NS_Proxy>; #pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, CORBA::Any, ACE_Hash<ACE_CString >, ACE_Equal_To<ACE_CString >, ACE_Null_Mutex> #pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, CORBA::Any, ACE_Hash<ACE_CString >, ACE_Equal_To<ACE_CString >, ACE_Null_Mutex> #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, CORBA::Any, ACE_Hash<ACE_CString >, ACE_Equal_To<ACE_CString >, ACE_Null_Mutex> - -#pragma instantiate TAO_ESF_Shutdown_Proxy<TAO_NS_EventChannel> -#pragma instantiate TAO_ESF_Shutdown_Proxy<TAO_NS_Admin> -#pragma instantiate TAO_ESF_Shutdown_Proxy<TAO_NS_Proxy> - #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |