Sun Feb 11 12:38:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

5 files changed, 16 insertions, 90 deletions

diff --git a/TAO/tao/Domain/DomainS.cpp b/TAO/tao/Domain/DomainS.cpp
index d86e97751cf..d769f788f6a 100644
--- a/TAO/tao/Domain/DomainS.cpp
+++ b/TAO/tao/Domain/DomainS.cpp
@@ -303,7 +303,6 @@ POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::get_strategy (
     CORBA::Object_ptr obj
 
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Collocation_Strategy strategy =
     TAO_ORB_Core::collocation_strategy (obj);
@@ -322,7 +321,6 @@ POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::dispatch (
     TAO::Collocation_Strategy strategy
 
   )
-  ACE_THROW_SPEC ((CORBA::Exception))
 {
   TAO::Direct_Collocation_Upcall_Wrapper collocation_upcall_wrapper;
   collocation_upcall_wrapper.upcall (
@@ -382,11 +380,7 @@ POA_CORBA::_TAO_DomainManager_Direct_Proxy_Impl::get_domain_policy (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
     int
-
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   ((TAO::Arg_Traits< CORBA::Policy>::ret_val *) args[0])->arg () =
     dynamic_cast<POA_CORBA::DomainManager_ptr>
@@ -1055,7 +1049,6 @@ POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::get_strategy (
     CORBA::Object_ptr obj
 
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO::Collocation_Strategy strategy =
     TAO_ORB_Core::collocation_strategy (obj);
@@ -1074,7 +1067,6 @@ POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::dispatch (
     TAO::Collocation_Strategy strategy
 
   )
-  ACE_THROW_SPEC ((CORBA::Exception))
 {
   TAO::Direct_Collocation_Upcall_Wrapper collocation_upcall_wrapper;
   collocation_upcall_wrapper.upcall (
@@ -1134,11 +1126,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::make_domain_manager (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
     int
-
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   dynamic_cast<POA_CORBA::ConstructionPolicy_ptr>
     (servant)
diff --git a/TAO/tao/Domain/DomainS.h b/TAO/tao/Domain/DomainS.h
index f8810004498..578f77dc2b1 100644
--- a/TAO/tao/Domain/DomainS.h
+++ b/TAO/tao/Domain/DomainS.h
@@ -139,9 +139,7 @@ namespace POA_CORBA
     virtual ::CORBA::Policy_ptr get_domain_policy (
         ::CORBA::PolicyType policy_type
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void get_domain_policy_skel (
         TAO_ServerRequest & server_request,
@@ -169,8 +167,7 @@ namespace POA_CORBA
     get_strategy (
         CORBA::Object_ptr obj
 
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
+      );
 
     void
     dispatch (
@@ -182,8 +179,7 @@ namespace POA_CORBA
         size_t op_len,
         TAO::Collocation_Strategy strategy
 
-      )
-      ACE_THROW_SPEC ((CORBA::Exception));
+      );
 
     static _TAO_DomainManager_Strategized_Proxy_Broker *
     the_TAO_DomainManager_Strategized_Proxy_Broker (void);
@@ -218,10 +214,7 @@ namespace POA_CORBA
         TAO::Argument ** args,
         int num_args
 
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
   };
 
   //
@@ -306,9 +299,7 @@ namespace POA_CORBA
         ::CORBA::InterfaceDef_ptr object_type,
         ::CORBA::Boolean constr_policy
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
+      = 0;
 
     static void make_domain_manager_skel (
         TAO_ServerRequest & server_request,
@@ -367,8 +358,7 @@ namespace POA_CORBA
     get_strategy (
         CORBA::Object_ptr obj
 
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
+      );
 
     void
     dispatch (
@@ -380,8 +370,7 @@ namespace POA_CORBA
         size_t op_len,
         TAO::Collocation_Strategy strategy
 
-      )
-      ACE_THROW_SPEC ((CORBA::Exception));
+      );
 
     static _TAO_ConstructionPolicy_Strategized_Proxy_Broker *
     the_TAO_ConstructionPolicy_Strategized_Proxy_Broker (void);
@@ -418,18 +407,13 @@ namespace POA_CORBA
         int num_args
 
       )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));static void
+      ;static void
     _get_policy_type (
         TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
 
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_interface.cpp:2050
@@ -440,10 +424,7 @@ namespace POA_CORBA
         TAO::Argument ** args,
         int num_args
 
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_interface.cpp:2050
@@ -454,10 +435,7 @@ namespace POA_CORBA
         TAO::Argument ** args,
         int num_args
 
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
   };
 
   //
diff --git a/TAO/tao/Domain/DomainS.inl b/TAO/tao/Domain/DomainS.inl
index ac024975dee..d65a01973ec 100644
--- a/TAO/tao/Domain/DomainS.inl
+++ b/TAO/tao/Domain/DomainS.inl
@@ -97,9 +97,6 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::_get_policy_type (
     int num_args
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::_get_policy_type (
       servant,
@@ -120,9 +117,6 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::copy (
     int num_args
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::copy (
       servant,
@@ -143,9 +137,6 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::destroy (
     int num_args
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::destroy (
       servant,
diff --git a/TAO/tao/Domain/DomainS_T.h b/TAO/tao/Domain/DomainS_T.h
index 02cdc148bbf..104c41a5088 100644
--- a/TAO/tao/Domain/DomainS_T.h
+++ b/TAO/tao/Domain/DomainS_T.h
@@ -92,10 +92,7 @@ namespace POA_CORBA
     ::CORBA::Policy_ptr get_domain_policy (
         ::CORBA::PolicyType policy_type
 
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
@@ -152,30 +149,21 @@ namespace POA_CORBA
 
     CORBA::PolicyType policy_type (
         void
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     ::CORBA::Policy_ptr copy (
         void
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
 
     void destroy (
         void
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/tie_sh.cpp:60
@@ -184,10 +172,7 @@ namespace POA_CORBA
         ::CORBA::InterfaceDef_ptr object_type,
         ::CORBA::Boolean constr_policy
 
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
   private:
     T *ptr_;
diff --git a/TAO/tao/Domain/DomainS_T.inl b/TAO/tao/Domain/DomainS_T.inl
index 937efa3ed1a..a24aaedddda 100644
--- a/TAO/tao/Domain/DomainS_T.inl
+++ b/TAO/tao/Domain/DomainS_T.inl
@@ -129,9 +129,6 @@ template <class T> ACE_INLINE
     ::CORBA::PolicyType policy_type
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return this->ptr_->get_domain_policy (
     policy_type
@@ -239,9 +236,6 @@ template <class T> ACE_INLINE
 CORBA::PolicyType POA_CORBA::ConstructionPolicy_tie<T>::policy_type  (
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return this->ptr_->policy_type (
 
@@ -255,9 +249,6 @@ template <class T> ACE_INLINE
 ::CORBA::Policy_ptr POA_CORBA::ConstructionPolicy_tie<T>::copy  (
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   return this->ptr_->copy (
 
@@ -269,11 +260,7 @@ template <class T> ACE_INLINE
 
 template <class T> ACE_INLINE
 void POA_CORBA::ConstructionPolicy_tie<T>::destroy  (
-
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   this->ptr_->destroy (
 
@@ -289,9 +276,6 @@ void POA_CORBA::ConstructionPolicy_tie<T>::make_domain_manager  (
     ::CORBA::Boolean constr_policy
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
   this->ptr_->make_domain_manager (
     object_type,