Wed Jan 24 12:25:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

1 files changed, 7 insertions, 11 deletions

diff --git a/TAO/tao/PortableServer/POA_Policy_Set.cpp b/TAO/tao/PortableServer/POA_Policy_Set.cpp
index af860e75a75..6587bf06665 100644
--- a/TAO/tao/PortableServer/POA_Policy_Set.cpp
+++ b/TAO/tao/PortableServer/POA_Policy_Set.cpp
@@ -34,7 +34,7 @@ TAO_POA_Policy_Set::~TAO_POA_Policy_Set (void)
 
 void
 TAO_POA_Policy_Set::add_client_exposed_fixed_policies (CORBA::PolicyList *client_exposed_policies
-                                                       ACE_ENV_ARG_DECL)
+                                                       )
 {
   CORBA::ULong cep_index = client_exposed_policies->length ();
 
@@ -49,8 +49,7 @@ TAO_POA_Policy_Set::add_client_exposed_fixed_policies (CORBA::PolicyList *client
         {
           client_exposed_policies->length (cep_index + 1);
           (*client_exposed_policies)[cep_index] =
-                                  policy->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+                                  policy->copy ();
 
           cep_index++;
         }
@@ -60,16 +59,14 @@ TAO_POA_Policy_Set::add_client_exposed_fixed_policies (CORBA::PolicyList *client
 void
 TAO_POA_Policy_Set::validate_policies (TAO_Policy_Validator &validator,
                                        TAO_ORB_Core &orb_core
-                                       ACE_ENV_ARG_DECL)
+                                       )
 {
   // Just give a last chance for all the unloaded validators in other
   // libraries to be registered
-  orb_core.load_policy_validators (validator ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  orb_core.load_policy_validators (validator);
 
   // Validate that all of the specified policies make sense.
-  validator.validate (this->impl_  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  validator.validate (this->impl_ );
 
   // Verify that all policies are legal for the currently loaded
   // POA extensions.
@@ -79,15 +76,14 @@ TAO_POA_Policy_Set::validate_policies (TAO_Policy_Validator &validator,
     {
       CORBA::Policy_var policy = this->impl_.get_policy_by_index (i);
 
-      CORBA::PolicyType type = policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      CORBA::PolicyType type = policy->policy_type ();
 
       if (validator.legal_policy (type) == 0)
         {
 #if ! defined (CORBA_E_MICRO)
           // An invalid policy was specified.  Let the user know about
           // it.
-          ACE_THROW (PortableServer::POA::InvalidPolicy ());
+          throw (PortableServer::POA::InvalidPolicy ());
 #else
           ACE_ERROR ((LM_ERROR, "Invalid policy\n"));
 #endif