summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.h
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify/Notify_Event.h')
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_Event.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.h
index a659e89a038..524c4d2ef37 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.h
@@ -126,16 +126,16 @@ public:
// ownership of the data to the new object otherwise we copy the data
// for the new object.
- virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter TAO_ENV_ARG_DECL) = 0;
+ virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL) = 0;
// Returns true if the filter matches.
- virtual void do_push (CosEventComm::PushConsumer_ptr consumer TAO_ENV_ARG_DECL) const = 0;
- virtual void do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer TAO_ENV_ARG_DECL) const = 0;
+ virtual void do_push (CosEventComm::PushConsumer_ptr consumer ACE_ENV_ARG_DECL) const = 0;
+ virtual void do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer ACE_ENV_ARG_DECL) const = 0;
virtual void do_push (CosNotifyComm::SequencePushConsumer_ptr consumer,
const TAO_Notify_QoSAdmin_i& qos_admin,
CosNotification::EventBatch& unsent,
int flush_queue
- TAO_ENV_ARG_DECL) const = 0;
+ ACE_ENV_ARG_DECL) const = 0;
// Push self to <consumer>
// = QoS Properties.
@@ -206,14 +206,14 @@ public:
virtual CORBA::Boolean is_special_event_type (void) const;
virtual const TAO_Notify_EventType& event_type (void) const;
- virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter TAO_ENV_ARG_DECL);
- virtual void do_push (CosEventComm::PushConsumer_ptr consumer TAO_ENV_ARG_DECL) const;
- virtual void do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer TAO_ENV_ARG_DECL) const;
+ virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL);
+ virtual void do_push (CosEventComm::PushConsumer_ptr consumer ACE_ENV_ARG_DECL) const;
+ virtual void do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer ACE_ENV_ARG_DECL) const;
virtual void do_push (CosNotifyComm::SequencePushConsumer_ptr consumer,
const TAO_Notify_QoSAdmin_i& qos_admin,
CosNotification::EventBatch& unsent,
int flush_queue
- TAO_ENV_ARG_DECL) const;
+ ACE_ENV_ARG_DECL) const;
protected:
CORBA::Any* data_;
@@ -243,14 +243,14 @@ public:
virtual CORBA::Boolean is_special_event_type (void) const;
virtual const TAO_Notify_EventType& event_type (void) const;
- virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter TAO_ENV_ARG_DECL);
- virtual void do_push (CosEventComm::PushConsumer_ptr consumer TAO_ENV_ARG_DECL) const;
- virtual void do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer TAO_ENV_ARG_DECL) const;
+ virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL);
+ virtual void do_push (CosEventComm::PushConsumer_ptr consumer ACE_ENV_ARG_DECL) const;
+ virtual void do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer ACE_ENV_ARG_DECL) const;
virtual void do_push (CosNotifyComm::SequencePushConsumer_ptr consumer,
const TAO_Notify_QoSAdmin_i& qos_admin,
CosNotification::EventBatch& unsent,
int flush_queue
- TAO_ENV_ARG_DECL) const;
+ ACE_ENV_ARG_DECL) const;
protected: