ChangeLogTag:Tue Jan 29 21:09:12 2002 Oliver Kellogg <oliver.kellogg@sysde.eads.net>

1 files changed, 21 insertions, 21 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h
index 3847d750794..c8757fcb99a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h
@@ -76,7 +76,7 @@ class TAO_Notify_Export TAO_Notify_EventChannel_i : public virtual POA_CosNotify
              const CosNotification::AdminProperties& initial_admin,
              PortableServer::POA_ptr default_POA,
              PortableServer::POA_ptr my_POA
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
   // Initialize this object.
   // checks if the <initial_qos> and <initial admin> are valid.
   // creates default filter, consumer admin and supplier admin.
@@ -85,7 +85,7 @@ class TAO_Notify_Export TAO_Notify_EventChannel_i : public virtual POA_CosNotify
   PortableServer::POA_ptr get_default_POA (void);
   // Get the default POA.
 
-  CosNotifyChannelAdmin::EventChannel_ptr get_ref (TAO_ENV_SINGLE_ARG_DECL);
+  CosNotifyChannelAdmin::EventChannel_ptr get_ref (ACE_ENV_SINGLE_ARG_DECL);
   // Get the CORBA object for this servant
 
   TAO_Notify_Event_Manager* get_event_manager (void);
@@ -98,34 +98,34 @@ class TAO_Notify_Export TAO_Notify_EventChannel_i : public virtual POA_CosNotify
   void supplier_admin_destroyed (CosNotifyChannelAdmin::AdminID SA_ID);
   // This id is no longer in use.It can be reused by <supplier_admin_ids_>.
 
-  void unregister_listener (TAO_Notify_EventListener* group_listener TAO_ENV_ARG_DECL);
+  void unregister_listener (TAO_Notify_EventListener* group_listener ACE_ENV_ARG_DECL);
   // Consumer Admin's are Group Listeners that are registered automatically with the EC when a ConsumerAdmin
   // is created. When a consumer is destroyed, it asks the EC to unregister itself.
 
   // = Interface methods
   virtual CosNotifyChannelAdmin::EventChannelFactory_ptr MyFactory (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr default_consumer_admin (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotifyChannelAdmin::SupplierAdmin_ptr default_supplier_admin (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotifyFilter::FilterFactory_ptr default_filter_factory (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -134,7 +134,7 @@ virtual CosNotifyFilter::FilterFactory_ptr default_filter_factory (
 virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr new_for_consumers (
     CosNotifyChannelAdmin::InterFilterGroupOperator op,
     CosNotifyChannelAdmin::AdminID_out id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -143,7 +143,7 @@ virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr new_for_consumers (
 virtual CosNotifyChannelAdmin::SupplierAdmin_ptr new_for_suppliers (
     CosNotifyChannelAdmin::InterFilterGroupOperator op,
     CosNotifyChannelAdmin::AdminID_out id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -151,7 +151,7 @@ virtual CosNotifyChannelAdmin::SupplierAdmin_ptr new_for_suppliers (
 
 virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr get_consumeradmin (
     CosNotifyChannelAdmin::AdminID id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -160,7 +160,7 @@ virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr get_consumeradmin (
 
 virtual CosNotifyChannelAdmin::SupplierAdmin_ptr get_supplieradmin (
     CosNotifyChannelAdmin::AdminID id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -168,21 +168,21 @@ virtual CosNotifyChannelAdmin::SupplierAdmin_ptr get_supplieradmin (
   ));
 
 virtual CosNotifyChannelAdmin::AdminIDSeq * get_all_consumeradmins (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotifyChannelAdmin::AdminIDSeq * get_all_supplieradmins (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotification::QoSProperties * get_qos (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -190,7 +190,7 @@ virtual CosNotification::QoSProperties * get_qos (
 
   virtual void set_qos (
     const CosNotification::QoSProperties & qos
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -200,7 +200,7 @@ virtual CosNotification::QoSProperties * get_qos (
   virtual void validate_qos (
     const CosNotification::QoSProperties & required_qos,
     CosNotification::NamedPropertyRangeSeq_out available_qos
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -208,7 +208,7 @@ virtual CosNotification::QoSProperties * get_qos (
   ));
 
   virtual CosNotification::AdminProperties * get_admin (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -216,7 +216,7 @@ virtual CosNotification::QoSProperties * get_qos (
 
   virtual void set_admin (
     const CosNotification::AdminProperties & admin
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -224,21 +224,21 @@ virtual CosNotification::QoSProperties * get_qos (
   ));
 
   virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
   virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
   virtual void destroy (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
                    CORBA::SystemException