diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Event/Event_Channel.h')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/Event_Channel.h | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h index 71792377d92..7859e667756 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h +++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h @@ -100,10 +100,6 @@ void TAO_ORBSVCS_Export dump_event (const RtecEventComm::Event &event); // ************************************************************ -#if defined(_MSC_VER) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - class TAO_ORBSVCS_Export ACE_RTU_Manager // = TITLE // ACE RTU Manager @@ -1248,8 +1244,7 @@ class ACE_EventChannel; // = Event Channel interfaces. -class TAO_ORBSVCS_Export ACE_Push_Supplier_Proxy : public POA_RtecEventChannelAdmin::ProxyPushConsumer, public PortableServer::RefCountServantBase -// +class TAO_ORBSVCS_Export ACE_Push_Supplier_Proxy : public POA_RtecEventChannelAdmin::ProxyPushConsumer // = TITLE // Push Supplier Proxy. // @@ -1283,6 +1278,9 @@ public: // = Operations for the Event Channel. + RtecEventChannelAdmin::ProxyPushConsumer_ptr get_ref (CORBA::Environment &); + // Allow transformations to RtecEventChannelAdmin::ProxyPushConsumer. + int connected (void); // Returns 1 if the proxy has been connected to a "remote" client. @@ -1325,8 +1323,7 @@ private: // ************************************************************ -class TAO_ORBSVCS_Export ACE_Push_Consumer_Proxy : public POA_RtecEventChannelAdmin::ProxyPushSupplier, public PortableServer::RefCountServantBase -// +class TAO_ORBSVCS_Export ACE_Push_Consumer_Proxy : public POA_RtecEventChannelAdmin::ProxyPushSupplier // = TITLE // Push Consumer Proxy. // @@ -1372,6 +1369,9 @@ public: void shutdown (void); // Actively disconnect from the consumer. + RtecEventChannelAdmin::ProxyPushSupplier_ptr get_ref (CORBA::Environment &); + // Allow transformations to RtecEventChannelAdmin::ProxyPushSupplier. + ACE_ES_Consumer_Correlation &correlation (void); // Access the consumer-specific Consumer_Correlation. @@ -1398,8 +1398,4 @@ private: #include "Event_Channel.i" #endif /* __ACE_INLINE__ */ -#if defined(_MSC_VER) -#pragma warning(default:4250) -#endif /* _MSC_VER */ - #endif /* ACE_EVENT_CHANNEL_H */ |