summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h')
-rw-r--r--TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
index 6d66ed280a7..10b3adb9270 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
@@ -40,13 +40,13 @@ public:
int event_a,
int event_b,
RtecEventChannelAdmin::EventChannel_ptr ec
- TAO_ENV_ARG_DECL);
+ ACE_ENV_ARG_DECL);
// This method connects the supplier to the EC.
- void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+ void disconnect (ACE_ENV_SINGLE_ARG_DECL);
// Disconnect from the EC.
- virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException));
// The methods in the skeleton.
@@ -100,7 +100,7 @@ public:
void push_supplier (void* supplier_cookie,
RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer,
const RtecEventComm::EventSet &events
- TAO_ENV_ARG_DECL_NOT_USED);
+ ACE_ENV_ARG_DECL_NOT_USED);
// Callback method for suppliers, we push for them to their
// consumers and take statistics on the way.
// It is possible that we ignore the <consumer> parameter when
@@ -111,11 +111,11 @@ private:
// parse the command line args
void connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
- TAO_ENV_ARG_DECL);
- void disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL);
+ ACE_ENV_ARG_DECL);
+ void disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL);
// Connect the suppliers.
- void activate_suppliers (TAO_ENV_SINGLE_ARG_DECL);
+ void activate_suppliers (ACE_ENV_SINGLE_ARG_DECL);
// Activate the suppliers, i.e. they start generating events.
private: