summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Event/EC_Filter.h')
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Filter.h44
1 files changed, 22 insertions, 22 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
index 206ec8cd122..a9d6c03e718 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
@@ -85,11 +85,11 @@ public:
* not const then filter can take ownership of the event.
*/
virtual int filter (const RtecEventComm::EventSet& event,
- TAO_EC_QOS_Info& qos_info,
- CORBA::Environment& env) = 0;
+ TAO_EC_QOS_Info& qos_info
+ TAO_ENV_ARG_DECL) = 0;
virtual int filter_nocopy (RtecEventComm::EventSet& event,
- TAO_EC_QOS_Info& qos_info,
- CORBA::Environment& env) = 0;
+ TAO_EC_QOS_Info& qos_info
+ TAO_ENV_ARG_DECL) = 0;
/**
* This is called by the children when they accept an event and
@@ -98,11 +98,11 @@ public:
* not const then filter can take ownership of the event.
*/
virtual void push (const RtecEventComm::EventSet& event,
- TAO_EC_QOS_Info& qos_info,
- CORBA::Environment& env) = 0;
+ TAO_EC_QOS_Info& qos_info
+ TAO_ENV_ARG_DECL) = 0;
virtual void push_nocopy (RtecEventComm::EventSet& event,
- TAO_EC_QOS_Info& qos_info,
- CORBA::Environment& env) = 0;
+ TAO_EC_QOS_Info& qos_info
+ TAO_ENV_ARG_DECL) = 0;
/// Clear any saved state, must reset and assume no events have been
/// received.
@@ -133,8 +133,8 @@ public:
* fairly soon.
*/
virtual int add_dependencies (const RtecEventComm::EventHeader& header,
- const TAO_EC_QOS_Info& qos_info,
- CORBA::Environment &ACE_TRY_ENV) = 0;
+ const TAO_EC_QOS_Info& qos_info
+ TAO_ENV_ARG_DECL) = 0;
/**
* Obtain the QOS information for this filter, the default
@@ -142,8 +142,8 @@ public:
* support scheduling information implement this method.
* Returns 0 on success and -1 on failure
*/
- virtual void get_qos_info (TAO_EC_QOS_Info& qos_info,
- CORBA::Environment &ACE_TRY_ENV);
+ virtual void get_qos_info (TAO_EC_QOS_Info& qos_info
+ TAO_ENV_ARG_DECL);
private:
/// The parent...
@@ -174,23 +174,23 @@ public:
// = The TAO_EC_Filter methods, please check the documentation in
// TAO_EC_Filter.
virtual int filter (const RtecEventComm::EventSet& event,
- TAO_EC_QOS_Info& qos_info,
- CORBA::Environment& env);
+ TAO_EC_QOS_Info& qos_info
+ TAO_ENV_ARG_DECL);
virtual int filter_nocopy (RtecEventComm::EventSet& event,
- TAO_EC_QOS_Info& qos_info,
- CORBA::Environment& env);
+ TAO_EC_QOS_Info& qos_info
+ TAO_ENV_ARG_DECL);
virtual void push (const RtecEventComm::EventSet& event,
- TAO_EC_QOS_Info& qos_info,
- CORBA::Environment& env);
+ TAO_EC_QOS_Info& qos_info
+ TAO_ENV_ARG_DECL);
virtual void push_nocopy (RtecEventComm::EventSet& event,
- TAO_EC_QOS_Info& qos_info,
- CORBA::Environment& env);
+ TAO_EC_QOS_Info& qos_info
+ TAO_ENV_ARG_DECL);
virtual void clear (void);
virtual CORBA::ULong max_event_size (void) const;
virtual int can_match (const RtecEventComm::EventHeader& header) const;
virtual int add_dependencies (const RtecEventComm::EventHeader& header,
- const TAO_EC_QOS_Info &qos_info,
- CORBA::Environment &ACE_TRY_ENV);
+ const TAO_EC_QOS_Info &qos_info
+ TAO_ENV_ARG_DECL);
};
// ****************************************************************