1 files changed, 3 insertions, 12 deletions

diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
index 758e9dc7019..fd0ef8ebc02 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
@@ -4,6 +4,7 @@
 #include "tao/debug.h"
 #include "ace/Log_Msg.h"
 #include "tao/ORB_Constants.h"
+#include "tao/SystemException.h"
 #include "tao/AnyTypeCode/Any.h"
 
 #if !defined (__ACE_INLINE__)
@@ -16,14 +17,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TimeBase::TimeT
 TAO_FT_Request_Duration_Policy::request_duration_policy_value (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->request_duration_;
 }
 
 CORBA::PolicyType
 TAO_FT_Request_Duration_Policy::policy_type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return FT::REQUEST_DURATION_POLICY;
 }
@@ -33,8 +32,7 @@ TAO_FT_Request_Duration_Policy::create (const CORBA::Any& val)
 {
   TimeBase::TimeT value;
   if ((val >>= value) == 0)
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
-                      CORBA::Policy::_nil ());
+    throw CORBA::PolicyError (CORBA::BAD_POLICY_VALUE);
 
   TAO_FT_Request_Duration_Policy *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -57,7 +55,6 @@ TAO_FT_Request_Duration_Policy::clone (void) const
 
 CORBA::Policy_ptr
 TAO_FT_Request_Duration_Policy::copy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_FT_Request_Duration_Policy* tmp = 0;
   ACE_NEW_THROW_EX (tmp, TAO_FT_Request_Duration_Policy (*this),
@@ -69,7 +66,6 @@ TAO_FT_Request_Duration_Policy::copy (void)
 
 void
 TAO_FT_Request_Duration_Policy::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -95,7 +91,6 @@ TAO_FT_Request_Duration_Policy::set_time_value (ACE_Time_Value &time_value)
 
 FT::HeartbeatPolicyValue
 TAO_FT_Heart_Beat_Policy::heartbeat_policy_value (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   FT::HeartbeatPolicyValue val;
   val.heartbeat = this->heartbeat_;
@@ -111,8 +106,7 @@ TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val)
 {
   FT::HeartbeatPolicyValue *value = 0;
   if ((val >>= value) == 0)
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
-                      CORBA::Policy::_nil ());
+    throw CORBA::PolicyError (CORBA::BAD_POLICY_VALUE);
 
   TAO_FT_Heart_Beat_Policy *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
@@ -128,7 +122,6 @@ TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val)
 
 CORBA::PolicyType
 TAO_FT_Heart_Beat_Policy::policy_type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return FT::HEARTBEAT_POLICY;
 }
@@ -136,7 +129,6 @@ TAO_FT_Heart_Beat_Policy::policy_type (void)
 
 CORBA::Policy_ptr
 TAO_FT_Heart_Beat_Policy::copy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_FT_Heart_Beat_Policy * tmp = 0;
   ACE_NEW_THROW_EX (tmp, TAO_FT_Heart_Beat_Policy (*this),
@@ -158,7 +150,6 @@ TAO_FT_Heart_Beat_Policy::clone (void) const
 
 void
 TAO_FT_Heart_Beat_Policy::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }