1 files changed, 26 insertions, 80 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
index bbc47b4ec6f..a5014412d7e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
@@ -50,92 +50,38 @@ public:
   virtual ~TAO_Notify_ETCL_Filter ();
 
 protected:
-  virtual char * constraint_grammar (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  virtual char * constraint_grammar (void);
 
-  virtual CosNotifyFilter::ConstraintInfoSeq * add_constraints (const CosNotifyFilter::ConstraintExpSeq & constraint_list)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosNotifyFilter::InvalidConstraint
-                     ));
+  virtual CosNotifyFilter::ConstraintInfoSeq * add_constraints (const CosNotifyFilter::ConstraintExpSeq & constraint_list);
 
   virtual void modify_constraints (const CosNotifyFilter::ConstraintIDSeq & del_list,
                                    const CosNotifyFilter::ConstraintInfoSeq & modify_list
-                                   )
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosNotifyFilter::InvalidConstraint,
-                     CosNotifyFilter::ConstraintNotFound
-                     ));
-
-  virtual CosNotifyFilter::ConstraintInfoSeq * get_constraints (const CosNotifyFilter::ConstraintIDSeq & id_list)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosNotifyFilter::ConstraintNotFound
-                     ));
-
-  virtual CosNotifyFilter::ConstraintInfoSeq * get_all_constraints (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  virtual void remove_all_constraints (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  virtual CORBA::Boolean match (const CORBA::Any & filterable_data)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosNotifyFilter::UnsupportedFilterableData
-                     ));
-
-  virtual CORBA::Boolean match_structured (const CosNotification::StructuredEvent & filterable_data)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosNotifyFilter::UnsupportedFilterableData
-                     ));
-
-  virtual CORBA::Boolean match_typed (const CosNotification::PropertySeq & filterable_data)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosNotifyFilter::UnsupportedFilterableData
-                     ));
-
-  virtual CosNotifyFilter::CallbackID attach_callback (CosNotifyComm::NotifySubscribe_ptr callback)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
-
-  virtual void detach_callback (CosNotifyFilter::CallbackID callback)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosNotifyFilter::CallbackNotFound
-                     ));
-
-  virtual CosNotifyFilter::CallbackIDSeq * get_callbacks (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+                                   );
+
+  virtual CosNotifyFilter::ConstraintInfoSeq * get_constraints (const CosNotifyFilter::ConstraintIDSeq & id_list);
+
+  virtual CosNotifyFilter::ConstraintInfoSeq * get_all_constraints (void);
+
+  virtual void remove_all_constraints (void);
+
+  virtual void destroy (void);
+
+  virtual CORBA::Boolean match (const CORBA::Any & filterable_data);
+
+  virtual CORBA::Boolean match_structured (const CosNotification::StructuredEvent & filterable_data);
+
+  virtual CORBA::Boolean match_typed (const CosNotification::PropertySeq & filterable_data);
+
+  virtual CosNotifyFilter::CallbackID attach_callback (CosNotifyComm::NotifySubscribe_ptr callback);
+
+  virtual void detach_callback (CosNotifyFilter::CallbackID callback);
+
+  virtual CosNotifyFilter::CallbackIDSeq * get_callbacks (void);
 
 private:
-  void add_constraints_i (const CosNotifyFilter::ConstraintInfoSeq& constraint_info_seq)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException,
-                     CosNotifyFilter::InvalidConstraint
-                     ));
-
-  void remove_all_constraints_i (void)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  void add_constraints_i (const CosNotifyFilter::ConstraintInfoSeq& constraint_info_seq);
+
+  void remove_all_constraints_i (void);
 
   struct TAO_Notify_Constraint_Expr
   {