diff options
Diffstat (limited to 'TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp')
| -rw-r--r-- | TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp index 397be5ee664..03559f68670 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp +++ b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp @@ -5,6 +5,8 @@ #include "tao/ORB_Constants.h" #include "tao/AnyTypeCode/Any.h" +#include "ace/CORBA_macros.h" + ACE_RCSID (BiDir_GIOP, BiDir_PolicyFactory, "$Id$") @@ -15,10 +17,8 @@ CORBA::Policy_ptr TAO_BiDir_PolicyFactory::create_policy ( CORBA::PolicyType type, const CORBA::Any &value) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::PolicyError)) { - CORBA::Policy_ptr policy = CORBA::Policy::_nil (); + CORBA::Policy_ptr policy = CORBA::Policy_ptr (); if (type == BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE) { @@ -27,8 +27,7 @@ TAO_BiDir_PolicyFactory::create_policy ( // Extract the value from the any. if ((value >>= val) == 0) { - ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE), - CORBA::Policy::_nil ()); + throw ::CORBA::PolicyError (CORBA::BAD_POLICY_VALUE); } ACE_NEW_THROW_EX (policy, @@ -42,8 +41,7 @@ TAO_BiDir_PolicyFactory::create_policy ( return policy; } - ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE), - CORBA::Policy::_nil ()); + throw ::CORBA::PolicyError (CORBA::BAD_POLICY_TYPE); } TAO_END_VERSIONED_NAMESPACE_DECL |