diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h | 70 |
1 files changed, 33 insertions, 37 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h index 3631b5e24ad..73159a636e1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h @@ -135,8 +135,8 @@ public: */ void init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec, RtecUDPAdmin::AddrServer_ptr addr_server, - TAO_ECG_UDP_Out_Endpoint *endpoint, - CORBA::Environment &env = TAO_default_environment ()); + TAO_ECG_UDP_Out_Endpoint *endpoint + TAO_ENV_ARG_DECL_WITH_DEFAULTS); /** * The sender may need to fragment the message, otherwise the @@ -149,21 +149,20 @@ public: /// Disconnect and shutdown the sender, no further connections will /// work unless init() is called again. - void shutdown (CORBA::Environment & = TAO_default_environment ()); + void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Connect (or reconnect) to the EC with the given subscriptions. - void open (RtecEventChannelAdmin::ConsumerQOS &sub, - CORBA::Environment &env = TAO_default_environment ()); + void open (RtecEventChannelAdmin::ConsumerQOS &sub + TAO_ENV_ARG_DECL_WITH_DEFAULTS); /// Disconnect from the EC, but reconnection is still possible. - void close (CORBA::Environment &env = TAO_default_environment ()); + void close (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// The PushConsumer methods. - virtual void disconnect_push_consumer (CORBA::Environment & = - TAO_default_environment ()) + virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void push (const RtecEventComm::EventSet &events, - CORBA::Environment & = TAO_default_environment ()) + virtual void push (const RtecEventComm::EventSet &events + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -183,8 +182,8 @@ private: CORBA::ULong fragment_id, CORBA::ULong fragment_count, iovec iov[], - int iovcnt, - CORBA::Environment &env = TAO_default_environment ()); + int iovcnt + TAO_ENV_ARG_DECL_WITH_DEFAULTS); /** * Count the number of fragments that will be required to send the @@ -348,8 +347,8 @@ public: char* fragment_buffer (CORBA::ULong fragment_offset); /// Decode the events, the message must be complete. - void decode (RtecEventComm::EventSet& event, - CORBA::Environment &env = TAO_default_environment ()); + void decode (RtecEventComm::EventSet& event + TAO_ENV_ARG_DECL_WITH_DEFAULTS); /// Increment the timeout counter... void inc_timeout (void); @@ -446,18 +445,18 @@ public: RtecUDPAdmin::AddrServer_ptr addr_server, ACE_Reactor *reactor, const ACE_Time_Value &expire_interval, - int max_timeout, - CORBA::Environment &env = TAO_default_environment ()); + int max_timeout + TAO_ENV_ARG_DECL_WITH_DEFAULTS); /// Disconnect and shutdown the gateway, no further connectsions - void shutdown (CORBA::Environment & = TAO_default_environment ()); + void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Connect to the EC using the given publications lists. - void open (RtecEventChannelAdmin::SupplierQOS& pub, - CORBA::Environment &env = TAO_default_environment ()); + void open (RtecEventChannelAdmin::SupplierQOS& pub + TAO_ENV_ARG_DECL_WITH_DEFAULTS); /// Disconnect to the EC. - virtual void close (CORBA::Environment &env = TAO_default_environment ()); + virtual void close (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /** * The Event_Handlers call this method when data is available at the @@ -472,14 +471,13 @@ public: const void* act); // The PushSupplier method. - virtual void disconnect_push_supplier (CORBA::Environment & = - TAO_default_environment ()) + virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Call the RtecUDPAdmin::AddrServer void get_addr (const RtecEventComm::EventHeader& header, - RtecUDPAdmin::UDP_Addr_out addr, - CORBA::Environment &env = TAO_default_environment ()); + RtecUDPAdmin::UDP_Addr_out addr + TAO_ENV_ARG_DECL_WITH_DEFAULTS); private: /// The remote and the local EC, so we can reconnect when the list changes. @@ -589,15 +587,15 @@ public: * types and mcast groups) and the class registers itself with the * reactor. */ - int open (RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &env = TAO_default_environment ()); + int open (RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL_WITH_DEFAULTS); /** * Remove ourselves from the event channel, unsubscribe from the * multicast groups, close the sockets and unsubscribe from the * reactor. */ - int close (CORBA::Environment &env = TAO_default_environment ()); + int close (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /** * Obtain the dgram, this is one of those "controlled violations of @@ -611,11 +609,11 @@ public: virtual ACE_HANDLE get_handle (void) const; /// The Observer methods - void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub, - CORBA::Environment &env = TAO_default_environment ()) + void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub, - CORBA::Environment &env = TAO_default_environment ()) + void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -637,14 +635,12 @@ public: // The Observer methods virtual void update_consumer ( - const RtecEventChannelAdmin::ConsumerQOS& sub, - CORBA::Environment &env = - TAO_default_environment ()) + const RtecEventChannelAdmin::ConsumerQOS& sub + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void update_supplier ( - const RtecEventChannelAdmin::SupplierQOS& pub, - CORBA::Environment &env = - TAO_default_environment ()) + const RtecEventChannelAdmin::SupplierQOS& pub + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: |