diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.h')
| -rw-r--r-- | TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.h | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.h index f13fb64cca5..a936d5e2d27 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.h +++ b/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.h @@ -51,21 +51,21 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_PushConsumer : public POA_CosNotifyComm: TAO_Notify_PushConsumer (void); // Constructor. - void init (PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV); + void init (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL); // Init - void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin, CORBA::Environment &ACE_TRY_ENV); + void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin TAO_ENV_ARG_DECL); // Activates this object with the <default_POA_> // Creates a new proxy supplier and connects to it. - void disconnect (CORBA::Environment &ACE_TRY_ENV); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); // Disconnect from the supplier. - void deactivate (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); + void deactivate (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Deactivate the object from the POA. // = ServantBase operations - virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); protected: virtual ~TAO_Notify_PushConsumer (); @@ -74,9 +74,8 @@ protected: // = NotifyPublish method void offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () + const CosNotification::EventTypeSeq & removed + TAO_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -84,8 +83,8 @@ protected: )); void push ( - const CORBA::Any & data, - CORBA::Environment &ACE_TRY_ENV + const CORBA::Any & data + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -94,7 +93,7 @@ protected: // The default operation is no op. void disconnect_push_consumer ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException |