diff options
Diffstat (limited to 'TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp')
| -rw-r--r-- | TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp b/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp index eaa42cf7ff5..7b337421ed3 100644 --- a/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp +++ b/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp @@ -21,7 +21,7 @@ CORBA::Policy_ptr TAO_PortableServer_PolicyFactory::create_policy ( CORBA::PolicyType type, const CORBA::Any &value - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)) { @@ -33,8 +33,7 @@ TAO_PortableServer_PolicyFactory::create_policy ( TAO::Portable_Server::ThreadPolicy *thread_policy = 0; PortableServer::ThreadPolicyValue thr_value; - TAO::Portable_Server::create_policy (thread_policy, thr_value, value ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + TAO::Portable_Server::create_policy (thread_policy, thr_value, value); return thread_policy; } @@ -45,8 +44,7 @@ TAO_PortableServer_PolicyFactory::create_policy ( TAO::Portable_Server::LifespanPolicy *lifespan_policy = 0; PortableServer::LifespanPolicyValue lifespan_value; - TAO::Portable_Server::create_policy (lifespan_policy, lifespan_value, value ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + TAO::Portable_Server::create_policy (lifespan_policy, lifespan_value, value); return lifespan_policy; } @@ -56,8 +54,7 @@ TAO_PortableServer_PolicyFactory::create_policy ( TAO::Portable_Server::IdUniquenessPolicy *id_uniqueness_policy = 0; PortableServer::IdUniquenessPolicyValue id_uniqueness_value; - TAO::Portable_Server::create_policy (id_uniqueness_policy, id_uniqueness_value, value ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + TAO::Portable_Server::create_policy (id_uniqueness_policy, id_uniqueness_value, value); return id_uniqueness_policy; } @@ -67,8 +64,7 @@ TAO_PortableServer_PolicyFactory::create_policy ( TAO::Portable_Server::IdAssignmentPolicy *id_assignment_policy = 0; PortableServer::IdAssignmentPolicyValue id_assignment_value; - TAO::Portable_Server::create_policy (id_assignment_policy, id_assignment_value, value ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + TAO::Portable_Server::create_policy (id_assignment_policy, id_assignment_value, value); return id_assignment_policy; } @@ -80,8 +76,7 @@ TAO_PortableServer_PolicyFactory::create_policy ( TAO::Portable_Server::ImplicitActivationPolicy *implicit_activatation_policy = 0; PortableServer::ImplicitActivationPolicyValue implicit_activation_value; - TAO::Portable_Server::create_policy (implicit_activatation_policy, implicit_activation_value, value ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + TAO::Portable_Server::create_policy (implicit_activatation_policy, implicit_activation_value, value); return implicit_activatation_policy; } @@ -91,8 +86,7 @@ TAO_PortableServer_PolicyFactory::create_policy ( TAO::Portable_Server::ServantRetentionPolicy *servant_retention_policy = 0; PortableServer::ServantRetentionPolicyValue servant_retention_value; - TAO::Portable_Server::create_policy (servant_retention_policy, servant_retention_value, value ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + TAO::Portable_Server::create_policy (servant_retention_policy, servant_retention_value, value); return servant_retention_policy; } @@ -102,8 +96,7 @@ TAO_PortableServer_PolicyFactory::create_policy ( TAO::Portable_Server::RequestProcessingPolicy *request_processing_policy = 0; PortableServer::RequestProcessingPolicyValue request_processing_value; - TAO::Portable_Server::create_policy (request_processing_policy, request_processing_value, value ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); + TAO::Portable_Server::create_policy (request_processing_policy, request_processing_value, value); return request_processing_policy; } |