1 files changed, 153 insertions, 158 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
index c9d280703e6..0096fddd78d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
@@ -38,10 +38,7 @@ public:
   TAO_NS_ConsumerAdmin (void);
 
   /// Destructor
-  ~TAO_NS_ConsumerAdmin ();  
-
-  /// Init this object.
-  void set (CosNotifyChannelAdmin::InterFilterGroupOperator op ACE_ENV_ARG_DECL);
+  ~TAO_NS_ConsumerAdmin ();
 
   /// Return servant
   virtual PortableServer::Servant servant (void);
@@ -54,187 +51,185 @@ public:
   virtual void release (void);
 
 protected:
-  /// = CosNotifyChannelAdmin::ConsumerAdmin methods  
+  /// = CosNotifyChannelAdmin::ConsumerAdmin methods
 
-virtual CosNotifyChannelAdmin::AdminID MyID (
-    
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
+  virtual CosNotifyChannelAdmin::AdminID MyID (
 
-virtual ::CosNotifyChannelAdmin::EventChannel_ptr MyChannel (
-    
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
+    ACE_THROW_SPEC ((
+                     CORBA::SystemException
+                     ));
 
-virtual ::CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (
-    
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
+  virtual ::CosNotifyChannelAdmin::EventChannel_ptr MyChannel (
 
-virtual ::CosNotifyFilter::MappingFilter_ptr priority_filter (
-    
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
+    ACE_THROW_SPEC ((
+                     CORBA::SystemException
+                     ));
 
-virtual void priority_filter (
-    CosNotifyFilter::MappingFilter_ptr priority_filter
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
+  virtual ::CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (ACE_ENV_SINGLE_ARG_DECL)
+    ACE_THROW_SPEC ((
+                     CORBA::SystemException
+                     ));
 
-virtual ::CosNotifyFilter::MappingFilter_ptr lifetime_filter (
-    
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
+  virtual ::CosNotifyFilter::MappingFilter_ptr priority_filter (
 
-virtual void lifetime_filter (
-    CosNotifyFilter::MappingFilter_ptr lifetime_filter
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
+    ACE_THROW_SPEC ((
+                     CORBA::SystemException
+                     ));
 
-virtual ::CosNotifyChannelAdmin::ProxyIDSeq * pull_suppliers (
-    
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
+  virtual void priority_filter (
+                                CosNotifyFilter::MappingFilter_ptr priority_filter
+                                )
+    ACE_THROW_SPEC ((
+                     CORBA::SystemException
+                     ));
 
-virtual ::CosNotifyChannelAdmin::ProxyIDSeq * push_suppliers (
-    
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
+  virtual ::CosNotifyFilter::MappingFilter_ptr lifetime_filter (
 
-virtual ::CosNotifyChannelAdmin::ProxySupplier_ptr get_proxy_supplier (
-    CosNotifyChannelAdmin::ProxyID proxy_id
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-    , CosNotifyChannelAdmin::ProxyNotFound
-  ));
-
-virtual ::CosNotifyChannelAdmin::ProxySupplier_ptr obtain_notification_pull_supplier (
-    CosNotifyChannelAdmin::ClientType ctype,
-    CosNotifyChannelAdmin::ProxyID_out proxy_id
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-    , CosNotifyChannelAdmin::AdminLimitExceeded
-  ));
-
-virtual ::CosNotifyChannelAdmin::ProxySupplier_ptr obtain_notification_push_supplier (
-    CosNotifyChannelAdmin::ClientType ctype,
-    CosNotifyChannelAdmin::ProxyID_out proxy_id
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-    , CosNotifyChannelAdmin::AdminLimitExceeded
-  ));
+    ACE_THROW_SPEC ((
+                     CORBA::SystemException
+                     ));
 
-virtual void destroy (
-    
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
+  virtual void lifetime_filter (
+                                CosNotifyFilter::MappingFilter_ptr lifetime_filter
+                                )
+    ACE_THROW_SPEC ((
+                     CORBA::SystemException
+                     ));
+
+  virtual ::CosNotifyChannelAdmin::ProxyIDSeq * pull_suppliers (
+
+  )
+    ACE_THROW_SPEC ((
+                     CORBA::SystemException
+                     ));
 
-virtual ::CosNotification::QoSProperties * get_qos (
-    
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
+  virtual ::CosNotifyChannelAdmin::ProxyIDSeq * push_suppliers (
 
-virtual void set_qos (
-    const CosNotification::QoSProperties & qos
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-    , CosNotification::UnsupportedQoS
-  ));
-
-virtual void validate_qos (
-    const CosNotification::QoSProperties & required_qos,
-    CosNotification::NamedPropertyRangeSeq_out available_qos
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-    , CosNotification::UnsupportedQoS
-  ));
-
-virtual void subscription_change (
-    const CosNotification::EventTypeSeq & added,
-    const CosNotification::EventTypeSeq & removed
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-    , CosNotifyComm::InvalidEventType
-  ));
+    ACE_THROW_SPEC ((
+                     CORBA::SystemException
+                     ));
 
-virtual CosNotifyFilter::FilterID add_filter (
-    CosNotifyFilter::Filter_ptr new_filter
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
+  virtual ::CosNotifyChannelAdmin::ProxySupplier_ptr get_proxy_supplier (
+                                                                         CosNotifyChannelAdmin::ProxyID proxy_id
+                                                                         )
+    ACE_THROW_SPEC ((
+                     CORBA::SystemException
+                     , CosNotifyChannelAdmin::ProxyNotFound
+                     ));
 
-virtual void remove_filter (
-    CosNotifyFilter::FilterID filter
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-    , CosNotifyFilter::FilterNotFound
-  ));
+  virtual ::CosNotifyChannelAdmin::ProxySupplier_ptr obtain_notification_pull_supplier (
+                                                                                        CosNotifyChannelAdmin::ClientType ctype,
+                                                                                        CosNotifyChannelAdmin::ProxyID_out proxy_id
+                                                                                        )
+    ACE_THROW_SPEC ((
+                     CORBA::SystemException
+                     , CosNotifyChannelAdmin::AdminLimitExceeded
+                     ));
 
-virtual ::CosNotifyFilter::Filter_ptr get_filter (
-    CosNotifyFilter::FilterID filter
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-    , CosNotifyFilter::FilterNotFound
-  ));
+  virtual ::CosNotifyChannelAdmin::ProxySupplier_ptr obtain_notification_push_supplier (
+                                                                                        CosNotifyChannelAdmin::ClientType ctype,
+                                                                                        CosNotifyChannelAdmin::ProxyID_out proxy_id
+                                                                                        )
+    ACE_THROW_SPEC ((
+                     CORBA::SystemException
+                     , CosNotifyChannelAdmin::AdminLimitExceeded
+                     ));
 
-virtual ::CosNotifyFilter::FilterIDSeq * get_all_filters (
-    
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
+  virtual void destroy (
 
-virtual void remove_all_filters (
-    
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
+    ACE_THROW_SPEC ((
+                     CORBA::SystemException
+                     ));
 
-virtual ::CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier (
-    
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
+  virtual ::CosNotification::QoSProperties * get_qos (
 
-virtual ::CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier (
-    
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
+    ACE_THROW_SPEC ((
+                     CORBA::SystemException
+                     ));
+
+  virtual void set_qos (
+                        const CosNotification::QoSProperties & qos
+                        )
+    ACE_THROW_SPEC ((
+                     CORBA::SystemException
+                     , CosNotification::UnsupportedQoS
+                     ));
+
+  virtual void validate_qos (
+                             const CosNotification::QoSProperties & required_qos,
+                             CosNotification::NamedPropertyRangeSeq_out available_qos
+                             )
+    ACE_THROW_SPEC ((
+                     CORBA::SystemException
+                     , CosNotification::UnsupportedQoS
+                     ));
+
+  virtual void subscription_change (
+                                    const CosNotification::EventTypeSeq & added,
+                                    const CosNotification::EventTypeSeq & removed
+                                    )
+    ACE_THROW_SPEC ((
+                     CORBA::SystemException
+                     , CosNotifyComm::InvalidEventType
+                     ));
+
+  virtual CosNotifyFilter::FilterID add_filter (
+                                                CosNotifyFilter::Filter_ptr new_filter
+                                                )
+    ACE_THROW_SPEC ((
+                     CORBA::SystemException
+                     ));
+
+  virtual void remove_filter (
+                              CosNotifyFilter::FilterID filter
+                              )
+    ACE_THROW_SPEC ((
+                     CORBA::SystemException
+                     , CosNotifyFilter::FilterNotFound
+                     ));
+
+  virtual ::CosNotifyFilter::Filter_ptr get_filter (
+                                                    CosNotifyFilter::FilterID filter
+                                                    )
+    ACE_THROW_SPEC ((
+                     CORBA::SystemException
+                     , CosNotifyFilter::FilterNotFound
+                     ));
+
+  virtual ::CosNotifyFilter::FilterIDSeq * get_all_filters (
+
+  )
+    ACE_THROW_SPEC ((
+                     CORBA::SystemException
+                     ));
+
+  virtual void remove_all_filters (
+
+  )
+    ACE_THROW_SPEC ((
+                     CORBA::SystemException
+                     ));
+
+  virtual ::CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier (
+
+  )
+    ACE_THROW_SPEC ((
+                     CORBA::SystemException
+                     ));
+
+  virtual ::CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier (
+
+  )
+    ACE_THROW_SPEC ((
+                     CORBA::SystemException
+                     ));
 
 };