diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify/EventChannel.h')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/EventChannel.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h index 2fe1c13ff05..086282ad2a5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h @@ -14,18 +14,17 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Notify/notify_serv_export.h" +#include "notify_serv_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/Notify/Topology_Object.h" -#include "orbsvcs/Notify/Object.h" -#include "orbsvcs/Notify/EventChannelFactory.h" +#include "Topology_Object.h" +#include "Object.h" +#include "EventChannelFactory.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Notify_ConsumerAdmin; class TAO_Notify_SupplierAdmin; @@ -35,7 +34,7 @@ class TAO_Notify_ProxySupplier; template <class TYPE> class TAO_Notify_Container_T; #if defined(_MSC_VER) -#pragma warning(push) + #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ @@ -96,6 +95,7 @@ public: TAO_Notify_ProxyConsumer * find_proxy_consumer (TAO_Notify::IdVec & id_path, size_t position ACE_ENV_ARG_DECL); TAO_Notify_ProxySupplier * find_proxy_supplier (TAO_Notify::IdVec & id_path, size_t position ACE_ENV_ARG_DECL); + /// Shutdown virtual int shutdown (ACE_ENV_SINGLE_ARG_DECL); virtual void load_attrs(const TAO_Notify::NVPList& attrs); @@ -243,8 +243,6 @@ private: virtual void release (void); }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ |