diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify/Builder.h')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Builder.h | 39 |
1 files changed, 14 insertions, 25 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.h b/TAO/orbsvcs/orbsvcs/Notify/Builder.h index 7ed2c219c65..42d695e2658 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Builder.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.h @@ -56,11 +56,10 @@ public: /// Build EventChannel Factory. virtual CosNotifyChannelAdmin::EventChannelFactory_ptr - build_event_channel_factory (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL); + build_event_channel_factory (PortableServer::POA_ptr poa); /// Build the Filter Factory. virtual CosNotifyFilter::FilterFactory_ptr build_filter_factory ( - ACE_ENV_SINGLE_ARG_DECL ); /// Build EventChannel. @@ -68,22 +67,19 @@ public: build_event_channel (TAO_Notify_EventChannelFactory* ecf , const CosNotification::QoSProperties & initial_qos , const CosNotification::AdminProperties & initial_admin - , CosNotifyChannelAdmin::ChannelID_out id - ACE_ENV_ARG_DECL); + , CosNotifyChannelAdmin::ChannelID_out id); virtual TAO_Notify_EventChannel * build_event_channel (TAO_Notify_EventChannelFactory* ecf - , const CosNotifyChannelAdmin::ChannelID id - ACE_ENV_ARG_DECL); + , const CosNotifyChannelAdmin::ChannelID id); /// Build ConsumerAdmin virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr build_consumer_admin (TAO_Notify_EventChannel* ec , CosNotifyChannelAdmin::InterFilterGroupOperator op - , CosNotifyChannelAdmin::AdminID_out id - ACE_ENV_ARG_DECL); + , CosNotifyChannelAdmin::AdminID_out id); /// Build ConsumerAdmin during topology restore /// TODO: this returns a reference to the actual type @@ -92,14 +88,13 @@ public: virtual TAO_Notify_ConsumerAdmin * build_consumer_admin (TAO_Notify_EventChannel* ec , const CosNotifyChannelAdmin::AdminID id //CORBA::Long id // note: an in parameter! - ACE_ENV_ARG_DECL); + ); /// Build SupplierAdmin virtual CosNotifyChannelAdmin::SupplierAdmin_ptr build_supplier_admin (TAO_Notify_EventChannel * ec , CosNotifyChannelAdmin::InterFilterGroupOperator op - , CosNotifyChannelAdmin::AdminID_out id - ACE_ENV_ARG_DECL); + , CosNotifyChannelAdmin::AdminID_out id); /// Build ConsumerAdmin during topology restore /// TODO: this returns a reference to the actual type @@ -108,63 +103,57 @@ public: virtual TAO_Notify_SupplierAdmin * build_supplier_admin (TAO_Notify_EventChannel * ec , const CosNotifyChannelAdmin::AdminID id //CORBA::Long id // note: an in parameter! - ACE_ENV_ARG_DECL); + ); /// Build ProxyConsumer virtual CosNotifyChannelAdmin::ProxyConsumer_ptr build_proxy (TAO_Notify_SupplierAdmin* sa , CosNotifyChannelAdmin::ClientType ctype , CosNotifyChannelAdmin::ProxyID_out proxy_id - , const CosNotification::QoSProperties & initial_qos - ACE_ENV_ARG_DECL); + , const CosNotification::QoSProperties & initial_qos); /// Reload ProxyConsumer virtual TAO_Notify_ProxyConsumer * build_proxy (TAO_Notify_SupplierAdmin* sa , CosNotifyChannelAdmin::ClientType ctype - , const CosNotifyChannelAdmin::ProxyID proxy_id - ACE_ENV_ARG_DECL); + , const CosNotifyChannelAdmin::ProxyID proxy_id); /// Build ProxySupplier. virtual CosNotifyChannelAdmin::ProxySupplier_ptr build_proxy (TAO_Notify_ConsumerAdmin* ca , CosNotifyChannelAdmin::ClientType ctype , CosNotifyChannelAdmin::ProxyID_out proxy_id - , const CosNotification::QoSProperties & initial_qos - ACE_ENV_ARG_DECL); + , const CosNotification::QoSProperties & initial_qos); /// Reload ProxySupplier. virtual TAO_Notify_ProxySupplier * build_proxy (TAO_Notify_ConsumerAdmin* ca , CosNotifyChannelAdmin::ClientType ctype - , const CosNotifyChannelAdmin::ProxyID proxy_id - ACE_ENV_ARG_DECL); + , const CosNotifyChannelAdmin::ProxyID proxy_id); /// Build CosEC style ProxySupplier. virtual CosEventChannelAdmin::ProxyPushSupplier_ptr - build_proxy (TAO_Notify_ConsumerAdmin* ca ACE_ENV_ARG_DECL); + build_proxy (TAO_Notify_ConsumerAdmin* ca); /// Build CosEC style ProxyConsumer. virtual CosEventChannelAdmin::ProxyPushConsumer_ptr - build_proxy (TAO_Notify_SupplierAdmin* sa ACE_ENV_ARG_DECL); + build_proxy (TAO_Notify_SupplierAdmin* sa); /// Apply Reactive concurrency. virtual void apply_reactive_concurrency ( - TAO_Notify_Object& object ACE_ENV_ARG_DECL + TAO_Notify_Object& object ); /// Apply Thread Pools. virtual void apply_thread_pool_concurrency ( TAO_Notify_Object& object, const NotifyExt::ThreadPoolParams& tp_params - ACE_ENV_ARG_DECL ); /// Apply Thread Pools with Lanes. virtual void apply_lane_concurrency ( TAO_Notify_Object& object, const NotifyExt::ThreadPoolLanesParams& tpl_params - ACE_ENV_ARG_DECL ); }; |