diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h index ee897512072..b6bfd97d181 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h @@ -15,9 +15,8 @@ #include /**/ "ace/pre.h" #include "ace/Auto_Ptr.h" -#include "orbsvcs/Notify/Refcountable.h" - -#include "orbsvcs/Notify/notify_serv_export.h" +#include "Refcountable.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -27,8 +26,6 @@ #include "ace/CORBA_macros.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - class TAO_Notify_ProxySupplier; class TAO_Notify_ProxyConsumer; class TAO_Notify_EventTypeSeq; @@ -115,13 +112,6 @@ protected: void un_publish (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& last_seq ACE_ENV_ARG_DECL); private: - // Disallow copying and assignment; we don't need them - // and if we let the compiler generate them it needs the - // full declaration of the template arguments for ACE_Auto_Ptr<> - // below. - TAO_Notify_Event_Manager (TAO_Notify_Event_Manager&); - TAO_Notify_Event_Manager& operator= (TAO_Notify_Event_Manager&); - /// Consumer Map ACE_Auto_Ptr< TAO_Notify_Consumer_Map > consumer_map_; @@ -129,8 +119,6 @@ private: ACE_Auto_Ptr< TAO_Notify_Supplier_Map > supplier_map_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_Notify_EVENT_MANAGER_H */ |