diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-02-11 12:51:42 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-02-11 12:51:42 +0000 |
commit | 684f4149bb62552bd083a246812149010a0d5278 (patch) | |
tree | e7cd895a2fa466e22075c21c31fc83ebc30f476d /TAO/tao/Messaging | |
parent | df13612f36e202934137663b99b65394b07ae8cd (diff) | |
download | ATCD-684f4149bb62552bd083a246812149010a0d5278.tar.gz |
Sun Feb 11 12:38:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/Messaging')
-rw-r--r-- | TAO/tao/Messaging/AMH_Response_Handler.cpp | 5 | ||||
-rw-r--r-- | TAO/tao/Messaging/AMH_Response_Handler.h | 3 | ||||
-rw-r--r-- | TAO/tao/Messaging/Asynch_Invocation.cpp | 1 | ||||
-rw-r--r-- | TAO/tao/Messaging/Asynch_Invocation.h | 9 | ||||
-rw-r--r-- | TAO/tao/Messaging/Asynch_Invocation_Adapter.h | 2 | ||||
-rw-r--r-- | TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp | 2 | ||||
-rw-r--r-- | TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp | 13 | ||||
-rw-r--r-- | TAO/tao/Messaging/Connection_Timeout_Policy_i.h | 12 | ||||
-rw-r--r-- | TAO/tao/Messaging/Messaging_ORBInitializer.cpp | 2 | ||||
-rw-r--r-- | TAO/tao/Messaging/Messaging_ORBInitializer.h | 6 | ||||
-rw-r--r-- | TAO/tao/Messaging/Messaging_PolicyFactory.cpp | 2 | ||||
-rw-r--r-- | TAO/tao/Messaging/Messaging_PolicyFactory.h | 4 | ||||
-rw-r--r-- | TAO/tao/Messaging/Messaging_Policy_i.cpp | 8 | ||||
-rw-r--r-- | TAO/tao/Messaging/Messaging_Policy_i.h | 24 |
14 files changed, 22 insertions, 71 deletions
diff --git a/TAO/tao/Messaging/AMH_Response_Handler.cpp b/TAO/tao/Messaging/AMH_Response_Handler.cpp index 846a65647fd..e3bd443d1fc 100644 --- a/TAO/tao/Messaging/AMH_Response_Handler.cpp +++ b/TAO/tao/Messaging/AMH_Response_Handler.cpp @@ -133,7 +133,6 @@ TAO_AMH_Response_Handler::_tao_rh_init_reply (void) void TAO_AMH_Response_Handler::_tao_rh_send_reply (void) { - { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); @@ -176,8 +175,7 @@ TAO_AMH_Response_Handler::_tao_rh_send_reply (void) } void -TAO_AMH_Response_Handler::_tao_rh_send_exception (CORBA::Exception &ex - ) +TAO_AMH_Response_Handler::_tao_rh_send_exception (CORBA::Exception &ex) { { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); @@ -250,7 +248,6 @@ namespace TAO void ARH_Refcount_Functor::operator () ( TAO_AMH_Response_Handler *arh) - ACE_THROW_SPEC (()) { (void) arh->_remove_ref (); } diff --git a/TAO/tao/Messaging/AMH_Response_Handler.h b/TAO/tao/Messaging/AMH_Response_Handler.h index 9f25b914054..b8dc247eb2d 100644 --- a/TAO/tao/Messaging/AMH_Response_Handler.h +++ b/TAO/tao/Messaging/AMH_Response_Handler.h @@ -211,8 +211,7 @@ namespace TAO class TAO_Messaging_Export ARH_Refcount_Functor { public: - void operator() (TAO_AMH_Response_Handler *arh) - ACE_THROW_SPEC (()); + void operator() (TAO_AMH_Response_Handler *arh); }; } diff --git a/TAO/tao/Messaging/Asynch_Invocation.cpp b/TAO/tao/Messaging/Asynch_Invocation.cpp index c35d2cde9af..b7de10524f4 100644 --- a/TAO/tao/Messaging/Asynch_Invocation.cpp +++ b/TAO/tao/Messaging/Asynch_Invocation.cpp @@ -40,7 +40,6 @@ namespace TAO Invocation_Status Asynch_Remote_Invocation::remote_invocation (ACE_Time_Value * max_wait_time) - ACE_THROW_SPEC ((CORBA::Exception)) { TAO_Target_Specification tspec; this->init_target_spec (tspec); diff --git a/TAO/tao/Messaging/Asynch_Invocation.h b/TAO/tao/Messaging/Asynch_Invocation.h index 0aee5c7a088..3a6df1d100d 100644 --- a/TAO/tao/Messaging/Asynch_Invocation.h +++ b/TAO/tao/Messaging/Asynch_Invocation.h @@ -36,11 +36,6 @@ class TAO_Operation_Details; class TAO_InputCDR; class TAO_Asynch_Reply_Dispatcher_Base; -namespace CORBA -{ - class SystemException; -} - namespace TAO { class Profile_Transport_Resolver; @@ -55,9 +50,7 @@ namespace TAO TAO_Asynch_Reply_Dispatcher_Base *rd, bool response_expected = true); - Invocation_Status remote_invocation (ACE_Time_Value *value - ) - ACE_THROW_SPEC ((CORBA::Exception)); + Invocation_Status remote_invocation (ACE_Time_Value *value); protected: // To prevent leaking memory from the reply dispatcher that we diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h index e8f175910ea..03f84fab1e0 100644 --- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h +++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h @@ -25,7 +25,6 @@ #include "tao/Messaging/Messaging.h" #include "tao/Asynch_Reply_Dispatcher_Base.h" #include "tao/Invocation_Adapter.h" -#include "ace/CORBA_macros.h" #include "ace/Global_Macros.h" #include "ace/Auto_Functor.h" @@ -43,7 +42,6 @@ class TAO_Asynch_Reply_Dispatcher_Base; namespace CORBA { class Object; - class SystemException; } namespace TAO diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp index b4bc0cb4485..a2a1a4b3796 100644 --- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp +++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp @@ -8,8 +8,6 @@ #include "tao/ORB_Core.h" #include "tao/Transport.h" -#include "ace/CORBA_macros.h" - ACE_RCSID(Messaging, Asynch_Reply_Dispatcher, "$Id$") TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp index d62ce1d8a54..cc34fa8f55a 100644 --- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp +++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp @@ -3,6 +3,7 @@ #include "tao/ORB_Core.h" #include "tao/Stub.h" #include "tao/debug.h" +#include "tao/SystemException.h" #include "tao/AnyTypeCode/Any.h" ACE_RCSID (Messaging, @@ -37,17 +38,13 @@ TAO_ConnectionTimeoutPolicy::TAO_ConnectionTimeoutPolicy ( } TimeBase::TimeT -TAO_ConnectionTimeoutPolicy::relative_expiry ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)) +TAO_ConnectionTimeoutPolicy::relative_expiry (void) { return this->relative_expiry_; } CORBA::PolicyType -TAO_ConnectionTimeoutPolicy::policy_type ( - void) - ACE_THROW_SPEC ((CORBA::SystemException)) +TAO_ConnectionTimeoutPolicy::policy_type (void) { return TAO::CONNECTION_TIMEOUT_POLICY_TYPE; } @@ -115,7 +112,7 @@ TAO_ConnectionTimeoutPolicy::create (const CORBA::Any& val) if ((val >>= value) == 0) throw ::CORBA::PolicyError (CORBA::BAD_POLICY_VALUE); - TAO_ConnectionTimeoutPolicy *tmp; + TAO_ConnectionTimeoutPolicy *tmp = 0; ACE_NEW_THROW_EX (tmp, TAO_ConnectionTimeoutPolicy (value), CORBA::NO_MEMORY (TAO::VMCID, @@ -136,7 +133,6 @@ TAO_ConnectionTimeoutPolicy::clone (void) const CORBA::Policy_ptr TAO_ConnectionTimeoutPolicy::copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Future policy implementors: notice how the following code is // exception safe! @@ -151,7 +147,6 @@ TAO_ConnectionTimeoutPolicy::copy (void) void TAO_ConnectionTimeoutPolicy::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h index 63f0091e14f..a3e17bb91b8 100644 --- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h +++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h @@ -69,17 +69,13 @@ public: virtual TAO_ConnectionTimeoutPolicy *clone (void) const; // = The TAO::ConnectionTinoutPolicy methods - virtual TimeBase::TimeT relative_expiry (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual TimeBase::TimeT relative_expiry (void); - virtual CORBA::PolicyType policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::PolicyType policy_type (void); - virtual CORBA::Policy_ptr copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Policy_ptr copy (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); /// Change the CORBA representation to the ACE representation. void set_time_value (ACE_Time_Value &time_value); diff --git a/TAO/tao/Messaging/Messaging_ORBInitializer.cpp b/TAO/tao/Messaging/Messaging_ORBInitializer.cpp index 59c8194037f..12bffa243dc 100644 --- a/TAO/tao/Messaging/Messaging_ORBInitializer.cpp +++ b/TAO/tao/Messaging/Messaging_ORBInitializer.cpp @@ -18,7 +18,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL void TAO_Messaging_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { #if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) TAO_ORB_Core::set_timeout_hook (TAO_RelativeRoundtripTimeoutPolicy::hook); @@ -37,7 +36,6 @@ TAO_Messaging_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr) void TAO_Messaging_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->register_policy_factories (info); diff --git a/TAO/tao/Messaging/Messaging_ORBInitializer.h b/TAO/tao/Messaging/Messaging_ORBInitializer.h index 443118bf601..d5462ee0dbc 100644 --- a/TAO/tao/Messaging/Messaging_ORBInitializer.h +++ b/TAO/tao/Messaging/Messaging_ORBInitializer.h @@ -49,11 +49,9 @@ public: */ //@{ - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); //@} diff --git a/TAO/tao/Messaging/Messaging_PolicyFactory.cpp b/TAO/tao/Messaging/Messaging_PolicyFactory.cpp index 35af00c3ddd..e54fe791701 100644 --- a/TAO/tao/Messaging/Messaging_PolicyFactory.cpp +++ b/TAO/tao/Messaging/Messaging_PolicyFactory.cpp @@ -38,8 +38,6 @@ CORBA::Policy_ptr TAO_Messaging_PolicyFactory::create_policy ( CORBA::PolicyType type, const CORBA::Any &value) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::PolicyError)) { #if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) if (type == Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE) diff --git a/TAO/tao/Messaging/Messaging_PolicyFactory.h b/TAO/tao/Messaging/Messaging_PolicyFactory.h index a2e5d63eae0..51c46e053ca 100644 --- a/TAO/tao/Messaging/Messaging_PolicyFactory.h +++ b/TAO/tao/Messaging/Messaging_PolicyFactory.h @@ -43,9 +43,7 @@ class TAO_Messaging_PolicyFactory public: virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, - const CORBA::Any & value) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::PolicyError)); + const CORBA::Any & value); private: #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) CORBA::Policy_ptr diff --git a/TAO/tao/Messaging/Messaging_Policy_i.cpp b/TAO/tao/Messaging/Messaging_Policy_i.cpp index 9ab757e6aaa..a4b44a0ac93 100644 --- a/TAO/tao/Messaging/Messaging_Policy_i.cpp +++ b/TAO/tao/Messaging/Messaging_Policy_i.cpp @@ -43,7 +43,6 @@ TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy ( TimeBase::TimeT TAO_RelativeRoundtripTimeoutPolicy::relative_expiry ( void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->relative_expiry_; } @@ -51,7 +50,6 @@ TAO_RelativeRoundtripTimeoutPolicy::relative_expiry ( CORBA::PolicyType TAO_RelativeRoundtripTimeoutPolicy::policy_type ( void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE; } @@ -140,7 +138,6 @@ TAO_RelativeRoundtripTimeoutPolicy::clone (void) const CORBA::Policy_ptr TAO_RelativeRoundtripTimeoutPolicy::copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Future policy implementors: notice how the following code is // exception safe! @@ -155,7 +152,6 @@ TAO_RelativeRoundtripTimeoutPolicy::copy (void) void TAO_RelativeRoundtripTimeoutPolicy::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -209,7 +205,6 @@ TAO_Sync_Scope_Policy::TAO_Sync_Scope_Policy (const TAO_Sync_Scope_Policy &rhs) CORBA::PolicyType TAO_Sync_Scope_Policy::policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return Messaging::SYNC_SCOPE_POLICY_TYPE; } @@ -287,14 +282,12 @@ TAO_Sync_Scope_Policy::clone (void) const Messaging::SyncScope TAO_Sync_Scope_Policy::synchronization (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->synchronization_; } CORBA::Policy_ptr TAO_Sync_Scope_Policy::copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Sync_Scope_Policy *servant = 0; ACE_NEW_THROW_EX (servant, @@ -306,7 +299,6 @@ TAO_Sync_Scope_Policy::copy (void) void TAO_Sync_Scope_Policy::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } TAO_Cached_Policy_Type diff --git a/TAO/tao/Messaging/Messaging_Policy_i.h b/TAO/tao/Messaging/Messaging_Policy_i.h index 34be4fb5093..5da18bf8731 100644 --- a/TAO/tao/Messaging/Messaging_Policy_i.h +++ b/TAO/tao/Messaging/Messaging_Policy_i.h @@ -62,17 +62,13 @@ public: virtual TAO_RelativeRoundtripTimeoutPolicy *clone (void) const; // = The Messaging::RelativeRoundtripTimeoutPolicy methods - virtual TimeBase::TimeT relative_expiry (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual TimeBase::TimeT relative_expiry (void); - virtual CORBA::PolicyType policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::PolicyType policy_type (void); - virtual CORBA::Policy_ptr copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Policy_ptr copy (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); /// Change the CORBA representation to the ACE representation. void set_time_value (ACE_Time_Value &time_value); @@ -128,19 +124,15 @@ public: // = The Messaging::SyncScopePolicy methods. - virtual Messaging::SyncScope synchronization (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual Messaging::SyncScope synchronization (void); void get_synchronization (Messaging::SyncScope &synchronization) const; - virtual CORBA::PolicyType policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::PolicyType policy_type (void); - virtual CORBA::Policy_ptr copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Policy_ptr copy (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); // Return the cached policy type for this policy. virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; |